]> SALOME platform Git repositories - tools/siman.git/commitdiff
Salome HOME
Tiles is added
authormka <mka@opencascade.com>
Thu, 8 Nov 2012 14:28:53 +0000 (14:28 +0000)
committermka <mka@opencascade.com>
Thu, 8 Nov 2012 14:28:53 +0000 (14:28 +0000)
37 files changed:
Workspace/Siman/WebContent/WEB-INF/tiles/tiles-defs.xml
Workspace/Siman/WebContent/jsp/exception.jsp [new file with mode: 0644]
Workspace/Siman/WebContent/jsp/presentationpane.jsp
Workspace/Siman/WebContent/layout/baseLayout.jsp [new file with mode: 0644]
Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp [new file with mode: 0644]
Workspace/Siman/WebContent/layout/homeLayout.jsp [new file with mode: 0644]
Workspace/Siman/WebContent/layout/layoutLogin.jsp
Workspace/Siman/WebContent/layout/welcomeLayout.jsp [new file with mode: 0644]
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/WebContent/welcome.jsp
Workspace/Siman/src/labels_en.properties
Workspace/Siman/src/org/splat/simer/Action.java
Workspace/Siman/src/org/splat/simer/ConnectionAction.java
Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
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/StudyPropertiesAction.java
Workspace/Siman/src/org/splat/simer/UploadAction.java
Workspace/Siman/src/org/splat/simer/VersionDocumentAction.java
Workspace/Siman/src/struts.xml

index 7a322b3b66d64d4679d152eae34e916fd4bec840..4d1b001433fb7116b344d7a06e72a6278d1b895e 100644 (file)
 <tiles-definitions>
  
 <definition name="baseLayout" template="/layout/baseLayout.jsp">
-       <put-attribute name="title" value="" type="string"/>
+       <put-attribute name="title" value="name.module" type="string"/>
        <put-attribute name="menu_bar"  value="/jsp/menubar.jsp"/>
        <put-attribute name="title_bar" value="/jsp/titlebar.jsp"/>
        <put-attribute name="tool_bar"   value="/jsp/toolbar.jsp"/>
        <put-attribute name="left_menus"   value="/jsp/menuitem.jsp"/>
+       <put-attribute name="study_properties"   value="/jsp/studyProperties.jsp"/>
+       <put-attribute name="presentation_pane"   value="/jsp/presentationpane.jsp"/>
+</definition>
+
+<definition name="baseLayoutWithoutTitleBar" template="/layout/baseLayoutWithoutTitleBar.jsp">
+       <put-attribute name="title" value="name.module" type="string"/>
+       <put-attribute name="menu_bar"  value="/jsp/menubar.jsp"/>
+       <put-attribute name="tool_bar"   value="/jsp/toolbar.jsp"/>
+       <put-attribute name="left_menus"   value="/jsp/menuitem.jsp"/>
        <put-attribute name="presentation_pane"   value="/jsp/presentationpane.jsp"/>
 </definition>
 
 <definition name="page.login" template="/layout/layoutLogin.jsp">
        <put-attribute name="title" value="Login" type="string"/>
        <put-attribute name="menu_bar"  value="/jsp/menubar.jsp"/>
-       <put-attribute name="menu_bar_mode"  value="none" type="string"/>
        <put-attribute name="presentation_pane"   value="/login.jsp"/>
 </definition>
 
+<definition name="page.welcome" template="/layout/welcomeLayout.jsp">
+       <put-attribute name="title" value="name.module" type="string"/>
+       <put-attribute name="menu_bar"  value="/jsp/menubar.jsp"/>
+</definition>
+
+<definition name="page.exception" extends="page.login">
+       <put-attribute name="title" value="title.application" type="string"/>
+       <put-attribute name="presentation_pane"   value="/jsp/exception.jsp"/>
+</definition>
+
+<definition name="page.home" template="/layout/homeLayout.jsp">
+       <put-attribute name="title" value="name.module" type="string"/>
+       <put-attribute name="menu_bar"  value="/jsp/menubar.jsp"/>
+</definition>
+
+<definition name="page.error.study" extends="baseLayout">
+       <put-attribute name="title" value="name.module" type="string"/>
+       <put-attribute name="presentation_pane"   value="/study/error.jsp"/>
+</definition>
+
+<definition name="page.newstudy" extends="baseLayoutWithoutTitleBar">
+       <put-attribute name="presentation_pane"   value="/study/newStudy.jsp"/>
+</definition>
+
+<definition name="page.searchstudy" extends="baseLayoutWithoutTitleBar">
+       <put-attribute name="presentation_pane"   value="/study/searchStudy.jsp"/>
+</definition>
+
+<definition name="page.searchknowledge" extends="baseLayoutWithoutTitleBar">
+       <put-attribute name="presentation_pane"   value="/study/searchKnowledge.jsp"/>
+</definition>
+
+<definition name="page.displaystudy" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/displayStudyStep.jsp"/>
+</definition>
+
+<definition name="page.displaystudyproperties" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/displayStudyProperties.jsp"/>
+</definition>
+
+<definition name="page.editstudyproperties" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/editStudyProperties.jsp"/>
+</definition>
+
+<definition name="page.displayknowledge" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/displayKnowledge.jsp"/>
+</definition>
+
+<definition name="page.newscenario" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/newScenario.jsp"/>
+</definition>
+
+<definition name="page.editscenarioproperties" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/editScenarioProperties.jsp"/>
+</definition>
+
+<definition name="page.uploadstudy" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/upload.jsp"/>
+</definition>
+
+<definition name="page.importdocument" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/importDocument.jsp"/>
+</definition>
+
+<definition name="page.versiondocument" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/versionDocument.jsp"/>
+</definition>
+
+<definition name="page.uploadsadmin" extends="baseLayoutWithoutTitleBar">
+       <put-attribute name="presentation_pane"   value="/sadmin/upload.jsp"/>
+</definition>
+
+<definition name="page.indexstudies" extends="baseLayoutWithoutTitleBar">
+       <put-attribute name="presentation_pane"   value="/sadmin/indexStudies.jsp"/>
+</definition>
+
+<definition name="page.displayuser" extends="baseLayoutWithoutTitleBar">
+       <put-attribute name="presentation_pane"   value="/sadmin/displayUser.jsp"/>
+</definition>
+
+<definition name="page.importerror" extends="baseLayout">
+       <put-attribute name="presentation_pane"   value="/study/importError.jsp"/>
+</definition>
 </tiles-definitions>
\ No newline at end of file
diff --git a/Workspace/Siman/WebContent/jsp/exception.jsp b/Workspace/Siman/WebContent/jsp/exception.jsp
new file mode 100644 (file)
index 0000000..4cd64ae
--- /dev/null
@@ -0,0 +1,16 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+       <head>
+               <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+               <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+       </head>
+       <body>
+               <div>
+                       <s:if test="errorCode != null">
+                               <s:property value="%{getText(errorCode)}" />
+                       </s:if>
+               </div>
+</body>
+</html>
\ No newline at end of file
index f986ff8d334e57b3de3bb29c6e855f95880aa736..eb08e955a6038252f2a3902b76c1f4c916dc5848 100644 (file)
@@ -1,8 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%><%@
-    taglib prefix="s" uri="/struts-tags"
-%>
+    pageEncoding="ISO-8859-1" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
@@ -11,6 +9,6 @@
                <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
        </head>
        <body>
-               <p>Simple body text</p>
+               <p/>
        </body>
 </html>
