Refactoring: kernel and som are moved to Siman-Common.

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / ConnectionAction.java

diff --git a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
index fee1e70c08fdefba5f0bc4b77d65db9c54fb2ea2..f42782683e9ecc0c6444a5ac1b38a16176a0ddc0 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
+++ b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
@@ -12,7 +12,6 @@ import org.hibernate.Transaction;
 import org.splat.kernel.User;
 import org.splat.som.ApplicationRights;
 import org.splat.som.Database;
-import org.splat.wapp.TabBar;
 
 import java.io.IOException;
 import javax.security.auth.login.FailedLoginException;
@@ -77,15 +76,12 @@ public class ConnectionAction extends Action {
         if (logged.canContributeToStudy() || logged.canValidate()) {
 //TODO: Set the search filter according to user preferences
           Map<String,Object> session = getSession();
-          Map<String,Object> kfilter = (Map<String, Object>)session.get("knowledge.filter");
+//        Map<String,Object> kfilter = (Map<String, Object>)session.get("knowledge.filter");
           Map<String,Object> sfilter = (Map<String, Object>)session.get("study.filter");
           
-          TabBar kbar = (TabBar)kfilter.get("area");
-          TabBar sbar = (TabBar)sfilter.get("area");
-          kbar.enables("private");
-          sbar.enables("private");
-          sbar.selects("private");
-          if (logged.canCreateStudy()) sfilter.put("owner", "mine");    // Supposed being initialized to "all"
+          sfilter.put("state", "ANY");
+          sfilter.put("visibility", "PRIVATE");
+          if (logged.canCreateStudy()) sfilter.put("author", String.valueOf(user.getIndex()));
         }
         this.connect(context, user);                                    // Updates the session context
            return backmenu;
@@ -105,7 +101,7 @@ public class ConnectionAction extends Action {
 //  -------------------------
       try {
         Map<String,Object>  session = getSession();
-        Map<String,Object>  kfilter = (Map<String, Object>)session.get("knowledge.filter");
+//      Map<String,Object>  kfilter = (Map<String, Object>)session.get("knowledge.filter");
         Map<String,Object>  sfilter = (Map<String, Object>)session.get("study.filter");
         LoginContext        context = (LoginContext)session.get("login.context");     
         
@@ -113,9 +109,8 @@ public class ConnectionAction extends Action {
         context.logout();
 
 //TODO: ProjectSettings.deleteDownloadDirectory(user);
-        sfilter.put("owner", "all");
-        ((TabBar)sfilter.get("area")).disables("private");
-        ((TabBar)kfilter.get("area")).disables("private");
+        sfilter.put("state", "ANY");
+        sfilter.put("author", "0");
 
         this.disconnect();                                              // Updates the session context
         return backmenu;