Salome HOME
Left menu is improved
authormka <mka@opencascade.com>
Wed, 31 Oct 2012 12:09:30 +0000 (12:09 +0000)
committermka <mka@opencascade.com>
Wed, 31 Oct 2012 12:09:30 +0000 (12:09 +0000)
44 files changed:
Workspace/Siman/WebContent/jsp/menuitem.jsp
Workspace/Siman/WebContent/menu.jsp
Workspace/Siman/WebContent/sadmin/approveKnowelm.jsp
Workspace/Siman/WebContent/sadmin/approveSContext.jsp
Workspace/Siman/WebContent/sadmin/displayUser.jsp
Workspace/Siman/WebContent/sadmin/indexStudies.jsp
Workspace/Siman/WebContent/sadmin/upload.jsp
Workspace/Siman/WebContent/study/displayKnowledge.jsp
Workspace/Siman/WebContent/study/displayStudyProperties.jsp
Workspace/Siman/WebContent/study/displayStudyStep.jsp
Workspace/Siman/WebContent/study/editScenarioProperties.jsp
Workspace/Siman/WebContent/study/editStudyProperties.jsp
Workspace/Siman/WebContent/study/error.jsp
Workspace/Siman/WebContent/study/importDocument.jsp
Workspace/Siman/WebContent/study/importError.jsp
Workspace/Siman/WebContent/study/newScenario.jsp
Workspace/Siman/WebContent/study/newStudy.jsp
Workspace/Siman/WebContent/study/searchKnowledge.jsp
Workspace/Siman/WebContent/study/searchStudy.jsp
Workspace/Siman/WebContent/study/upload.jsp
Workspace/Siman/WebContent/study/versionDocument.jsp
Workspace/Siman/src/org/splat/simer/Action.java
Workspace/Siman/src/org/splat/simer/DisplayKnowledgeAction.java
Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
Workspace/Siman/src/org/splat/simer/EditDocumentAction.java
Workspace/Siman/src/org/splat/simer/EditKnowledgeElementAction.java
Workspace/Siman/src/org/splat/simer/EditScenarioPropertiesAction.java
Workspace/Siman/src/org/splat/simer/EditSimulationContextAction.java
Workspace/Siman/src/org/splat/simer/EditStudyAction.java
Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
Workspace/Siman/src/org/splat/simer/LeftMenuSettings.java [new file with mode: 0644]
Workspace/Siman/src/org/splat/simer/NewScenarioAction.java
Workspace/Siman/src/org/splat/simer/NewStudyAction.java
Workspace/Siman/src/org/splat/simer/NotYetImplementedAction.java
Workspace/Siman/src/org/splat/simer/SearchKnowledgeAction.java
Workspace/Siman/src/org/splat/simer/SearchStudyAction.java
Workspace/Siman/src/org/splat/simer/StartAction.java
Workspace/Siman/src/org/splat/simer/StudyPropertiesAction.java
Workspace/Siman/src/org/splat/simer/UploadAction.java
Workspace/Siman/src/org/splat/simer/VersionDocumentAction.java
Workspace/Siman/src/org/splat/simer/admin/DatabaseIndexingAction.java
Workspace/Siman/src/org/splat/simer/admin/ImportUserAction.java
Workspace/Siman/src/org/splat/simer/admin/SimulationContextAction.java
Workspace/Siman/src/spring/applicationContext.xml

index 528ebd30d8c967d68af933fff80ca8ea1eca84e0..2eb236ee822b0886c87bac375dd1cf26e713bd0b 100644 (file)
@@ -4,27 +4,24 @@
 <%@ page import="java.util.Iterator"%>
 <%@ page import="org.splat.wapp.Menu"%>
 <%@ page import="org.splat.wapp.MenuItem"%>
-<%@
-    taglib prefix="s" uri="/struts-tags"
-%>
-<!-- Initialization of the context
-  -->
-<%  String  mename = request.getParameter("menu");       
-    Menu    menu   = (Menu)session.getAttribute("menu." + mename);
-%>
-  <s:set var="menuname"><%=menu.getName()%></s:set>
-  <s:set var="namespace"><%=menu.getNamespace()%></s:set>
+<%@ page import="org.splat.simer.Action"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+
+  <s:set var="menuname" value="leftMenuSettings.menuName" />
+  <s:set var="namespace" value="leftMenuSettings.menuNamespace" />
 
 <!-- Display of the menu tab
   -->
   <div id="tab-bar">
     <span id="tab-front">&nbsp;&nbsp;<s:text name="title.%{#menuname}"/>&nbsp;&nbsp;</span>
   </div>
+  
 
 <!-- Display of menu items
   -->
   <div id=menuitem-box>
 <%