\ No newline at end of file
diff --git a/Workspace/Siman/WebContent/layout/baseLayout.jsp b/Workspace/Siman/WebContent/layout/baseLayout.jsp
new file mode 100644 (file)
index 0000000..d4d0726
--- /dev/null
@@ -0,0 +1,40 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+ <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <tiles:importAttribute name="title" scope="request"/>      
+       <title>
+               <s:property value="%{getText(#request.title)}"/>
+       </title>
+    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+</head>
+
+<body>
+       <!-- Menu-bar  -->
+    <tiles:insertAttribute name="menu_bar" ignore="true" />
+
+       <!-- Title-bar -->
+       <tiles:insertAttribute name="title_bar" ignore="true" />
+
+<!-- Left pane -->
+    <div id=left-pane>
+       <tiles:insertAttribute name="tool_bar" ignore="true" />
+       <div id=top-spacer></div>
+       <tiles:insertAttribute name="left_menus" ignore="true" />
+       <tiles:insertAttribute name="study_properties" ignore="true" />
+    </div>
+
+<!-- Message pane
+     =============================================================================================================================
+  -->
+    <div id=main-pane>
+       <tiles:insertAttribute name="presentation_pane" ignore="true" />
+    </div>
+
+  </body>
+  
\ No newline at end of file
diff --git a/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp b/Workspace/Siman/WebContent/layout/baseLayoutWithoutTitleBar.jsp
new file mode 100644 (file)
index 0000000..8db8fbf
--- /dev/null
@@ -0,0 +1,38 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+ <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <tiles:importAttribute name="title" scope="request"/>      
+       <title>
+               <s:property value="%{getText(#request.title)}"/>
+       </title>
+    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+</head>
+
+<body>
+       <!-- Menu-bar  -->
+    <tiles:insertAttribute name="menu_bar" ignore="true" />
+    
+    <div id=top-spacer></div>
+
+<!-- Left pane -->
+    <div id=left-pane>
+       <tiles:insertAttribute name="tool_bar" ignore="true" />
+       <div id=top-spacer></div>
+       <tiles:insertAttribute name="left_menus" ignore="true" />
+    </div>
+
+<!-- Message pane
+     =============================================================================================================================
+  -->
+    <div id=main-pane>
+       <tiles:insertAttribute name="presentation_pane" ignore="true" />
+    </div>
+
+  </body>
+  
\ No newline at end of file
diff --git a/Workspace/Siman/WebContent/layout/homeLayout.jsp b/Workspace/Siman/WebContent/layout/homeLayout.jsp
new file mode 100644 (file)
index 0000000..fd331cb
--- /dev/null
@@ -0,0 +1,34 @@
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <tiles:importAttribute name="title" scope="request"/>
+    <title>
+               <s:property value="%{getText(#request.title)}"/>
+       </title>
+    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+</head>
+
+<body>
+
+       <!-- Menu-bar -->
+       <tiles:insertAttribute name="menu_bar" ignore="true" />
+    
+    <table border="0" cellpadding="10" cellspacing="0" class="error">
+        <tr height=24 valign=middle>
+               <td>
+                       <s:if test="errorCode != null">
+                       <s:property value="%{getText(errorCode)}" />
+               </s:if>
+               </td>
+        </tr>
+    </table>
+</body>
+
+</html>
\ No newline at end of file
index 8bd81193f3739660078bd81ee8cb3aff3eceee92..384dece09062ed04c2e2697be282816c5f5f47e4 100644 (file)
@@ -17,9 +17,8 @@
 <body> <!--  onLoad="document.login.username.focus();" -->
 
        <!-- Menu-bar -->
+       <tiles:insertAttribute name="menu_bar" ignore="true" />
        
-       <jsp:include page="/jsp/menubar.jsp" />
-
        <div id=top-spacer>
        </div>
 
diff --git a/Workspace/Siman/WebContent/layout/welcomeLayout.jsp b/Workspace/Siman/WebContent/layout/welcomeLayout.jsp
new file mode 100644 (file)
index 0000000..02d9153
--- /dev/null
@@ -0,0 +1,30 @@
+<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+       
+       <tiles:importAttribute name="title" scope="request"/>   
+       <title>
+               <s:property value="%{getText(#request.title)}"/>
+       </title>
+       <link href=<s:url value="/skin/default.css"/> rel="stylesheet"  type="text/css">
+</head>
+
+<body>
+       <!-- Menu-bar  -->
+
+       <tiles:insertAttribute name="menu_bar" ignore="true" />
+
+       <!-- Title-bar   -->
+       <div id=title-bar>
+               <s:text name="message.welcome" />
+       </div>
+</body>
+
+</html>
\ No newline at end of file
index 05970dc2043807569a4b8e163730973b78634e47..6ffb7c7428c169068544980c47cff90c7a5026e3 100644 (file)
@@ -7,26 +7,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-  </head>
+  <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-    <div id=top-spacer></div>
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-    </div>
 
 <!-- Updload dialog
      =============================================================================================================================
index 257448510ed31cd62e9f4d6cd7eb78c028229dca..f2966c100f0bfa208c8c271746135ad2c10cf5d2 100644 (file)
@@ -6,28 +6,9 @@
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-  </head>
+  <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
 
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-    <div id=top-spacer></div>
-
-<!-- Search menu
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-    </div>
 
     <div id=main-pane>
 
index 282bec304eba0ab493a09579dc7cdf29dae00bb6..9fc7ce9bc67e736413c668d622933454a5698f04 100644 (file)
@@ -1,15 +1,9 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
     <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
     <script language="JavaScript">
   
     </script>
   </head>
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-    <div id=top-spacer></div>
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-    </div>
 
 <!-- Updload dialog
      =============================================================================================================================
index b61bf2b110d7e1a5693d1f1804823316bcf2e91f..bf7a6a11e00d463d56dc5d9a43ee82d846c4e1a9 100644 (file)
@@ -1,37 +1,11 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%><%@
-    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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-  </head>
+  <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
 
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/knowledgeProperties.jsp" />
-    </div>
 
     <div id=main-pane>
 
index ff3ac0a1709cb2406444ae7977db38a318c71fe5..f845a5d9c9d99023c2a3ad00ce6b9ea2b29e5b60 100644 (file)
@@ -1,38 +1,11 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-  </head>
+  <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
 
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
 <!-- Properties form
      =============================================================================================================================
index b9b66fcdc9733326eab269cf63309198c1cd6e5c..4d608267679b8af4c0c4c2da2efe9b889a3d9b10 100644 (file)
 <s:set var="todo"><%=action%></s:set>
 <html>
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-    <link href="../rtef/rte.css" rel="stylesheet" type="text/css">
+       <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+
     <script language="JavaScript" type="text/javascript" src="../rtef/lang/fr.js"></script>
     <script language="JavaScript" type="text/javascript" src="../rtef/richtext.js"></script>
     <script language="JavaScript" type="text/javascript" src="../rtef/xhtml.js"></script>
       edit.submit();
     }
     </script>
-  </head>
 
   <body onLoad="initialize('<%=action%>')">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />          
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
     <div id=main-pane>
 
index 114a11089f0fe6f164905fb542bbc26f67484d39..ab046b24c920f85d4bdd064b12bda9966451bd00 100644 (file)
@@ -1,16 +1,11 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
     <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+    
     <script language="JavaScript">
 
     function checkin (message) {
   </head>
 
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
 <!-- Properties form
      =============================================================================================================================
index 4941f113b4657b641b496790f25b28ffd040a486..98b113e256a91060e9dbe41daef5725c82671ca7 100644 (file)
@@ -6,15 +6,19 @@
 <%@ page import="com.opensymphony.xwork2.ActionContext"%>
 <%@ page import="org.splat.simer.StudyPropertiesAction"%>
 <%@ page import="org.splat.dal.bo.kernel.User"%>
-<%@
-    taglib prefix="s" uri="/struts-tags"
-%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<%  String              action = request.getParameter("action");   
-    if (action == null) action = "display";
-%>
-<s:set var="todo"><%=action%></s:set>
+
+<s:if test="actionType == null">
+       <s:set var="todo">display</s:set>
+</s:if>
+<s:else>
+       <s:set var="todo">
+               <s:property value="actionType" />
+       </s:set>
+</s:else>
+
 <s:url id="edititle" namespace="/study" action="edit-title" />
 <s:url id="edibutor" namespace="/study" action="edit-contributor" />
 <s:url id="addcycle" namespace="/study" action="edit-cycle">
@@ -25,7 +29,6 @@
 
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
     <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
     <script language="JavaScript">
 
   </head>
 
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
 <!-- Properties form
      =============================================================================================================================
@@ -83,8 +67,8 @@
             </tr>
             <tr height=5><td></td></tr>
             <tr height=26>
-<%  if (action.equals("edititle")) {
-%>
+            
+            <s:if test="actionType eq 'edititle'">
               <td>
                 <s:a href="%{#undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="button.cancel"/>"/></s:a>
               </td>
                   <img src="<s:url value="/skin/image.export.png"/>" title="<s:text name="button.save"/>"/>
                 </button>
               </td>
-<%  } else {
-%>            <td>
+              </s:if>
+              <s:else>
+
+                 <td>
                 <s:if test="#todo == 'display'"><s:a href="%{#edititle}"><img src="<s:url value="/skin/icon.ed.png"/>" border="none" title="<s:text name="tooltip.edit.title"/>"/></s:a></s:if>
               </td>
               <td colspan=4><s:property value="studyTitle"/></td>
-<%  }
-%>          </tr>
+              </s:else>
+              
+               </tr>
             <tr height=10><td width=20></td></tr>
             <tr>
               <td><img src="<s:url value="/skin/image.downarrow.png"/>" border="none"/></td>
               <td><b><s:text name="label.members"/></b></td>
             </tr>
-            <tr height=5><td></td></tr>       
-<%  if (action.equals("edibutor")) {
-%>
+            <tr height=5><td></td></tr>    
+            
+            <s:if test="actionType eq 'edibutor'">   
             <tr>
               <td>
                 <s:a href="%{#undo}"><img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="button.cancel"/>"/></s:a>
             out.print(user.toString());
           out.print("</td>");
         out.print("</tr>");
-      }
-    } else {
-%>          <tr>
+      }%>
+      </s:if>
+         <s:else>
+          <tr>
               <td></td>
               <td><s:text name="label.contributor"/></td>
               <td></td>
               </td>
               <td><s:property value="%{author.toString()}"/></td>
             </tr>
