Fix of wrong search results after logout.

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

diff --git a/Workspace/Siman/src/org/splat/simer/OpenStudy.java b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
index 6b467ae4dca0ac3b9a471dd56abd4685fc7741c4..e6190801bf1d92edd4f670094ac5fc78ea7cc00d 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/OpenStudy.java
+++ b/Workspace/Siman/src/org/splat/simer/OpenStudy.java
@@ -14,7 +14,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ResourceBundle;
 
-import org.apache.log4j.Logger;
 import org.splat.dal.bo.kernel.User;
 import org.splat.dal.bo.som.Document;
 import org.splat.dal.bo.som.DocumentType;
@@ -25,6 +24,7 @@ import org.splat.dal.bo.som.Scenario;
 import org.splat.dal.bo.som.SimulationContext;
 import org.splat.dal.bo.som.Study;
 import org.splat.kernel.Do;
+import org.splat.log.AppLogger;
 import org.splat.manox.Toolbox;
 import org.splat.manox.Writer;
 import org.splat.service.DocumentService;
@@ -49,7 +49,7 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
        /**
         * Serial version ID.
         */
-       protected final static Logger LOGGER = org.splat.simer.Action.LOG;
+       protected final static AppLogger LOGGER = org.splat.simer.Action.LOG;
 
        /**
         * The currently open study.
@@ -152,8 +152,19 @@ public class OpenStudy extends AbstractOpenObject implements OpenStudyServices {
                                        _popup = getApplicationSettings().getPopupMenu(
                                                        "steditablemarkprivate");
                                } else {
-                                       _popup = getApplicationSettings().getPopupMenu(
-                                                       "steditablemarkpublic");
+                                       if (_mystudy.getProgressState() == ProgressState.inWORK) {
+                                               _popup = getApplicationSettings().getPopupMenu(
+                                                               "steditable");
+                                       } else if (_mystudy.getProgressState() == ProgressState.inDRAFT) {
+                                               _popup = getApplicationSettings().getPopupMenu(
+                                                               "streviewable");
+                                       } else if (_mystudy.getProgressState() == ProgressState.inCHECK) {
+                                               _popup = getApplicationSettings().getPopupMenu(
+                                                               "stapprovable");
+                                       } else { // APPROVED
+                                               _popup = getApplicationSettings().getPopupMenu(
+                                                               "steditablemarkpublic");
+                                       }
                                }
 
                        }