Javacode is removed from menubar.jsp.

diff --git a/Workspace/Siman/WebContent/jsp/menubar.jsp b/Workspace/Siman/WebContent/jsp/menubar.jsp
index fae7130b6d26243d521539a7d5c374f3e729c6ed..ff3d1120b5481842d26cd4f9d8258638a303f92d 100644 (file)
--- a/Workspace/Siman/WebContent/jsp/menubar.jsp
+++ b/Workspace/Siman/WebContent/jsp/menubar.jsp
@@ -1,129 +1,138 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@ page import="org.splat.dal.bo.kernel.User"%>
-<%@ page import="org.splat.som.ApplicationRights"%>
-<%@
-    taglib prefix="s" uri="/struts-tags"
-%>
+<%@page language="java" contentType="text/html; charset=ISO-8859-1"
+       pageEncoding="ISO-8859-1"%>
+<%@taglib prefix="s" uri="/struts-tags"%>
 
-<!-- Initialization of the context
-  -->
-<%  String   login     = request.getParameter("login");     // Null or disabled
-
-       ApplicationRights user  = (ApplicationRights)session.getAttribute("user.rights");  // Active user rights
-
-%>
 <!-- Set of actions associated to menus
   -->
 
-<s:url id="login"    namespace="/" action="login">
-  <s:param name="backMenu" value="menuProperty"></s:param>
+<s:url id="login" namespace="/" action="login">
+       <s:param name="backMenu" value="menuProperty"></s:param>
 </s:url>
-<s:url id="logout"   namespace="/" action="logout">
-  <s:param name="backMenu" value="menuProperty"></s:param>
+<s:url id="logout" namespace="/" action="logout">
+       <s:param name="backMenu" value="menuProperty"></s:param>
 </s:url>
-<s:url id="new"      namespace="/"  action="select">
-  <s:param name="menu">create</s:param>
+<s:url id="new" namespace="/" action="select">
+       <s:param name="menu">create</s:param>
 </s:url>
-<s:url id="open"     namespace="/" action="select">
-  <s:param name="menu">search</s:param>
+<s:url id="open" namespace="/" action="select">
+       <s:param name="menu">search</s:param>
 </s:url>
-<s:url id="study"    namespace="/study"  action="step-study"></s:url>
-<s:url id="idea"     namespace="/study"  action="step-knowledge"></s:url>
+<s:url id="study" namespace="/study" action="step-study"></s:url>
+<s:url id="idea" namespace="/study" action="step-knowledge"></s:url>
 <s:url id="datadmin" namespace="/" action="select">
-  <s:param name="menu">datadmin</s:param>
+       <s:param name="menu">datadmin</s:param>
 </s:url>
 <s:url id="sysadmin" namespace="/" action="select">
-  <s:param name="menu">sysadmin</s:param>
+       <s:param name="menu">sysadmin</s:param>
 </s:url>
-<s:url id="site"     value="%{menuBarSettings.webSiteURL}" />
-<s:url id="help"     value="%{menuBarSettings.helpURL}"></s:url>
+<s:url id="site" value="%{menuBarSettings.webSiteURL}" />
+<s:url id="help" value="%{menuBarSettings.helpURL}"></s:url>
 
 <!-- Display of the menu-bar
   -->
 <div id=header>