+       Menu menu = Action.getStaticMenu();
     boolean submenu = false;
     for (Iterator<MenuItem> listem = menu.asList().iterator(); listem.hasNext(); ) {
        MenuItem item  = listem.next();
index 173a937f05b26fe9e5fbb32a5fc6251702b321d2..23a057110465a3cefef9698cb62f090076e9c16a 100644 (file)
@@ -31,9 +31,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
   </body>
index 1d44ac01ed8e29613fda023664f58b8b2a7447de..bc458b61d2631e2f3225b41f7b54ee7ad60c0b42 100644 (file)
@@ -25,9 +25,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
   </body>
index 4936bfbb33b3acc5cde195c54cd9ae8db335ab3c..5f8f7b0a750ebe2a6e556fafe12e252fdab51b40 100644 (file)
@@ -28,9 +28,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
     <div id=main-pane>
index 3b519c6fe4e02497c963c4fbdd4ce361edfd49b4..05970dc2043807569a4b8e163730973b78634e47 100644 (file)
@@ -25,9 +25,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
 <!-- Updload dialog
index 125e2548ca6578f8dfd67dc2c8aa0f6d0f29ee04..257448510ed31cd62e9f4d6cd7eb78c028229dca 100644 (file)
@@ -26,9 +26,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
     <div id=main-pane>
index 09c4cc7e0c720214f7d157db25d73fda32de336a..282bec304eba0ab493a09579dc7cdf29dae00bb6 100644 (file)
@@ -32,9 +32,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
 <!-- Updload dialog
index c0db77d95ca3ed19fe162f454b053d675ee1174d..b61bf2b110d7e1a5693d1f1804823316bcf2e91f 100644 (file)
@@ -29,9 +29,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="knowledge" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/knowledgeProperties.jsp" />
     </div>
 
index c0b955f78db63f8fbeb06afc2e102d56702b9aab..ff3ac0a1709cb2406444ae7977db38a318c71fe5 100644 (file)
@@ -30,9 +30,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index 26c49bc60d0cecb65c9fc8b533bf8c3bbb0877da..b9b66fcdc9733326eab269cf63309198c1cd6e5c 100644 (file)
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />          
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="study" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index 95de82b733d4a09688070ce15efc51f0ccb6a042..114a11089f0fe6f164905fb542bbc26f67484d39 100644 (file)
@@ -40,9 +40,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index a60cd416cb40a98823e6b3526112209f44c5839b..4941f113b4657b641b496790f25b28ffd040a486 100644 (file)
@@ -55,9 +55,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index 1388428fdcd0cb4afb276ed9c36eab6a929292e3..e24dd15ad6f50a35f592457561e95130f40c4b0c 100644 (file)
@@ -38,9 +38,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="study" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index c16250435a90c1e7abe0b8359d4896691aa1d74b..bd70163694006ab2c37baa02cb047c768885caef 100644 (file)
@@ -36,9 +36,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="study" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index 37f943f7a83d015dc03aacb3f5852c43d6715303..dca6f4ca2dad6c3406208f5ddbf6f37f9247a512 100644 (file)
@@ -38,9 +38,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="study" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index a401e4e757e4b9548f7857071e042d50d5b97771..21050f4333197259db06619a969615cdb3c9c588 100644 (file)
@@ -39,9 +39,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="scenario" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index d227e8e7f373b4e9da07636d486e3066a15829da..8846d3b39b697aacdb04d605211460816b8d248c 100644 (file)
@@ -44,9 +44,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
 <!-- New study dialog
index 0bf40279f0dfd97513e7e84060c0c2cb66f1b49c..faba00d12b0ca83914978dc1f0563818ef162f7e 100644 (file)
@@ -52,9 +52,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
     <div id=main-pane>
index 7f9834d10629bc68c18a94acee506c2e8736184a..7e65eb59d551044f5bd9fabf9bc602d5f446cac2 100644 (file)
@@ -52,9 +52,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="open" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
     </div>
 
     <div id=main-pane>
index 55d32493dd47bde881a5b3bb11a8f0c18322105e..ea03b0a190cd2d28729fdeedd53b5caa6fee5f33 100644 (file)
@@ -34,9 +34,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="study" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index 070bee3f3715b8213dea7c517cc99c9be0955e5d..e9f7c6a009750d00b9d697d77c7e77715a2895e7 100644 (file)
@@ -36,9 +36,7 @@
     <div id=left-pane>
       <jsp:include page="/jsp/toolbar.jsp" />
       <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp">
-        <jsp:param name="menu" value="study" />
-      </jsp:include>
+      <jsp:include page="/jsp/menuitem.jsp" />
       <jsp:include page="/jsp/studyProperties.jsp" />
     </div>
 
index aef69cf121b3a2ba7897de8da2352d34753c60bc..7b56bc4c3d9e579374c1d201bd4169892606929d 100644 (file)
@@ -73,10 +73,21 @@ public class Action extends ActionSupport implements ServletRequestAware, Sessio
         */
        private ToolBarSettings _toolBarSettings;
        
+       /**
+        * LeftMenuSettings bean.
+        */
+       private LeftMenuSettings _leftMenuSettings;
+       
        /**
         * Injected application settings bean.
         */
        private ApplicationSettings _applicationSettings;
+       
+       /**
+        * Will be removed!!!
+        * It's temporary solution for menuitem.jsp
+        */
+       private static Menu staticMenu; 
 
     public class DocumentTypeComparator implements Comparator<DocumentType> {
       public int compare(DocumentType t1, DocumentType t2)
@@ -176,7 +187,7 @@ public class Action extends ActionSupport implements ServletRequestAware, Sessio
     }
     
     /**
-     * Initialization the Context for menubar.
+     * Initialization the Context for menubar and toolbar.
      */
     public void initializationContext() {
        getMenuBarSettings().initializeInitialMenuProperties();
@@ -231,6 +242,20 @@ public class Action extends ActionSupport implements ServletRequestAware, Sessio
     }
     
     /**
+     * Initialization the Context for left menu.
+     * @param leftMenuProperty - the property of the left menu.
+     */
+    public void initializationContextLeftMenus(final String leftMenuProperty) {
+                 
+        Menu    menu   = (Menu)session.get("menu." + leftMenuProperty);
+        
+        getLeftMenuSettings().setMenu(menu);
+        setStaticMenu(menu);
+        getLeftMenuSettings().setMenuName(menu.getName());
+        getLeftMenuSettings().setMenuNamespace(menu.getNamespace());
+    }
+    
+    /**s
      * Initialization the Context for Menu Bar and Tool Bar.
      * 
      * @param titleProperty - The title of the open study/knowledge.
@@ -304,6 +329,40 @@ public class Action extends ActionSupport implements ServletRequestAware, Sessio
                getMenuBarSettings().intializeMenuBar(menuProperty);
                getToolBarSettings().intializeMenuBar(toolProperty);
        }
+       
+       /**
+        * Initialization of the screen context for menu bar, title bar and tool bar.
+        * 
+        * @param menuProperty - the property of the menu bar.
+        * @param titleProperty - The title of the open study/knowledge.
+     * @param editDisabledProperty - Property that indicates whether the current open study is editable or not.
+     * @param toolProperty - the property of the tool bar.
+     * @param leftMenuProperty - the property of the left menu.
+        */
+       public void initializationFullScreenContext(final String menuProperty, 
+                       final String titleProperty, final String editDisabledProperty,
+                       final String toolProperty, final String leftMenuProperty) {
+               
+               initializationScreenContext(menuProperty, titleProperty, editDisabledProperty);
+               initializationContextLeftMenus(leftMenuProperty);
+               getToolBarSettings().intializeMenuBar(toolProperty);
+       }
+       
+       /**
+        * Initialization of the screen context for menu bar and tool bar.
+        * 
+        * @param menuProperty - the property of the menu bar.
+     * @param toolProperty - the property of the tool bar.
+     * @param leftMenuProperty - the property of the left menu.
+        */
+       public void initializationFullScreenContext(final String menuProperty, 
+                       final String toolProperty, final String leftMenuProperty) {
+               
+               initializationContext();
+               initializationContextLeftMenus(leftMenuProperty);
+               getMenuBarSettings().intializeMenuBar(menuProperty);
+               getToolBarSettings().intializeMenuBar(toolProperty);
+       }
 //  ==============================================================================================================================
 //  Getters and setters
 //  ==============================================================================================================================
@@ -389,4 +448,35 @@ public class Action extends ActionSupport implements ServletRequestAware, Sessio
        public void setApplicationSettings(ApplicationSettings applicationSettings) {
                _applicationSettings = applicationSettings;
        }
+       /**
+        * Get the leftMenuSettings.
+        * @return the leftMenuSettings
+        */
+       public LeftMenuSettings getLeftMenuSettings() {
+               return _leftMenuSettings;
+       }
+               
+       /**
+        * Get the staticMenu.
+        * @return the staticMenu
+        */
+       public static Menu getStaticMenu() {
+               return staticMenu;
+       }
+       /**
+        * Set the staticMenu.
+        * @param staticMenu the staticMenu to set
+        */
+       public static void setStaticMenu(Menu staticMenu) {
+               Action.staticMenu = staticMenu;
+       }
+       /**
+        * Set the leftMenuSettings.
+        * @param leftMenuSettings the leftMenuSettings to set
+        */
+       public void setLeftMenuSettings(LeftMenuSettings leftMenuSettings) {
+               _leftMenuSettings = leftMenuSettings;
+       }
+       
+       
 }
