From: rkv <rkv@opencascade.com>
Date: Sun, 18 Nov 2012 11:35:46 +0000 (+0000)
Subject: MenuAction mapping is fixed for the case if no item is selected. The default selectio... 
X-Git-Tag: Root_Delivery1_2012_12_06~61
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=981ea6ffc99c5e058a9185ace6504e4ca7620b95;p=tools%2Fsiman.git

MenuAction mapping is fixed for the case if no item is selected. The default selection is introduced in the Menu. If "none" is returned? i.e. the menu is empty, then home page is displayed. The sysadmin menu is working now.
The static menu is removed from Action class. The left menu is retrieved from the action context now.
---

diff --git a/Workspace/Siman/WebContent/jsp/menuitem.jsp b/Workspace/Siman/WebContent/jsp/menuitem.jsp
index 2eb236e..57f88f8 100644
--- a/Workspace/Siman/WebContent/jsp/menuitem.jsp
+++ b/Workspace/Siman/WebContent/jsp/menuitem.jsp
@@ -7,7 +7,8 @@
 <%@ page import="org.splat.simer.Action"%>
 <%@ taglib prefix="s" uri="/struts-tags"%>
 
-  <s:set var="menuname" value="leftMenuSettings.menuName" />
+  <%@page import="com.opensymphony.xwork2.ActionContext"%>
+<s:set var="menuname" value="leftMenuSettings.menuName" />
   <s:set var="namespace" value="leftMenuSettings.menuNamespace" />
 
 <!-- Display of the menu tab
@@ -21,7 +22,8 @@
   -->
   <div id=menuitem-box>
 <%
-	Menu menu = Action.getStaticMenu();
+    Action anAction = (Action)ActionContext.getContext().getActionInvocation().getAction();
+	Menu menu = anAction.getLeftMenuSettings().getMenu();
     boolean submenu = false;
     for (Iterator<MenuItem> listem = menu.asList().iterator(); listem.hasNext(); ) {
     	MenuItem item  = listem.next();
diff --git a/Workspace/Siman/src/org/splat/simer/Action.java b/Workspace/Siman/src/org/splat/simer/Action.java
index 40ee111..4c0a974 100644
--- a/Workspace/Siman/src/org/splat/simer/Action.java
+++ b/Workspace/Siman/src/org/splat/simer/Action.java
@@ -106,11 +106,6 @@ public class Action extends ActionSupport implements ServletRequestAware,
 	 */
 	private ApplicationSettings _applicationSettings;
 
-	/**
-	 * Will be removed!!! It's temporary solution for menuitem.jsp
-	 */
-	private static Menu staticMenu;
-
 	/**
 	 * Comparator for sorting document types with localized names.
 	 */
@@ -379,7 +374,6 @@ public class Action extends ActionSupport implements ServletRequestAware,
 		Menu menu = (Menu) _session.get("menu." + leftMenuProperty);
 
 		getLeftMenuSettings().setMenu(menu);
-		setStaticMenu(menu);
 		getLeftMenuSettings().setMenuName(menu.getName());
 		getLeftMenuSettings().setMenuNamespace(menu.getNamespace());
 	}
@@ -662,25 +656,6 @@ public class Action extends ActionSupport implements ServletRequestAware,
 		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(final Menu staticMenu) {
-		Action.staticMenu = staticMenu;
-	}
-
 	/**
 	 * Set the leftMenuSettings.
 	 * 
diff --git a/Workspace/Siman/src/org/splat/simer/MenuAction.java b/Workspace/Siman/src/org/splat/simer/MenuAction.java
index 3764e28..c9c0dc9 100644
--- a/Workspace/Siman/src/org/splat/simer/MenuAction.java
+++ b/Workspace/Siman/src/org/splat/simer/MenuAction.java
@@ -34,9 +34,12 @@ public class MenuAction extends Action {
 
 		if (_item == null) { // Switch back to the menu, keeping the last selection
 			getSession().put("menu.open", menu); // Activates the menu
-			_item = menu.getSelection();
-			if (_item == null) {
-				_item = "none";
+			if (menu != null) {
+				_item = menu.getSelection();
+				if (_item == null) { // Select default menu item if nothing has been selected
+					_item = menu.getDefaultSelection();
+					menu.selects(_item);
+				}
 			}
 		} else { // Selection of another menu item
 			menu.selects(_item);
diff --git a/Workspace/Siman/src/org/splat/wapp/Menu.java b/Workspace/Siman/src/org/splat/wapp/Menu.java
index b9016e3..e8a791e 100644
--- a/Workspace/Siman/src/org/splat/wapp/Menu.java
+++ b/Workspace/Siman/src/org/splat/wapp/Menu.java
@@ -181,4 +181,22 @@ public class Menu {
 			_selection = name;
 		}
 	}
+
+	/**
+	 * Get default selection.
+	 * 
+	 * @return the first item name or "none" if the menu is empty
+	 */
+	public String getDefaultSelection() {
+		String res = Constants.NONE;
+		if ((!_indices.isEmpty()) && _indices.containsValue(0)) {
+			for (String item : _indices.keySet()) {
+				if (_indices.get(item) == 0) {
+					res = item;
+					break;
+				}
+			}
+		}
+		return res;
+	}
 }