-  <div id=top-spacer></div>
-  <div id=logo>
-    <s:a href="%{site}" target="_new"><img src="<s:url value="/skin/logo.png"/>" width="115" height="24" border="none"/></s:a>
-  </div>
-
-  <div id=menu-bar>
-
-       <s:if test="menuBarSettings.isMenuCreate">
-       <span id="menu-front"><img src="<s:url value="/skin/icon.new.png"/>" border="none" title="<s:text name="tooltip.new"/>" /></span>
-    </s:if>    
-       <s:elseif test="menuBarSettings.canUserCreateStudy">
-       <span id="menu-back"><s:a href="%{new}"><img src="<s:url value="/skin/icon.new.png"/>" border="none" title="<s:text name="tooltip.new"/>" /></s:a></span>
-    </s:elseif>
-       <s:else>
-           <span id="menu-back"><img src="<s:url value="/skin/disabled.new.png"/>" border="none" /></span>
-       </s:else>
-
-       <s:if test="menuBarSettings.isMenuOpen">
-       <span id="menu-front"><img src="<s:url value="/skin/icon.open.png"/>" border="none" title="<s:text name="tooltip.open"/>" /></span>
-    </s:if>
-       <s:else>
-          <span id="menu-back"><s:a href="%{open}"><img src="<s:url value="/skin/icon.open.png"/>" border="none" title="<s:text name="tooltip.open"/>" /></s:a></span>
-       </s:else>
-
-       <s:if test="menuBarSettings.isMenuStudy">
-       <span id="menu-front"><img src="<s:url value="/skin/icon.study.png"/>" border="none" /></span>
-       </s:if> 
-    <s:elseif test="menuBarSettings.isStudyNull">
-       <span id="menu-back"><img src="<s:url value="/skin/disabled.study.png"/>" border="none" /></span>
-    </s:elseif>
-    <s:else>
-          <span id="menu-back"><s:a href="%{study}"><img src="<s:url value="/skin/icon.study.png"/>" border="none" title="<s:text name="tooltip.study"/>" /></s:a></span>
-       </s:else>
-
-       <s:if test="menuBarSettings.isMenuKnowledge">
-           <span id="menu-front"><img src="<s:url value="/skin/icon.idea.png"/>" border="none" /></span>
-       </s:if>
-       <s:elseif test="menuBarSettings.isKnowledgeNull">
-       <span id="menu-back"><img src="<s:url value="/skin/disabled.idea.png"/>" border="none" /></span>
-       </s:elseif>
-       <s:else>
-           <span id="menu-back"><s:a href="%{idea}"><img src="<s:url value="/skin/icon.idea.png"/>" border="none" title="<s:text name="tooltip.idea"/>" /></s:a></span>
-       </s:else>
-       
-       <s:if test="menuBarSettings.isMenuSysAdmin">
-       <span id="menu-front"><img src="<s:url value="/skin/icon.base.png"/>" border="none" /></span>
-    </s:if>
-    <s:elseif test="menuBarSettings.canUserManageDatabase">
-           <span id="menu-back"><s:a href="%{sysadmin}"><img src="<s:url value="/skin/icon.base.png"/>" border="none" title="<s:text name="tooltip.sysadmin"/>" /></s:a></span>
-       </s:elseif>
-
-       <s:if test="menuBarSettings.isMenuHelp">
-           <span id="menu-front"><img src="<s:url value="/skin/icon.help.png"/>" border="none" /></span>
-       </s:if>
-       <s:else>
-       <span id="menu-back"><s:a href="%{help}" target="_new"><img src="<s:url value="/skin/icon.help.png"/>" border="none" title="<s:text name="tooltip.help"/>" /></s:a></span>
-    </s:else>
+<div id=top-spacer></div>
+<div id=logo><s:a href="%{site}" target="_new">
+       <img src="<s:url value="/skin/logo.png"/>" width="115" height="24"
+               border="none" />
+</s:a></div>
 