\ No newline at end of file
index 61c252279661e987cbb59198c941ae0a9fc2bfde..2495f13922482ee79a06622eb9594629d582a840 100644 (file)
@@ -41,6 +41,12 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -80,7 +86,8 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
                setMenuProperty("knowledge");
                setTitleProperty("knowledge");
                setToolProperty("none");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("knowledge");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
                return SUCCESS;
        }
@@ -97,7 +104,8 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
                setMenuProperty("knowledge");
                setTitleProperty("knowledge");
                setToolProperty("none");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("knowledge");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return SUCCESS;
        }
@@ -115,7 +123,8 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
                setMenuProperty("knowledge");
                setTitleProperty("knowledge");
                setToolProperty("none");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("knowledge");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return SUCCESS;
        }
@@ -131,7 +140,8 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
                setMenuProperty("knowledge");
                setTitleProperty("knowledge");
                setToolProperty("none");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("knowledge");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return SUCCESS;
        }
@@ -252,4 +262,20 @@ public class DisplayKnowledgeAction extends DisplayBaseAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index ff3b5de00120379c92b16776fb50378a7c36e39a..db5487e3e85d6cbee70d56569bbe2aa2abfad36c 100644 (file)
@@ -50,6 +50,12 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -112,8 +118,10 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
                } else {
                        setToolProperty("standard");
                }
