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

r1719 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by chatellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: chatellier Date: 2008-12-22 15:59:12 +0000 (Mon, 22 Dec 2008) New Revision: 1719 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Modification de l'intsanciation du listener 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 2008-12-22 14:17:03 UTC (rev 1718) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-12-22 15:59:12 UTC (rev 1719) @@ -58,13 +58,12 @@ import fr.ifremer.isisfish.simulator.launcher.SimulationService; import fr.ifremer.isisfish.simulator.launcher.SimulationJob; import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; - + SimulationServiceListener simulationListener; + setContextValue(new MatrixPanelEditor()); simulParamsNumbers.add(getContextValue(MatrixPanelEditor.class), BorderLayout.CENTER); - - SimulationService.getService().addSimulationServiceListener(new SimulationServiceListener() { - + simulationListener = new SimulationServiceListener() { @Override public void simulationStart(SimulationService simService, SimulationJob job) { } @@ -78,7 +77,9 @@ @Override public void clearJobDone(SimulationService simService) { } - }); + } + SimulationService.getService().addSimulationServiceListener(simulationListener); + public ParamsUI(SimulAction action){ setContextValue(action);

1 0

r1718 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by sletellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: sletellier Date: 2008-12-22 14:17:03 +0000 (Mon, 22 Dec 2008) New Revision: 1718 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Feature requests 1760 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2008-12-22 14:15:43 UTC (rev 1717) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2008-12-22 14:17:03 UTC (rev 1718) @@ -233,7 +233,7 @@ protected void paste(){ } protected void checkScript(){ - getContextValue(ScriptAction.class).checkScript(editor.getText()); + actionLogArea.setText(getContextValue(ScriptAction.class).checkScript(editor.getText())); setInfoText(_("isisfish.message.check.finished")); } protected void evaluateScript(){

1 0

r1717 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by sletellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: sletellier Date: 2008-12-22 14:15:43 +0000 (Mon, 22 Dec 2008) New Revision: 1717 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Feature requests 1760 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2008-12-22 13:57:40 UTC (rev 1716) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2008-12-22 14:15:43 UTC (rev 1717) @@ -233,7 +233,7 @@ protected void paste(){ } protected void checkScript(){ - actionLogArea.setText(getContextValue(ScriptAction.class).checkScript(editor.getText())); + getContextValue(ScriptAction.class).checkScript(editor.getText()); setInfoText(_("isisfish.message.check.finished")); } protected void evaluateScript(){

1 0

r1716 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: sletellier Date: 2008-12-22 13:57:40 +0000 (Mon, 22 Dec 2008) New Revision: 1716 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2008-12-22 13:45:31 UTC (rev 1715) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2008-12-22 13:57:40 UTC (rev 1716) @@ -50,7 +50,7 @@ for (String s : values){ boolean selected = false; for (String sv : selectedValue){ - selected = sv.equals(s); + selected = (sv.equals(s) || selected); } items.add(new Item(s, s, s, selected)); }

1 0

r1715 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: sletellier Date: 2008-12-22 13:45:31 +0000 (Mon, 22 Dec 2008) New Revision: 1715 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-22 13:11:44 UTC (rev 1714) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-22 13:45:31 UTC (rev 1715) @@ -49,7 +49,7 @@ for (String s : values){ boolean selected = false; for (String sv : selectedValue){ - selected = sv.equals(s); + selected = (sv.equals(s) || selected); } items.add(new Item(s, s, s, selected)); }

1 0

r1714 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: sletellier Date: 2008-12-22 13:11:44 +0000 (Mon, 22 Dec 2008) New Revision: 1714 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-22 12:49:52 UTC (rev 1713) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-22 13:11:44 UTC (rev 1714) @@ -39,6 +39,9 @@ public ResultChoiceUI (SimulAction action){ setContextValue(action); } + public void refresh(){ + setListSimulExportChooseModel(); + } protected void setListSimulExportChooseModel(){ java.util.List<String> values = getContextValue(SimulAction.class).getResultNames(); java.util.List<String> selectedValue = getContextValue(SimulAction.class).getDefaultResultNames();

1 0

r1713 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: sletellier Date: 2008-12-22 12:49:52 +0000 (Mon, 22 Dec 2008) New Revision: 1713 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx Log: Debug final ! Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-22 10:41:12 UTC (rev 1712) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-12-22 12:49:52 UTC (rev 1713) @@ -35,12 +35,10 @@ import fr.ifremer.isisfish.ui.WelcomePanelUI; import jaxx.runtime.swing.Item; + setListSimulExportChooseModel(); public ResultChoiceUI (SimulAction action){ setContextValue(action); } - public void refresh(){ - setListSimulExportChooseModel(); - } protected void setListSimulExportChooseModel(){ java.util.List<String> values = getContextValue(SimulAction.class).getResultNames(); java.util.List<String> selectedValue = getContextValue(SimulAction.class).getDefaultResultNames();

1 0

r1712 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: chatellier Date: 2008-12-22 10:41:12 +0000 (Mon, 22 Dec 2008) New Revision: 1712 Modified: isis-fish/trunk/pom.xml Log: H2 version bump Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-12-22 10:36:16 UTC (rev 1711) +++ isis-fish/trunk/pom.xml 2008-12-22 10:41:12 UTC (rev 1712) @@ -194,7 +194,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.1.104</version> + <version>1.1.105</version> <scope>compile</scope> </dependency>

1 0

r1711 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script
by chatellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: chatellier Date: 2008-12-22 10:36:16 +0000 (Mon, 22 Dec 2008) New Revision: 1711 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx Log: Use msg var, not "msg" string Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2008-12-22 09:32:37 UTC (rev 1710) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2008-12-22 10:36:16 UTC (rev 1711) @@ -163,7 +163,7 @@ } protected void setInfoText(String msg){ WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText("msg"); + root.setInfoText(msg); } /* * JButton and JMenu Action

1 0

r1710 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 22 Dec '08

22 Dec '08

Author: chatellier Date: 2008-12-22 09:32:37 +0000 (Mon, 22 Dec 2008) New Revision: 1710 Modified: isis-fish/trunk/pom.xml Log: Update to lutinutil 1.0.1 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-12-19 17:24:16 UTC (rev 1709) +++ isis-fish/trunk/pom.xml 2008-12-22 09:32:37 UTC (rev 1710) @@ -26,7 +26,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>1.0</version> + <version>1.0.1</version> <scope>compile</scope> </dependency> @@ -40,7 +40,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia-service</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> <scope>compile</scope> </dependency> @@ -307,20 +307,14 @@  <labs.project>isis-fish</labs.project> -  +  <jaxx.version>0.8-SNAPSHOT</jaxx.version> - -  <generator.version>0.63</generator.version> - -  <topia.version>2.1.2-SNAPSHOT</topia.version> - -  <lutinwidget.version>0.12-SNAPSHOT</lutinwidget.version> -  <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> - + <openmap.version>4.6.4</openmap.version> +  <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> @@ -417,7 +411,7 @@ <dependency> <groupId>openmap</groupId> <artifactId>openmap</artifactId> - <version>4.6.4</version> + <version>${openmap.version}</version> </dependency> </dependencies> </plugin>

1 0