+<div id=menu-bar>
+<s:if test="menuBarSettings.isMenuCreate">
+       <span id="menu-front"><img
+               src="<s:url value="/skin/icon.new.png"/>" border="none"
+               title="<s:text name="tooltip.new"/>" /></span>
+</s:if> <s:elseif test="menuBarSettings.canUserCreateStudy">
+       <span id="menu-back"><s:a href="%{new}">
+               <img src="<s:url value="/skin/icon.new.png"/>" border="none"
+                       title="<s:text name="tooltip.new"/>" />
+       </s:a></span>
+</s:elseif> <s:else>
+       <span id="menu-back"><img
+               src="<s:url value="/skin/disabled.new.png"/>" border="none" /></span>
+</s:else> 
+<s:if test="menuBarSettings.isMenuOpen">
+       <span id="menu-front"><img
+               src="<s:url value="/skin/icon.open.png"/>" border="none"
+               title="<s:text name="tooltip.open"/>" /></span>
+</s:if> <s:else>
+       <span id="menu-back"><s:a href="%{open}">
+               <img src="<s:url value="/skin/icon.open.png"/>" border="none"
+                       title="<s:text name="tooltip.open"/>" />
+       </s:a></span>
+</s:else> 
+<s:if test="menuBarSettings.isMenuStudy">
+       <span id="menu-front"><img
+               src="<s:url value="/skin/icon.study.png"/>" border="none" /></span>
+</s:if> <s:elseif test="menuBarSettings.isStudyNull">
+       <span id="menu-back"><img
+               src="<s:url value="/skin/disabled.study.png"/>" border="none" /></span>
+</s:elseif> <s:else>
+       <span id="menu-back"><s:a href="%{study}">
+               <img src="<s:url value="/skin/icon.study.png"/>" border="none"
+                       title="<s:text name="tooltip.study"/>" />
+       </s:a></span>
+</s:else> 
+<s:if test="menuBarSettings.isMenuKnowledge">
+       <span id="menu-front"><img
+               src="<s:url value="/skin/icon.idea.png"/>" border="none" /></span>
+</s:if> <s:elseif test="menuBarSettings.isKnowledgeNull">
+       <span id="menu-back"><img
+               src="<s:url value="/skin/disabled.idea.png"/>" border="none" /></span>
+</s:elseif> <s:else>
+       <span id="menu-back"><s:a href="%{idea}">
+               <img src="<s:url value="/skin/icon.idea.png"/>" border="none"
+                       title="<s:text name="tooltip.idea"/>" />
+       </s:a></span>
+</s:else> 
+<s:if test="menuBarSettings.isMenuSysAdmin">
+       <span id="menu-front"><img
+               src="<s:url value="/skin/icon.base.png"/>" border="none" /></span>
+</s:if> <s:elseif test="menuBarSettings.canUserManageDatabase">
+       <span id="menu-back"><s:a href="%{sysadmin}">
+               <img src="<s:url value="/skin/icon.base.png"/>" border="none"
+                       title="<s:text name="tooltip.sysadmin"/>" />
+       </s:a></span>
+</s:elseif> 
+<s:if test="menuBarSettings.isMenuHelp">
+       <span id="menu-front"><img
+               src="<s:url value="/skin/icon.help.png"/>" border="none" /></span>
+</s:if> <s:else>
+       <span id="menu-back"><s:a href="%{help}" target="_new">
+               <img src="<s:url value="/skin/icon.help.png"/>" border="none"
+                       title="<s:text name="tooltip.help"/>" />
+       </s:a></span>
+</s:else>
 </div>
 <!-- Display of the login menu
-  -->
-<%if (login == null) {   // That is, not disabled (yes, null means enabled!)
-      User connected = user.getUser();
-%><div id=login-bar>
-    <table border="0" cellpadding="4" cellspacing="0" class="text">
-      <tr valign="bottom">
-        <td><br/><img src="<s:url value="/skin/image.user.png"/>" border="none"/></td>
-<%    if (connected != null) {
-        if (connected.getRoleNames().equals("sysadmin")) {
-%>        <td><s:text name="label.sysadmin"/></td>
-<%      } else {
-%>        <td><%=connected.getDisplayName()%></td>     
-<%      }
-%>      <td>|&nbsp;&nbsp;<s:a href="%{logout}" cssClass="link"><s:text name="menu.logout"/></s:a></td>
-<%    } else {
-%>      <td><br/><s:a href="%{login}" cssClass="link"><s:text name="menu.login"/></s:a></td>
-<%    }
-%>      <td></td>
-      </tr>
-    </table>
-  </div>
-<%}
-%><div id=dock></div>
+  --> <s:if test="%{login == null}">
+       <!-- // That is, not disabled (yes, null means enabled!)-->
+       <div id=login-bar>
+       <table border="0" cellpadding="4" cellspacing="0" class="text">
+               <tr valign="bottom">
+                       <td><br />
+                       <img src="<s:url value="/skin/image.user.png"/>" border="none" /></td>
+                       <s:if test="connectedUser != null">
+                               <s:if test="connectedUser.roleNames == 'sysadmin'">
+                                       <td><s:text name="label.sysadmin" /></td>
+                               </s:if>
+                               <s:else>
+                                       <td><s:property value="connectedUser.displayName" /></td>
+                               </s:else>
+                               <td>|&nbsp;&nbsp;<s:a href="%{logout}" cssClass="link">
+                                       <s:text name="menu.logout" />
+                               </s:a></td>
+                       </s:if>
+                       <s:else>
+                               <td><br />
+                               <s:a href="%{login}" cssClass="link">
+                                       <s:text name="menu.login" />
+                               </s:a></td>
+                       </s:else>
+                       <td></td>
+               </tr>
+       </table>
+       </div>
+</s:if>
+<div id=dock></div>
 </div>
