May 2009 - Isis-fish-commits - mailman.cloud.codelutin.com

r2246 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 19, 2009

May 19, 2009

Author: chatellier Date: 2009-05-19 08:12:28 +0000 (Tue, 19 May 2009) New Revision: 2246 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx Log: Check isis home to be absolute path Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-19 07:48:17 UTC (rev 2245) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-19 08:12:28 UTC (rev 2246) @@ -88,7 +88,7 @@ } currentSSHIsisHome = sshIsisHomeField.getText().trim(); - if (currentSSHIsisHome.isEmpty()) { + if (!currentSSHIsisHome.startsWith("/")) { configurationValid = false; setColor(true, sshIsisHomeField); }

1 0

r2245 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh
by chatellier＠users.labs.libre-entreprise.org May 19, 2009

May 19, 2009

Author: chatellier Date: 2009-05-19 07:48:17 +0000 (Tue, 19 May 2009) New Revision: 2245 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUtils.java Log: Add out args to get exec channel output Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUtils.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUtils.java 2009-05-18 17:17:14 UTC (rev 2244) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/ssh/SSHUtils.java 2009-05-19 07:48:17 UTC (rev 2245) @@ -28,11 +28,10 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; +import java.io.Writer; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.util.MD5InputStream; import com.jcraft.jsch.Channel; import com.jcraft.jsch.ChannelExec; @@ -78,7 +77,21 @@ * @return channel exit status (0 = no problem) * @throws SSHException */ - public static int exec(Session session, String command) + public static int exec(Session session, String command) throws SSHException { + return exec(session, command, null); + } + + /** + * Exec command on remote server. + * + * @param session opened valid session + * @param command command to exec + * @param out exec output (can be null) + * + * @return channel exit status (0 = no problem) + * @throws SSHException + */ + public static int exec(Session session, String command, Writer out) throws SSHException { int exitStatus = 0; @@ -94,7 +107,10 @@ String line = null; while (true) { while ((line = br.readLine()) != null) { - if (log.isInfoEnabled()) { + if (out != null) { + out.write(line); + } + else if (log.isInfoEnabled()) { log.info("Remote output : " + line); } }

1 0

r2244 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 17:17:14 +0000 (Mon, 18 May 2009) New Revision: 2244 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs/ Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Begin to refactor vcs ui Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 16:20:20 UTC (rev 2243) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 17:17:14 UTC (rev 2244) @@ -35,6 +35,7 @@ import fr.ifremer.isisfish.ui.simulator.SimulUI; import fr.ifremer.isisfish.ui.simulator.QueueUI; import fr.ifremer.isisfish.ui.simulator.launcher.SSHLauncherConfigUI; + import fr.ifremer.isisfish.ui.vcs.VCSConfigUI; import org.codelutin.widget.AboutFrame; import jaxx.runtime.JAXXInitialContext; import jaxx.runtime.DefaultJAXXContext; @@ -88,8 +89,10 @@ // Welcome.showConfig() } protected void configVCS() { -// FIXME a reimplanter -// fr.ifremer.isisfish.versionning.ui.VCSConfigUI.doLaunch() + VCSConfigUI vcsConfig = new VCSConfigUI(); + vcsConfig.pack(); + org.codelutin.widget.SwingUtil.center(vcsConfig); + vcsConfig.setVisible(true); } protected void configurationSSHLauncher() { Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/vcs (from rev 2233, isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning) Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-18 16:20:20 UTC (rev 2243) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-18 17:17:14 UTC (rev 2244) @@ -1030,6 +1030,7 @@ isisfish.vesselType.name=Name isisfish.vesselType.speed=Speed isisfish.welcome.menu.about=About +isisfish.welcome.menu.api=API isisfish.welcome.menu.close=Close isisfish.welcome.menu.configuration=Configuration isisfish.welcome.menu.configuration.sshlauncher= Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-18 16:20:20 UTC (rev 2243) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-18 17:17:14 UTC (rev 2244) @@ -1030,6 +1030,7 @@ isisfish.vesselType.name=Nom isisfish.vesselType.speed=Vitesse isisfish.welcome.menu.about=\u00C0 propos +isisfish.welcome.menu.api=API isisfish.welcome.menu.close=Fermer isisfish.welcome.menu.configuration=Configuration isisfish.welcome.menu.configuration.sshlauncher=Configuration Caparmor

1 0

r2243 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 16:20:20 +0000 (Mon, 18 May 2009) New Revision: 2243 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Update help menu Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 16:19:48 UTC (rev 2242) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 16:20:20 UTC (rev 2243) @@ -142,9 +142,8 @@ <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='configurationSSHLauncher()'/> </JMenu> <JMenu text="isisfish.welcome.menu.help"> - <JMenu text="isisfish.welcome.menu.help"> - <JMenuItem text="isisfish.welcome.menu.help.isisfish" onActionPerformed='help("ISISFISH")'/> - <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.help.isisfish" onActionPerformed='help("ISISFISH")'/> + <JMenu text="isisfish.welcome.menu.api"> <JMenuItem text="isisfish.welcome.menu.help.javaapi" onActionPerformed='help("JAVA_API")'/> <JMenuItem text="isisfish.welcome.menu.help.isisfishapi" onActionPerformed='help("ISIS_API")'/> <JMenuItem text="isisfish.welcome.menu.help.lutinmatrixapi" onActionPerformed='help("MATRIX_API")'/>

1 0

r2242 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 16:19:48 +0000 (Mon, 18 May 2009) New Revision: 2242 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx Log: Fix tooltip Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-18 16:15:08 UTC (rev 2241) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/launcher/SSHLauncherConfigUI.jaxx 2009-05-18 16:19:48 UTC (rev 2242) @@ -170,10 +170,10 @@ <row> <cell> <JLabel id='sshServerLabel' text='isisfish.config.main.simulation.ssh.server' - toolTipText='isisfish.config.main.simulation.ssh.login.description' /> + toolTipText='isisfish.config.main.simulation.ssh.server' /> </cell> <cell fill='horizontal' weightx="2.0"> - <JTextField id='sshServerField' toolTipText='isisfish.config.main.simulation.ssh.login.description' + <JTextField id='sshServerField' toolTipText='isisfish.config.main.simulation.ssh.server' onKeyReleased="doCheck()" /> </cell> </row>

1 0

r2241 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 16:15:08 +0000 (Mon, 18 May 2009) New Revision: 2241 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Make 'configuration' his own menu Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 16:11:06 UTC (rev 2240) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 16:15:08 UTC (rev 2241) @@ -135,13 +135,12 @@ <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='openFrame(new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(new SimulAction()).add(this)), _("isisfish.sensitivity.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> - <JSeparator/> - <JMenu text="isisfish.welcome.menu.configuration"> - <JMenuItem text="isisfish.welcome.menu.configuration" enabled='false' onActionPerformed='config()'/> - <JMenuItem text="isisfish.welcome.menu.configuration.vcs" enabled='false' onActionPerformed='configVCS()'/> - <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='configurationSSHLauncher()'/> - </JMenu> </JMenu> + <JMenu text="isisfish.welcome.menu.configuration"> + <JMenuItem text="isisfish.welcome.menu.configuration" enabled='false' onActionPerformed='config()'/> + <JMenuItem text="isisfish.welcome.menu.configuration.vcs" enabled='false' onActionPerformed='configVCS()'/> + <JMenuItem text="isisfish.welcome.menu.configuration.sshlauncher" onActionPerformed='configurationSSHLauncher()'/> + </JMenu> <JMenu text="isisfish.welcome.menu.help"> <JMenu text="isisfish.welcome.menu.help"> <JMenuItem text="isisfish.welcome.menu.help.isisfish" onActionPerformed='help("ISISFISH")'/>

1 0

r2240 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: sensitivity simulator
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 16:11:06 +0000 (Mon, 18 May 2009) New Revision: 2240 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Add menu on sensitivity launcher (need to be refactored) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2009-05-18 16:11:06 UTC (rev 2240) @@ -36,8 +36,38 @@ public void refresh(){ paramsUI.refresh(); } + + // TODO duplicated code (simulUI, Params UI, SensitivityUI) + protected void importSimulation() { + JFileChooser fc = new JFileChooser(); + int returnVal = fc.showOpenDialog(null); + + if (returnVal == JFileChooser.APPROVE_OPTION) { + File file = fc.getSelectedFile(); + //This is where a real application would open the file. + getContextValue(SimulAction.class).importSimulation(file); + refresh(); + } + } + // TODO duplicated code (simulUI, Params UI, SensitivityUI) + protected void saveSimulation() { + JFileChooser fc = new JFileChooser(); + int returnVal = fc.showSaveDialog(null); + + if (returnVal == JFileChooser.APPROVE_OPTION) { + File file = fc.getSelectedFile(); + //This is where a real application would open the file. + getContextValue(SimulAction.class).saveSimulation(file); + } + } ]]> </script> + <JMenuBar id="simulMenuBar" constraints='BorderLayout.NORTH'> + <JMenu id="simulMenu" text="isisfish.simulation.menu.simulation"> + <JMenuItem id="siSave" text="isisfish.simulation.menu.save" onActionPerformed="saveSimulation()"/> + <JMenuItem id="siImport" text="isisfish.simulation.menu.import" onActionPerformed="importSimulation()"/> + </JMenu> + </JMenuBar> <JTabbedPane id="sensitivityTabs" constraints="BorderLayout.CENTER"> <tab title='isisfish.params.title'> <ParamsUI id='paramsUI' sensitivity='{true}' constructorParams='getContextValue(SimulAction.class)'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-18 16:11:06 UTC (rev 2240) @@ -414,6 +414,7 @@ /** * TODO : Common code with {@link SimulUI#saveSimulation()} + * TODO duplicated code (simulUI, Params UI, SensitivityUI) */ protected void saveSimulation() { JFileChooser fc = new JFileChooser(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-18 16:11:06 UTC (rev 2240) @@ -165,7 +165,14 @@ simulName = name; } - protected void importSimulation(File f) { + /** + * Load simulation parameter file. + * + * @param f + * + * TODO public just for sensitivity + */ + public void importSimulation(File f) { FileInputStream fos = null; try { fos = new FileInputStream(f); @@ -192,7 +199,9 @@ /** * Save current simulation to given file. * - * @param f file to save smulation to + * @param f file to save simulation to + * + * TODO public just for sensitivity */ public void saveSimulation(File f) { FileOutputStream fos = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-05-18 16:11:06 UTC (rev 2240) @@ -66,6 +66,7 @@ resultChoiceUI.refresh(); advencedParamsUI.refresh(); } + // TODO duplicated code (simulUI, Params UI, SensitivityUI) protected void importSimulation() { JFileChooser fc = new JFileChooser(); int returnVal = fc.showOpenDialog(null); @@ -77,6 +78,7 @@ refresh(); } } + // TODO duplicated code (simulUI, Params UI, SensitivityUI) protected void saveSimulation() { JFileChooser fc = new JFileChooser(); int returnVal = fc.showSaveDialog(null);

1 0

r2239 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 15:57:54 +0000 (Mon, 18 May 2009) New Revision: 2239 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx Log: Fix comment Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2009-05-18 15:57:41 UTC (rev 2238) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) @@ -1,7 +1,6 @@  - <JFrame visible="true" size='{new Dimension(400,400)}' title="isisfish.monitor.title" layout='{new BorderLayout()}'> - <org.codelutin.widget.ApplicationMonitor smtpServer="fr.ifremer.isisfish.IsisConfig.getSmtpServer()" emailFrom="fr.ifremer.isisfish.IsisConfig.getUserMail()" emailTo="fr.ifremer.isisfish.IsisConfig.BUG_REPORT_EMAIL" /> - </JFrame> - Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-05-18 15:57:41 UTC (rev 2238) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) @@ -1,7 +1,6 @@  <Table> - <row> - <cell fill="both" weightx="0.2"> - <JProgressBar id="progressStatus"/> - </cell> - <cell fill="both" weightx="0.2"> - <JLabel id="labelStatus"/> - </cell> - <cell fill="both" weightx="0.2"> - <JButton id="stopCommand" actionCommand="stopCommand" - visible="false" text="isisfish.common.stop" toolTipText="Stop the process"/> - </cell> - <cell fill="both" weightx="0.2"> - <org.codelutin.widget.StatusBar/> - </cell> - </row> + <row> + <cell fill="both" weightx="0.2"> + <JProgressBar id="progressStatus" /> + </cell> + <cell fill="both" weightx="0.2"> + <JLabel id="labelStatus" /> + </cell> + <cell fill="both" weightx="0.2"> + <JButton id="stopCommand" actionCommand="stopCommand" visible="false" text="isisfish.common.stop" + toolTipText="Stop the process" /> + </cell> + <cell fill="both" weightx="0.2"> + <org.codelutin.widget.StatusBar /> + </cell> + </row> </Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-05-18 15:57:41 UTC (rev 2238) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) @@ -1,7 +1,6 @@  - <JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> - <script> +<JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> + <script> <![CDATA[ import fr.ifremer.isisfish.IsisFish; public void setContent(Container c){ @@ -52,9 +39,8 @@ return getContextValue(WelcomeSaveVerifier.class); } ]]> - </script> - - <JPanel layout='{new BorderLayout()}' constraints="BorderLayout.SOUTH"> - <StatusBarUI id='statusBar' constraints="BorderLayout.CENTER"/> - </JPanel> - </JPanel> \ No newline at end of file + </script> + <JPanel layout='{new BorderLayout()}' constraints="BorderLayout.SOUTH"> + <StatusBarUI id='statusBar' constraints="BorderLayout.CENTER" /> + </JPanel> +</JPanel> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-05-18 15:57:41 UTC (rev 2238) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2009-05-18 15:57:54 UTC (rev 2239) @@ -1,7 +1,6 @@  <JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> <script><![CDATA[

1 0

r2238 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui resources/i18n
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 15:57:41 +0000 (Mon, 18 May 2009) New Revision: 2238 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Fix "analyse de sensibility" menu item Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 15:36:41 UTC (rev 2237) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 15:57:41 UTC (rev 2238) @@ -1,7 +1,6 @@ <!-- /* *##% - * Copyright (C) 2005 - 2009 - * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * Copyright (C) 2005 - 2009 Ifremer, Code Lutin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -133,7 +132,7 @@ <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultView(), _("isisfish.result.title"))'/> <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(new JAXXInitialContext().add(verifier).add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.input.title"))'/> <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> - <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='openFrame(new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(this)), _("isisfish.sensitivity.title"))'/> + <JMenuItem text="isisfish.sensitivity.title" onActionPerformed='openFrame(new SensitivityUI(new JAXXInitialContext().add(new InputAction()).add(new InputSaveVerifier()).add(new SimulAction()).add(this)), _("isisfish.sensitivity.title"))'/> <JSeparator/> <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new QueueUI(), _("isisfish.queue.title"))'/> <JSeparator/> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-18 15:36:41 UTC (rev 2237) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-05-18 15:57:41 UTC (rev 2238) @@ -881,13 +881,13 @@ isisfish.selectivity.selectPopulation=Select a population isisfish.selectivity.title=Selectivity isisfish.sens.backParameter=Back to parameter tab -isisfish.sens.title=Sensibility analysis +isisfish.sens.title=Simulation plan isisfish.sensitivity.displaysecondpass=Display results isisfish.sensitivity.export=Export isisfish.sensitivity.secondpass=Analyze results isisfish.sensitivity.secondpass.title=Analyze results isisfish.sensitivity.select=Method -isisfish.sensitivity.title=Factors input +isisfish.sensitivity.title=Sensitivity analysis isisfish.sensitivityChooser.title=Sensitivities input isisfish.server.ssh.generateKey.title=Generate Ssh key isisfish.setOfVessels.comments=Comments Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-18 15:36:41 UTC (rev 2237) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-18 15:57:41 UTC (rev 2238) @@ -887,7 +887,7 @@ isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats isisfish.sensitivity.secondpass.title=Analyse des r\u00E9sultats isisfish.sensitivity.select=M\u00E9thode -isisfish.sensitivity.title=S\u00E9lection des facteurs +isisfish.sensitivity.title=Analyse de sensibilit\u00E9 isisfish.sensitivityChooser.title=M\u00E9thode de la sensibilit\u00E9 isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH isisfish.setOfVessels.comments=Commentaires

1 0

r2237 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org May 18, 2009

May 18, 2009

Author: chatellier Date: 2009-05-18 15:36:41 +0000 (Mon, 18 May 2009) New Revision: 2237 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Use adpater instead of empty listener Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 15:23:12 UTC (rev 2236) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2009-05-18 15:36:41 UTC (rev 2237) @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *##%*/ --> -<JFrame id='isisfishFrame' title="isisfish.welcome.title" width='874' height='736' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> +<JFrame id='isisfishFrame' title="isisfish.welcome.title" width='874' height='736' resizable="true" layout='{new BorderLayout()}'> <script><![CDATA[ import static org.codelutin.i18n.I18n._; import javax.swing.JFrame; @@ -56,37 +56,12 @@ f.setSize(new Dimension(800, 600)); f.setDefaultCloseOperation(f.DO_NOTHING_ON_CLOSE); allFrameOpened.put(f, welcome); - f.addWindowListener(new WindowListener() { - + f.addWindowListener(new WindowAdapter() { @Override - public void windowOpened(WindowEvent e) { - } - - @Override public void windowClosing(WindowEvent e) { JFrame f = (JFrame) e.getSource(); allFrameOpened.get(f).close(f); } - - @Override - public void windowClosed(WindowEvent e) { - } - - @Override - public void windowIconified(WindowEvent e) { - } - - @Override - public void windowDeiconified(WindowEvent e) { - } - - @Override - public void windowActivated(WindowEvent e) { - } - - @Override - public void windowDeactivated(WindowEvent e) { - } }); f.setVisible(true); }

1 0