-<%  }
-%>          <tr height=15><td width=20></td></tr>
+            </s:else>
+
+            <tr height=15><td width=20></td></tr>
             <tr>
               <td><img src="<s:url value="/skin/image.downarrow.png"/>" border="none"/></td>
               <td><b><s:text name="label.approcycle"/></b></td>
index e24dd15ad6f50a35f592457561e95130f40c4b0c..d5818d5f5b38089c1683034f42f7437c1beb5687 100644 (file)
@@ -1,72 +1,23 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!-- Initialization of the message
-     =============================================================================================================================
-  -->
-<%  String  message = request.getParameter("message");
-    String  value   = request.getParameter("value");
-%>
-<s:set var="code"><%=message%></s:set>
-<html>
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-  </head>
-
-  <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
-
-<!-- Message pane
-     =============================================================================================================================
-  -->
-    <div id=main-pane>
-      <div id=article-box>
-        <div id=article-body>
-          <table width=100% cellpadding=0 cellspacing=0 border=0 class=error>
+<div id=article-box>
+       <div id=article-body>
+       <table width=100% cellpadding=0 cellspacing=0 border=0 class=error>
             <tr height=5><td></td></tr>
             <tr>
-              <td>
-                <s:text name="message.error.%{#code}">
-<%  if (value != null) {
-%>                <s:param><%=value%></s:param>
-<%  }
-%>              </s:text>
-              </td>
+               <td>
+                       <s:if test="errorCode != null">
+                               <s:property value="%{getText(errorCode)}" />
+                       </s:if>
+               </td>
             </tr>
             <tr height=10><td></td></tr>
             <tr>
-              <td align=center><input type=button style='width: 100px;' value="<s:text name="button.ok"/>" onClick="history.back();return false;">
+               <td align=center><input type=button style='width: 100px;' value="<s:text name="button.ok"/>" onClick="history.back();return false;">
             </tr>
-          </table>
-        </div>
-      </div>
-    </div>
-
-  </body>
-  
\ No newline at end of file
+        </table>
+       </div>
+</div>
\ No newline at end of file
index bd70163694006ab2c37baa02cb047c768885caef..7dae4d23083e643aa3e4ca4879d3b4e74bee7a4d 100644 (file)
@@ -8,8 +8,6 @@
 <html>
 
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
     <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
     <script language="JavaScript">
 
     </script>
   </head>
   <body onLoad="initialize()">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
 <!-- Import dialog
      =============================================================================================================================
index dca6f4ca2dad6c3406208f5ddbf6f37f9247a512..7e6052824c93fbc2ecfc6ccc5ad7e822195aafb6 100644 (file)
@@ -6,41 +6,11 @@
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!-- Initialization of the message
-     =============================================================================================================================
-  -->
-<%  String  message = request.getParameter("message");
-    String  value   = request.getParameter("value");
-%>
-<s:set var="code"><%=message%></s:set>
 <html>
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-  </head>
+  <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
 
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
 <!-- Message pane
      =============================================================================================================================
             <tr height=5><td></td></tr>
             <tr>
               <td>
-                <s:text name="message.error.%{#code}">
-<%  if (value != null) {
-%>                <s:param><%=value%></s:param>
-<%  }
-%>              </s:text>
+                <s:if test="errorCode != null">
+                                       <s:property value="%{getText(errorCode)}" />
+                               </s:if>
               </td>
             </tr>
             <tr height=10><td></td></tr>
index 21050f4333197259db06619a969615cdb3c9c588..1a659e1c7a001451097cefc9724bad7df52be821 100644 (file)
@@ -1,13 +1,7 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%>
-<%@
-    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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<%  String            init = request.getParameter("init");   
-    if (init == null) init = "none";
-%>
+
 <html>
 
   <head>
     </script>
   </head>
 
-  <body onLoad="initialize('<%=init%>')">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
+  <body onLoad="initialize(#actionType)">
 
 <!-- New scenario properties
      =============================================================================================================================
index 8846d3b39b697aacdb04d605211460816b8d248c..e5b2c1a4e892c75ee74e90f410e04abc1ecce5d5 100644 (file)
@@ -1,15 +1,8 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%><%@
-    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"%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+<div>
     <script language="JavaScript">
 
     function initialize () {
       create.elements[2].focus();
     }
     </script>
-  </head>
-
-  <body onLoad="initialize()">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-    <div id=top-spacer></div>
-
-<!-- Creation menu
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-    </div>
 
 <!-- New study dialog
      =============================================================================================================================
     <div id=right-pane></div>
     <div id=bottom-spacer></div>
 
-  </body>
-
-</html>
\ No newline at end of file
+</div>
\ No newline at end of file
index faba00d12b0ca83914978dc1f0563818ef162f7e..1c5efa18bf4d8d0547b4185ba39dca61a9873bab 100644 (file)
@@ -15,8 +15,7 @@
 <!-- Initialization of the context
      =============================================================================================================================
   -->
-<%  String  action = request.getParameter("action");
-
+<% 
     ApplicationRights rights    = (ApplicationRights)session.getAttribute("user.rights");
     ResourceBundle    locale    = ResourceBundle.getBundle("som", ApplicationSettings.getCurrentLocale());
     String            format    = locale.getString("date.format");
     if (rights.getUser() != null)                      connected = true;
     if (session.getAttribute("search.result") == null) result    = "obsolete";
 %>
-<s:set var="todo"><%=action%></s:set>
+
 <s:set var="user"><%=connected%></s:set>
 <s:set var="format"><%=format%></s:set>
 <s:set var="today"><%=tostring.format(java.util.Calendar.getInstance().getTime())%></s:set>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-    <script language="JavaScript" type="text/javascript" src="../js/search.js"></script>
-  </head>
 
-  <body onLoad="initialize('<%=result%>')">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-    <div id=top-spacer></div>
+       <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
+  
+    <script language="JavaScript" type="text/javascript" src="../js/search.js"></script>
 
-<!-- Search menu
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-    </div>
+       <body onLoad="initialize('<%=result%>')">
 
     <div id=main-pane>
 
                     </tr>
                   </s:iterator>
 
-                  <s:if test="%{#todo == 'setContext'}">
+                  <s:if test="%{actionType == 'setContext'}">
                     <tr>
                       <td>
                         <img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" onClick="cancel()" />&nbsp;
                   </s:if>
                 </table>
 
-                <s:if test="%{#todo != 'setContext'}">
+                <s:if test="%{actionType != 'setContext'}">
                         <select name="contextType" onChange="submit()">
                           <option value="-1"><s:text name="menu.addcontext"/></option>
                           <s:set var="snum" value="null"/>