\ No newline at end of file
diff --git a/Workspace/Siman/src/org/splat/wapp/SimpleMenu.java b/Workspace/Siman/src/org/splat/wapp/SimpleMenu.java
index 5866d3e..2ea869b 100644
--- a/Workspace/Siman/src/org/splat/wapp/SimpleMenu.java
+++ b/Workspace/Siman/src/org/splat/wapp/SimpleMenu.java
@@ -1,27 +1,28 @@
 package org.splat.wapp;
 
-
 public class SimpleMenu extends Menu {
 
-//  ==============================================================================================================================
-//  Constructors
-//  ==============================================================================================================================
+	// ==============================================================================================================================
+	// Constructors
+	// ==============================================================================================================================
+
+	public SimpleMenu(final String name) {
+		// -------------------------------
+		super(name);
+	}
 
-    public SimpleMenu (String name) {
-//  -------------------------------
-      super(name);
-    }
-    public SimpleMenu (String name, String scope) {
-//  ---------------------------------------------
-      super(name, scope);
-    }
+	public SimpleMenu(final String name, final String scope) {
+		// ---------------------------------------------
+		super(name, scope);
+	}
 
-//  ==============================================================================================================================
-//  Member functions
-//  ==============================================================================================================================
+	// ==============================================================================================================================
+	// Member functions
+	// ==============================================================================================================================
 
-    public void addItem (String name, String label, String icon, String url) {
-//  ------------------------------------------------------------------------
-      this.addItem(name, new MenuItem(label,icon,url) );
-    }
+	public void addItem(final String name, final String label,
+			final String icon, final String url) {
+		// ------------------------------------------------------------------------
+		this.addItem(name, new MenuItem(label, icon, url));
+	}
 }
\ No newline at end of file
diff --git a/Workspace/Siman/src/spring/applicationContext.xml b/Workspace/Siman/src/spring/applicationContext.xml
index d51647d..0fc145c 100644
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -46,13 +46,13 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 	<bean id="titleBarSettings" class="org.splat.simer.TitleBarSettings"
 		scope="session">
 	</bean>
-	
-	<bean id="toolBarSettings"
-		class="org.splat.simer.ToolBarSettings" scope="session">
+
+	<bean id="toolBarSettings" class="org.splat.simer.ToolBarSettings"
+		scope="session">
 	</bean>
-	
-	<bean id="leftMenuSettings"
-		class="org.splat.simer.LeftMenuSettings" scope="session">
+
+	<bean id="leftMenuSettings" class="org.splat.simer.LeftMenuSettings"
+		scope="session">
 	</bean>
 
 	<bean id="slidMenu" scope="session" abstract="true">
@@ -96,7 +96,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<bean id="baseAction" class="org.splat.simer.Action"
 		scope="prototype" abstract="true">
-        <property name="applicationSettings" ref="applicationSettings" />
+		<property name="applicationSettings" ref="applicationSettings" />
 		<property name="openStudy" ref="openStudy" />
 		<property name="openKnowledge" ref="openKnowledge" />
 		<property name="menuBarSettings" ref="menuBarSettings" />
@@ -201,7 +201,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 	</bean>
 
 	<bean id="menuAction" class="org.splat.simer.MenuAction"
-		scope="prototype">
+		scope="prototype" parent="baseAction">
 	</bean>
 
 	<bean id="notYetImplementedAction"
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index c086ca4..cee8182 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -55,7 +55,8 @@
             <result name="admin-importuser" type="redirectAction">sadmin/select-file?nextAction=importuser</result>
             <result name="admin-scontext"   type="redirectAction">sadmin/scontext</result>
             <result name="admin-knowelm"    type="redirectAction">sadmin/knowlelm</result>
-            <result name="none">/menu.jsp?menu=%{menu}</result>
+            <!-- If no menu item is selected then go to home page -->
+            <result name="none" type="tiles">page.home</result>
         </action>
 
     </package>