+               
+               setLeftMenuProperty("study");
 
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
                return SUCCESS;
        }
@@ -144,7 +152,9 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return SUCCESS;
        }
@@ -166,7 +176,8 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return SUCCESS;
        }
@@ -186,7 +197,8 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return SUCCESS;
        }
@@ -333,4 +345,20 @@ public class DisplayStudyStepAction extends DisplayBaseAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 04d77a4ed8e03e4f97e135856558ff9d67ac9934..9c24fc99f1db24f60b080822c34af3adf14b019e 100644 (file)
@@ -56,6 +56,12 @@ public class EditDocumentAction extends DisplayStudyStepAction {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -89,8 +95,9 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                return SUCCESS;
        }
 
@@ -103,8 +110,9 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                try {
                        mystudy = getOpenStudy();
 
@@ -156,8 +164,9 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                try {
                        // Getting user inputs
                        mystudy = getOpenStudy();
@@ -192,8 +201,9 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                try {
                        mystudy = getOpenStudy();
 
@@ -348,5 +358,19 @@ public class EditDocumentAction extends DisplayStudyStepAction {
                _toolProperty = toolProperty;
        }
 
-       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index a69510412f5c075ddc929ec20af7436228cbfea0..94c4888643db9caa6114ade7793ee824b9594dc2 100644 (file)
@@ -50,20 +50,29 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
        private String _menuProperty;
 
        /**
-        * Value of the title bar property. It can be: study, knowledge.
+        * Value of the title bar property. 
+        * It can be: study, knowledge.
         */
        private String _titleProperty;
 
        /**
-        * Property that indicates whether the current open study is editable or not. On the screen it looks like pen on the status icon, pop-up
-        * menu also can be called. It is necessary for correct building the title bar.
+        * Property that indicates whether the current open study is editable or not.
+        * On the screen it looks like pen on the status icon, pop-up menu also can be called.
+        * It is necessary for correct building the title bar.
         */
        private String _editDisabledProperty = "false";
 
        /**
-        * Value of the tool bar property. It can be: none, standard, study, back.
+        * Value of the tool bar property. 
+        * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        // ==============================================================================================================================
        // Action methods
@@ -79,14 +88,13 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 
                setMenuProperty("study");
                setTitleProperty("study");
-               if ("true".equals(getWriteAccess())
-                               && getUserRights().canCreateDocument()) {
+               if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
                        setToolProperty("study");
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty,
-                               _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
                return SUCCESS;
        }
@@ -100,14 +108,13 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 
                setMenuProperty("study");
                setTitleProperty("study");
-               if ("true".equals(getWriteAccess())
-                               && getUserRights().canCreateDocument()) {
+               if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
                        setToolProperty("study");
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty,
-                               _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
                try {
                        User user = getConnectedUser();
@@ -208,14 +215,14 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
 
                setMenuProperty("study");
                setTitleProperty("study");
-               if ("true".equals(getWriteAccess())
-                               && getUserRights().canCreateDocument()) {
+               if ("true".equals(getWriteAccess()) &&  getUserRights().canCreateDocument()) {
                        setToolProperty("study");
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty,
-                               _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
        }
 
        // ==============================================================================================================================
@@ -409,4 +416,22 @@ public class EditKnowledgeElementAction extends DisplayStudyStepAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
+
+       
 }
\ No newline at end of file
index 884426e3882c7f1572f2dd301a0de923673ea5c3..2e27061900f472879c94662bac58674f572033e8 100644 (file)
@@ -42,6 +42,12 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        /**
         * Serial version ID.
@@ -72,7 +78,8 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
                setTitleProperty("study");
                setEditDisabledProperty("true");
                setToolProperty("back");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
                return SUCCESS;
        }
@@ -96,7 +103,8 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
 
                
                return SUCCESS;
@@ -241,4 +249,20 @@ public class EditScenarioPropertiesAction extends DisplayStudyStepAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index fa96d379e1b8ef4a5f7b0fb4333c8aa20767123f..ff83ddfc03ec0d6879ee0041230494cae4728db1 100644 (file)
@@ -56,6 +56,12 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -81,7 +87,9 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
                if (contype.isEmpty())
                        return "create";
@@ -99,7 +107,8 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                int typid = Integer.valueOf(selectype);
                if (typid == 0)
@@ -127,7 +136,8 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
                        } else {
                                setToolProperty("standard");
                        }
-                       initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+                       setLeftMenuProperty("study");
+                       initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                        
                        if (newtype.length() == 0 || value.length() == 0)
                                return INPUT;
@@ -165,7 +175,8 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                try {
                        mystudy = getOpenStudy();
@@ -201,7 +212,8 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                try {
                        mystudy = getOpenStudy();
@@ -465,4 +477,19 @@ public class EditSimulationContextAction extends DisplayStudyStepAction {
                _toolProperty = toolProperty;
        }
        
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 7c77a53a78883d36b5c402e1104585548c49850d..faaa14a4979f0064e29e575e10efa6736f7ec4d4 100644 (file)
@@ -33,6 +33,12 @@ public class EditStudyAction extends DisplayStudyStepAction {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -62,7 +68,8 @@ public class EditStudyAction extends DisplayStudyStepAction {
                } else {
                        setToolProperty("standard");
                }
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+        setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
         return SUCCESS;
          }
@@ -151,5 +158,21 @@ public class EditStudyAction extends DisplayStudyStepAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 
 }
\ No newline at end of file
index d6af46bcf4a4608bd413a62f5ad6a2ec153559f3..02d29ca827b39028e318388846e79abdb26b954a 100644 (file)
@@ -83,6 +83,12 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -108,7 +114,8 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                } else {
                        setToolProperty("none");
                }
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
              
                User user = getConnectedUser();
                File updir = getRepositoryService().getDownloadDirectory(user);
@@ -143,7 +150,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                        setErrorCode("reference.undefined");
                                        
                                        setToolProperty("none");
-                                       initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+                                       initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                                        
                                        return ERROR;
                                } else {
@@ -151,7 +158,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                                setErrorCode("reference.duplicate");
                                                
                                                setToolProperty("none");
-                                               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+                                               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                                                
                                                return ERROR;
                                        }
@@ -174,7 +181,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                        setErrorCode("format.version");
                                        
                                        setToolProperty("none");
-                                       initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+                                       initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                                        
                                        return ERROR;
                                }
@@ -191,7 +198,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                        setErrorCode("format.date");
                                        
                                        setToolProperty("none");
-                                       initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+                                       initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                                        
                                        return ERROR;
                                }
@@ -234,7 +241,8 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                        setErrorCode("import.type");
                        
                        setToolProperty("none");
-                       initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+                       setLeftMenuProperty("study");
+                       initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                        
                        return ERROR;
                }
@@ -329,7 +337,8 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                }
                
                setToolProperty("none");
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return ERROR;
        }
@@ -571,4 +580,20 @@ public class ImportDocumentAction extends UploadBaseNextAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
diff --git a/Workspace/Siman/src/org/splat/simer/LeftMenuSettings.java b/Workspace/Siman/src/org/splat/simer/LeftMenuSettings.java
new file mode 100644 (file)
index 0000000..1c3942b
--- /dev/null
@@ -0,0 +1,85 @@
+/*****************************************************************************
+ * Company         EURIWARE
+ * Application     SIMAN
+ * File            $Id$ 
+ * Creation date   30.10.2012
+ * @author         Author: Maria KRUCHININA
+ * @version        Revision: 
+ *****************************************************************************/
+
+package org.splat.simer; 
+
+import org.splat.wapp.Menu;
+
+/**
+ * Settings for the left menu.
+ * @author Maria KRUCHININA
+ *
+ */
+public class LeftMenuSettings {
+       
+       /**
+        * The name of the left menu.
+        */
+       private String menuName;
+       
+       /**
+        * The name space of the left menu.
+        */
+       private String menuNamespace;
+       
+       /**
+        * The left menu.
+        */
+       private Menu menu;
+
+       /**
+        * Get the menuName.
+        * @return the menuName
+        */
+       public String getMenuName() {
+               return menuName;
+       }
+
+       /**
+        * Set the menuName.
+        * @param menuName the menuName to set
+        */
+       public void setMenuName(final String menuName) {
+               this.menuName = menuName;
+       }
+
+       /**
+        * Get the menuNamespace.
+        * @return the menuNamespace
+        */
+       public String getMenuNamespace() {
+               return menuNamespace;
+       }
+
+       /**
+        * Set the menuNamespace.
+        * @param menuNamespace the menuNamespace to set
+        */
+       public void setMenuNamespace(final String menuNamespace) {
+               this.menuNamespace = menuNamespace;
+       }
+
+       /**
+        * Get the menu.
+        * @return the menu
+        */
+       public Menu getMenu() {
+               return menu;
+       }
+
+       /**
+        * Set the menu.
+        * @param menu the menu to set
+        */
+       public void setMenu(final Menu menu) {
+               this.menu = menu;
+       }
+       
+       
+}
index 45fdac90827a37b7fdf6bd0d7619244511d975f4..e9da800fb15b35ea8c6f90ea764cfa776bb68b0b 100644 (file)
@@ -55,6 +55,12 @@ public class NewScenarioAction extends Action {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -97,7 +103,8 @@ public class NewScenarioAction extends Action {
       setTitleProperty("study");
       setEditDisabledProperty("true");
       setToolProperty("none");
-      initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+      setLeftMenuProperty("scenario");
+      initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
       return SUCCESS;
     }
@@ -118,7 +125,8 @@ public class NewScenarioAction extends Action {
       setTitleProperty("study");
       setEditDisabledProperty("true");
       setToolProperty("none");
-      initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+      setLeftMenuProperty("scenario");
+      initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
       
       return SUCCESS;
     }
@@ -168,7 +176,8 @@ public class NewScenarioAction extends Action {
         setMenuProperty("study");
         setTitleProperty("study");
                setToolProperty("standard");
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
         return ERROR;
       }
@@ -342,4 +351,20 @@ public class NewScenarioAction extends Action {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 55536d67b23277ce6d274ffe47e86351f04ca3af..9c48097575583488c912ae3d4390d359e848fd7a 100644 (file)
@@ -56,6 +56,12 @@ public class NewStudyAction extends Action {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        // ==============================================================================================================================
        // Action methods
@@ -79,7 +85,8 @@ public class NewStudyAction extends Action {
 
                setMenuProperty("create");
                setToolProperty("none");
-               initializationScreenContext(_menuProperty, _toolProperty);
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
 
                return SUCCESS;
        }
@@ -141,7 +148,8 @@ public class NewStudyAction extends Action {
 
                        setMenuProperty("study");
                        setToolProperty("none");
-                       initializationScreenContext(_menuProperty, _toolProperty);
+                       setLeftMenuProperty("open");
+                       initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
 
                        return SUCCESS;
                } catch (Exception error) {
@@ -269,4 +277,20 @@ public class NewStudyAction extends Action {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 97be0e680e287391cfad67617c8db0ee92309091..a2a4f662fc1727507819b31ca81e5ad464c6d792 100644 (file)
@@ -32,6 +32,12 @@ public class NotYetImplementedAction extends Action {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
 //  ==============================================================================================================================
 //  Action methods
@@ -44,7 +50,8 @@ public class NotYetImplementedAction extends Action {
        setTitleProperty("study");
        setEditDisabledProperty("true");
        setToolProperty("none");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+       setLeftMenuProperty("study");
+        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
       return SUCCESS;
     }
@@ -112,4 +119,20 @@ public class NotYetImplementedAction extends Action {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index ac8b541a790824f7e85c6da7eaa379fbb2be0c99..92a200873c21c75bb92ce56df273177b1dd468fa 100644 (file)
@@ -59,6 +59,12 @@ public class SearchKnowledgeAction extends SearchBaseAction {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        // ==============================================================================================================================
        // Action methods
@@ -73,7 +79,8 @@ public class SearchKnowledgeAction extends SearchBaseAction {
                
                setMenuProperty("open");
                setToolProperty("none");
-               initializationScreenContext(_menuProperty, _toolProperty);
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
                
                try {
                        loadFilter();
@@ -374,4 +381,20 @@ public class SearchKnowledgeAction extends SearchBaseAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 02df3a3559d4b9a873eedcd52a3ce9006ae3db6f..18ed3fdb61e277a26dae391a04a788a9ad92da19 100644 (file)
@@ -56,6 +56,12 @@ public class SearchStudyAction extends SearchBaseAction {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        /**
         * Serial version ID.
@@ -85,7 +91,8 @@ public class SearchStudyAction extends SearchBaseAction {
                        
                        setMenuProperty("open");
                        setToolProperty("none");
-                       initializationScreenContext(_menuProperty, _toolProperty);
+                       setLeftMenuProperty("open");
+                       initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
 
                        return SUCCESS;
                } catch (Exception error) {
@@ -376,4 +383,20 @@ public class SearchStudyAction extends SearchBaseAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index bfd28f85c887567dd9ef362c7856abc5391c73e9..e84c0841c385bc605fac281b8898c67a16521601 100644 (file)
@@ -47,6 +47,12 @@ public class StartAction extends Action implements ServletRequestAware {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        /**
         * Serial version ID.
@@ -98,7 +104,8 @@ public class StartAction extends Action implements ServletRequestAware {
         setTitleProperty("study");
         setEditDisabledProperty("true");
         setToolProperty("none");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+        setLeftMenuProperty("study");
+        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
         
         return ERROR;
       }
@@ -208,4 +215,20 @@ public class StartAction extends Action implements ServletRequestAware {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 370355cbe6488b31b7df9bb73e5519bd0eb37e29..e38497d8e61d2fb78a28d2b2a597d09defa85f6f 100644 (file)
@@ -78,6 +78,12 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         */
        private String _toolProperty;
        
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -141,7 +147,8 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setTitleProperty("study");
                setEditDisabledProperty("true");
                setToolProperty("back");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
                if (mystudy.isOpenForWriting() && user.canEditProperties()) {                   
                        return "edit";
@@ -183,8 +190,9 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setTitleProperty("study");
                setEditDisabledProperty("true");
                setToolProperty("back");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                return SUCCESS;
        }
 
@@ -227,8 +235,9 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setTitleProperty("study");
                setEditDisabledProperty("true");
                setToolProperty("back");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                return SUCCESS;
        }
 
@@ -277,8 +286,9 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setTitleProperty("study");
                setEditDisabledProperty("true");
                setToolProperty("back");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                return SUCCESS;
        }
 
@@ -361,8 +371,9 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setTitleProperty("study");
                setEditDisabledProperty("true");
                setToolProperty("back");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
-               
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+
                return SUCCESS;
        }
 
@@ -596,4 +607,20 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index a33fcdcf7531457bedbbbcff5c21289e64997352..16328ec4d81184bf1dd12e12691fbc9cc29f6b2f 100644 (file)
@@ -38,6 +38,13 @@ public class UploadAction extends Action {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
+       
        /**
         * Property that indicates whether the current open study is editable or not.
         * On the screen it looks like pen on the status icon, pop-up menu also can be called.
@@ -57,7 +64,8 @@ public class UploadAction extends Action {
 //  -----------------------------
        setMenuProperty("study");
        setToolProperty("none");
-        initializationScreenContext(_menuProperty, _toolProperty);
+       setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
                
       return SUCCESS;
     }
@@ -83,7 +91,6 @@ public class UploadAction extends Action {
                next = "import";
         }*/
         
-        logger.info("MKA next = " + next);
         return next;
       }
       catch (OutOfMemoryError error) {
@@ -92,7 +99,8 @@ public class UploadAction extends Action {
        setTitleProperty("study");
        setEditDisabledProperty("true");
        setToolProperty("none");
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+       setLeftMenuProperty("study");
+        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
        return "outofmemory";
       }
@@ -226,4 +234,20 @@ public class UploadAction extends Action {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 6b879e6c2407d66a661839cb076758af1ba6bb95..5c0830bd8548c30e2b8e6377acff1ff1634ff0d6 100644 (file)
@@ -94,6 +94,12 @@ public class VersionDocumentAction extends UploadBaseNextAction {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        /**
         * Property that indicates whether the current open study is editable or not.
@@ -121,7 +127,8 @@ public class VersionDocumentAction extends UploadBaseNextAction {
                } else {
                        setToolProperty("none");
                }
-        initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               setLeftMenuProperty("study");
+        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
            
                User user = getConnectedUser();
                File updir = getRepositoryService().getDownloadDirectory(user);
@@ -140,7 +147,8 @@ public class VersionDocumentAction extends UploadBaseNextAction {
                if (!extractProperties(upfile, doc)) {
                        if (!("none".equals(_toolProperty))) {
                                setToolProperty("none");
-                               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+                               setLeftMenuProperty("study");
+                               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                        }
                        return ERROR;
                }
@@ -272,7 +280,9 @@ public class VersionDocumentAction extends UploadBaseNextAction {
                }
                
                setToolProperty("none");
-               initializationScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty);
+               
+               setLeftMenuProperty("study");
+               initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
                
                return ERROR;
        }
@@ -474,4 +484,20 @@ public class VersionDocumentAction extends UploadBaseNextAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 881ca58b5bc278bb67227b342a593601738369e3..4287a4b11a356962a5eca4701fd44c8e7b594ac0 100644 (file)
@@ -43,6 +43,12 @@ public class DatabaseIndexingAction extends Action {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        // ==============================================================================================================================
        // Action methods
@@ -58,7 +64,8 @@ public class DatabaseIndexingAction extends Action {
                
                setMenuProperty("sysadmin");
                setToolProperty("none");
-        initializationScreenContext(_menuProperty, _toolProperty);
+               setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
                
                return SUCCESS;
        }
@@ -157,4 +164,20 @@ public class DatabaseIndexingAction extends Action {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 232bcb5f17ac7b6fe0012e45316b8114323caffb..91586d7ae56736f91c7e2e845250a764778747c6 100644 (file)
@@ -44,6 +44,12 @@ public class ImportUserAction extends UploadBaseNextAction {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
 //  ==============================================================================================================================
 //  Action methods
@@ -66,7 +72,8 @@ public class ImportUserAction extends UploadBaseNextAction {
         
         setMenuProperty("sysadmin");
         setToolProperty("none");
-        initializationScreenContext(_menuProperty, _toolProperty);
+        setLeftMenuProperty("open");
+        initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
         
         return SUCCESS;
       }
@@ -152,4 +159,20 @@ public class ImportUserAction extends UploadBaseNextAction {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 4366eb204f056b706828120484cc6fb6bfa7a602..47a5c37fe19c262f8f6ab56c2973a83eca582584 100644 (file)
@@ -75,6 +75,12 @@ public class SimulationContextAction extends Action {
         * It can be: none, standard, study, back.
         */
        private String _toolProperty;
+       
+       /**
+        * Value of the left menu property. 
+        * It can be: open, study, knowledge, scenario.
+        */
+       private String _leftMenuProperty;
 
        /**
         * Context name comparator.
@@ -145,7 +151,8 @@ public class SimulationContextAction extends Action {
                        
                        setMenuProperty("study");
                        setToolProperty("none");
-               initializationScreenContext(_menuProperty, _toolProperty);
+                       setLeftMenuProperty("open");
+               initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
 
                        return SUCCESS;
                } catch (Exception error) {
@@ -159,7 +166,8 @@ public class SimulationContextAction extends Action {
                
                setMenuProperty("study");
                setToolProperty("none");
-        initializationScreenContext(_menuProperty, _toolProperty);
+               setLeftMenuProperty("open");
+        initializationFullScreenContext(_menuProperty, _toolProperty, _leftMenuProperty);
         
                Session connex = Database.getCurSession();
                Transaction transax = connex.beginTransaction();
@@ -396,4 +404,20 @@ public class SimulationContextAction extends Action {
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
+       
+       /**
+        * Get the leftMenuProperty.
+        * @return the leftMenuProperty
+        */
+       public String getLeftMenuProperty() {
+               return _leftMenuProperty;
+       }
+
+       /**
+        * Set the leftMenuProperty.
+        * @param leftMenuProperty the leftMenuProperty to set
+        */
+       public void setLeftMenuProperty(final String leftMenuProperty) {
+               _leftMenuProperty = leftMenuProperty;
+       }
 }
\ No newline at end of file
index 544f7914297e236cbea90187a2a1e21513e5cf36..cdcfa55e60bd8a9d99feb7782e1322bf8cd45cad 100644 (file)
@@ -50,6 +50,10 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        <bean id="toolBarSettings"
                class="org.splat.simer.ToolBarSettings" scope="session">
        </bean>
+       
+       <bean id="leftMenuSettings"
+               class="org.splat.simer.LeftMenuSettings" scope="session">
+       </bean>
 
        <bean id="slidMenu" scope="session" abstract="true">
                <property name="projectElementService"
@@ -98,6 +102,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="menuBarSettings" ref="menuBarSettings" />
                <property name="titleBarSettings" ref="titleBarSettings" />
                <property name="toolBarSettings" ref="toolBarSettings" />
+               <property name="leftMenuSettings" ref="leftMenuSettings" />
        </bean>
 
        <!--========= Inherited from baseAction ========= -->