index 7e65eb59d551044f5bd9fabf9bc602d5f446cac2..d6c85d2ff743db5c5458e4ed390b4678245d4f23 100644 (file)
@@ -15,8 +15,7 @@
 <!-- Initialization of the context
      =============================================================================================================================
   -->
-<%  String  action = request.getParameter("action");
-
+<%  
     ApplicationRights rights    = (ApplicationRights)session.getAttribute("user.rights");
     ResourceBundle    locale    = ResourceBundle.getBundle("som", ApplicationSettings.getCurrentLocale());
     String            format    = locale.getString("date.format");
     if (rights.getUser() != null)                      connected = true;
     if (session.getAttribute("search.result") == null) result    = "obsolete";
 %>
-<s:set var="todo"><%=action%></s:set>
+
 <s:set var="user"><%=connected%></s:set>
 <s:set var="format"><%=format%></s:set>
 <s:set var="today"><%=tostring.format(java.util.Calendar.getInstance().getTime())%></s:set>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-    <script language="JavaScript" type="text/javascript" src="../js/search.js"></script>
-  </head>
 
-  <body onLoad="initialize('<%=result%>')">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-    <div id=top-spacer></div>
+  <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
 
-<!-- Search menu
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-    </div>
+  <script language="JavaScript" type="text/javascript" src="../js/search.js"></script>
+
+  <body onLoad="initialize('<%=result%>')">
 
     <div id=main-pane>
 
                     </tr>
                   </s:iterator>
 
-                  <s:if test="%{#todo == 'setContext'}">
+                  <s:if test="%{actionType == 'setContext'}">
                     <tr>
                       <td>
                         <img src="<s:url value="/skin/icon.undo.png"/>" border="none" title="<s:text name="tooltip.cancel"/>" onClick="cancel()" />&nbsp;
                   </s:if>
                 </table>
 
-                <s:if test="%{#todo != 'setContext'}">
+                <s:if test="%{actionType != 'setContext'}">
                         <select name="contextType" onChange="submit()">
                           <option value="-1"><s:text name="menu.addcontext"/></option>
                           <s:iterator value="contextTypeOptions">
index ea03b0a190cd2d28729fdeedd53b5caa6fee5f33..5b04c9d221a7f03f599f6e392c44266b012e3c83 100644 (file)
@@ -6,8 +6,6 @@
 <html>
 
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
     <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
     <script language="JavaScript">
   
     </script>
   </head>
   <body>
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
 <!-- Updload dialog
      =============================================================================================================================
index e9f7c6a009750d00b9d697d77c7e77715a2895e7..16d4f1cb506978c49a433dc6cd3a086eeadce3b6 100644 (file)
@@ -8,8 +8,6 @@
 <html>
 
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
     <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
     <script language="JavaScript">
 
     </script>
   </head>
   <body onLoad="initialize()">
-<!-- Menu-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/menubar.jsp" />
-
-<!-- Title-bar
-     =============================================================================================================================
-  -->
-    <jsp:include page="/jsp/titlebar.jsp" />
-
-<!-- Left pane
-     =============================================================================================================================
-  -->
-    <div id=left-pane>
-      <jsp:include page="/jsp/toolbar.jsp" />
-      <div id=top-spacer></div>
-      <jsp:include page="/jsp/menuitem.jsp" />
-      <jsp:include page="/jsp/studyProperties.jsp" />
-    </div>
 
 <!-- Import dialog
      =============================================================================================================================
index ae6d2a6b0a2769b2fbbe0f93af1e521605a5e781..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -1,26 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"
-%><%@
-    taglib prefix="s" uri="/struts-tags"
-%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-    <title><s:text name="name.module"/></title>
-    <link href=<s:url value="/skin/default.css"/> rel="stylesheet" type="text/css">
-  </head>
-
-  <body>
-<!-- Menu-bar
-  -->
-  
-    <jsp:include page="/jsp/menubar.jsp" />
-       
-<!-- Title-bar
-  -->
-    <div id=title-bar><s:text name="message.welcome"/></div>
-  </body>
-
-</html>
\ No newline at end of file
index fe4d72d6d9888932e3dc11a6305c27981a59ea47..cb4499062f22f69eb7be16153ea3cc97aa4177a1 100644 (file)
@@ -49,7 +49,7 @@ menu.admin.context    = The simulation contexts
 menu.admin.knowledge  = The knowledges
 menu.admin.study      = The studies
 
-
+title.application     = SIMAN
 title.login           = Enter your login identification
 title.criteria        = Search criteria
 title.newstudy        = Define your study
index e2446fe69488ac4caa3aa403324e6b4cd81c7d34..40ee111325b32057fb65992153bffd8bf36590a4 100644 (file)
@@ -69,6 +69,10 @@ public class Action extends ActionSupport implements ServletRequestAware,
         * Error code.
         */
        private String _errorCode;
+       /**
+        * ActionType for specifying the type of the operaion.
+        */
+       private String _actionType;
        /**
         * Current open study facade object.
         */
@@ -686,5 +690,20 @@ public class Action extends ActionSupport implements ServletRequestAware,
        public void setLeftMenuSettings(final LeftMenuSettings leftMenuSettings) {
                _leftMenuSettings = leftMenuSettings;
        }
+       
+       /**
+        * Get the actionType.
+        * @return the actionType
+        */
+       public String getActionType() {
+               return _actionType;
+       }
 
+       /**
+        * Set the actionType.
+        * @param actionType the actionType to set
+        */
+       public void setActionType(final String actionType) {
+               _actionType = actionType;
+       }
 }
