Author: sletellier Date: 2008-10-14 09:01:24 +0000 (Tue, 14 Oct 2008) New Revision: 1564 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 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: Migration des fichiers JAXX Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-10-14 09:01:24 UTC (rev 1564) @@ -0,0 +1,118 @@ +<!-- +/* *##% + * Copyright (C) 2005 + * Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +/* * + * IsisFish.java + * + * Created: 1 aout 2005 18:37:25 CEST + * + * @author Benjamin POUSSIN <poussin at codelutin.com> + * @version $Revision: 1312 $ + * + * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $ + * by : $Author: sletellier $ + */ + --> +<JFrame id='isisfishFrame' title="isisfish.welcome.title" size='{new Dimension(800,600)}' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> + <script><![CDATA[ + import static org.codelutin.i18n.I18nf._; + import fr.ifremer.isisfish.ui.simulator.SimulAction; + import fr.ifremer.isisfish.ui.input.InputUI; + import fr.ifremer.isisfish.ui.input.InputAction; + import fr.ifremer.isisfish.ui.result.ResultUI; + import fr.ifremer.isisfish.ui.script.ScriptUI; + import fr.ifremer.isisfish.ui.simulator.SimulQueueUI; + import fr.ifremer.isisfish.ui.simulator.SimulUI; + import javax.swing.JFrame; + welcomePanelUI.setContent(new WelcomeTabUI()); + protected void openFrame(Container c, String title){ + JFrame f = new JFrame(); + f.setLayout(new BorderLayout()); + WelcomePanelUI welcome = new WelcomePanelUI(); + welcome.setContent(c); + f.add(welcome, BorderLayout.CENTER); + f.setTitle(title); + f.setVisible(true); + f.pack(); + } + ]]> + </script> + <JMenuBar> + <JMenu text='isisfish.welcome.menu.file'> + <JMenuItem text="isisfish.welcome.menu.synchro" /> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).updateVCS()" +--> + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.close"/> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).close(getContextValue(this.getClass()))" +--> + </JMenu> + <JMenu text="isisfish.welcome.menu.frame"> + <JMenuItem text="isisfish.welcome.menu.simulation" onActionPerformed='openFrame(new SimulUI(new SimulAction()), _("isisfish.simulation.title"))'/> + <JMenuItem text="isisfish.welcome.menu.result" onActionPerformed='openFrame(new ResultUI(), _("isisfish.result.title"))'/> + <JMenuItem text="isisfish.welcome.menu.input" onActionPerformed='openFrame(new InputUI(), _("isisfish.input.title"))'/> + <JMenuItem text="isisfish.welcome.menu.script" onActionPerformed='openFrame(new ScriptUI(), _("isisfish.script.title"))'/> + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.queue" onActionPerformed='openFrame(new SimulQueueUI(), _("isisfish.queue.title"))'/> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).openSimulQueueUIFrame()" +--> + <JSeparator/> + <JMenu text="isisfish.welcome.menu.configuration"> + <JMenuItem text="isisfish.welcome.menu.configuration"/> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).showConfig()" +--> + <JMenuItem text="isisfish.welcome.menu.vcs.configuration"/> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).showConfigVCS()" +--> + </JMenu> + </JMenu> + <JMenu text="isisfish.welcome.menu.help"> + <JMenuItem text="isisfish.welcome.menu.help"/> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).help()" +--> + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.monitor"/> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).monitorUI()" +--> + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.about"/> +<!-- + onActionPerformed="getContextValue(WelcomeAction.class).aboutUI()" +--> + </JMenu> + </JMenuBar> + <WelcomePanelUI id="welcomePanelUI"/> +<!-- <JTabbedPane id="simulTabs" tabPlacement='{JTabbedPane.LEFT}'> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/simulation.gif"))}'><fr.ifremer.isisfish.ui.simulator.SimulUI/></tab> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'><fr.ifremer.isisfish.ui.result.ResultUI/></tab> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/book.gif"))}'><fr.ifremer.isisfish.ui.input.InputUI/></tab> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/bookPage.gif"))}'><fr.ifremer.isisfish.ui.script.ScriptUI/></tab> + </JTabbedPane> + <JPanel constraints="BorderLayout.SOUTH"> + <StatusBarUI id='statusBar'/> + </JPanel> --> +</JFrame> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-10-14 08:54:25 UTC (rev 1563) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-10-14 09:01:24 UTC (rev 1564) @@ -55,13 +55,17 @@ getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText()); } protected void removeTagValue(){ - // getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(getSelectedRow(),0)); + getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(tableTagValue.getSelectedRow(),0).toString()); } protected void saveTagValue(){ - // getContextValue(SimulAction.class).saveTagValue(); + if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){ + getContextValue(SimulAction.class).saveTagValue(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); + } } protected void setSimulName(){ - getContextValue(SimulAction.class).getSimulationParameter().setSimulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); + if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){ + getContextValue(SimulAction.class).getSimulationParameter().setSimulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); + } } ]]> </script> @@ -102,27 +106,15 @@ </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> -<!-- -origin='$SimulationParameter/simulErrorLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> -<!-- -origin='$SimulationParameter/simulWarnLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> -<!-- -origin='$SimulationParameter/simulInfoLevel'origin='$SimulationParameter/simulInfoLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> -<!-- -origin='$SimulationParameter/simulDebugLevel' ---> </cell> </row> <row> @@ -131,27 +123,15 @@ </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> -<!-- -origin='$SimulationParameter/scriptErrorLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> -<!-- -origin='$SimulationParameter/scriptWarnLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> -<!-- -origin='$SimulationParameter/scriptInfoLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> -<!-- -origin='$SimulationParameter/scriptDebugLevel' ---> </cell> </row> <row> @@ -160,24 +140,15 @@ </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> -<!-- -origin='$SimulationParameter/libErrorLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> -<!-- -origin='$SimulationParameter/libWarnLevel' ---> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> </cell> <cell fill="horizontal" weightx="0.2"> <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> -<!-- -origin='$SimulationParameter/libInfoLevel' ---> </cell> </row> <row> 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-10-14 08:54:25 UTC (rev 1563) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2008-10-14 09:01:24 UTC (rev 1564) @@ -33,6 +33,7 @@ <Table> <script><![CDATA[ + fieldSimulExportFolder.setText(getContextValue(SimulAction.class).getSimulationParameter().getExportDirectory()); public ExportUI (SimulAction action){ setContextValue(action); } @@ -41,7 +42,7 @@ <row> <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> - <JList id="listSimulExportChoose" selectionMode="2"> + <JList id="listSimulExportChoose" selectionMode="2" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getExportNames().toArray())}'> <!-- Fixme : ListModel <ListModel origin="$ExportNames"/> <ListSelectionEvents onValueChanged="Update($listSimulExportChoose/selectedValues, $SimulationParameter/exportNames)"/> @@ -61,13 +62,13 @@ <JTextField id="fieldSimulExportFolder"/> </cell> <cell> - <JButton text="isisfish.common.ellipsis"/> + <JButton text="isisfish.common.ellipsis" onActionPerformed='getContextValue(SimulAction.class).updateDirectory()'/> <!-- actionCommand="update(org.codelutin.util.FileUtil.getDirectory(), $SimulationParameter/exportDirectory);refreshView($fieldSimulExportFolder)" --> </cell> <cell> - <JButton text="isisfish.common.saveNextSimulation"/> + <JButton text="isisfish.common.saveNextSimulation" onActionPerformed='getContextValue(SimulAction.class).saveExport()'/> </cell> </row> 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-10-14 08:54:25 UTC (rev 1563) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-10-14 09:01:24 UTC (rev 1564) @@ -35,6 +35,11 @@ public ResultChoiceUI (SimulAction action){ setContextValue(action); } + protected void saveResultNames(){ + if (listResultNames.getSelectedIndex() != -1){ + getContextValue(SimulAction.class).saveResultNames(listResultNames.getSelectedValues()); + } + } ]]> </script> @@ -50,7 +55,7 @@ <JLabel text="isisfish.resultChoice.save" horizontalAlignment="0" constraints='BorderLayout.NORTH'/> <JScrollPane constraints='BorderLayout.CENTER'> <!--list id="listResultNames" SelectionMode="2" renderer="org.codelutin.i18n.I18n._(.)"--> - <JList id="listResultNames" selectionMode="2"> + <JList id="listResultNames" selectionMode="2" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getResultNames().toArray())}'> <!-- Fixme : ListModel, ListSelectionEvents and listRender origin="$SimulationParameter/resultEnabled" <ListModel origin="$ResultNames"/> @@ -62,7 +67,7 @@ </JList> </JScrollPane> - <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation"/> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation" onActionPerformed='saveResultNames()'/> <!-- actionCommand="simulator.SimulatorAction.saveResultNames($listResultNames/selectedValues)" --> 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 2008-10-14 08:54:25 UTC (rev 1563) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2008-10-14 09:01:24 UTC (rev 1564) @@ -44,7 +44,9 @@ import static org.codelutin.i18n.I18nf._; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.ExportStorage; import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -273,49 +275,67 @@ SimulationService.getService().submit(simulId, p, launcher, 0); } } - public void addTagValue(String tag, String value){ - param.getTagValue().put(tag, value); - } - public void removeTagValue(String tag){ - log.debug("removeTagValue: " + tag); - param.getTagValue().remove(tag); - } - public void saveTagValue(Map<String, String> tagValues){ - log.debug("call saveTagValue: " + tagValues); - IsisFish.config.setDefaultTagValues(tagValues); - } public List<SimulatorLauncher> getSimulationLauncher(){ return SimulationService.getService().getSimulationLaunchers(); } public List<Strategy> getStrategies(){ List<Strategy> result = new ArrayList<Strategy>(); try { - result = regionStorage.getFisheryRegion(param.getRegion().getStorage()).getStrategy(); - } catch (StorageException ex) { + result = RegionStorage.getFisheryRegion(param.getRegion().getStorage().beginTransaction()).getStrategy(); + } catch (Exception ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); } -// result = param.getStrategies(); return result; } public List<Population> getPopulations(){ List<Species> species; List<Population> result = new ArrayList<Population>(); try { - species = regionStorage.getFisheryRegion(param.getRegion().getStorage()).getSpecies(); + species = RegionStorage.getFisheryRegion(param.getRegion().getStorage().beginTransaction()).getSpecies(); for (Species s : species){ result.addAll(s.getPopulation()); } } catch (Exception ex) { Logger.getLogger(SimulAction.class.getName()).log(Level.SEVERE, null, ex); } -// result = param.getPopulations(); return result; } public void setNbAnnees(String years){ param.setNumberOfYear(Integer.parseInt(years)); } - - static public List<String> getSimulatorNames(){ + public List<String> getSimulatorNames(){ return SimulatorStorage.getSimulatorNames(); } + public void addTagValue(String tag, String value){ + param.getTagValue().put(tag, value); + } + public void removeTagValue(String tag){ + log.debug("removeTagValue: " + tag); + param.getTagValue().remove(tag); + } + public void saveTagValue(String simulatorName){ + Map<String, String> tagValues = param.getTagValue(); + log.debug("call saveTagValue: " + tagValues); + IsisFish.config.setDefaultTagValues(tagValues); + + IsisFish.config.setSimulatorClassfile(simulatorName); + //IsisFish.config.setSimulatorLauncher(local?"local":"isis-server"); + } + public List<String> getExportNames(){ + return ExportStorage.getExportNames(); + } + public void updateDirectory(){ + param.setExportDirectory(org.codelutin.util.FileUtil.getDirectory()); + } + public void saveExport(){ + IsisFish.config.setDefaultExportDirectory(param.getExportDirectory()); + IsisFish.config.setDefaultExportNames(param.getExportNames()); + } + public void saveResultNames(Object[] resultNames) { + List<String> resultNamesString = new ArrayList<String>(); + for (Object o : resultNames){ + resultNamesString.add(o.toString()); + } + IsisFish.config.setDefaultResultNames(resultNamesString); + } }