From 02b02906aad2a2bc19e4ee92251d8a0fb588ba0d Mon Sep 17 00:00:00 2001 From: mka Date: Fri, 26 Oct 2012 14:23:43 +0000 Subject: [PATCH] parameters are removed from the title bar --- .../org/splat/dal/bo/som/ProgressState.java | 20 ++- Workspace/Siman/WebContent/jsp/titlebar.jsp | 19 +-- .../WebContent/study/displayKnowledge.jsp | 4 +- .../study/displayStudyProperties.jsp | 5 +- .../WebContent/study/displayStudyStep.jsp | 4 +- .../study/editScenarioProperties.jsp | 5 +- .../WebContent/study/editStudyProperties.jsp | 5 +- Workspace/Siman/WebContent/study/error.jsp | 5 +- .../Siman/WebContent/study/importDocument.jsp | 5 +- .../Siman/WebContent/study/importError.jsp | 5 +- .../Siman/WebContent/study/newScenario.jsp | 6 +- Workspace/Siman/WebContent/study/upload.jsp | 5 +- .../WebContent/study/versionDocument.jsp | 5 +- .../Siman/src/org/splat/simer/Action.java | 62 ++++++++- .../splat/simer/DisplayKnowledgeAction.java | 59 +++++++- .../splat/simer/DisplayStudyStepAction.java | 63 ++++++++- .../org/splat/simer/EditDocumentAction.java | 65 ++++++++- .../simer/EditKnowledgeElementAction.java | 56 +++++++- .../simer/EditScenarioPropertiesAction.java | 51 ++++++- .../simer/EditSimulationContextAction.java | 92 ++++++++++--- .../src/org/splat/simer/EditStudyAction.java | 47 ++++++- .../org/splat/simer/ImportDocumentAction.java | 55 +++++++- .../src/org/splat/simer/MenuBarSettings.java | 46 ++----- .../org/splat/simer/NewScenarioAction.java | 56 +++++++- .../splat/simer/NotYetImplementedAction.java | 51 ++++++- .../src/org/splat/simer/StartAction.java | 51 ++++++- .../splat/simer/StudyPropertiesAction.java | 68 +++++++++- .../src/org/splat/simer/TitleBarSettings.java | 128 ++++++++++++++++++ .../src/org/splat/simer/UploadAction.java | 55 +++++++- .../splat/simer/VersionDocumentAction.java | 53 +++++++- .../Siman/src/spring/applicationContext.xml | 5 + 31 files changed, 1001 insertions(+), 155 deletions(-) create mode 100644 Workspace/Siman/src/org/splat/simer/TitleBarSettings.java diff --git a/Workspace/Siman-Common/src/org/splat/dal/bo/som/ProgressState.java b/Workspace/Siman-Common/src/org/splat/dal/bo/som/ProgressState.java index a33ad5d..78f1311 100644 --- a/Workspace/Siman-Common/src/org/splat/dal/bo/som/ProgressState.java +++ b/Workspace/Siman-Common/src/org/splat/dal/bo/som/ProgressState.java @@ -6,8 +6,20 @@ package org.splat.dal.bo.som; */ public enum ProgressState { - inPROGRESS, // Represents inWORK, inDRAFT and inCHECK states for search purpose - inWORK, inDRAFT, inCHECK, APPROVED, - EXTERN, // Document-specific state representing documents produced outside studies - TEMPLATE // Study-specific state qualifying typical reference studies + /** + * Represents inWORK, inDRAFT and inCHECK states for search purpose. + */ + inPROGRESS, + inWORK, + inDRAFT, + inCHECK, + APPROVED, + /** + * Document-specific state representing documents produced outside studies. + */ + EXTERN, + /** + * Study-specific state qualifying typical reference studies. + */ + TEMPLATE; } \ No newline at end of file diff --git a/Workspace/Siman/WebContent/jsp/titlebar.jsp b/Workspace/Siman/WebContent/jsp/titlebar.jsp index bd5ed5e..a727de6 100644 --- a/Workspace/Siman/WebContent/jsp/titlebar.jsp +++ b/Workspace/Siman/WebContent/jsp/titlebar.jsp @@ -5,19 +5,14 @@ <%@ taglib prefix="s" uri="/struts-tags" %> - -<% String type = request.getParameter("entity"); // Study or Knowledge Element - String disabled = request.getParameter("disable"); // State of right buttons - OpenObject entity = (OpenObject)session.getAttribute(type + ".open"); // Active entity (Proxy + getSelection()) -%> -<%=type%> -<%=disabled%> -<%=entity.getProgressState()%> + + + + - <%=entity.getSelection()%> +
@@ -35,8 +30,8 @@ - - <%=entity.getType()%>: <%=entity.getTitle()%>   + +    diff --git a/Workspace/Siman/WebContent/study/displayKnowledge.jsp b/Workspace/Siman/WebContent/study/displayKnowledge.jsp index 1f1331a..3f3b7b8 100644 --- a/Workspace/Siman/WebContent/study/displayKnowledge.jsp +++ b/Workspace/Siman/WebContent/study/displayKnowledge.jsp @@ -21,9 +21,7 @@ - - - + - - - - + - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - - + diff --git a/Workspace/Siman/WebContent/study/upload.jsp b/Workspace/Siman/WebContent/study/upload.jsp index c00df6a..4180ff9 100644 --- a/Workspace/Siman/WebContent/study/upload.jsp +++ b/Workspace/Siman/WebContent/study/upload.jsp @@ -28,10 +28,7 @@ - - - - + - - - - + -- 2.39.2