Author: chatellier Date: 2009-09-16 09:49:24 +0000 (Wed, 16 Sep 2009) New Revision: 2628 Modified: isis-fish/trunk/changelog.txt isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Fix export selection for current simulation only Modified: isis-fish/trunk/changelog.txt =================================================================== --- isis-fish/trunk/changelog.txt 2009-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/changelog.txt 2009-09-16 09:49:24 UTC (rev 2628) @@ -1,6 +1,7 @@ isis-fish (3.2.0.7) stable; urgency=low * Add log in equation content + * Fix export names selection problem for current simulation * Fix result names selection problem for current simulation * Improve check region code (null object, invalid names...) * Refactor storage modifications notification (done for regions) 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 2009-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2009-09-16 09:49:24 UTC (rev 2628) @@ -21,12 +21,9 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.models.export.ExportNameListModel; + import javax.swing.event.ListSelectionEvent; refresh(); - - /*public ExportUI (SimulAction action) { - setContextValue(action); - }*/ protected SimulAction getSimulAction() { return getContextValue(SimulAction.class); @@ -55,7 +52,21 @@ } } - protected void saveExport() { + protected void saveSimulationExports(ListSelectionEvent event) { + // Set exports (this can save empty list (not a big deal)) + Object[] values = listSimulExportChoose.getSelectedValues(); + java.util.List<String> exportNames = new LinkedList<String>(); + for (Object o : values) { + exportNames.add((String) o); + } + getSimulAction().getSimulationParameter().setExportNames(exportNames); + + if (log.isDebugEnabled()) { + log.debug("Set exports in simulation : " + exportNames); + } + } + + protected void saveConfigExports() { // set export directory String exportDirectory = fieldSimulExportFolder.getText(); getSimulAction().getSimulationParameter().setExportDirectory(exportDirectory); @@ -73,6 +84,7 @@ } protected void setInfoText(String txt) { + // TODO remove getParentContainer use WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); root.setInfoText(txt); } @@ -82,7 +94,8 @@ <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> <JList id="listSimulExportChoose" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' /> + cellRenderer='{new fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer()}' + onValueChanged='saveSimulationExports(event)' /> </JScrollPane> </cell> </row> @@ -94,10 +107,10 @@ <JTextField id="fieldSimulExportFolder" /> </cell> <cell> - <JButton text="isisfish.common.ellipsis" onActionPerformed='getContextValue(SimulAction.class).updateDirectory()'/> + <JButton text="isisfish.common.ellipsis" onActionPerformed='getSimulAction().updateDirectory()'/> </cell> <cell> - <JButton text="isisfish.common.saveNextSimulation" onActionPerformed='saveExport()'/> + <JButton text="isisfish.common.saveNextSimulation" onActionPerformed='saveConfigExports()'/> </cell> </row> </Table> 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 2009-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2009-09-16 09:49:24 UTC (rev 2628) @@ -21,6 +21,7 @@ <script><![CDATA[ import fr.ifremer.isisfish.ui.WelcomePanelUI; import fr.ifremer.isisfish.ui.models.result.ResultListModel; + import javax.swing.event.ListSelectionEvent; refresh(); @@ -48,7 +49,7 @@ } } - protected void saveParametersResultNames() { + protected void saveParametersResultNames(ListSelectionEvent event) { getContextValue(SimulAction.class).saveParametersResultNames(listResultNames.getSelectedValues()); } @@ -68,7 +69,7 @@ <JScrollPane constraints='BorderLayout.CENTER'> <JList id="listResultNames" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" cellRenderer='{new fr.ifremer.isisfish.ui.models.result.ResultListRenderer()}' - onValueChanged='saveParametersResultNames()' /> + onValueChanged='saveParametersResultNames(event)' /> </JScrollPane> <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation" onActionPerformed='saveConfigResultNames()'/> </JPanel> 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-09-16 07:48:15 UTC (rev 2627) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-09-16 09:49:24 UTC (rev 2628) @@ -572,9 +572,17 @@ param.setExportDirectory(FileUtil.getDirectory()); } + /** + * Save current parameters exports names in configuration. + */ public void saveExport() { IsisFish.config.setDefaultExportDirectory(param.getExportDirectory()); if (param.getExportNames() != null) { + + if (log.isDebugEnabled()) { + log.debug("Set exports in configuration : " + param.getExportNames()); + } + IsisFish.config.setDefaultExportNames(param.getExportNames()); } }