\ No newline at end of file
index 2838c977a68e9bf9b3e289d818c7a83480836c6d..3cb190fe2d833b8a94ca7d22c3715ea11490b222 100644 (file)
@@ -30,7 +30,7 @@ public class ConnectionAction extends Action {
         * User password.
         */
        private String _password = null;
-       private transient String _backmenu = null;
+       private String _backmenu = null;
 
        private String _menuProperty;
 
@@ -48,6 +48,7 @@ public class ConnectionAction extends Action {
                 * 
                 * @see javax.security.auth.callback.CallbackHandler#handle(javax.security.auth.callback.Callback[])
                 */
+               @Override
                public void handle(final Callback[] callbacks) throws IOException,
                                UnsupportedCallbackException {
                        for (int i = 0; i < callbacks.length; i++) {
index 32ffa8c25c8f465fdbf5f8b991a856a2655bf373..beabeaaf6baea04979d66df29598ed0487903d54 100644 (file)
@@ -147,7 +147,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                Document slot = getDocumentService().selectDocument(fileref,
                                                new Revision().toString());
                                if (slot == null) {
-                                       setErrorCode("reference.undefined");
+                                       setErrorCode("message.error.reference.undefined");
                                        
                                        setToolProperty("none");
                                        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
@@ -155,7 +155,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                        return ERROR;
                                } else {
                                        if (!slot.isUndefined()) {
-                                               setErrorCode("reference.duplicate");
+                                               setErrorCode("message.error.reference.duplicate");
                                                
                                                setToolProperty("none");
                                                initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
@@ -178,7 +178,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                                state = ProgressState.inCHECK;
                                        docver = version.toString();
                                } catch (ParseException e) {
-                                       setErrorCode("format.version");
+                                       setErrorCode("message.error.format.version");
                                        
                                        setToolProperty("none");
                                        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
@@ -195,7 +195,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                                try {
                                        check.parse(date);
                                } catch (ParseException e) {
-                                       setErrorCode("format.date");
+                                       setErrorCode("message.error.format.date");
                                        
                                        setToolProperty("none");
                                        initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
@@ -238,7 +238,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                if (action == ToDo.cancel)
                        return "cancel";
                if (doctype == 0) {
-                       setErrorCode("import.type");
+                       setErrorCode("message.error.import.type");
                        
                        setToolProperty("none");
                        setLeftMenuProperty("study");
@@ -330,10 +330,10 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                        return SUCCESS;
                } catch (FileNotFoundException error) {
                        LOG.error("Reason:", error);
-                       setErrorCode("import.file");
+                       setErrorCode("message.error.import.file");
                } catch (Exception error) {
                        LOG.error("Reason:", error);
-                       setErrorCode("internal");
+                       setErrorCode("message.error.internal");
                }
                
                setToolProperty("none");
@@ -372,45 +372,45 @@ public class ImportDocumentAction extends UploadBaseNextAction {
                return docver;
        }
 
-       public void setDocumentDate(String date) {
+       public void setDocumentDate(final String date) {
                // -----------------------------------------
                this.date = date;
        }
 
-       public void setDocumentName(String name) {
+       public void setDocumentName(final String name) {
                // -----------------------------------------
                this.docname = name; // Name entered by the user if enabled
        }
 
-       public void setDocumentTitle(String name) { // Called even if DocumentName is enabled
+       public void setDocumentTitle(final String name) { // Called even if DocumentName is enabled
        // -----------------------------------------
                if (this.docname == null)
                        this.docname = name;
        }
 
-       public void setDocumentType(String value) {
+       public void setDocumentType(final String value) {
                // ------------------------------------------
                this.doctype = Integer.valueOf(value);
        }
 
-       public void setDefaultDocumentState(String state) { // Called even if DocumentState is enabled
+       public void setDefaultDocumentState(final String state) { // Called even if DocumentState is enabled
        // --------------------------------------------------
                if (this.state == null)
                        this.state = ProgressState.valueOf(state);
        }
 
-       public void setDefaultDocumentType(String value) { // Called even if DocumentType is enabled
+       public void setDefaultDocumentType(final String value) { // Called even if DocumentType is enabled
        // --------------------------------------------------
                if (this.doctype == 0)
                        this.doctype = Integer.valueOf(value);
        }
 
-       public void setReference(String value) {
+       public void setReference(final String value) {
                // ---------------------------------------
                this.docref = value;
        }
 
-       public void setVersion(String value) {
+       public void setVersion(final String value) {
                // -------------------------------------
                this.docver = value;
        }
@@ -430,7 +430,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * @param projectSettingsService
         *            project settings service
         */
-       public void setProjectSettings(ProjectSettingsService projectSettingsService) {
+       public void setProjectSettings(final ProjectSettingsService projectSettingsService) {
                _projectSettingsService = projectSettingsService;
        }
 
@@ -449,7 +449,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * @param publicationService
         *            the publicationService to set
         */
-       public void setPublicationService(PublicationService publicationService) {
+       public void setPublicationService(final PublicationService publicationService) {
                _publicationService = publicationService;
        }
 
@@ -465,7 +465,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * Set the stepService.
         * @param stepService the stepService to set
         */
-       public void setStepService(StepService stepService) {
+       public void setStepService(final StepService stepService) {
                _stepService = stepService;
        }
 
@@ -481,7 +481,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * Set the documentService.
         * @param documentService the documentService to set
         */
-       public void setDocumentService(DocumentService documentService) {
+       public void setDocumentService(final DocumentService documentService) {
                _documentService = documentService;
        }
 
@@ -497,7 +497,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * Set the repositoryService.
         * @param repositoryService the repositoryService to set
         */
-       public void setRepositoryService(RepositoryService repositoryService) {
+       public void setRepositoryService(final RepositoryService repositoryService) {
                _repositoryService = repositoryService;
        }
 
@@ -513,7 +513,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * Set the documentTypeService.
         * @param documentTypeService the documentTypeService to set
         */
-       public void setDocumentTypeService(DocumentTypeService documentTypeService) {
+       public void setDocumentTypeService(final DocumentTypeService documentTypeService) {
                _documentTypeService = documentTypeService;
        }
        
@@ -529,7 +529,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * Set the menuProperty.
         * @param menuProperty the menuProperty to set
         */
-       public void setMenuProperty(String menuProperty) {
+       public void setMenuProperty(final String menuProperty) {
                this._menuProperty = menuProperty;
        }
        
@@ -545,7 +545,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * Set the _titleProperty.
         * @param _titleProperty the titleProperty to set
         */
-       public void setTitleProperty(String titleProperty) {
+       public void setTitleProperty(final String titleProperty) {
                _titleProperty = titleProperty;
        }
 
@@ -561,7 +561,7 @@ public class ImportDocumentAction extends UploadBaseNextAction {
         * Set the editDisabledProperty.
         * @param editDisabledProperty the editDisabledProperty to set
         */
-       public final void setEditDisabledProperty(String editDisabledProperty) {
+       public final void setEditDisabledProperty(final String editDisabledProperty) {
                _editDisabledProperty = editDisabledProperty;
        }
 
index c20b83dedc358441784a5995da0332999e86570d..024b5fd345a8569654fc35642d86648761c7a7ac 100644 (file)
@@ -105,6 +105,8 @@ public class NewScenarioAction extends Action {
       setToolProperty("none");
       setLeftMenuProperty("scenario");
       initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+      
+      setActionType("focus");
                
       return SUCCESS;
     }
@@ -128,6 +130,8 @@ public class NewScenarioAction extends Action {
       setLeftMenuProperty("scenario");
       initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
       
+      setActionType("none");
+      
       return SUCCESS;
     }
 
@@ -212,23 +216,23 @@ public class NewScenarioAction extends Action {
       return mytitle;
     }
 
-    public void setCancel (boolean cancel) {
+    public void setCancel (final boolean cancel) {
 //  --------------------------------------
       action = ToDo.cancel;
     }
-    public void setSave (boolean save) {
+    public void setSave (final boolean save) {
 //  ----------------------------------
       action = ToDo.save;
     }
-    public void setSelectedScenario (String index) {
+    public void setSelectedScenario (final String index) {
 //  ----------------------------------------------
       scindex = Integer.valueOf(index);
     }
-    public void setSelection (String step) {
+    public void setSelection (final String step) {
 //  --------------------------------------
       selection = step;
     }
-    public void setTitle (String title) {
+    public void setTitle (final String title) {
 //  -----------------------------------
       mytitle = title;
     }
@@ -252,7 +256,7 @@ public class NewScenarioAction extends Action {
         *            the projectElementService to set
         */
        public void setProjectElementService(
-                       ProjectElementService projectElementService) {
+                       final ProjectElementService projectElementService) {
                _projectElementService = projectElementService;
        }
 
@@ -268,7 +272,7 @@ public class NewScenarioAction extends Action {
         * Set the menu.
         * @param menu the menu to set
         */
-       public void setMenu(Menu menu) {
+       public void setMenu(final Menu menu) {
                _menu = menu;
        }
 
@@ -284,7 +288,7 @@ public class NewScenarioAction extends Action {
         * Set the scenarioService.
         * @param scenarioService the scenarioService to set
         */
-       public void setScenarioService(ScenarioService scenarioService) {
+       public void setScenarioService(final ScenarioService scenarioService) {
                _scenarioService = scenarioService;
        }
        
@@ -300,7 +304,7 @@ public class NewScenarioAction extends Action {
         * Set the menuProperty.
         * @param menuProperty the menuProperty to set
         */
-       public void setMenuProperty(String menuProperty) {
+       public void setMenuProperty(final String menuProperty) {
                this._menuProperty = menuProperty;
        }
        
@@ -316,7 +320,7 @@ public class NewScenarioAction extends Action {
         * Set the _titleProperty.
         * @param _titleProperty the titleProperty to set
         */
-       public void setTitleProperty(String titleProperty) {
+       public void setTitleProperty(final String titleProperty) {
                _titleProperty = titleProperty;
        }
 
@@ -332,7 +336,7 @@ public class NewScenarioAction extends Action {
         * Set the _editDisabledProperty.
         * @param _editDisabledProperty the _editDisabledProperty to set
         */
-       public void setEditDisabledProperty(String _editDisabledProperty) {
+       public void setEditDisabledProperty(final String _editDisabledProperty) {
                this._editDisabledProperty = _editDisabledProperty;
        }
        
index 40ae3ff3ab8847a85346a025b6a79770e4a520b7..8020aff1004dbe93397a96311fa4d625743c4127 100644 (file)
@@ -162,6 +162,7 @@ public class NewStudyAction extends Action {
                        return SUCCESS;
                } catch (Exception error) {
                        LOG.error("Unable to save the study, reason:", error);
+                       setErrorCode("message.error.newstudy");
                        setMenuProperty("none");
                        initializationScreenContext(_menuProperty);
                        return ERROR;
index a2a4f662fc1727507819b31ca81e5ad464c6d792..5e2119732eb46084a9ad50535c3b32a2e78f3515 100644 (file)
@@ -52,6 +52,8 @@ public class NotYetImplementedAction extends Action {
        setToolProperty("none");
        setLeftMenuProperty("study");
         initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+        
+        setErrorCode("message.error.notyetimplemented");
                
       return SUCCESS;
     }
@@ -68,7 +70,7 @@ public class NotYetImplementedAction extends Action {
         * Set the menuProperty.
         * @param menuProperty the menuProperty to set
         */
-       public void setMenuProperty(String menuProperty) {
+       public void setMenuProperty(final String menuProperty) {
                this._menuProperty = menuProperty;
        }
        
@@ -84,7 +86,7 @@ public class NotYetImplementedAction extends Action {
         * Set the _titleProperty.
         * @param _titleProperty the titleProperty to set
         */
-       public void setTitleProperty(String titleProperty) {
+       public void setTitleProperty(final String titleProperty) {
                _titleProperty = titleProperty;
        }
 
@@ -100,7 +102,7 @@ public class NotYetImplementedAction extends Action {
         * Set the editDisabledProperty.
         * @param editDisabledProperty the editDisabledProperty to set
         */
-       public final void setEditDisabledProperty(String editDisabledProperty) {
+       public final void setEditDisabledProperty(final String editDisabledProperty) {
                _editDisabledProperty = editDisabledProperty;
        }
 
index 452ee07302469de3ce62ae61ffd16bb128eb1e37..00efb1d88b6e27f9113b00dc8fb391b8631f8626 100644 (file)
@@ -192,6 +192,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setToolProperty("back");
                setLeftMenuProperty("open");
                initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+               setActionType("edititle");
 
                return SUCCESS;
        }
@@ -238,6 +239,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setLeftMenuProperty("open");
                initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
+               setActionType("edibutor");
                return SUCCESS;
        }
 
@@ -289,6 +291,8 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
                setLeftMenuProperty("open");
                initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
 
+               setActionType("edicycle");
+               
                return SUCCESS;
        }
 
@@ -435,57 +439,57 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
        // Setters
        // ==============================================================================================================================
 
-       public void setCandidates(String indices) {
+       public void setCandidates(final String indices) {
                // ------------------------------------------
                candidates = indices;
        }
 
-       public void setCycle(String type) {
+       public void setCycle(final String type) {
                // ----------------------------------
                edicycle = type;
        }
 
-       public void setMembers(String indices) {
+       public void setMembers(final String indices) {
                // ---------------------------------------
                contributors = indices;
        }
 
-       public void setDocumentType(String index) {
+       public void setDocumentType(final String index) {
                // ------------------------------------------
                type = Integer.valueOf(index);
        }
 
-       public void setApprover(String index) {
+       public void setApprover(final String index) {
                // --------------------------------------
                approver = Integer.valueOf(index);
        }
 
-       public void setPublisher(String index) {
+       public void setPublisher(final String index) {
                // ---------------------------------------
                publisher = Integer.valueOf(index);
        }
 
-       public void setReviewer(String index) {
+       public void setReviewer(final String index) {
                // --------------------------------------
                reviewer = Integer.valueOf(index);
        }
 
-       public void setTitle(String title) {
+       public void setTitle(final String title) {
                // -----------------------------------
                stitle = title;
        }
 
-       public void setSaveTitle(String save) {
+       public void setSaveTitle(final String save) {
                // --------------------------------------
                tosave = Save.title;
        }
 
-       public void setSaveContributors(String save) {
+       public void setSaveContributors(final String save) {
                // ---------------------------------------------
                tosave = Save.contributor;
        }
 
-       public void setSaveCycle(String save) {
+       public void setSaveCycle(final String save) {
                // --------------------------------------
                tosave = Save.cycle;
        }
@@ -495,6 +499,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * 
         * @return the studyService
         */
+       @Override
        public StudyService getStudyService() {
                return _studyService;
        }
@@ -505,7 +510,8 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * @param studyService
         *            the studyService to set
         */
-       public void setStudyService(StudyService studyService) {
+       @Override
+       public void setStudyService(final StudyService studyService) {
                _studyService = studyService;
        }
 
@@ -524,7 +530,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * @param documentTypeService
         *            the documentTypeService to set
         */
-       public void setDocumentTypeService(DocumentTypeService documentTypeService) {
+       public void setDocumentTypeService(final DocumentTypeService documentTypeService) {
                _documentTypeService = documentTypeService;
        }
 
@@ -540,7 +546,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Set the userService.
         * @param userService the userService to set
         */
-       public void setUserService(UserService userService) {
+       public void setUserService(final UserService userService) {
                _userService = userService;
        }
        
@@ -548,6 +554,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Get the menuProperty.
         * @return the menuProperty
         */
+       @Override
        public String getMenuProperty() {
                return _menuProperty;
        }
@@ -556,7 +563,8 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Set the menuProperty.
         * @param menuProperty the menuProperty to set
         */
-       public void setMenuProperty(String menuProperty) {
+       @Override
+       public void setMenuProperty(final String menuProperty) {
                this._menuProperty = menuProperty;
        }
        
@@ -564,6 +572,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Get the _titleProperty.
         * @return the _titleProperty
         */
+       @Override
        public String getTitleProperty() {
                return _titleProperty;
        }
@@ -572,7 +581,8 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Set the _titleProperty.
         * @param _titleProperty the titleProperty to set
         */
-       public void setTitleProperty(String titleProperty) {
+       @Override
+       public void setTitleProperty(final String titleProperty) {
                _titleProperty = titleProperty;
        }
 
@@ -580,6 +590,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Get the editDisabledProperty.
         * @return the editDisabledProperty
         */
+       @Override
        public final String getEditDisabledProperty() {
                return _editDisabledProperty;
        }
@@ -588,7 +599,8 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Set the editDisabledProperty.
         * @param editDisabledProperty the editDisabledProperty to set
         */
-       public final void setEditDisabledProperty(String editDisabledProperty) {
+       @Override
+       public final void setEditDisabledProperty(final String editDisabledProperty) {
                _editDisabledProperty = editDisabledProperty;
        }
 
@@ -596,6 +608,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Get the toolProperty.
         * @return the toolProperty
         */
+       @Override
        public String getToolProperty() {
                return _toolProperty;
        }
@@ -604,6 +617,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Set the toolProperty.
         * @param toolProperty the toolProperty to set
         */
+       @Override
        public void setToolProperty(final String toolProperty) {
                _toolProperty = toolProperty;
        }
@@ -612,6 +626,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Get the leftMenuProperty.
         * @return the leftMenuProperty
         */
+       @Override
        public String getLeftMenuProperty() {
                return _leftMenuProperty;
        }
@@ -620,6 +635,7 @@ public class StudyPropertiesAction extends DisplayStudyStepAction {
         * Set the leftMenuProperty.
         * @param leftMenuProperty the leftMenuProperty to set
         */
+       @Override
        public void setLeftMenuProperty(final String leftMenuProperty) {
                _leftMenuProperty = leftMenuProperty;
        }
index 49651266f32ceab6c92c2f00d6d4ab40bbd459e1..b9a6e6f6e4808366be6ae42726d8f8c135157364 100644 (file)
@@ -101,6 +101,8 @@ public class UploadAction extends Action {
        setToolProperty("none");
        setLeftMenuProperty("study");
         initializationFullScreenContext(_menuProperty, _titleProperty, _editDisabledProperty, _toolProperty, _leftMenuProperty);
+        
+        setErrorCode("message.error.outofmemory");
                
        return "outofmemory";
       }
@@ -126,31 +128,31 @@ public class UploadAction extends Action {
       return next;
     }
 
-    public void setCancel (boolean back) {
+    public void setCancel (final boolean back) {
 //  ------------------------------------
       this.action = ToDo.cancel;
     }
-    public void setDoIt (boolean upload) {
+    public void setDoIt (final boolean upload) {
 //  --------------------------------
       this.action = ToDo.upload;
     }
-    public void setIndex (String index) {
+    public void setIndex (final String index) {
 //  -----------------------------------
       this.index = index;
     }
-    public void setNextAction (String next) {
+    public void setNextAction (final String next) {
 //  ---------------------------------------
       this.next = next;
     }
-    public void setUpload (File upload) {
+    public void setUpload (final File upload) {
 //  -----------------------------------
       this.upload = upload;
     }
-    public void setUploadFileName (String name) {
+    public void setUploadFileName (final String name) {
 //  -------------------------------------------
       this.uploadFileName = name;
     }
-    public void setUploadContentType (String mime) {
+    public void setUploadContentType (final String mime) {
 //  ----------------------------------------------
       this.uploadMimeType = mime;
     }
@@ -167,7 +169,7 @@ public class UploadAction extends Action {
         * Set the repositoryService.
         * @param repositoryService the repositoryService to set
         */
-       public void setRepositoryService(RepositoryService repositoryService) {
+       public void setRepositoryService(final RepositoryService repositoryService) {
                _repositoryService = repositoryService;
        }
        
@@ -183,7 +185,7 @@ public class UploadAction extends Action {
         * Set the menuProperty.
         * @param menuProperty the menuProperty to set
         */
-       public void setMenuProperty(String menuProperty) {
+       public void setMenuProperty(final String menuProperty) {
                this._menuProperty = menuProperty;
        }
        
@@ -197,9 +199,9 @@ public class UploadAction extends Action {
 
        /**
         * Set the _titleProperty.
-        * @param _titleProperty the titleProperty to set
+        * @param titleProperty the titleProperty to set
         */
-       public void setTitleProperty(String titleProperty) {
+       public void setTitleProperty(final String titleProperty) {
                _titleProperty = titleProperty;
        }
 
@@ -215,7 +217,7 @@ public class UploadAction extends Action {
         * Set the _editDisabledProperty.
         * @param _editDisabledProperty the _editDisabledProperty to set
         */
-       public void setEditDisabledProperty(String _editDisabledProperty) {
+       public void setEditDisabledProperty(final String _editDisabledProperty) {
                this._editDisabledProperty = _editDisabledProperty;
        }
 
index f962e769b894c3e55b4949997d4371fa5e888b7b..ac94f1305ce72103d492e87cbaaa4a51afa864d0 100644 (file)
@@ -201,7 +201,7 @@ public class VersionDocumentAction extends UploadBaseNextAction {
                                                }
                                                _version = newver.toString();
                                        } catch (Exception e) {
-                                               setErrorCode("version.mismatch");
+                                               setErrorCode("message.error.version.mismatch");
                                                res = false;
                                        }
                                }
@@ -218,13 +218,13 @@ public class VersionDocumentAction extends UploadBaseNextAction {
                                                try {
                                                        check.parse(_date);
                                                } catch (ParseException e) {
-                                                       setErrorCode("format.date");
+                                                       setErrorCode("message.error.format.date");
                                                        res = false;
                                                }
                                        }
                                }
                        } else {
-                               setErrorCode("reference.mismatch");
+                               setErrorCode("message.error.reference.mismatch");
                                res = false;
                        }
                }
@@ -276,10 +276,10 @@ public class VersionDocumentAction extends UploadBaseNextAction {
                                res = SUCCESS;
                        } catch (FileNotFoundException error) {
                                LOG.error("Reason:", error);
-                               setErrorCode("import.file");
+                               setErrorCode("message.error.import.file");
                        } catch (Exception error) {
                                LOG.error("Reason:", error);
-                               setErrorCode("internal");
+                               setErrorCode("message.error.internal");
                        }
                        if (!SUCCESS.equals(res)) {
                                setToolProperty(Constants.NONE);
index e0447064fa79a0ceabe19e2872f6af9fca963b1b..50f5fd11d57669937cb4b4659cd2266a3ed5dfec 100644 (file)
         <default-action-ref name="index" />
 
         <action name="index" class="startAction" method="initialize">
-            <result name="success">/welcome.jsp</result>
-            <result name="error">/error.jsp?error=initialization</result>
+            <result name="success" type="tiles">page.welcome</result>
+            <result name="error" type="tiles">page.exception</result>
         </action>        
         <action name="login" class="connectionAction" method="login">
-            <result name="none">/home.jsp</result>
+            <result name="none" type="tiles">page.home</result>
             <result name="open"      type="redirectAction">select?menu=search</result>
             <result name="study"     type="redirectAction">study/step-study</result>
             <result name="knowledge" type="redirectAction">study/step-knowledge</result>
             <!--result name="input">/login.jsp</result-->
-            <result name="input"  type="tiles">page.login</result>
-            <result name="error">/home.jsp?error=login</result>
+            <result name="input" type="tiles">page.login</result>
+            <result name="error" type="tiles">page.home</result>
         </action>
         <action name="logout" class="connectionAction" method="logout">
-            <result name="none">/home.jsp</result>
-            <result name="create">/home.jsp</result>
+            <result name="none" type="tiles">page.home</result>
+            <result name="create" type="tiles">page.home</result>
             <result name="open"      type="redirectAction">select?menu=search</result>
             <result name="study"     type="redirectAction">study/step-study</result>
             <result name="knowledge" type="redirectAction">study/step-knowledge</result>
-            <result name="datadmin">/home.jsp</result>
-            <result name="sysadmin">/home.jsp</result>
+            <result name="datadmin" type="tiles">page.home</result>
+            <result name="sysadmin" type="tiles">page.home</result>
         </action>
         <action name="select" class="menuAction" method="selectItem">
             <result name="new-empty"        type="redirectAction">study/new-empty</result>
     </package>
 
     <package name="study" namespace="/study" extends="simer-default">
+    
+        <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <action name="notyetimplemented" class="notYetImplementedAction" method="initialize">
-            <result name="success">/study/error.jsp?message=notyetimplemented</result>
+            <result name="success" type="tiles">page.error.study</result>
         </action>
 
         <!-- Creation of a study
           -->        
         <action name="new-empty" class="newStudyAction" method="initialize">
-            <result name="success">/study/newStudy.jsp</result>
+            <result name="success" type="tiles">page.newstudy</result>
         </action>
         <action name="valid-new" class="newStudyAction" method="create">
             <result name="success" type="redirectAction">open-study?selection=0.1</result>
-            <result name="input">/study/newStudy.jsp</result>
-            <result name="error">/home.jsp?error=newstudy</result>
+            <result name="input" type="tiles">page.newstudy</result>
+            <result name="error" type="tiles">page.home</result>
         </action>
 
         <!-- Search for studies, knowledge elements and documents
           -->
         <action name="search-study" class="searchStudyAction" method="initialize">
-            <result name="success">/study/searchStudy.jsp</result>
-            <result name="error">/home.jsp</result>
+            <result name="success" type="tiles">page.searchstudy</result>
+            <result name="error" type="tiles">page.home</result>
         </action>
         <action name="refresh-study" class="searchStudyAction" method="submitForm">
-            <result name="selectype">/study/searchStudy.jsp?action=setContext</result>
-            <result name="refresh">/study/searchStudy.jsp</result>
-            <result name="wait">/study/searchStudy.jsp</result>
+            <result name="selectype" type="tiles">page.searchstudy</result>
+            <result name="refresh" type="tiles">page.searchstudy</result>
+            <result name="wait" type="tiles">page.searchstudy</result>
             <result name="error" type="redirectAction">search-study</result>
         </action>
 
         <action name="search-knowledge" class="searchKnowledgeAction" method="initialize">
-            <result name="success">/study/searchKnowledge.jsp</result>
+            <result name="success" type="tiles">page.searchknowledge</result>
         </action>
         <action name="refresh-knowledge" class="searchKnowledgeAction" method="submitForm">
-            <result name="selectype">/study/searchKnowledge.jsp?action=setContext</result>
-            <result name="refresh">/study/searchKnowledge.jsp</result>
-            <result name="wait">/study/searchKnowledge.jsp</result>
+            <result name="selectype" type="tiles">page.searchknowledge</result>
+            <result name="refresh" type="tiles">page.searchknowledge</result>
+            <result name="wait" type="tiles">page.searchknowledge</result>
             <result name="error" type="redirectAction">search-knowledge</result>
         </action>
 
         <!-- Display of studies
           -->
         <action name="open-study" class="displayStudyStepAction" method="open">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="step-study" class="displayStudyStepAction" method="selectStep">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="document-study" class="displayStudyStepAction" method="selectDocument">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="knowledge-study" class="displayStudyStepAction" method="selectKnowledge">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="close-study" class="displayStudyStepAction" method="close">
-            <result name="success">/home.jsp</result>
+            <result name="success" type="tiles">page.home</result>
         </action>
         <action name="prop-study" class="studyPropertiesAction" method="initialize">
-            <result name="display">/study/displayStudyProperties.jsp</result>
-            <result name="edit">/study/editStudyProperties.jsp</result>
+            <result name="display" type="tiles">page.displaystudyproperties</result>
+            <result name="edit" type="tiles">page.editstudyproperties</result>
         </action>
 
         <!-- Display of knowledge elements
           -->        
         <action name="open-knowledge" class="displayKnowledgeAction" method="open">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="step-knowledge" class="displayKnowledgeAction" method="selectStep">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="document-knowledge" class="displayKnowledgeAction" method="selectDocument">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="knowledge-knowledge" class="displayKnowledgeAction" method="selectKnowledge">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="close-knowledge" class="displayKnowledgeAction" method="close">
-            <result name="success">/home.jsp</result>
+            <result name="success" type="tiles">page.home</result>
         </action>
 
         <!-- Edition of study
           -->        
         <action name="edit-study" class="editStudyAction" method="edition">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="add-scenario" class="newScenarioAction" method="initialize">
-            <result name="success">/study/newScenario.jsp?init=focus</result>
+            <result name="success" type="tiles">page.newscenario</result>
         </action>
         <action name="edit-title" class="studyPropertiesAction" method="editTitle">
-            <result name="success">/study/editStudyProperties.jsp?action=edititle</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="edit-contributor" class="studyPropertiesAction" method="editContributors">
-            <result name="success">/study/editStudyProperties.jsp?action=edibutor</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="edit-cycle" class="studyPropertiesAction" method="editCycle">
-            <result name="success">/study/editStudyProperties.jsp?action=edicycle</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="select-step" class="newScenarioAction" method="selectStep">
-            <result name="success">/study/newScenario.jsp</result>
+            <result name="success" type="tiles">page.newscenario</result>
         </action>
         <action name="valid-add" class="newScenarioAction" method="create">
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="success" type="redirectAction">step-study</result>
-           <result name="error">/study/displayStudyStep.jsp?error=addScenario</result>
+           <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="valid-edit" class="studyPropertiesAction" method="edition">
-            <result name="success">/study/editStudyProperties.jsp</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="prop-scenario" class="editScenarioPropertiesAction" method="initialize">
-            <result name="success">/study/editScenarioProperties.jsp</result>
+            <result name="success" type="tiles">page.editscenarioproperties</result>
         </action>
 
         <!-- Edition of scenario
           -->
         <action name="checkin-scenario" class="editScenarioPropertiesAction" method="checkin">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
 
         <!-- Edition of simulation contexts
             <result name="set">/study/displayStudyStep.jsp?action=setContext&amp;index=%{contextType.index}</result>
         </action>
         <action name="newContext" class="editSimulationContextAction" method="createContext">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
             <result name="input">/study/displayStudyStep.jsp?action=newContext</result>
-            <result name="error">/study/displayStudyStep.jsp?error=addContext</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="setContext" class="editSimulationContextAction" method="setContext">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
             <result name="input">/study/displayStudyStep.jsp?action=setContext&amp;index=%{contextType.index}</result>
-            <result name="error">/study/displayStudyStep.jsp?error=addContext</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="remove-context" class="editSimulationContextAction" method="deleteContext">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="error">/study/displayStudyStep.jsp?error=removeContext</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
 
         <!-- Edition of documents
           -->
         <action name="select-file" class="uploadAction" method="initialize">
-            <result name="success">/study/upload.jsp</result>
+            <result name="success" type="tiles">page.uploadstudy</result>
         </action>
         <action name="upload" class="uploadAction" method="upload">
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="import"  type="redirectAction">import-document?fileName=%{fileName}</result>
             <result name="version" type="redirectAction">version-document?index=%{index}&amp;fileName=%{fileName}</result>
             <result name="attach"  type="redirectAction">attach-document?index=%{index}&amp;fileName=%{fileName}</result>
-            <result name="outofmemory">/study/error.jsp?message=outofmemory</result>
+            <result name="outofmemory" type="tiles">page.error.study</result>
         </action>
         <action name="import-document" class="importDocumentAction" method="initialize">
-            <result name="success">/study/importDocument.jsp</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}</result>
+            <result name="success" type="tiles">page.importdocument</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="valid-import" class="importDocumentAction" method="import">
             <result name="success" type="redirectAction">step-study</result>
             <result name="cancel"  type="redirectAction">step-study</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}&amp;action=back</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="version-document" class="versionDocumentAction" method="initialize">
-            <result name="success">/study/versionDocument.jsp</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}</result>
+            <result name="success" type="tiles">page.versiondocument</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="valid-version" class="versionDocumentAction" method="version">
             <result name="success" type="redirectAction">step-study</result>
             <result name="cancel"  type="redirectAction">step-study</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}&amp;action=back</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="attach-document" class="editDocumentAction" method="attach">
-            <result name="success">/study/displayStudyStep.jsp?action=display</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="edit-document" class="editDocumentAction" method="initialize">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="setDocument" class="editDocumentAction" method="setDocument">
-            <result name="success">/study/displayStudyStep.jsp?action=display</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="remove-document" class="editDocumentAction" method="deleteDocument">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="error">/study/displayStudyStep.jsp?error=removeDocument</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
 
         <!-- Edition of knowledge elements
             <result name="success">/study/displayStudyStep.jsp?action=addKnowledge&amp;index=%{knowledgeType}</result>
         </action>
         <action name="edit-knowledge" class="editKnowledgeElementAction" method="initialize">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="setKnowledge" class="editKnowledgeElementAction" method="setKnowledge">
-            <result name="success">/study/displayStudyStep.jsp?action=display</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="remove-knowledge" class="editKnowledgeElementAction" method="deleteKnowledge">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="error">/study/displayStudyStep.jsp?error=removeKnowledge</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="promote-knowledge" class="editKnowledgeElementAction" method="promoteKnowledge">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="demote-knowledge" class="editKnowledgeElementAction" method="demoteKnowledge">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
 
     </package>
 
 
     <package name="sadmin" namespace="/sadmin" extends="simer-default">
+    
+        <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <!-- Menus of database administration
           -->        
         <action name="indexing" class="databaseIndexingAction" method="initialize">
-            <result name="success">/sadmin/indexStudies.jsp</result>
+            <result name="success" type="tiles">page.indexstudies</result>
         </action>
         <action name="valid-indexing" class="databaseIndexingAction" method="indexing">
             <result name="success" type="redirectAction">../study/search-study</result>
         </action>
         <action name="select-file" class="uploadAction" method="initialize">
-            <result name="success">/sadmin/upload.jsp</result>
+            <result name="success" type="tiles">page.uploadsadmin</result>
         </action>
         <action name="upload"      class="uploadAction" method="upload">
             <result name="importuser" type="redirectAction">importuser?fileName=%{fileName}</result>
         </action>
         <action name="importuser" class="importUserAction" method="import">
-            <result name="success">/sadmin/displayUser.jsp</result>
+            <result name="success" type="tiles">page.displayuser</result>
         </action>
 
         <!-- Menus of knowledge administration
     </package>
 
     <package name="sgeom" namespace="/sgeom" extends="simer-default">
+    
+       <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <action name="valid-save"    class="saveDocumentAction" method="save">
             <result name="success">/sgeom/index.jsp</result>
 
 
     <package name="smesh" namespace="/smesh" extends="simer-default">
+    
+        <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <action name="valid-save"    class="saveDocumentAction" method="save">
             <result name="success">/smesh/index.jsp</result>