From 022b1132c1bb379b4408d335c50b20477784d9c7 Mon Sep 17 00:00:00 2001 From: rkv Date: Mon, 26 Nov 2012 08:48:05 +0000 Subject: [PATCH] Applet is working now and calls runSalome with appropriate parameters. New ant target "launcher" is introduced to generate the unsigned applet jar. --- Workspace/Siman/WebContent/conf/my.xml | 4 +- Workspace/Siman/WebContent/jap/psw.txt | 1 + .../Siman/WebContent/jap/signlauncher.bat | 5 + .../Siman/WebContent/jap/splat-launcher.jar | Bin 7385 -> 8619 bytes .../WebContent/jap/splat-signedlauncher.jar | Bin 8921 -> 10244 bytes Workspace/Siman/WebContent/jsp/toolbar.jsp | 27 +- Workspace/Siman/applet_howto.txt | 90 ++++++ Workspace/Siman/build.xml | 29 +- Workspace/Siman/src/hibernate.properties | 2 +- Workspace/Siman/src/jdbc.properties | 2 +- .../src/org/splat/launcher/ToolbarApplet.java | 81 +++++- .../org/splat/simer/AbstractOpenObject.java | 10 + .../org/splat/simer/ApplicationSettings.java | 269 ++++++++++-------- 13 files changed, 383 insertions(+), 137 deletions(-) create mode 100644 Workspace/Siman/WebContent/jap/psw.txt create mode 100644 Workspace/Siman/WebContent/jap/signlauncher.bat create mode 100644 Workspace/Siman/applet_howto.txt diff --git a/Workspace/Siman/WebContent/conf/my.xml b/Workspace/Siman/WebContent/conf/my.xml index 38f8d2c..8becf05 100644 --- a/Workspace/Siman/WebContent/conf/my.xml +++ b/Workspace/Siman/WebContent/conf/my.xml @@ -6,8 +6,8 @@ - - + + diff --git a/Workspace/Siman/WebContent/jap/psw.txt b/Workspace/Siman/WebContent/jap/psw.txt new file mode 100644 index 0000000..89f76d0 --- /dev/null +++ b/Workspace/Siman/WebContent/jap/psw.txt @@ -0,0 +1 @@ +launcher \ No newline at end of file diff --git a/Workspace/Siman/WebContent/jap/signlauncher.bat b/Workspace/Siman/WebContent/jap/signlauncher.bat new file mode 100644 index 0000000..bdb1f75 --- /dev/null +++ b/Workspace/Siman/WebContent/jap/signlauncher.bat @@ -0,0 +1,5 @@ +set path=%path%;"C:\Program Files\Java\jdk1.6.0_20\bin" + +delete splat-signedlauncher.jar + +jarsigner -verbose -keystore launcherkeystore -signedjar splat-signedlauncher.jar splat-launcher.jar launcheralias 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 literal 7385 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 diff --git a/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar b/Workspace/Siman/WebContent/jap/splat-signedlauncher.jar index 13bf335861e43d53906a216b5b8b193635df8ac2..34958b2382b72648cd9fbcbac15e7b46dc217c30 100644 GIT binary patch delta 9112 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 delta 7835 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 <%@ page import="org.splat.som.StepRights"%> <%@ page import="org.splat.simer.OpenStudy"%> +<%@ page import="org.splat.simer.Action"%> <%@ page import="org.splat.wapp.ToolBar"%> <%@ page import="org.splat.wapp.ToolButton"%> <%@ page import="java.util.Iterator"%> +<%@page import="com.opensymphony.xwork2.ActionContext"%> <%@ taglib prefix="s" uri="/struts-tags" %> @@ -42,22 +44,37 @@ " border="none" /> <% OpenStudy study = (OpenStudy)session.getAttribute("study.open"); ToolBar mbar = study.getModuleBar(); + Action anAction = (Action)ActionContext.getContext().getActionInvocation().getAction(); + if (study.getSelectedStepRights().canCreateDocument() && mbar != null) { %> - height=<%=mbar.getHeight()%>> + height=<%=mbar.getHeight()%>> <% Iterator item = mbar.asList().iterator(); for (int i=0; item.hasNext(); i++) { - ToolButton tool = item.next(); + ToolButton tool = item.next(); String arg = tool.getArgument(); %> -<% if (arg != null) { +<% + if ("runSalome".equals(tool.getAction())) { + // --siman --siman-study=s --siman-scenario=sc --siman-user=u -k + arg = "--siman --siman-study=" + study.getIndex() + + " --siman-scenario=" + study.getSelectedScenarioId() + + " --siman-user=" + anAction.getConnectedUser().getUsername() + + " -k"; + } + if (arg != null) { %> -<% } +<% } } %> <% } -%> +%> + + + + " border="none" title="" /> diff --git a/Workspace/Siman/applet_howto.txt b/Workspace/Siman/applet_howto.txt new file mode 100644 index 0000000..0c0a694 --- /dev/null +++ b/Workspace/Siman/applet_howto.txt @@ -0,0 +1,90 @@ +set path=%path%;C:\Program Files\Java\jdk1.6.0_03\bin + + +D:\users\rkv\SIMAN\SIMAN_SRC\Workspace\Siman\build\classes> +set path=%path%;"C:\Program Files\Java\jdk1.6.0_20\bin" + +C:\work\Siman\SIMAN_SRC\Workspace\Siman\build\classes> +jar cvf splat-launcher.jar org\splat\launcher\*.class + + +cd ..\..\WebContent\jap + +jarsigner -verbose -keystore launcherkeystore -signedjar splat-signedlauncher.jar splat-launcher.jar launcheralias + + + +For creation the applet please use the following java methods : + + //To get the SALOME_HOME environment variable + String SALOME_HOME = System.getenv("SALOME_ROOT_DIR"); + + If SALOME_ROOT_DIR does not exist the SALOME_HOME equals to _null_. + + //To execute the RunSalome script + Runtime runtime = Runtime.getRuntime(); + String pathToScript = SALOME_HOME+"\\runSalome" or pathToScript = SALOME_HOME+"runSalome" + + if (new File(pathToScript).exists()) { + Process process = runtime.exec(pathToScript); + } + + + + + + + + + + + +Dear Colleagues, + + + + Some more details about current procedure of SALOME running + + It probably will be updated in accordance with changes of SALOME directories + organizarion + + + + To check availability of SALOME environment, the applet should : + + - check existence of environment variable $SALOME_ROOT_DIR + + - check existence of environment file $SALOME_ROOT_DIR/env_build.sh + + - existence of run bash script $SALOME_ROOT_DIR/KERNEL/bin/salome/runSalome + + + + To run SALOME-SIMAN : + + - open bash shell + + bash + + - export SALOME environment variables + + . $SALOME_ROOT_DIR/env_build.sh + + - run bash shell script + + runSalome --siman --siman-study=s --siman-scenario=sc --siman-user=u -k + + + where : + + the SIMAN parameters are displayed as Title of the SALOME GUI Window + + "-k" is to kill previously run runSalome and all SALOME processes + + + + -- + + Best Regards, + + Alexander \ No newline at end of file diff --git a/Workspace/Siman/build.xml b/Workspace/Siman/build.xml index 1c35595..0cb3a8c 100644 --- a/Workspace/Siman/build.xml +++ b/Workspace/Siman/build.xml @@ -17,12 +17,29 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Workspace/Siman/src/hibernate.properties b/Workspace/Siman/src/hibernate.properties index 6c0cad6..326140a 100644 --- a/Workspace/Siman/src/hibernate.properties +++ b/Workspace/Siman/src/hibernate.properties @@ -1,4 +1,4 @@ -# Generated at 02/11/2012 05:50:20 +# Generated at 26/11/2012 09:23:45 # Don't edit manually. See the source in D:\users\rkv\SIMAN\SIMAN_SRC\Workspace\Siman\conf\templates. # Connection properties connection.driver_class=com.mysql.jdbc.Driver diff --git a/Workspace/Siman/src/jdbc.properties b/Workspace/Siman/src/jdbc.properties index 8404e7d..62a0c8b 100644 --- a/Workspace/Siman/src/jdbc.properties +++ b/Workspace/Siman/src/jdbc.properties @@ -1,4 +1,4 @@ -# Generated at 02/11/2012 05:50:20 +# Generated at 26/11/2012 09:23:45 # Don't edit manually. See the source in D:\users\rkv\SIMAN\SIMAN_SRC\Workspace\Siman\conf\templates. # Connection properties connection.url=jdbc:mysql://localhost/simer diff --git a/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java b/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java index c5bc176..183b0fe 100644 --- a/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java +++ b/Workspace/Siman/src/org/splat/launcher/ToolbarApplet.java @@ -4,18 +4,37 @@ import java.awt.ComponentOrientation; import java.awt.GridLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.io.File; +import java.io.FileNotFoundException; import java.io.ObjectInputStream; import java.net.URL; import java.net.URLConnection; +/** + * Applet providing a set of buttons. Each button is defined by three parameters:
+ *
    + *
  • icon<i>
    • + *
  • tool<i>
    • + *
  • file<i>
    • - may be null + *