\ No newline at end of file

diff --git a/Workspace/Siman/src/org/splat/simer/Action.java b/Workspace/Siman/src/org/splat/simer/Action.java
index dae6a9d5f84d54ad94082c5f53b3d75ce185144e..aef69cf121b3a2ba7897de8da2352d34753c60bc 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/Action.java
+++ b/Workspace/Siman/src/org/splat/simer/Action.java
@@ -135,9 +135,13 @@ public class Action extends ActionSupport implements ServletRequestAware, Sessio
       session.put("user.rights", new ApplicationRights(null) );          // Disables user rights
       session.remove("login.context");
     }
-    protected User getConnectedUser () {
+    public User getConnectedUser () {
       ApplicationRights  rights = (ApplicationRights)session.get("user.rights");
-      return rights.getUser();                                           // May be null
+      User connected = null;
+      if (rights != null) {
+         connected = rights.getUser();
+      }
+      return connected;                                           // May be null
     }
     protected Menu getMenu (String name) {
       return (Menu)session.get("menu." + name);
@@ -212,13 +216,13 @@ public class Action extends ActionSupport implements ServletRequestAware, Sessio
        
        ApplicationRights userRights  = (ApplicationRights)session.get("user.rights");
        
-       if (userRights.canCreateStudy()) {
+       if ((userRights != null) && userRights.canCreateStudy()) {
                getMenuBarSettings().setCanUserCreateStudy(true);
        } else {
                getMenuBarSettings().setCanUserCreateStudy(false);
        }
        
-       if (userRights.canManageDatabase()) {
+       if ((userRights != null) && userRights.canManageDatabase()) {
                getMenuBarSettings().setCanUserManageDatabase(true);
        } else {
                getMenuBarSettings().setCanUserManageDatabase(false);

diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
index 116d7b7189072c472e5d3c7acd072e8006c41ace..8ecfda15d4464ce01155b713abd2a580ab79a3c0 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
+++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java
@@ -56,9 +56,9 @@ public class ApplicationSettings implements ServletContextAware {
        
        private String wappserver;
        private String wappname;
-       private Properties wapprops; // General properties from the application properties files
+       private Properties wapprops = new Properties(); // General properties from the application properties files
        private Locale locale; // Current user locale
-       private Map<String, SimpleMenu> menus = null; // Application menus
+       private Map<String, SimpleMenu> menus = new HashMap<String, SimpleMenu>(); // Application menus
        private Map<Integer, ToolBar> bars = null; // Study module-bars structured by steps
        private Map<String, PopupMenu> popups = null;
        private Map<String, Map<String, Object>> filter = null; // Named search filters
@@ -66,7 +66,7 @@ public class ApplicationSettings implements ServletContextAware {
        private Map<String, String> tempfile = null; // Available template files
        private String[] viewermap = null; // List of file extensions mapped to a viewer
        private Map<String, Converter> convertmap = null; // Available document format converters
-       private Properties jndprops = null; // JNDI context for launching converters
+       private Properties jndprops = new Properties(); // JNDI context for launching converters
 
        private static ApplicationSettings my = null; // Singleton instance
        /**
@@ -564,8 +564,8 @@ public class ApplicationSettings implements ServletContextAware {
                locale = lang;
                wappserver = wurl[2];
                wappname = wurl[3];
-               wapprops = new Properties();
-               jndprops = new Properties();
+               wapprops.clear();
+               jndprops.clear();
                wapprops.load(cloader.getResourceAsStream(wappname + ".properties"));
                jndprops.load(cloader.getResourceAsStream("jndi.properties"));
 
@@ -586,7 +586,7 @@ public class ApplicationSettings implements ServletContextAware {
        public void configure(String filename) {
                // ---------------------------------------
                // Non customizable settings
-               menus = new HashMap<String, SimpleMenu>();
+               menus.clear();
                SimpleMenu menu = new NewMenu();
                menus.put(menu.getName(), menu);
                menu = new SearchMenu();
@@ -708,7 +708,6 @@ public class ApplicationSettings implements ServletContextAware {
        }
 
        public String getApplicationProperty(String name) {
-               // --------------------------------------------------
                return wapprops.getProperty(name); // May be null
        }
 

diff --git a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
index d588d946d119b5fbe0b70b6f35615acb49b57ad0..7e655654aed6dcaa2205784e6f5e7ee146fc8736 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
+++ b/Workspace/Siman/src/org/splat/simer/ConnectionAction.java
@@ -113,13 +113,23 @@ public class ConnectionAction extends Action {
                                        .get("study.filter");
                        LoginContext context = (LoginContext) session.get("login.context");
 
-                       logger.info("Deconnection of " + getConnectedUser().toString()
+                       String connectedUsr = "";
+                       if (getConnectedUser() != null) {
+                               connectedUsr = getConnectedUser().toString();
+                       }
+                       
+                       logger.info("Deconnection of " + connectedUsr
                                        + ".");
-                       context.logout();
+                       
+                       if (context != null) {
+                               context.logout();
+                       }
 
                        // TODO: ProjectSettings.deleteDownloadDirectory(user);
-                       sfilter.put("state", "ANY");
-                       sfilter.put("author", "0");
+                       if (sfilter != null) {
+                               sfilter.put("state", "ANY");
+                               sfilter.put("author", "0");
+                       }
 
                        this.disconnect(); // Updates the session context
                        

diff --git a/Workspace/Siman/src/org/splat/simer/OpenObject.java b/Workspace/Siman/src/org/splat/simer/OpenObject.java
index f00252e0ace788309fb2bf75359b85df5d471f85..8231fa5016f0580780ff0ea0482b21a798d444a2 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/OpenObject.java
+++ b/Workspace/Siman/src/org/splat/simer/OpenObject.java
@@ -1,5 +1,6 @@
 package org.splat.simer;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -11,7 +12,6 @@ import org.splat.dal.bo.som.DocumentType;
 import org.splat.dal.bo.som.KnowledgeElement;
 import org.splat.dal.bo.som.KnowledgeElementType;
 import org.splat.dal.bo.som.ProgressState;
-import org.splat.service.KnowledgeElementService;
 import org.splat.service.KnowledgeElementTypeService;
 import org.splat.service.ProjectElementService;
 import org.splat.service.PublicationService;
@@ -32,8 +32,8 @@ public abstract class OpenObject implements Proxy {
        protected String selection = null; // Menu selected by the user
        protected Step ustep = null; // Corresponding selected step
        protected String description = null; // Object description (rich text)
-       protected List<Step> involving = null;
-       protected List<SimulationContextFacade> context = null; // Simulation Context display representations
+       protected List<Step> involving = new ArrayList<Step>();
+       protected List<SimulationContextFacade> context = new ArrayList<SimulationContextFacade>(); // Simulation Context display representations
        protected List<DocumentFacade> contents = null; // Document display representations
        protected List<KnowledgeIterator> knowledge = null; // Knowledge Element display representations structured by knowledge types