+ * where i is an index beginning from zero. + */ public class ToolbarApplet extends java.applet.Applet implements ActionListener { + /** + * Serialization version id. + */ private static final long serialVersionUID = 3243053622061086715L; // ============================================================================================================================== // Overridden functions // ============================================================================================================================== + /** + * {@inheritDoc} + * + * @see java.applet.Applet#init() + */ @Override public void init() { URL appurl = getCodeBase(); @@ -39,8 +58,12 @@ public class ToolbarApplet extends java.applet.Applet implements ActionListener applyComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT); } + /** + * {@inheritDoc} + * + * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) + */ public void actionPerformed(final ActionEvent event) { - // ----------------------------------------------- if (event.getSource() instanceof ToolButton) { ToolButton clicked = (ToolButton) event.getSource(); String module = clicked.getTool(); @@ -53,8 +76,15 @@ public class ToolbarApplet extends java.applet.Applet implements ActionListener // Public member functions // ============================================================================================================================== + /** + * Launch an appropriate application for the given file. + * + * @param name + * module name + * @param filename + * file name + */ public void launch(final String name, final String filename) { - // ------------------------------------------------- String module = name; try { @@ -73,6 +103,53 @@ public class ToolbarApplet extends java.applet.Applet implements ActionListener } else // Opening an application on the local machine + + if (module.equals("runSalome")) { + // Run SALOME + // To get the SALOME_HOME environment variable + String SALOME_HOME = System.getenv("SALOME_ROOT_DIR"); + // If SALOME_ROOT_DIR does not exist the SALOME_HOME equals to null. + if (SALOME_HOME == null) { + // TODO: Use logger to be more user friendly + getAppletContext() + .showDocument( + new URL( + getCodeBase().toString() + + "error.jsp?message=launch&value=" + + "SALOME_ROOT_DIR environment variable is not defined."), + "_blank"); + throw new Exception( + "SALOME_ROOT_DIR nevironment variable is not defined."); + } else if (!SALOME_HOME.endsWith(File.separator)) { + SALOME_HOME += File.separator; + } + String pathToScript = SALOME_HOME + "runSalome"; + + File script = new File(pathToScript); + if (!script.exists()) { + script = new File(pathToScript + ".bat"); + if (!script.exists()) { + script = new File(pathToScript + ".cmd"); + } + } + + if (script.exists()) { + // Execute the runSalome script. + // filename here indeed a string containing parameters for runSalome. + Runtime.getRuntime().exec( + new String[] { script.getAbsolutePath(), filename }); + } else { + // TODO: Use logger to be more user friendly + getAppletContext().showDocument( + new URL(getCodeBase().toString() + + "error.jsp?message=launch&value=" + + "SALOME module is not found: " + + script.getAbsolutePath()), "_blank"); + throw new FileNotFoundException( + "SALOME module is not found: " + script.getAbsolutePath()); + } + } else + if (module.endsWith(".exe") || module.endsWith(".EXE")) { String applikey = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Classes\\Applications\\" + module; diff --git a/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java b/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java index a83ba4c..43a0391 100644 --- a/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java +++ b/Workspace/Siman/src/org/splat/simer/AbstractOpenObject.java @@ -216,6 +216,16 @@ public abstract class AbstractOpenObject implements Proxy { return _selection; } + public String getSelectedScenarioId() { + String res; + if (_selection == null) { + res = "0"; + } else { + res = _selection.substring(0, _selection.indexOf('.')); + } + return res; + } + public User getUser() { return _cuser; } diff --git a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java index 9309647..0c30875 100644 --- a/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java +++ b/Workspace/Siman/src/org/splat/simer/ApplicationSettings.java @@ -257,12 +257,12 @@ public class ApplicationSettings implements ServletContextAware { super("create"); addItem("new-empty", "menu.new.empty", "image.empty.png", "select?menu=create&item=new-empty"); - addItem("new-copy", new MenuItem("menu.new.copy") - .icon("image.copy.png")); - addItem("new-instance", new MenuItem("menu.new.instance") - .icon(IMG_HOLD)); - addItem("new-import", new MenuItem("menu.new.import") - .icon("icon.upload.png")); + addItem("new-copy", + new MenuItem("menu.new.copy").icon("image.copy.png")); + addItem("new-instance", + new MenuItem("menu.new.instance").icon(IMG_HOLD)); + addItem("new-import", + new MenuItem("menu.new.import").icon("icon.upload.png")); this.selects("new-empty"); } } @@ -274,8 +274,8 @@ public class ApplicationSettings implements ServletContextAware { "select?menu=search&item=search-study"); addItem("search-knowledge", "menu.search.idea", "image.idea.png", "select?menu=search&item=search-knowledge"); - addItem("search-document", new MenuItem("menu.search.document") - .icon("icon.any.png")); + addItem("search-document", + new MenuItem("menu.search.document").icon("icon.any.png")); this.selects("search-study"); } } @@ -303,8 +303,8 @@ public class ApplicationSettings implements ServletContextAware { "select?menu=datadmin&item=admin-scontext"); addItem("admin-knowelm", "menu.admin.knowledge", "image.idea.png", "select?menu=datadmin&item=admin-knowelm"); - addItem("admin-study", new MenuItem("menu.admin.study") - .icon("image.study.png")); + addItem("admin-study", + new MenuItem("menu.admin.study").icon("image.study.png")); } } @@ -329,26 +329,31 @@ public class ApplicationSettings implements ServletContextAware { private EditableStudyPopup() { super(); - addItem(MNU_PUBLISH, new PopupItem(MNU_NAME_PUBLISH).icon( - "image.publish.png").action("edit-study?action=publish") - .confirmation("message.publish.study")); + addItem(MNU_PUBLISH, + new PopupItem(MNU_NAME_PUBLISH).icon("image.publish.png") + .action("edit-study?action=publish") + .confirmation("message.publish.study")); addItem(MNU_PROMOTE, new PopupItem("menu.archive")); addSeparator(); - addItem(MNU_EDIT, new PopupItem("menu.properties").icon( - "icon.ed.png").action("../select?menu=properties")); + addItem(MNU_EDIT, + new PopupItem("menu.properties").icon("icon.ed.png") + .action("../select?menu=properties")); addSeparator(); - addItem(MNU_SCRIPT, new PopupItem(MNU_NAME_SCRIPT) - .action("add-scenario")); - addItem(MNU_VERSION, new PopupItem(MNU_NAME_VERSION).icon( - IMG_VERSION).action(ACT_NOT_YET_IMPLEMENTED)); + addItem(MNU_SCRIPT, + new PopupItem(MNU_NAME_SCRIPT).action("add-scenario")); + addItem(MNU_VERSION, + new PopupItem(MNU_NAME_VERSION).icon(IMG_VERSION).action( + ACT_NOT_YET_IMPLEMENTED)); addSeparator(); - addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE) - .confirmation("message.purge.study")); - addItem("export", new PopupItem("menu.export") - .icon("image.export.png")); // For future needs - addItem(MNU_REMOVE, new PopupItem(MNU_NAME_REMOVE).icon(IMG_DELETE) - .action(ACT_NOT_YET_IMPLEMENTED).confirmation( - "message.delete.study")); + addItem(MNU_PURGE, + new PopupItem(MNU_NAME_PURGE) + .confirmation("message.purge.study")); + addItem("export", + new PopupItem("menu.export").icon("image.export.png")); // For future needs + addItem(MNU_REMOVE, + new PopupItem(MNU_NAME_REMOVE).icon(IMG_DELETE) + .action(ACT_NOT_YET_IMPLEMENTED) + .confirmation("message.delete.study")); } @Override @@ -406,30 +411,36 @@ public class ApplicationSettings implements ServletContextAware { private EditableDocumentPopup() { super(); - addItem("accept", new PopupItem("menu.accept").icon( - "image.accept.png").action("setDocument?action=accept") - .confirmation("message.accept.document")); - addItem(MNU_PROMOTE, new PopupItem(MNU_NAME_PROMOTE).icon( - "image.publish.png").action("setDocument?action=promote") - .confirmation("message.promote.document")); + addItem("accept", + new PopupItem("menu.accept").icon("image.accept.png") + .action("setDocument?action=accept") + .confirmation("message.accept.document")); + addItem(MNU_PROMOTE, + new PopupItem(MNU_NAME_PROMOTE).icon("image.publish.png") + .action("setDocument?action=promote") + .confirmation("message.promote.document")); addSeparator(); - addItem(MNU_RENAME, new PopupItem(MNU_NAME_RENAME) - .action("edit-document?action=renameDocument")); + addItem(MNU_RENAME, + new PopupItem(MNU_NAME_RENAME) + .action("edit-document?action=renameDocument")); addItem(MNU_ATTACH, new PopupItem(MNU_NAME_ATTACH).icon(IMG_ATTACH) .action(ACT_ATTACH)); addSeparator(); - addItem(MNU_VERSION, new PopupItem(MNU_NAME_VERSION).icon( - IMG_VERSION).action(ACT_VERSION)); - addItem("replace", new PopupItem("menu.replace").icon( - "image.replace.png").action( - "select-file?nextAction=replace")); + addItem(MNU_VERSION, + new PopupItem(MNU_NAME_VERSION).icon(IMG_VERSION).action( + ACT_VERSION)); + addItem("replace", + new PopupItem("menu.replace").icon("image.replace.png") + .action("select-file?nextAction=replace")); addSeparator(); - addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( - ACT_NOT_YET_IMPLEMENTED).confirmation( - "message.purge.document")); - addItem(MNU_REMOVE, new PopupItem(MNU_NAME_REMOVE).icon(IMG_DELETE) - .action("remove-document").confirmation( - "message.delete.document")); + addItem(MNU_PURGE, + new PopupItem(MNU_NAME_PURGE).action( + ACT_NOT_YET_IMPLEMENTED).confirmation( + "message.purge.document")); + addItem(MNU_REMOVE, + new PopupItem(MNU_NAME_REMOVE).icon(IMG_DELETE) + .action("remove-document") + .confirmation("message.delete.document")); } @Override @@ -492,22 +503,26 @@ public class ApplicationSettings implements ServletContextAware { private ReviewableDocumentPopup() { super(); - addItem(MNU_DEMOTE, new PopupItem(MNU_NAME_DEMOTE).icon( - "image.demote.png").action("setDocument?action=demote") - .confirmation("message.demote.document")); - addItem(MNU_PROMOTE, new PopupItem("menu.review").icon( - "image.review.png").action("setDocument?action=review") - .confirmation("message.review.document")); + addItem(MNU_DEMOTE, + new PopupItem(MNU_NAME_DEMOTE).icon("image.demote.png") + .action("setDocument?action=demote") + .confirmation("message.demote.document")); + addItem(MNU_PROMOTE, + new PopupItem("menu.review").icon("image.review.png") + .action("setDocument?action=review") + .confirmation("message.review.document")); addSeparator(); addItem(MNU_ATTACH, new PopupItem(MNU_NAME_ATTACH).icon(IMG_ATTACH) .action(ACT_ATTACH)); addSeparator(); - addItem(MNU_VERSION, new PopupItem(MNU_NAME_VERSION).icon( - IMG_VERSION).action(ACT_VERSION)); + addItem(MNU_VERSION, + new PopupItem(MNU_NAME_VERSION).icon(IMG_VERSION).action( + ACT_VERSION)); addSeparator(); - addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( - ACT_NOT_YET_IMPLEMENTED).confirmation( - "message.purge.document")); + addItem(MNU_PURGE, + new PopupItem(MNU_NAME_PURGE).action( + ACT_NOT_YET_IMPLEMENTED).confirmation( + "message.purge.document")); } @Override @@ -551,22 +566,26 @@ public class ApplicationSettings implements ServletContextAware { private NotResultDocumentPopup() { super(); - addItem(MNU_DEMOTE, new PopupItem(MNU_NAME_DEMOTE).icon( - "image.demote.png").action("setDocument?action=demote") - .confirmation("message.demote.document")); + addItem(MNU_DEMOTE, + new PopupItem(MNU_NAME_DEMOTE).icon("image.demote.png") + .action("setDocument?action=demote") + .confirmation("message.demote.document")); addSeparator(); addItem(MNU_ATTACH, new PopupItem(MNU_NAME_ATTACH).icon(IMG_ATTACH) .action(ACT_ATTACH)); addSeparator(); - addItem(MNU_VERSION, new PopupItem(MNU_NAME_VERSION).icon( - IMG_VERSION).action(ACT_VERSION)); + addItem(MNU_VERSION, + new PopupItem(MNU_NAME_VERSION).icon(IMG_VERSION).action( + ACT_VERSION)); addSeparator(); - addItem(MNU_PURGE, new PopupItem(MNU_NAME_PURGE).action( - ACT_NOT_YET_IMPLEMENTED).confirmation( - "message.purge.document")); - addItem(MNU_REMOVE, new PopupItem(MNU_NAME_REMOVE).icon(IMG_DELETE) - .action("remove-document").confirmation( - "message.delete.document")); + addItem(MNU_PURGE, + new PopupItem(MNU_NAME_PURGE).action( + ACT_NOT_YET_IMPLEMENTED).confirmation( + "message.purge.document")); + addItem(MNU_REMOVE, + new PopupItem(MNU_NAME_REMOVE).icon(IMG_DELETE) + .action("remove-document") + .confirmation("message.delete.document")); } } @@ -578,16 +597,18 @@ public class ApplicationSettings implements ServletContextAware { private ApprovableDocumentPopup() { super(); - addItem("undo", new PopupItem(MNU_NAME_DEMOTE).icon( - "image.invalidate.png").action( - "setDocument?action=invalidate").confirmation( - "message.demote.document")); - addItem(MNU_DEMOTE, new PopupItem("menu.disapprove").icon( - "image.demote.png").action("setDocument?action=disapprove") - .confirmation("message.disapprove.document")); - addItem("approve", new PopupItem("menu.approve").icon( - "icon.APPROVED.png").action("setDocument?action=approve") - .confirmation("message.approve.document")); + addItem("undo", + new PopupItem(MNU_NAME_DEMOTE).icon("image.invalidate.png") + .action("setDocument?action=invalidate") + .confirmation("message.demote.document")); + addItem(MNU_DEMOTE, + new PopupItem("menu.disapprove").icon("image.demote.png") + .action("setDocument?action=disapprove") + .confirmation("message.disapprove.document")); + addItem("approve", + new PopupItem("menu.approve").icon("icon.APPROVED.png") + .action("setDocument?action=approve") + .confirmation("message.approve.document")); } @Override @@ -629,8 +650,9 @@ public class ApplicationSettings implements ServletContextAware { addItem(MNU_ATTACH, new PopupItem(MNU_NAME_ATTACH).icon(IMG_ATTACH) .action(ACT_ATTACH)); addSeparator(); - addItem(MNU_VERSION, new PopupItem(MNU_NAME_VERSION).icon( - IMG_VERSION).action(ACT_VERSION)); + addItem(MNU_VERSION, + new PopupItem(MNU_NAME_VERSION).icon(IMG_VERSION).action( + ACT_VERSION)); } } @@ -642,15 +664,17 @@ public class ApplicationSettings implements ServletContextAware { private ExternPopup() { super(); - addItem(MNU_RENAME, new PopupItem(MNU_NAME_RENAME) - .action("edit-document?action=renameDocument")); - addItem("replace", new PopupItem("menu.replace").icon( - "image.replace.png").action( - "select-file?nextAction=replace")); + addItem(MNU_RENAME, + new PopupItem(MNU_NAME_RENAME) + .action("edit-document?action=renameDocument")); + addItem("replace", + new PopupItem("menu.replace").icon("image.replace.png") + .action("select-file?nextAction=replace")); addSeparator(); - addItem(MNU_REMOVE, new PopupItem("menu.remove.document").icon( - IMG_DELETE).action("remove-document").confirmation( - "message.delete.document")); + addItem(MNU_REMOVE, + new PopupItem("menu.remove.document").icon(IMG_DELETE) + .action("remove-document") + .confirmation("message.delete.document")); } @Override @@ -689,14 +713,17 @@ public class ApplicationSettings implements ServletContextAware { private ScontextPopup() { super(); - addItem(MNU_RENAME, new PopupItem(MNU_NAME_RENAME) - .action("edit-context?action=renameContext")); - addItem(MNU_EDIT, new PopupItem(MNU_NAME_EDIT) - .action("edit-context?action=editContext")); + addItem(MNU_RENAME, + new PopupItem(MNU_NAME_RENAME) + .action("edit-context?action=renameContext")); + addItem(MNU_EDIT, + new PopupItem(MNU_NAME_EDIT) + .action("edit-context?action=editContext")); addSeparator(); - addItem(MNU_REMOVE, new PopupItem("menu.remove").icon(IMG_DELETE) - .action("remove-context").confirmation( - "message.delete.context")); + addItem(MNU_REMOVE, + new PopupItem("menu.remove").icon(IMG_DELETE) + .action("remove-context") + .confirmation("message.delete.context")); } @Override @@ -729,21 +756,26 @@ public class ApplicationSettings implements ServletContextAware { private FeedbexPopup() { super(); - addItem(MNU_PROMOTE, new PopupItem(MNU_NAME_PROMOTE).icon( - "image.review.png").action("promote-knowledge") - .confirmation("message.promote.knowledge")); - addItem(MNU_DEMOTE, new PopupItem(MNU_NAME_DEMOTE).icon( - "image.invalidate.png").action("demote-knowledge") - .confirmation("message.demote.knowledge")); + addItem(MNU_PROMOTE, + new PopupItem(MNU_NAME_PROMOTE).icon("image.review.png") + .action("promote-knowledge") + .confirmation("message.promote.knowledge")); + addItem(MNU_DEMOTE, + new PopupItem(MNU_NAME_DEMOTE).icon("image.invalidate.png") + .action("demote-knowledge") + .confirmation("message.demote.knowledge")); addSeparator(); - addItem(MNU_RENAME, new PopupItem(MNU_NAME_RENAME) - .action("edit-knowledge?action=renameKnowledge")); - addItem(MNU_EDIT, new PopupItem(MNU_NAME_EDIT) - .action("edit-knowledge?action=editKnowledge")); + addItem(MNU_RENAME, + new PopupItem(MNU_NAME_RENAME) + .action("edit-knowledge?action=renameKnowledge")); + addItem(MNU_EDIT, + new PopupItem(MNU_NAME_EDIT) + .action("edit-knowledge?action=editKnowledge")); addSeparator(); - addItem(MNU_REMOVE, new PopupItem("menu.remove").icon(IMG_DELETE) - .action("remove-knowledge").confirmation( - "message.delete.knowledge")); + addItem(MNU_REMOVE, + new PopupItem("menu.remove").icon(IMG_DELETE) + .action("remove-knowledge") + .confirmation("message.delete.knowledge")); } @Override @@ -895,8 +927,7 @@ public class ApplicationSettings implements ServletContextAware { ToolBar bar = new ToolBar(24); // Height of the module-bar Set module = new HashSet(); // For not duplicating modules - for (Iterator j = formats.iterator(); j.hasNext();) { - String format = j.next(); + for (String format : formats) { String command = getApplicationProperty("executable." + format); if (command == null) { continue; // Module not installed @@ -922,9 +953,8 @@ public class ApplicationSettings implements ServletContextAware { } else { icon = "tool." + icon.toLowerCase() + ".png"; } - File image = new File(ApplicationSettings - .getApplicationSkinPath() - + icon); + File image = new File( + ApplicationSettings.getApplicationSkinPath() + icon); if (!image.exists()) { icon = "tool.any.png"; } @@ -932,9 +962,8 @@ public class ApplicationSettings implements ServletContextAware { } else { docname = "/jsp/newDocument.jsp?type=" + docname; String icon = "tool." + name[0].toLowerCase() + ".png"; - File image = new File(ApplicationSettings - .getApplicationSkinPath() - + icon); + File image = new File( + ApplicationSettings.getApplicationSkinPath() + icon); if (!image.exists()) { icon = "tool.any.png"; } @@ -957,8 +986,8 @@ public class ApplicationSettings implements ServletContextAware { } public String getApplicationURL() { - StringBuffer url = new StringBuffer("http://").append( - MY_APP._wappserver).append("/").append(_wappname); + StringBuffer url = new StringBuffer("http://") + .append(MY_APP._wappserver).append("/").append(_wappname); return url.toString(); } @@ -1002,9 +1031,9 @@ public class ApplicationSettings implements ServletContextAware { } public static String getDownloadURL(final User user) { - StringBuffer url = new StringBuffer("http://").append( - MY_APP._wappserver).append("/download/").append( - user.getUsername()).append("/"); + StringBuffer url = new StringBuffer("http://") + .append(MY_APP._wappserver).append("/download/") + .append(user.getUsername()).append("/"); return url.toString(); // The download Tomcat context is supposed being defined } -- 2.39.2