Author: tchemit Date: 2008-10-13 18:38:55 +0000 (Mon, 13 Oct 2008) New Revision: 1559 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ExitUI.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 isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/bsh/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/logging/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 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/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.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/SensUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx Removed: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning/jaxx/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ExitUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBarUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/bsh/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/result/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/ Modified: isis-fish/trunk/changelog isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Input.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java Log: rename last ui EquationEditorPane to EquationEditorPaneUI and move all ui to src/main/java Modified: isis-fish/trunk/changelog =================================================================== --- isis-fish/trunk/changelog 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/changelog 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,5 +1,6 @@ isis-fish (3.2.0.1) chemit + * all ui are now in src/main/java * use maven 2 directory layout * use org.codelutin:lutinproject 3.0 * passageto UTF-8 Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/pom.xml 2008-10-13 18:38:55 UTC (rev 1559) @@ -588,9 +588,9 @@ <goals> <goal>generate</goal> </goals> - <!--configuration> + <configuration> <src>src/main/java</src> - </configuration--> + </configuration> </execution> </executions> <dependencies> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2008-10-13 18:38:55 UTC (rev 1559) @@ -122,7 +122,7 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; -import fr.ifremer.isisfish.ui.input.EquationEditorPane; +import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; /** @@ -357,7 +357,7 @@ if (manual) { log.info("Ask user for manual equation conversion"); // EquationEditorFrame frame = new EquationEditorFrame(true, true); - EquationEditorPane frame = new EquationEditorPane(); + EquationEditorPaneUI frame = new EquationEditorPaneUI(); frame.setTitle("Conversion manuel de l'equation"); for (String id : equationId) { context = storage.getStorage().beginTransaction(); Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/AboutFrameUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,62 @@ +<!-- +/* *##% + * 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="aboutFrame" visible="true" size='{new Dimension(250,180)}' title="isisfish.about.title" + layout='{new BorderLayout()}'> +<!-- +Maximizable="false" Closable="true" +bundle="org.codelutin.i18n.I18nBundleBridge" +--> + <JPanel constraints='"BorderLayout.NORTH"' layout='{new GridBagLayout()}'> + <JLabel id="version"> +<!-- Fixme : gridbagconstraints + origin="fr.ifremer.isisfish.IsisConfig.getVERSION()" + <gridbagconstraints id="gbc_1" insets="5,2,2,2" gridx="0" gridy="0" ipadx="5" ipady="5" fill="1" /> +--> + </JLabel> + <JLabel text="isisfish.about.text"> +<!-- Fixme : gridbagconstraints +<gridbagconstraints use="gbc_1" gridx="0" gridy="1"/> +--> + </JLabel> + <JLabel text="isisfish.about.site"> +<!-- Fixme : gridbagconstraints +<gridbagconstraints use="gbc_1" gridx="0" gridy="2"/> +--> + </JLabel> + <JButton text="isisfish.common.ok" actionCommand="cancel"> +<!-- Fixme : gridbagconstraints +<gridbagconstraints use="gbc_1" gridx="0" gridy="3"/> +--> + </JButton> + </JPanel> +</JFrame> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,49 @@ +<!-- +/* *##% + * 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 visible="true" size='{new Dimension(400,400)}' title="isisfish.monitor.title" + layout='{new BorderLayout()}'> +<!-- Fixme : ApplicationMonitor + maximizable="true" closable="true" + bundle="org.codelutin.i18n.I18nBundleBridge" + + +--> + <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> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ExitUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ExitUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ExitUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/ExitUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,53 @@ +<!-- +/* *##% + * 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="exitComment" name="isisfish.exit.title" visible="true" size='{new Dimension(400,100)}' title="isisfish.exit.title" + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/Exit.xgl")}'> +<!-- + Resizable="true" + bundle="org.codelutin.i18n.I18nBundleBridge" +--> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + + <JLabel constraints='"labelExitComment"' text="isisfish.exit.text"/> + + <JTextArea constraints='"fieldExitComment"' id="fieldExitComment" /> + + <JButton constraints='"buttonExitOK"' id="buttonExitOK" text="isisfish.common.ok"/> + +<!-- +actionCommand="Saisie.saveCommentAndExit($fieldExitComment/text)" +--> + +</JFrame> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBarUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,60 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<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> +</Table> +<!-- Fixme : ActionMonitor + <ActionMonitor postThreadCommand="xpath:setVisible($stopCommand, 'false')" + progressStartTime="5" messageTime="7" + messageDisplayer="$labelStatus" progressDisplayer="$progressStatus"/> + --> + + + +<!-- + <org.codelutin.widget.MemoryStatus/> +--> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,48 @@ +<!-- +/* *##% + * 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 $ + */ + --> + <JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> + <script> + <![CDATA[ + public void setContent(Container c){ + this.add(c, BorderLayout.CENTER); + } + public void setInfoText(String s){ + statusBar.getLabelStatus().setText(s); + } + ]]> + </script> + + <JPanel layout='{new BorderLayout()}' constraints="BorderLayout.SOUTH"> + <StatusBarUI id='statusBar' constraints="BorderLayout.CENTER"/> + </JPanel> + </JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,51 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel id='welcomePanelUI' layout='{new BorderLayout()}'> + <script> + import fr.ifremer.isisfish.ui.simulator.SimulAction; + </script> + <JTabbedPane id="simulTabs" tabPlacement='{JTabbedPane.LEFT}' constraints="BorderLayout.CENTER"> + <tab title='isisfish.notitle' icon='{new ImageIcon(getClass().getResource("/images/simulation.gif"))}'> + <fr.ifremer.isisfish.ui.simulator.SimulUI constructorParams='new SimulAction()'/> + </tab> + <tab title='isisfish.notitle' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'> + <fr.ifremer.isisfish.ui.result.ResultUI/> + </tab> + <tab title='isisfish.notitle' icon='{new ImageIcon(getClass().getResource("/images/book.gif"))}'> + <fr.ifremer.isisfish.ui.input.InputUI/> + </tab> + <tab title='isisfish.notitle' icon='{new ImageIcon(getClass().getResource("/images/bookPage.gif"))}'> + <fr.ifremer.isisfish.ui.script.ScriptUI/> + </tab> + </JTabbedPane> +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/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-13 18:38:55 UTC (rev 1559) @@ -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(), _("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> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/bsh (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/bsh) Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/CellUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,119 @@ +<!-- +/* *##% + * 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 $ + */ + --> + + <!-- + + Cell + +--> +<JPanel layout='{new BorderLayout()}'> + <JSplitPane id="CellTab" name="Cells" + oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> + <JPanel name="isisfish.cell.title"> +<!-- Fixme : ContextDataSource + <ContextDataSource id="Cell" context="current" source="Cell"/> +--> + <!-- Widget --> + <JComboBox id="fieldCell"> +<!-- Fixme : ComboBoxModel +origin="$Cell" renderer="name" +actionCommand='UIHelper.setTreeSelection($tree, $treeModel, $fieldCell/selectedItem)' +<ComboBoxModel origin="$FisheryRegion/cell"/> +--> + </JComboBox> + <JLabel text="isisfish.cell.name"/> + <JTextField id="fieldCellName"> +<!-- Fixme : DocumentEvents +origin="$Cell/name" + <DocumentEvents onModified="Update($fieldCellName/text)"/> +--> + </JTextField> + <JLabel text="isisfish.cell.latitude"/> + <JTextField id="fieldCellLatitude" editable="false"/> +<!-- +origin="$Cell/latitude" +--> + <JLabel text="isisfish.cell.longitude"/> + <JTextField id="fieldCellLongitude" editable="false"/> +<!-- +origin="$Cell/longitude" +--> + <JLabel text="isisfish.cell.land"/> + <JCheckBox id="fieldCellLand"> +<!-- Fixme : ItemEvents +origin="$Cell/land" +<ItemEvents onStateChanged="Update($fieldCellLand/selected)"/> +--> + </JCheckBox> + <JLabel text="isisfish.cell.comments"/> + <JScrollPane> + <JTextArea id="fieldCellComment"> +<!-- +origin="$Cell/comment" +<DocumentEvents onModified="Update($fieldCellComment/text)"/> +--> + </JTextArea> + </JScrollPane> + <JPanel id="panelCellButtonAction"> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("Cell", $Cell);refreshView($inputCell)' +--> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("Cell", $Cell);refreshView($inputCell)' +--> + </JPanel> + </JPanel> + +<!-- + <xpanel xml="input/Cell.xml" id="inputCell"/> +--> + <JPanel id="cellMapPanel" layout='{new BorderLayout()}'> +<!-- + <OpenMapToolPanel constraints='"BorderLayout.NORTH"' id="cellMapTool"> + <OpenMapToolSet id="cellMapToolSet" origin="$cellMap"/> + </OpenMapToolPanel> + <OpenMap constraints='"BorderLayout.CENTER"' id="cellMap" + origin="$FisheryRegion" selected="$Cell" selectionMode="1"> + <OpenMapEvents id="cellMapEvents" mouseMode="Select" + onMouseClicked="UIHelper.setTreeSelection($cellMap/selectedCells[1])"/> + </OpenMap> +--> + </JPanel> + </JSplitPane> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueZones"/> +<!-- + actionCommand="UIHelper.setTreeSelection('Zones')" +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,262 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<Table> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JList id="fieldEffortDescriptionMetierList" selectionMode="0"> +<!-- Fixme : ListModel and ListSelectionEvents +renderer="name" +<ListModel origin="$FisheryRegion/metier"/> +<ListSelectionEvents onValueChanged="refreshViewPattern('buttonEffortDescriptionAdd.*')"/> +--> + </JList> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='both' weightx='0.5'> + <Table> + <row> + <cell fill='horizontal' weightx='1.0'> + <JButton id="buttonEffortDescriptionAdd" text="isisfish.common.add"/> +<!-- +actionCommand="input.InputEffortDescription.addEffortDescription($SetOfVessels, $fieldEffortDescriptionMetierList/selectedValue)" +origin="not(getPossibleMetiers($SetOfVessels, $fieldEffortDescriptionMetierList/selectedValue))" +--> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JList id="fieldEffortDescriptionEffortDescriptionList" + selectionMode="0"> + <!-- Fixme : ListModel and ListSelectionEvents +origin="$EffortDescription" +renderer="possibleMetiers/name" +<ListModel origin="$SetOfVessels/possibleMetiers"/> +<ListSelectionEvents onValueChanged="input.Input.selectEntity('EffortDescription', $fieldEffortDescriptionEffortDescriptionList/selectedValue)"/> +--> + </JList> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weightx='0.5'> + <Table> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.fishingOperation"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionFishingOperation"/> +<!-- Fixme : DocumentEvents +origin="$EffortDescription/fishingOperation" +<DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionFishingOperation/text"/> +</DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.fishingOperationDuration"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionFishingOperationDuration"/> +<!-- Fixme : DocumentEvents +origin="$EffortDescription/fishingOperationDuration/hour" tooltips="in hour" +<DocumentEvents onModified="Update(3600 * $fieldEffortDescriptionFishingOperationDuration/text, $EffortDescription/fishingOperationDuration)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.gearsNumberPerOperation"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionGearsNumberPerOperation"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/gearsNumberPerOperation" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionGearsNumberPerOperation/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.crewSize"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionCrewSize"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/crewSize" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionCrewSize/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.unitCostOfFishing"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionUnitCostOfFishing"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/unitCostOfFishing" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionUnitCostOfFishing/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.fixedCrewSalary"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionFixedCrewSalary"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/fixedCrewSalary" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionFixedCrewSalary/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.crewFoodCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionCrewFoodCost"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/crewFoodCost" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionCrewFoodCost/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.crewShareRate"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionCrewShareRate"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/crewShareRate" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionCrewShareRate/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/repairAndMaintenanceGearCost" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionRepairAndMaintenanceGearCost/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.landingCosts"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionLandingCosts"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/landingCosts" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionLandingCosts/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.otherRunningCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionOtherRunningCost"/> +<!-- Fixme : DocumentEvents + origin="$EffortDescription/otherRunningCost" + <DocumentEvents onModified="UpdateOrigin"> + <UpdateOrigin source="$fieldEffortDescriptionOtherRunningCost/text"/> + </DocumentEvents> +--> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.3'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("EffortDescription", $EffortDescription);refreshView($inputEffortDescription)' +--> + </cell> + <cell fill='horizontal' weightx='0.3'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("EffortDescription", $EffortDescription);refreshView($inputEffortDescription)' +--> + </cell> + <cell fill='horizontal' weightx='0.3'> + <JButton text="isisfish.common.remove"/> +<!-- +origin="$EffortDescription" +actionCommand="input.InputEffortDescription.remove($SetOfVessels, $EffortDescription)" +--> + </cell> + </row> + </Table> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/EquationEditorPane.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,129 @@ +<JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" +width="400" height="400"> + + <script> +import org.codelutin.widget.editor.Editor; +import fr.ifremer.isisfish.util.CompileHelper; +import org.codelutin.util.FileUtil; +import javax.swing.text.html.HTMLEditorKit; +import javax.swing.text.html.HTMLDocument; +import javax.swing.event.HyperlinkListener; +import javax.swing.text.html.HTMLFrameHyperlinkEvent; +import javax.swing.event.HyperlinkEvent; +import java.io.PrintWriter; +import java.io.StringWriter; +import fr.ifremer.isisfish.util.EvaluatorHelper; + +boolean ok = false; +Class javaInterface = null; + +setModalityType(Dialog.ModalityType.APPLICATION_MODAL); +doc.setEditable(false); +doc.setEditorKit(new HTMLEditorKit()); +doc.addHyperlinkListener(createHyperLinkListener()); + +editor.setAskIfNotSaved(false); + +checkWindow.setEditable(false); + +split.setDividerLocation(0.8) + +public boolean isOk() { + return ok; +} + +public void setEquation(String category, String name, Class javaInterface, String content) throws Exception { + this.javaInterface = javaInterface; + getDoc().setText(CompileHelper.extractDoc(category, name, javaInterface)); + getEditor().open(FileUtil.getTempFile(content, ".java")); +} + + public HyperlinkListener createHyperLinkListener() { + return new HyperlinkListener() { + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + if (e instanceof HTMLFrameHyperlinkEvent) { + ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent( + (HTMLFrameHyperlinkEvent)e); + } else { + try { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().browse(e.getURL().toURI()); + } else { + doc.setPage(e.getURL()); + } + } catch (Exception eee) { + System.out.println("Error for : " + e.getURL()); + eee.printStackTrace(); + } + } + } + } + }; + } + + public void check() { + try { + String content = editor.getText(); + + StringWriter result = new StringWriter(); + PrintWriter out = new PrintWriter(result); + int compileResult = 0; + try { + compileResult = EvaluatorHelper.check(javaInterface, content, out); + } catch (Exception eee) { + compileResult = -1; + } + + out.flush(); + if (compileResult != 0) { + checkWindow.setText(result.toString()); + checkWindow.setBackground(Color.red); + } else { + checkWindow.setText("Compilation Ok"); + checkWindow.setBackground(Color.white); + } + + } catch(Exception eee){ + System.out.println("Can't check script " + eee); + } + } + + </script> + + <Table weightx="1"> + <row> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane> + <JEditorPane id="doc"/> + </JScrollPane> + </cell> + </row> + + <row columns='4' weighty="5" fill='both'> + <cell> + <JSplitPane id='split' orientation='vertical' oneTouchExpandable='true' resizeWeight='0.8'> + <Editor id="editor"/> + <JScrollPane> + <JEditorPane id="checkWindow"/> + </JScrollPane> + </JSplitPane> + </cell> + </row> + + <row fill='horizontal'> + <cell> + <JButton text='isisfish.common.check' onActionPerformed='check()'/> + </cell> + <cell> + <JButton id='okButton' text='isisfish.common.ok' onActionPerformed='ok=true; setVisible(false)'/> + </cell> + <cell> + <JButton id='cancelButton' text='isisfish.common.cancel' onActionPerformed='setVisible(false)'/> + </cell> + <cell> + </cell> + </row> + + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,169 @@ +<!-- +/* *##% + * 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 $ + */ + --> + <!-- + + FisheryRegion + +--> +<JPanel id="inputFisheryRegion" layout='{new BorderLayout()}'> + <JSplitPane id="FisheryRegionTab" name="FisheryRegion" + oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> + <JPanel name="isisfish.fisheryRegion.title"> + +<!-- Fixme : ContextDataSource +<ContextDataSource id="FisheryRegion" context="current" source="FisheryRegion"/> +--> + + + <!-- Widget --> + <JLabel text="isisfish.fisheryRegion.name"/> + <JTextField id="fieldRegion"> +<!-- Fixme : DocumentEvents +origin="$RegionStorage/name" +<DocumentEvents id="updateRegion" onChangedUpdate="Update($fieldRegion/text)"/> +--> + </JTextField> + <JLabel text="isisfish.fisheryRegion.area"/> + <JLabel text="isisfish.fisheryRegion.latitude.min"/> + <JTextField id="fieldLatMin"> +<!-- Fixme : DocumentEvents +origin="$FisheryRegion/minLatitude" +<DocumentEvents onModified="Update($fieldLatMin/text)"/> +--> + </JTextField> + <JLabel text="isisfish.fisheryRegion.latitude.max"/> + <JTextField id="fieldLatMax"> +<!-- Fixme : DocumentEvents +origin="$FisheryRegion/maxLatitude" +<DocumentEvents onModified="Update($fieldLatMax/text)"/> +--> + </JTextField> + <JLabel text="isisfish.fisheryRegion.longitude.min"/> + <JTextField id="fieldLongMin"> +<!-- Fixme : DocumentEvents +origin="$FisheryRegion/minLongitude" +<DocumentEvents onModified="Update($fieldLongMin/text)"/> +--> + </JTextField> + <JLabel text="isisfish.fisheryRegion.longitude.max"/> + <JTextField id="fieldLongMax"> +<!-- Fixme : DocumentEvents +origin="$FisheryRegion/maxLongitude" +<DocumentEvents onModified="Update($fieldLongMax/text)"/> +--> + </JTextField> + <JLabel text="isisfish.fisheryRegion.spatial"/> + <JLabel text="isisfish.fisheryRegion.latitude"/> + <JTextField id="fieldCellLengthLatitude"> +<!-- Fixme : DocumentEvents +origin="$FisheryRegion/cellLengthLatitude" +<DocumentEvents onModified="Update($fieldCellLengthLatitude/text)"/> +--> + </JTextField> + <JLabel text="isisfish.fisheryRegion.longitude"/> + <JTextField id="fieldCellLengthLongitude"> +<!-- Fixme : DocumentEvents +origin="$FisheryRegion/cellLengthLongitude" +<DocumentEvents onModified="Update($fieldCellLengthLongitude/text)"/> +--> + </JTextField> + <JScrollPane> + <JList id="fieldMapfiles"> +<!-- Fixme : ListModel + <ListModel origin="$FisheryRegion/mapFileList"/> +--> + </JList> + </JScrollPane> + <JPanel> + <JButton id="buttonAddMap" text="isisfish.fisheryRegion.addMap"/> +<!-- +actionCommand="input.InputFisheryRegion.addMap($FisheryRegion, $fieldMapfiles)" +--> + <JButton id="buttonRemoveMap" text="isisfish.fisheryRegion.delMap"/> +<!-- +actionCommand="input.InputFisheryRegion.removeMap($FisheryRegion, $fieldMapfiles)" +--> + </JPanel> + <JLabel text="isisfish.fisheryRegion.comments"/> + <JScrollPane> + <JTextArea id="fieldComment"> +<!-- Fixme : DocumentEvents +origin="$FisheryRegion/comment" +<DocumentEvents onModified="Update($fieldComment/text)"/> +--> + </JTextArea> + </JScrollPane> + <JLabel text="isisfish.fisheryRegion.selectFile"/> + <JLabel text="isisfish.fisheryRegion.ofCells"/> + <JPanel> + <JTextField id="fieldCellFile"/> + <JButton id="buttonCellFile" text="isisfish.common.ellipsis"/> +<!-- +actionCommand="input.InputFisheryRegion.loadCellFile($fieldCellFile)" +--> + </JPanel> + <JPanel id="panelRegionButtonAction"> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='thread:input.InputFisheryRegion.save("FisheryRegion", $FisheryRegion);refreshView($inputFisheryRegion)' +--> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("FisheryRegion", $FisheryRegion);refreshView($inputFisheryRegion)' +--> + <JButton text="isisfish.common.check"/> +<!-- +actionCommand='thread:input.InputFisheryRegion.check($FisheryRegion)' +--> + </JPanel> + </JPanel> +<!-- + <xpanel xml="input/FisheryRegion.xml"/> +--> + <JPanel id="fisheryRegionMapPanel" layout='{new BorderLayout()}'> +<!-- + <OpenMapToolPanel constraints='"BorderLayout.NORTH"' id="fisheryRegionMapTool"> + <OpenMapToolSet id="fisheryRegionMapToolSet" origin="$fisheryRegionMap"/> + </OpenMapToolPanel> + <OpenMap id="fisheryRegionMap" origin="$FisheryRegion" + selectionMode="0"> + <OpenMapEvents id="fisheryRegionMapEvents" mouseMode="Nav"/> + </OpenMap> +--> + </JPanel> + </JSplitPane> + <JButton text="isisfish.input.continueCells"/> +<!-- + actionCommand="UIHelper.setTreeSelection('Cells')" +--> +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,53 @@ +<!-- +/* *##% + * 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 $ + */ + --> + + + <!-- + + Gear + +--> +<JPanel layout='{new BorderLayout()}'> + <JTabbedPane constraints='BorderLayout.CENTER' id="GearTab" name="Gear"> + <tab title='{_("isisfish.gear.title")}'><GearUI/></tab> + <tab title='{_("isisfish.selectivity.title")}'><SelectivityUI/></tab> +<!-- + name="isisfish.gear.title" + name="isisfish.selectivity.title" + <xpanel xml="input/Gear.xml" id="inputGear"/> + <xpanel xml="input/Selectivity.xml" id="inputSelectivity"/> +--> + </JTabbedPane> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueMetiers"/> +<!-- + actionCommand="UIHelper.setTreeSelection('Metiers')" +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/GearUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,162 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.gear.name"/> + </cell> + <cell columns="2" fill='horizontal' weightx='1.0'> + <JTextField id="fieldGearName"/> +<!-- Fixme : DocumentEvents +origin="$Gear/name" +<DocumentEvents onModified="Update($fieldGearName/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.gear.effortUnit"/> + </cell> + <cell columns="2" fill='horizontal' weightx='1.0'> + <JTextField id="fieldGearEffortUnit"/> +<!-- Fixme : DocumentEvents +origin="$Gear/effortUnit" +<DocumentEvents onModified="Update($fieldGearEffortUnit/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.gear.standardisationFactor"/> + </cell> + <cell columns="2" fill='horizontal' weightx='1.0'> + <JTextField id="fieldGearStandardisationFactor"/> +<!-- Fixme : DocumentEvents +origin="$Gear/standardisationFactor" +<DocumentEvents onModified="Update($fieldGearStandardisationFactor/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.gear.technicalParameter"/> + </cell> + <cell columns="2" fill='horizontal' weightx='1.0'> + <JTextField id="fieldGearParamName"/> +<!-- Fixme : DocumentEvents +origin="$Gear/parameterName"> +<DocumentEvents onModified="Update($fieldGearParamName/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.gear.rangeValues"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldGearParamType"/> + <!-- Fixme : ComboBoxModel +firstNull="true" +origin="$Gear/possibleValue/type" +actionCommand="update(concat($fieldGearParamType/selectedItem, '[', $fieldGearParamPossibleValue/text, ']'), $Gear/possibleValue)" +<ComboBoxModel origin="fr.ifremer.isisfish.types.RangeOfValues.getPossibleTypes()"/> +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldGearParamPossibleValue"/> + <!-- Fixme : DocumentEvents +origin="$Gear/possibleValue/values" +<DocumentEvents onModified="Update(concat($fieldGearParamType/selectedItem, '[', $fieldGearParamPossibleValue/text, ']'), $Gear/possibleValue)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.gear.comments"/> + </cell> + <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTextArea id="fieldGearComment"> +<!-- Fixme : DocumentEvents +origin="$Gear/comment" +<DocumentEvents onModified="Update($fieldGearComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.new"/> + <!-- +origin="$FisheryRegion" +actionCommand='input.Input.create("Gear")' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("Gear", $Gear);refreshView($inputGear)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("Gear", $Gear);refreshView($inputGear)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> +<!-- +origin="$Gear" +actionCommand="input.Input.remove($Gear)" +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Input.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Input.java 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Input.java 2008-10-13 18:38:55 UTC (rev 1559) @@ -99,7 +99,7 @@ Class javaInterface, String content, Editor editor) { log.debug("openEditor"); try { - EquationEditorPane pane = new EquationEditorPane(); + EquationEditorPaneUI pane = new EquationEditorPaneUI(); pane.setEquation(category, name, javaInterface, content); pane.setVisible(true); if (pane.isOk() && editor != null) { Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/InputUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,212 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel id="input" visible="true" size='{new Dimension(700,500)}' layout='{new BorderLayout()}' location='{new Point(0,139)}'> + + <script> + + setContextValue(new InputAction()); + </script> +<!-- + <JMenuBar id="menu"> + <JMenu text="isisfish.input.menu.file"> + <JMenuItem text="isisfish.input.menu.importRegion" accelerator="accNew"/> +<! - - +ActionCommand="thread:input.Input.importRegion()" +- - > + <JMenuItem text="isisfish.input.menu.importRenameRegion" accelerator="accNew"/> +<! - - +ActionCommand="thread:input.Input.importRegionAndRename()" +- - > + <JMenuItem text="isisfish.input.menu.importRegionV2" accelerator="accNew"/> +<! - - +ActionCommand="thread:input.Input.importV2Region()" + - - > + <JMenuItem text="isisfish.input.menu.importRegionSimulation" accelerator="accImportFromSimulation"/> +<! - - +ActionCommand="thread:input.Input.importRegionFromSimulation($fieldCurrentRegion)" +- - > + <JMenuItem text="isisfish.input.menu.exportRegion" accelerator="accExport"/> +<! - - +ActionCommand="thread:input.Input.exportRegion($RegionStorage)" +- - > + <JMenuItem text="isisfish.input.menu.copyRegion" accelerator="accCopy"/> +<! - - +ActionCommand="thread:input.Input.copyRegion($RegionStorage)" + - - > + <JSeparator/> + <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocaly" accelerator="accRemove"/> +<! - - +ActionCommand="thread:input.Input.removeRegion($RegionStorage, 'false')" +- - > + <JSeparator/> + <JMenuItem name="miClose" text="isisfish.input.menu.close" accelerator="accOpen"/> +<! - - +ActionCommand="close" +- - > + </JMenu> + <JMenu text="isisfish.input.menu.server"> + <JMenuItem text="isisfish.input.menu.addRegion" accelerator="accAdd"/> +<! - - +ActionCommand="thread:input.Input.commitRegionInCVS($RegionStorage)" +- - > + <JMenuItem text="isisfish.input.menu.commit" accelerator="accCommitVCS"/> +<! - - +ActionCommand="thread:input.Input.commitRegionInCVS($RegionStorage)" +- - > + <JSeparator/> + <JMenuItem name="miRemove" text="isisfish.input.menu.removeLocalyRemotely" accelerator="accRemove"/> +<! - - +ActionCommand="thread:input.Input.removeRegion($RegionStorage, 'true')" +- - > + </JMenu> + <JMenu text="isisfish.input.menu.help"> + <JMenuItem name="miAbout" text="isisfish.input.menu.about" accelerator="accAbout"/> + </JMenu> + </JMenuBar> +--> + <JSplitPane oneTouchExpandable="true" dividerLocation="200" orientation="HORIZONTAL"> + <JPanel layout='{new BorderLayout()}'> + <Table constraints='BorderLayout.NORTH'> + <row> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldNewRegion"/> +<!-- + <DocumentEvents onModified="refreshView($JButtonNewRegion)"/> +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id="JButtonNewRegion" text="isisfish.input.newRegion"/> +<!-- + actionCommand="input.Input.newRegion($inputPane, $fieldCurrentRegion, $fieldNewRegion/text)" +--> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JComboBox id="fieldCurrentRegion"/> + +<!-- + model='{new DefaultComboBoxModel(getContextValue(InputAction.class).getCurrentRegionItem())}' + actionCommand="thread:input.Input.loadRegion($inputPane, $fieldCurrentRegion/selectedItem)" +--> + +<!-- + origin="fr.ifremer.isisfish.datastore.RegionStorage.getRegionNames()" + --> + </cell> + </row> + </Table> + <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}'> + <JScrollPane constraints='BorderLayout.CENTER'> + <JTree id="tree" name="tree"> +<!-- Fixme : NestedTreeModel + <NestedTreeModel id="treeModel"> + <TreeNode id="rootTreeNode" origin="$FisheryRegion"> + <TreeNode id="cellsTreeNode" name="Cells" type="fr.ifremer.isisfish.entities.Cell"> + <TreeNode treeOrigin="../.." childsPropertyName="cell"/> + </TreeNode> + <TreeNode id="zonesTreeNode" name="Zones" type="fr.ifremer.isisfish.entities.Zone"> + <TreeNode id="zoneNode" treeOrigin="../.." childsPropertyName="zone"/> + </TreeNode> + <TreeNode name="Ports" type="fr.ifremer.isisfish.entities.Port"> + <TreeNode treeOrigin="../.." childsPropertyName="port"/> + </TreeNode> + <TreeNode name="Species" type="fr.ifremer.isisfish.entities.Species"> + <TreeNode treeOrigin="../.." childsPropertyName="species"> + <TreeNode name="Populations" type="fr.ifremer.isisfish.entities.Population"> + <TreeNode treeOrigin="../.." childsPropertyName="getPopulation(.)"/> + </TreeNode> + </TreeNode> + </TreeNode> + <TreeNode name="Gears" type="fr.ifremer.isisfish.entities.Gear"> + <TreeNode treeOrigin="../.." childsPropertyName="gear"/> + </TreeNode> + <TreeNode name="Metiers" type="fr.ifremer.isisfish.entities.Metier"> + <TreeNode treeOrigin="../.." childsPropertyName="metier"/> + </TreeNode> + <TreeNode name="TripTypes" type="fr.ifremer.isisfish.entities.TripType"> + <TreeNode treeOrigin="../.." childsPropertyName="tripType"/> + </TreeNode> + <TreeNode name="VesselTypes" type="fr.ifremer.isisfish.entities.VesselType"> + <TreeNode treeOrigin="../.." childsPropertyName="vesselType"/> + </TreeNode> + <TreeNode name="SetOfVessels" type="fr.ifremer.isisfish.entities.SetOfVessels"> + <TreeNode treeOrigin="../.." childsPropertyName="setOfVessels"/> + </TreeNode> + <TreeNode name="Strategies" type="fr.ifremer.isisfish.entities.Strategy"> + <TreeNode treeOrigin="../.." childsPropertyName="strategy"/> + </TreeNode> + </TreeNode> + </NestedTreeModel> + + <TreeSelectionEvents id="treeSelectionListener" + onValueChanged="input.Input.treeSelectionChanged($inputPane, $tree)"/> + + <TreeRenderer> + <DefaultTreeRenderer childsPropertyName="name"/> + <DefaultTreeRenderer type="java.lang.String"/> + </TreeRenderer> +--> + <!-- used to update Tree when IsisContext is modified --> +<!-- + <TopiaEntityEvents id="updateTree" origin="$TopiaContext" + commit="input.Input.updateTreeEntityCommit($tree, $treeModel, $e/initialEvent)" + rollback="input.Input.updateTreeEntityRollback($tree, $treeModel, $e/initialEvent)" + entityRemoved="input.Input.updateTreeEntityRemoved($tree, $treeModel, $e/initialEvent)"/> + +--> + </JTree> + </JScrollPane> + </JPanel> + </JPanel> + <JPanel id="inputPane" layout='{new BorderLayout()}'> + +<!-- Fixme : CardLayout +layout='{new Cardlayout()}' +--> +<!-- + <JLabel horizontalAlignment="0" text="isisfish.input.selectNodeTree" constraints='BorderLayout.CENTER'/> +--> + <PopulationTabUI/> + + + + + + </JPanel> + </JSplitPane> + +<!-- +<xpanel constraints='"BorderLayout.SOUTH"' xml="StatusBar.xml"/> +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,182 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='0.5'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoSpecies.selectSeason"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldMetierSeasonInfo"/> +<!-- Fixme : ComboBoxModel +firstNull="true" +origin="$MetierSeasonInfo" renderer="concat(firstMonth, '-', lastMonth)" +actionCommand="input.Input.selectEntity('MetierSeasonInfo', $fieldMetierSeasonInfo/selectedItem)" +<ComboBoxModel origin="getMetierSeasonInfo($Metier)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldTargetSpecies"/> +<!-- Fixme : ComboBoxModel +firstNull="true" renderer="name" +<ComboBoxModel origin="$FisheryRegion/species"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoSpecies.targetFactor"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldTargetFactorEquation"/> +<!-- Fixme : ComboBoxModel +renderer="name" firstNull="true" +actionCommand="update($fieldTargetFactorEquation/selectedItem/content, $fieldTargetFactorScript/text)" +<ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "TargetFactor")'/> +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- +actionCommand='input.Input.saveAsModel("TargetFactor", "Java", $fieldTargetFactorScript/text);refreshView($fieldTargetFactorEquation)' +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> +<!-- +actionCommand='input.Input.openEditor("TargetFactor","new","fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation",$fieldTargetFactorScript/text,$fieldTargetFactorScript)' +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> +<!-- +<editor id="fieldTargetFactorScript" askIfNotSaved="false" +origin="org.codelutin.util.FileUtil.getTempFile('', '.java')"> +</editor> +--> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldPrimaryCatch" text="isisfish.metierSeasonInfoSpecies.mainSpecies"/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='0.5'> + <Table> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="buttonMetierSpeciesAddTargetSpecies" + text="isisfish.common.add"/> +<!-- +actionCommand="input.InputMetier.addTargetSpecies($fieldMetierSeasonInfo/selectedItem, $fieldTargetSpecies/selectedItem, $fieldTargetFactorScript/text, $fieldPrimaryCatch/selected)" +--> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTable id="tableTargetSpecies"> +<!-- + <tableModel origin="getSpeciesTargetSpecies($MetierSeasonInfo)"> + <column title="Species" property="species" renderer="name"/> + <column title="Target factor" property="targetFactorEquation" renderer="name" editable="true"> + <tableColumnEditor><EquationTableEditor/></tableColumnEditor> + </column> + <column title="Main species for the metier" property="primaryCatch" + type="boolean" editable="true"/> + </tableModel> +--> + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="buttonMetierSpeciesRemoveTargetSpecies" + text="isisfish.common.remove"/> +<!-- +actionCommand="input.InputMetier.removeTargetSpecies(getSpeciesTargetSpecies($MetierSeasonInfo)[$tableTargetSpecies/selectedRow + 1])" +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoSpecies)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoSpecies)' +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,146 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoZone.selectSeason"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldMetierSeasonChoice"/> +<!-- +firstNull="true" +origin="$MetierSeasonInfo" renderer="concat(firstMonth, '-', lastMonth)" +actionCommand="input.Input.selectEntity('MetierSeasonInfo', $fieldMetierSeasonChoice/selectedItem)" +<ComboBoxModel origin="getMetierSeasonInfo($Metier)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoZone.season"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JPanel/> + +<!-- Fixme : SeasonIntervalPanel + <SeasonIntervalPanel constraints='"displayMetierSeason"' id="displayMetierSeason" + origin="$MetierSeasonInfo"> + <PropertyChangeEvents onChange="Update" propertyName="first"> + <UpdateOrigin source="$displayMetierSeason/model/first" + target="$MetierSeasonInfo/firstMonth"/> + </PropertyChangeEvents> + <PropertyChangeEvents onChange="Update" propertyName="last"> + <UpdateOrigin source="$displayMetierSeason/model/last" + target="$MetierSeasonInfo/lastMonth"/> + </PropertyChangeEvents> + </SeasonIntervalPanel> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.common.zone"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.7'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="metierZones"> +<!-- Fixme : ListModel and ListSelectionEvents +origin="$MetierSeasonInfo/zone" renderer="name" +<ListModel origin="$FisheryRegion/zone"/> +<ListSelectionEvents onValueChanged="Update($metierZones/selectedValues)"/> +--> + </JList> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoZone.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.3'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTextArea id="fieldMetierSeasonZoneComment"> +<!-- Fixme : DocumentEvents +origin="$MetierSeasonInfo/seasonZoneComment" +<DocumentEvents onModified="Update($fieldMetierSeasonZoneComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.new"/> +<!-- +origin="$FisheryRegion" +actionCommand='input.InputMetier.createSeasonInfo($Metier)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoZone)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("MetierSeasonInfo", $MetierSeasonInfo);refreshView($inputMetierSeasonInfoZone)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> +<!-- +origin="$MetierSeasonInfo" +actionCommand="input.InputMetier.removeSeasonInfo($Metier, $MetierSeasonInfo)" +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,47 @@ +<!-- +/* *##% + * 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 $ + */ + --> + <!-- + + Metier + +--> +<JPanel layout='{new BorderLayout()}'> + <JTabbedPane id="MetierTab" name="Metier" constraints='BorderLayout.CENTER'> + <tab title='{_("isisfish.metier.title")}'><MetierUI/></tab> + <tab title='{_("isisfish.metierSeasonInfoZone.title")}'><MetierSeasonInfoZoneUI/></tab> + <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'><MetierSeasonInfoSpeciesUI/></tab> + + </JTabbedPane> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueTripTypes"/> +<!-- + actionCommand="UIHelper.setTreeSelection('TripTypes')" +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/MetierUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,132 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metier.name"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldMetierName"/> +<!-- Fixme : DocumentEvents + origin="$Metier/name" +<DocumentEvents onModified="Update($fieldMetierName/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.common.gear"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldMetierGear"/> +<!-- Fixme : ComboBoxModel +origin="$Metier/gear" renderer="name" firstNull="true" +actionCommand="update($fieldMetierGear/selectedItem, $Metier/gear)" +<ComboBoxModel origin="$FisheryRegion/gear"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metier.rangeValues"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldMetierParam"/> +<!-- Fixme : DocumentEvents +origin="$Metier/gearParameterValue" +<DocumentEvents onModified="Update($fieldMetierParam/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metier.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTextArea id="fieldMetierComment"> +<!-- Fixme : DocumentEvents + origin="$Metier/comment" +<DocumentEvents onModified="Update($fieldMetierComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.new"/> +<!-- +origin="$FisheryRegion" +actionCommand='input.Input.create("Metier")' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("Metier", $Metier);refreshView($inputMetier)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("Metier", $Metier);refreshView($inputMetier)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> +<!-- +origin="$Metier" +actionCommand="input.Input.remove($Metier)" +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,283 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.name"/> + </cell> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationBasicsName"/> +<!-- Fixme : DocumentEvents +origin="$Population/name" +<DocumentEvents onModified="Update($fieldPopulationBasicsName/text)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.geographicID"/> + </cell> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationBasicsGeographicID"/> +<!-- Fixme : DocumentEvents +origin="$Population/geographicId" +<DocumentEvents onModified="Update($fieldPopulationBasicsGeographicID/text)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.numberGroup"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldPopulationBasicsNbClasses" editable="false"/> +<!-- +origin="sizePopulationGroup($Population)" +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses"/> +<!-- +actionCommand="input.InputPopulation.wizardGroupOpen($Population)" +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.maturityGroup"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationBasicsMatureClass"/> +<!-- +firstNull="true" +origin="$Population/maturityGroup" renderer="concat(population/name, ' - ', id)" +actionCommand="update($fieldPopulationBasicsMatureClass/selectedItem, $Population/maturityGroup)" +<ComboBoxModel origin="$Population/populationGroup"/> +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup"/> +<!-- Fixme : MouseEvents +origin="$Population/plusGroup" +<MouseEvents onClicked="Update($fieldPopulationBasicsPlusGroup/selected)"/> +--> + </cell> + </row> + <row> + <cell columns='3' fill='both' weightx='1.0'> + <JTable> +<!-- Fixme : tableModel + layDown="true" + <tableModel origin="$Population/populationGroup"> + <column title="Age" property="age"/> + <column title="Length" property="length"/> + </tableModel> +--> + </JTable> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.growth"/> + </cell> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationBasicsGrowth"/> +<!-- +origin="$Population/growth" renderer="name" firstNull="true" +actionCommand="update($fieldPopulationBasicsGrowth/selectedItem/content, $fieldScriptPopulationBasicsGrowth/text)" +<ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Growth")'/> +--> + </cell> + </row> + <row> + <cell fill='both'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- +actionCommand='input.Input.saveEquationAsModel($Population/growth);refreshView($fieldPopulationBasicsGrowth)' +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell columns='2' fill='both' weightx='1.0' weighty='0.4'> + <JTextArea/> +<!-- Fixme : editor and DocumentEvents +actionCommand='input.Input.openEditor($Population/growth/category,$Population/growth/name,$Population/growth/javaInterface,$Population/growth/content,$fieldScriptPopulationBasicsGrowth)' + <editor constraints='"fieldScriptPopulationBasicsGrowth"' askIfNotSaved="false" + id="fieldScriptPopulationBasicsGrowth" + origin="org.codelutin.util.FileUtil.getTempFile($Population/growth/content, '.java')"> + <DocumentEvents onModified="Update"> + <UpdateOrigin + target="setEquationGrowth($Population, $fieldScriptPopulationBasicsGrowth/text)"/> + </DocumentEvents> + </editor> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.growthReverse"/> + </cell> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationBasicsGrowthReverse"/> +<!-- Fixme : ComboBoxModel +origin="$Population/growthReverse" renderer="name" firstNull="true" +actionCommand="update($fieldPopulationBasicsGrowthReverse/selectedItem/content, $fieldScriptPopulationBasicsGrowthReverse/text)" +<ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "GrowthReverse")'/> +--> + </cell> + </row> + <row> + <cell fill='both'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- +actionCommand='input.Input.saveEquationAsModel($Population/growthReverse);refreshView($fieldPopulationBasicsGrowthReverse)' +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell columns='2' fill='both' weightx='1.0' weighty='0.4'> + <JTextArea/> +<!-- Fixme : editor +actionCommand='input.Input.openEditor($Population/growthReverse/category,$Population/growthReverse/name,$Population/growthReverse/javaInterface,$Population/growthReverse/content,$fieldScriptPopulationBasicsGrowthReverse)' + + <editor constraints='"fieldScriptPopulationBasicsGrowthReverse"' askIfNotSaved="false" id="fieldScriptPopulationBasicsGrowthReverse" origin="org.codelutin.util.FileUtil.getTempFile($Population/growthReverse/content, '.java')"> + <DocumentEvents onModified="Update"> + <UpdateOrigin + target="setEquationGrowthReverse($Population, $fieldScriptPopulationBasicsGrowthReverse/text)"/> + </DocumentEvents> + </editor> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.population.comments"/> + </cell> + <cell columns='2' fill='both' weightx='1.0' weighty='0.2'> + <JScrollPane> + <JTextArea id="fieldPopulationBasicsComment"> +<!-- Fixme : DocumentEvents +origin="$Population/comment" +<DocumentEvents onModified="Update($fieldPopulationBasicsComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.new"/> +<!-- +origin="$FisheryRegion" +actionCommand='input.InputPopulation.create()' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationBasics)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationBasics)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> +<!-- +origin="$Population" +actionCommand="input.Input.remove($Population)" +--> + </cell> + </row> + </Table> + </cell> + </row> + </Table> + </cell> + </row> +</Table> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,85 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell columns='2' fill='horizontal' weightx='1.0' anchor='east'> + <JLabel text="isisfish.populationCapturability.selectCoefficient"/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0'> + <JTable/> +<!-- Fixme : MatrixPanel and MatrixPanelEvents + <MatrixPanel constraints="fieldPopulationCapturability" id="fieldPopulationCapturability" + origin="copy($Population/capturability)"> + <MatrixPanelEvents onMatrixChanged="Update(copy($fieldPopulationCapturability/matrix), $Population/capturability)"/> + </MatrixPanel> +--> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0' anchor='east'> + <JLabel text="isisfish.populationCapturability.comments"/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTextArea id="fieldPopulationCapturabilityComment"> +<!-- Fixme : DocumentEvents + origin="$Population/capturabilityComment" + <DocumentEvents onModified="Update($fieldPopulationCapturabilityComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("Population", $Population);refreshView($inputCapturability)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("Population", $Population);refreshView($inputCapturability)' +--> + </cell> + </row> +</Table> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,66 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<Table> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> + <PopulationOneEquationUI id='NaturalDeathRate'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> + <PopulationOneEquationUI id='MeanWeight'/> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='0.3'> + <PopulationOneEquationUI id='Price'/> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationEquation)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationEquation)' +--> + </cell> + </row> +</Table> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,158 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.common.populationGroup"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox/> +<!-- Fixme : ComboBoxModel + id="fieldPopulationGroupPopulationGroup" renderer="concat(population/name, ' - ', id)" + origin="$PopulationGroup" firstNull="true" + actionCommand="input.Input.selectEntity('PopulationGroup', $fieldPopulationGroupPopulationGroup/selectedItem)" + <ComboBoxModel origin="$Population/populationGroup"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.meanWeigth"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupMeanWeight"/> +<!-- + origin="$PopulationGroup/meanWeight" editable="false" +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.price"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupPrice"/> +<!-- + origin="$PopulationGroup/price" editable="false" +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.naturalDeathRate"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.5'> + <JTable/> +<!-- Fixme : matrixPanel + <matrixPanel constraints='"fieldPopulationGroupNaturalDeathRate"' + id="fieldPopulationGroupNaturalDeathRate" + origin="reduce(getSubMatrixOnSemantic($Population/naturalDeathRateMatrix, '0', util:array($PopulationGroup)))" /> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.reproductionRate"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupReproductionRate"/> +<!-- +origin="$PopulationGroup/reproductionRate" +<DocumentEvents onModified="Update($fieldPopulationGroupReproductionRate/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.age"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupAge"/> +<!-- Fixme : DocumentEvents +origin="$PopulationGroup/age" +<DocumentEvents onModified="Update($fieldPopulationGroupAge/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.length"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.5'> + <JTextField id="fieldPopulationGroupLength"/> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.5'> + <JScrollPane> + <JTextArea id="fieldPopulationGroupComment"> +<!-- Fixme : DocumentEvents +origin="$PopulationGroup/comment" + <DocumentEvents onModified="Update($fieldPopulationGroupComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("PopulationGroup", $PopulationGroup);refreshView($inputPopulationGroup)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("PopulationGroup", $PopulationGroup);refreshView($inputPopulationGroup)' +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> +<!-- + <JTextField/> + <JTextField id="fieldPopulationGroupMinLength"/> + <JTextField id="fieldPopulationGroupMaxLength"/> +--> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,93 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<!-- + name="isisfish.populationMigrationEmigration.title" +--> +<Table> + <row> + <cell> + <JLabel text="isisfish.common.populationGroup"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationMigrationEmigrationGroupChooser"/> + </cell> + <cell> + <JLabel text="isisfish.populationMigrationEmigration.coefficient"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldPopulationMigrationEmigrationCoefficient"/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.populationMigrationEmigration.departureZone"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationMigrationEmigrationDepartureZoneChooser"/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JPanel/> + </cell> + </row> + <row columns='4'> + <cell fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationMigrationEmigrationAdd" text="isisfish.common.add"/> +<!-- +actionCommand="input.InputPopulation.addEmigration($fieldPopulationMigrationEmigrationGroupChooser/selectedItem, $fieldPopulationMigrationEmigrationDepartureZoneChooser/selectedItem, $fieldPopulationMigrationEmigrationCoefficient/text)" +--> + </cell> + </row> + <row columns='4'> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JTable/> +<!-- Fixme : MatrixPanel + + <MatrixPanel constraints="PopulationMigrationEmigrationTable" id="PopulationMigrationEmigrationTable" + origin="copy($PopulationSeasonInfo/emigrationMatrix)" linearModel="true"> + <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationEMigrationTable/matrix), $PopulationSeasonInfo/emigrationMatrix)"/> + </MatrixPanel> +--> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationMigrationEmigrationRemove" text="isisfish.common.remove"/> +<!-- +actionCommand="input.InputPopulation.removeEmigration($PopulationMigrationEmigrationTable)" +--> + </cell> + </row> +</Table> + + \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,153 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel name="isisfish.populationMigrationEquation.title" constraints='"inputPopulationMigrationEquation"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xgl")}'> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + <!-- + | Migration + + --> + <JLabel constraints='"labelPopulationMigrationEquationMigration"' + text="isisfish.common.migration"/> + <JComboBox constraints='"fieldPopulationMigrationEquationMigration"' + id="fieldPopulationMigrationEquationMigration"> +<!-- Fixme : ComboBoxModel + origin="$PopulationInfoSaison/migrationEquation" + renderer="name" firstNull="true" + actionCommand="update($fieldPopulationMigrationEquationMigration/selectedItem/content, $fieldScriptPopulationMigrationEquationMigration/text)" + <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Migration")'/> +--> + </JComboBox> + + <JButton constraints='"buttonPopulationMigrationEquationMigrationSaveAsModel"' + text="isisfish.common.saveModel"/> + +<!-- +actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/migrationEquation);refreshView($fieldPopulationMigrationEquationMigration)' +--> + + <JButton constraints='"buttonPopulationMigrationEquationMigrationEquationEditor"' text="isisfish.common.openEditor"/> +<!-- +actionCommand='input.Input.openEditor($PopulationSeasonInfo/migrationEquation/category,$PopulationSeasonInfo/migrationEquation/name,$PopulationSeasonInfo/migrationEquation/javaInterface,$PopulationSeasonInfo/migrationEquation/content,$fieldScriptPopulationMigrationEquationMigration)' +--> + + <JScrollPane constraints='"fieldScriptPopulationMigrationEquationMigration"'> +<!-- Fixme : editor, DocumentEvents + <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationMigration" + origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/migrationEquation/content, '.java')"> + <DocumentEvents onModified="Update"> + <UpdateOrigin + target="setMigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationMigration/text)"/> + </DocumentEvents> + </editor> +--> + </JScrollPane> + + <!-- + | Emigration + + --> + <JLabel constraints='"labelPopulationMigrationEquationEmigration"' text="isisfish.common.emigration"/> + <JComboBox constraints='"fieldPopulationMigrationEquationEmigration"' + id="fieldPopulationMigrationEquationEmigration"> +<!-- Fixme : ComboBoxModel +origin="$PopulationInfoSaison/emigrationEquation" +renderer="name" firstNull="true" +actionCommand="update($fieldPopulationMigrationEquationEmigration/selectedItem/content, $fieldScriptPopulationMigrationEquationEmigration/text)" +<ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Emigration")'/> +--> + </JComboBox> + + <JButton constraints='"buttonPopulationMigrationEquationEmigrationSaveAsModel"' + text="isisfish.common.saveModel"/> +<!-- + + actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/emigrationEquation);refreshView($fieldPopulationMigrationEquationEmigration)' +--> + + <JButton constraints='"buttonPopulationMigrationEquationEmigrationEquationEditor"' text="isisfish.common.openEditor"/> +<!-- +actionCommand='input.Input.openEditor($PopulationSeasonInfo/emigrationEquation/category,$PopulationSeasonInfo/emigrationEquation/name,$PopulationSeasonInfo/emigrationEquation/javaInterface,$PopulationSeasonInfo/emigrationEquation/content,$fieldScriptPopulationMigrationEquationEmigration)' +--> + + <JScrollPane constraints='"fieldScriptPopulationMigrationEquationEmigration"'> +<!-- Fixme : editor, DocumentEvents + <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationEmigration" + origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/emigrationEquation/content, '.java')"> + <DocumentEvents onModified="Update"> + <UpdateOrigin + target="setEmigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationEmigration/text)"/> + </DocumentEvents> + </editor> +--> + </JScrollPane> + + <!-- + | Immigration + + --> + <JLabel constraints='"labelPopulationMigrationEquationImmigration"' + text="isisfish.common.immigration"/> + <JComboBox constraints='"fieldPopulationMigrationEquationImmigration"' + id="fieldPopulationMigrationEquationImmigration"> +<!--Fixme : ComboBoxModel +origin="$PopulationInfoSaison/immigrationEquation" +renderer="name" firstNull="true" +actionCommand="update($fieldPopulationMigrationEquationImmigration/selectedItem/content, $fieldScriptPopulationMigrationEquationImmigration/text)" + <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Immigration")'/> +--> + </JComboBox> + + <JButton constraints='"buttonPopulationMigrationEquationImmigrationSaveAsModel"' + text="isisfish.common.saveModel"/> +<!-- + + actionCommand='input.Input.saveEquationAsModel($PopulationInfoSaison/immigrationEquation);refreshView($fieldPopulationMigrationEquationImmigration)' +--> + + <JButton constraints='"buttonPopulationMigrationEquationImmigrationEquationEditor"' text="isisfish.common.openEditor"/> +<!-- + actionCommand='input.Input.openEditor($PopulationSeasonInfo/immigrationEquation/category,$PopulationSeasonInfo/immigrationEquation/name,$PopulationSeasonInfo/immigrationEquation/javaInterface,$PopulationSeasonInfo/immigrationEquation/content,$fieldScriptPopulationMigrationEquationImmigration)' +--> + <JScrollPane constraints='"fieldScriptPopulationMigrationEquationImmigration"'> +<!-- Fixme : editor, DocumentEvents + <editor askIfNotSaved="false" id="fieldScriptPopulationMigrationEquationImmigration" + origin="org.codelutin.util.FileUtil.getTempFile($PopulationSeasonInfo/immigrationEquation/content, '.java')"> + <DocumentEvents onModified="Update"> + <UpdateOrigin + target="setImmigrationEquationAsString($PopulationSeasonInfo, $fieldScriptPopulationMigrationEquationImmigration/text)"/> + </DocumentEvents> + </editor> +--> + </JScrollPane> + +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,91 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<!-- Fixme : ContextDataSource + name="isisfish.populationMigrationImmigration.title" +--> +<Table> + <row> + <cell> + <JLabel text="isisfish.common.populationGroup"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationMigrationImmigrationGroupChooser"/> + </cell> + <cell> + <JLabel text="isisfish.populationMigrationImmigration.coefficient"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldPopulationMigrationImmigrationCoefficient"/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.populationMigrationImmigration.arrivalZone"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationMigrationImmigrationArrivalZoneChooser"/> + </cell> + <cell columns='2' fill='horizontal' weightx='0.5'> + <JPanel/> + </cell> + </row> + <row columns='4'> + <cell fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationMigrationImmigrationAdd" text="isisfish.common.add"/> +<!-- +actionCommand="input.InputPopulation.addImmigration($fieldPopulationMigrationImmigrationGroupChooser/selectedItem, $fieldPopulationMigrationImmigrationArrivalZoneChooser/selectedItem, $fieldPopulationMigrationImmigrationCoefficient/text)" +--> + </cell> + </row> + <row columns='4'> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JTable/> +<!-- Fixme : MatrixPanel + +<MatrixPanel constraints="PopulationMigrationImmigrationTable" id="PopulationMigrationImmigrationTable" + origin="copy($PopulationSeasonInfo/immigrationMatrix)" linearModel="true"> + <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationImmigrationTable/matrix), $PopulationSeasonInfo/immigrationMatrix)"/> + </MatrixPanel> +--> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationImmigrationMigrationRemove" text="isisfish.common.remove"/> +<!-- + actionCommand="input.InputPopulation.removeImmigration($PopulationMigrationImmigrationTable)" +--> + </cell> + </row> +</Table> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,94 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell> + <JLabel text="isisfish.common.populationGroup"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationMigrationMigrationGroupChooser"/> + </cell> + <cell> + <JLabel text="isisfish.populationMigrationMigration.coefficient"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldPopulationMigrationMigrationCoefficient"/> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.populationMigrationMigration.departureZone"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationMigrationMigrationDepartureZoneChooser"/> + </cell> + <cell> + <JLabel text="isisfish.populationMigrationMigration.arrivalZone"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationMigrationMigrationArrivalZoneChooser"/> + </cell> + </row> + <row columns='4'> + <cell fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationMigrationMigrationAdd" text="isisfish.common.add"/> +<!-- + actionCommand="input.InputPopulation.addMigration($fieldPopulationMigrationMigrationGroupChooser/selectedItem, $fieldPopulationMigrationMigrationDepartureZoneChooser/selectedItem, $fieldPopulationMigrationMigrationArrivalZoneChooser/selectedItem, $fieldPopulationMigrationMigrationCoefficient/text)" +--> + </cell> + </row> + <row columns='4'> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JTable/> +<!-- Fixme : MatrixPanel + + + <MatrixPanel constraints="PopulationMigrationMigrationTable" id="PopulationMigrationMigrationTable" + origin="copy($PopulationSeasonInfo/migrationMatrix)" linearModel="true"> + <MatrixPanelEvents onMatrixChanged="Update(copy($PopulationMigrationMigrationTable/matrix), $PopulationSeasonInfo/migrationMatrix)"/> + </MatrixPanel> +--> + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationMigrationMigrationRemove" + text="isisfish.common.remove"/> +<!-- +actionCommand="input.InputPopulation.removeMigration($PopulationMigrationMigrationTable)" +--> + </cell> + </row> +</Table> + \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,116 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationMigration.selectSeason"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationMigrationSeasonChooser"/> +<!-- + firstNull="true" + origin="getPopulationSeasonInfo($Population)" + actionCommand="input.Input.selectEntityAndRefresh('PopulationSeasonInfo', $fieldPopulationMigrationSeasonChooser/selectedItem, '(fieldUseEquationMigration|hideablePanel)')" +--> + </cell> + </row> + <row> + <cell columns='2' anchor='west'> + <JCheckBox id="fieldUseEquationMigration" text="isisfish.populationMigration.useEquation"> +<!-- Fixme : ItemEvents +origin="$PopulationSeasonInfo/useEquationMigration" + <ItemEvents onStateChanged="Update($fieldUseEquationMigration/selected, $PopulationSeasonInfo/useEquationMigration, refreshView($hideablePanel))"/> +--> + </JCheckBox> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='0.7'> + <JPanel id="hideablePanel"> +<!-- + <hidablePanel constraints="fieldUseEquation" layout="BorderLayout" + origin="getUseEquationMigration($PopulationSeasonInfo)"> + <xpanel xml="input/PopulationMigrationEquation.xml"/> + </hidablePanel> + + <hidablePanel constraints='"fieldUseMatrix"' layout="BorderLayout" + origin="not(getUseEquationMigration($PopulationSeasonInfo))"> + <tabbedpane id="PopulationMigrationTabbed" constraints="PopulationMigrationTabbed"> + <xpanel xml="input/PopulationMigrationMigration.xml"/> + <xpanel xml="input/PopulationMigrationImmigration.xml"/> + <xpanel xml="input/PopulationMigrationEmigration.xml"/> + </tabbedpane> + </hidablePanel> +--> + </JPanel> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationMigration.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.3'> + <JScrollPane> + <JTextArea id="fieldPopulationMigrationComment"> +<!-- Fixme : DocumentEvents + origin="$Population/migrationComment" + <DocumentEvents onModified="Update($fieldPopulationMigrationComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" +actionCommand="input.Input.save('PopulationSeasonInfo', $PopulationSeasonInfo);refreshView($inputMigration)" +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- +origin="$EntityModified" +actionCommand="input.Input.cancel('PopulationSeasonInfo', $PopulationSeasonInfo);refreshView($inputMigration)" +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationOneEquationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,99 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationEquation.naturalDeathRate"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationNaturalDeathRate"/> +<!-- Fixme : ComboBoxModel +origin="$Population/naturalDeathRate" renderer="name" firstNull="true" +actionCommand="update($fieldPopulationNaturalDeathRate/selectedItem/content, $fieldScriptPopulationNaturalDeathRate/text)" + <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "NaturalDeathRate")'/> +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- + actionCommand='input.Input.saveEquationAsModel($Population/naturalDeathRate);refreshView($fieldPopulationNaturalDeathRate)' +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> +<!-- + actionCommand='input.Input.openEditor($Population/naturalDeathRate/category,$Population/naturalDeathRate/name,$Population/naturalDeathRate/javaInterface,$Population/naturalDeathRate/content,$fieldScriptPopulationNaturalDeathRate)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weighty='1.0'> + +<!-- Fixme : editor + <editor constraints='"fieldScriptPopulationNaturalDeathRate"' askIfNotSaved="false" + id="fieldScriptPopulationNaturalDeathRate" + origin="org.codelutin.util.FileUtil.getTempFile($Population/naturalDeathRate/content, '.java')"> + <DocumentEvents onModified="Update"> + <UpdateOrigin + target="setEquationNaturalDeathRate($Population, $fieldScriptPopulationNaturalDeathRate/text)"/> + </DocumentEvents> + </editor> +--> + <JPanel/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationEquation.meanWeight"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationMeanWeight"/> +<!-- Fixme : ComboBoxModel + origin="$Population/meanWeight" renderer="name" firstNull="true" + actionCommand="update($fieldPopulationMeanWeight/selectedItem/content, $fieldScriptPopulationMeanWeight/text) + <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "MeanWeight")'/> +--> + </cell> + </row> +</Table> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,167 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationRecruitment.reproductionEquation"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationReproductionEquation"/> +<!-- Fixme : ComboBoxModel + firstNull="true" + origin="$Population/reproductionEquation" renderer="name" + actionCommand="update($fieldPopulationReproductionEquation/selectedItem/content, $fieldScriptPopulationReproductionEquation/text) +<ComboBoxModel origin="fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext,'Reproduction')" /> +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- +actionCommand="input.Input.saveEquationAsModel($Population/reproductionEquation);refreshView($fieldPopulationReproductionEquation)" +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> +<!-- Fixme : editor, DocumentEvents +actionCommand='input.Input.openEditor($Population/reproductionEquation/category,$Population/reproductionEquation/name,$Population/reproductionEquation/javaInterface,$Population/reproductionEquation/content,$fieldScriptPopulationReproductionEquation)' +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JTextArea/> +<!-- +<editor constraints="fieldScriptPopulationReproductionEquation" askIfNotSaved="false" id="fieldScriptPopulationReproductionEquation" + origin="org.codelutin.util.FileUtil.getTempFile($Population/reproductionEquation/content, '.java')"> + <DocumentEvents onModified="update"> + <UpdateOrigin + target="setEquationReproductionEquation($Population, $fieldScriptPopulationReproductionEquation/text)"/> + </DocumentEvents> + </editor> + +--> + </cell> + </row> + <row> + <cell anchor='east'> +<!-- FIXME : I18n, ou multilabel --> + <JLabel text="Month Gap BetweenRepro Recruitment"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement"/> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationRecruitment.recruitmentDistribution"/> + </cell> + <cell fill='both' weightx='1.0'> + <JTable/> +<!-- Fixme : MatrixPanel + <MatrixPanel constraints="fieldPopulationRecruitmentDistribution" id="fieldPopulationRecruitmentDistribution"xx + origin="copy($Population/recruitmentDistribution)"> + <MatrixPanelEvents onMatrixChanged="Update(copy($fieldPopulationRecruitmentDistribution/matrix), $Population/recruitmentDistribution)"/> + </MatrixPanel> +--> + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationRecruitmentDistributionNew" text="isisfish.common.newMatrix"/> +<!-- + actionCommand="input.InputPopulation.createRecruitmentDistribution($Population)" +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationRecruitment.comments"/> + </cell> + <cell fill='both' weightx='1.0'> + <JScrollPane> + <JTextArea id="fieldPopulationRecruitmentComment"> +<!-- + origin="$Population/recruitmentComment" +<DocumentEvents onRemoveUpdate="Update($fieldPopulationRecruitmentComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Population", $Population);refreshView($inputPopulationRecruitment)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationRecruitment)' +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> + + \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,166 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationSeasons.selectSeason"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationSeasonInfoChooser"/> +<!-- Fixme : ComboBoxModel + firstNull="true" origin="$PopulationSeasonInfo" +renderer="concat(firstMonth, '-', lastMonth)" +actionCommand="input.Input.selectEntity('PopulationSeasonInfo', $fieldPopulationSeasonInfoChooser/selectedItem)" + <ComboBoxModel origin="getPopulationSeasonInfo($Population)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.common.season"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JPanel/> +<!-- Fixme : SeasonIntervalPanel, hidablePanel + <SeasonIntervalPanel constraints="fieldPopulationSeasonInterval" + id="fieldPopulationSeasonInterval" origin="$PopulationSeasonInfo"> + <PropertyChangeEvents onChange="Update" propertyName="first"> + <UpdateOrigin source="$fieldPopulationSeasonInterval/model/first" + target="$PopulationSeasonInfo/firstMonth"/> + </PropertyChangeEvents> + <PropertyChangeEvents onChange="Update" propertyName="last"> + <UpdateOrigin source="$fieldPopulationSeasonInterval/model/last" + target="$PopulationSeasonInfo/lastMonth"/> + </PropertyChangeEvents> + </SeasonIntervalPanel> +--> + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup"/> +<!-- +<ItemEvents onStateChanged="Update($fieldPopulationSeasonGroupChange/selected)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationSeasons.distributionSpawning"/> + </cell> + <cell fill='both' weightx='1.0'> + <JTable/> +<!-- + <MatrixPanel id="fieldPopulationSeasonReproductionDistribution" + origin="copy($PopulationSeasonInfo/reproductionDistribution)"> + <MatrixPanelEvents + onMatrixChanged="Update(copy($fieldPopulationSeasonReproductionDistribution/matrix), $PopulationSeasonInfo/reproductionDistribution)"/> + </MatrixPanel> + </hidablePanel> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationSeasons.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTextArea id="fieldPopulationSeasonComment"> +<!-- Fixme : DocumentEvents + origin="$Population/seasonsComment" +<DocumentEvents onModified="Update($fieldPopulationSeasonComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.new"/> +<!-- + origin="$FisheryRegion" + actionCommand='input.InputPopulation.createSeasonInfo($Population)' + --> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("PopulationSeasonInfo", $PopulationSeasonInfo);refreshView($inputPopulationSeasonInfo);refreshView($inputCapturability)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("PopulationSeasonInfo", $PopulationSeasonInfo);refreshView($inputPopulationSeasonInfo);refreshView($inputCapturability)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> +<!-- + origin="$PopulationSeasonInfo" + actionCommand="input.InputPopulation.removeSeasonInfo($Population, $PopulationSeasonInfo)" +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> + + + + + + + + + + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationTabUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationTabUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationTabUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationTabUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,69 @@ +<!-- +/* *##% + * 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 $ + */ + --> + + + <!-- + + Population + +--> +<JPanel layout='{new BorderLayout()}'> + <JTabbedPane id="PopulationTab" name="Populations" constraints='BorderLayout.CENTER'> + <tab title='{_("isisfish.populationBasics.title")}'> + <PopulationBasicsUI/> + </tab> + <tab title='{_("isisfish.populationGroup.title")}'> + <PopulationGroupUI/> + </tab> + <tab title='{_("isisfish.populationEquation.title")}'> + <PopulationEquationUI/> + </tab> + <tab title='{_("isisfish.populationZones.title")}'> + <PopulationZonesUI/> + </tab> + <tab title='{_("isisfish.populationSeasons.title")}'> + <PopulationSeasonsUI/> + </tab> + <tab title='{_("isisfish.populationCapturability.title")}'> + <PopulationCapturabilityUI/> + </tab> + <tab title='{_("isisfish.populationRecruitment.title")}'> + <PopulationRecruitmentUI/> + </tab> + <tab title='{_("isisfish.populationMigration.title")}'> + <PopulationMigrationUI/> + </tab> + </JTabbedPane> + <JButton text="isisfish.input.continueGears" constraints='BorderLayout.SOUTH'/> +<!-- + actionCommand="UIHelper.setTreeSelection('Gears')" +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,136 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='horizontal' weightx='0.3'> + <JLabel text="isisfish.populationZones.selectPopulationAreas"/> + </cell> + <cell fill='horizontal' weightx='0.3'> + <JLabel text="isisfish.populationZones.selectSpawningAreas"/> + </cell> + <cell fill='horizontal' weightx='0.3'> + <JLabel text="isisfish.populationZones.selectRecruitmentAreas"/> + </cell> + </row> + <row> + <cell fill='both' weightx='0.3' weighty='0.5'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="populationZonesPresence"> +<!-- Fixme : ListModel + origin="getPopulationZone($Population)" + renderer="name" + <ListModel origin="$FisheryRegion/zone"/> + <ListSelectionEvents + onValueChanged="Update($populationZonesPresence/selectedValues, $Population/populationZone, refreshViewPattern('fieldPopulationZones.*'))"/> +--> + </JList> + </JScrollPane> + </cell> + <cell fill='both' weightx='0.3' weighty='0.5'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="fieldPopulationZonesReproduction"> +<!-- Fixme : ListModel + origin="getReproductionZone($Population)" + renderer="name" + <ListModel origin="getPopulationZone($Population)"/> + <ListSelectionEvents + onValueChanged="Update($fieldPopulationZonesReproduction/selectedValues, $Population/reproductionZone, refreshView($fieldPopulationMappingZoneReproZoneRecru))"/> + +--> + </JList> + </JScrollPane> + </cell> + <cell fill='both' weightx='0.3' weighty='0.5'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="fieldPopulationZonesRecruitment"> +<!-- Fixme : ListModel + origin="getRecruitmentZone($Population)" + renderer="name" +<ListModel origin="getPopulationZone($Population)"/> + <ListSelectionEvents + onValueChanged="Update($fieldPopulationZonesRecruitment/selectedValues, $Population/recruitmentZone, refreshView($fieldPopulationMappingZoneReproZoneRecru))"/> +--> + </JList> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='3' anchor='west'> + <JLabel text="isisfish.populationZones.betweenSpawningRecruitmentAreas"/> + </cell> + </row> + <row> + <cell columns='3' fill='both' weightx='1.0' weighty='0.5'> + <JTable/> + <!-- Fixme : MatrixPanel + <MatrixPanel constraints='"fieldPopulationMappingZoneReproZoneRecru"' + id="fieldPopulationMappingZoneReproZoneRecru" + origin="copy($Population/mappingZoneReproZoneRecru)"> + <MatrixPanelEvents + onMatrixChanged="Update(copy($fieldPopulationMappingZoneReproZoneRecru/matrix), $Population/mappingZoneReproZoneRecru)"/> + </MatrixPanel> +--> + </cell> + </row> + <row> + <cell columns='3' fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Population", $Population);refreshView($fieldPopulationMappingZoneReproZoneRecru);refreshView($inputPopulationZones)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + +<!-- +origin="$EntityModified" +actionCommand='input.Input.cancel("Population", $Population);refreshView($inputPopulationZones)' +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> + + + + + \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/PortUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -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 $ + */ + --> + + + <!-- + + Port + +--> +<JPanel layout='{new BorderLayout()}'> + <JSplitPane id="PortTab" name="Ports" + oneTouchExpandable="true" dividerLocation="270" orientation="VERTICAL"> + <JPanel name="isisfish.port.title"> + +<!-- ContextDataSource + <ContextDataSource id="Port" context="current" source="Port"/> +--> + <JLabel text="isisfish.port.name"/> + <JTextField id="fieldPortName"> +<!-- Fixme : DocumentEvents +origin="$Port/name" + <DocumentEvents onModified="Update($fieldPortName/text)"/> +--> + </JTextField> + <JLabel text="isisfish.port.cell"/> + <JScrollPane> + <JList id="portCell"> +<!-- Fixme : ListModel +SelectionMode="0" renderer="name" + origin="getCell($Port)" + <ListModel origin="$FisheryRegion/cell"/> + <ListSelectionEvents onValueChanged="Update($portCell/selectedValue, $Port/cell, refreshView($portMap))"/> +--> + </JList> + </JScrollPane> + <JLabel text="isisfish.port.comments"/> + <JScrollPane> + <JTextArea id="fieldPortComment"> +<!-- Fixme : DocumentEvents + origin="$Port/comment" +<DocumentEvents onModified="Update($fieldPortComment/text)"/> +--> + </JTextArea> + </JScrollPane> + <JPanel id="panelPortButtonAction"> + <JButton text="isisfish.common.new"/> +<!-- +origin="$FisheryRegion" + actionCommand='input.Input.create("Port")' +--> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Port", $Port);refreshView($inputPort)' +--> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("Port", $Port);refreshView($inputPort)' +--> + <JButton text="isisfish.common.remove"/> +<!-- + origin="$Port" + actionCommand="input.Input.remove($Port)" +--> + </JPanel> + </JPanel> + +<!-- + + <xpanel xml="input/Port.xml" id="inputPort"/> +--> + <JPanel id="portMapPanel" layout='{new BorderLayout()}'> +<!-- Fixme : OpenMapToolPanel, OpenMap + <OpenMapToolPanel constraints='"BorderLayout.NORTH"' id="portMapTool"> + <OpenMapToolSet id="portMapToolSet" origin="$portMap"/> + </OpenMapToolPanel> + <OpenMap id="portMap" origin="$FisheryRegion" selected="$Port/cell" + selectionMode="1"> + <OpenMapEvents id="portMapEvents" mouseMode="Select" + onMouseClicked="Update($portMap/selectedCells[1], $Port/cell, refreshView($portCell))"/> + </OpenMap> +--> + </JPanel> + </JSplitPane> + <JButton text="isisfish.input.continueSpecies"/> +<!-- + actionCommand="UIHelper.setTreeSelection('Species')" +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,156 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.selectivity.selectPopulation"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSelectivityPopulation"/> +<!-- Fixme : ComboBoxModel +renderer="name" firstNull="true" +<ComboBoxModel origin="$FisheryRegion/species/population" iterate="true"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.selectivity.equation"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSelectivityEquation"/> +<!-- Fixme : ComboBoxModel + renderer="name" firstNull="true" + actionCommand="update($fieldSelectivityEquation/selectedItem/content, $fieldSelectivityScript/text)" + <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Selectivity")'/> +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- + actionCommand='input.Input.saveAsModel("Selectivity", "Java", $fieldSelectivityScript/text);refreshView($fieldSelectivityEquation)' +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> +<!-- + actionCommand='input.Input.openEditor("Selectivity","new","fr.ifremer.isisfish.equation.SelectivityEquation",$fieldSelectivityScript/text,$fieldSelectivityScript)' +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> +<!-- Fixme : editor + <editor id="fieldSelectivityScript" askIfNotSaved="false" origin="org.codelutin.util.FileUtil.getTempFile('', '.java')"> + </editor> +--> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="buttonAddSelectivity" text="isisfish.common.add"/> +<!-- + origin="$Gear" + actionCommand="input.InputGear.addSelectivity($Gear, $fieldSelectivityPopulation/selectedItem, $fieldSelectivityScript/text)" +--> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTable id="selectivityTable"> +<!-- + <tableModel origin="$Gear/populationSelectivity"> + <column title="Population" property="population"/> + <column title="Equation" property="equation" editable="true"> + <tableColumnEditor><EquationTableEditor/></tableColumnEditor> + </column> + </tableModel> +--> + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="buttonSelectivityRemove" text="isisfish.common.remove"/> +<!-- + origin="$Gear/populationSelectivity" + actionCommand="input.InputGear.removeSelectivity($Gear, getPopulationSelectivity($Gear)[$selectivityTable/selectedRow + 1])" +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Gear", $Gear);refreshView($inputSelectivity)' +--> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("Gear", $Gear);refreshView($inputSelectivity)' +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,54 @@ +<!-- +/* *##% + * 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 $ + */ + --> + + + <!-- + + SetOfVessels + +--> +<JPanel layout='{new BorderLayout()}'> + <JTabbedPane id="SetOfVesselsTab" name="SetOfVessels" constraints='BorderLayout.CENTER'> + <tab title='{_("isisfish.setOfVessels.title")}'><SetOfVesselsUI/></tab> + <tab title='{_("isisfish.effortDescription.title")}'><EffortDescriptionUI/></tab> +<!-- +isisfish.setOfVessels.title +isisfish.effortDescription.title + <xpanel xml="input/SetOfVessels.xml" id="inputSetOfVessels"/> + <xpanel xml="input/EffortDescription.xml" id="inputEffortDescription"/> +--> + </JTabbedPane> + <JButton text="isisfish.input.continueStrategies" constraints='BorderLayout.SOUTH'/> +<!-- + + actionCommand="UIHelper.setTreeSelection('Strategies')" +--> +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,213 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.name"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldSetOfVesselsName"/> +<!-- Fixmee : DocumentEvents + origin="$SetOfVessels/name" +<DocumentEvents onModified="Update($fieldSetOfVesselsName/text)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.common.port"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSetOfVesselsPort"/> +<!-- Fixme : ComboBoxModel + origin="$SetOfVessels/port" renderer="name" firstNull="true" + actionCommand="update($fieldSetOfVesselsPort/selectedItem, $SetOfVessels/port)" + <ComboBoxModel origin="$FisheryRegion/port"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.vesselType"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSetOfVesselsVesselType"/> +<!-- Fixme : ComboBoxModel + origin="$SetOfVessels/vesselType" renderer="name" firstNull="true" + actionCommand="update($fieldSetOfVesselsVesselType/selectedItem, $SetOfVessels/vesselType)" +<ComboBoxModel origin="$FisheryRegion/vesselType"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.numberOfVessels"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldSetOfVesselsNumberOfVessels"/> + +<!-- + origin="$SetOfVessels/numberOfVessels" + <DocumentEvents onModified="Update($fieldSetOfVesselsNumberOfVessels/text)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.fixedCosts"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldSetOfVesselsFixedCosts"/> + +<!-- + origin="$SetOfVessels/fixedCosts" +<DocumentEvents onModified="Update($fieldSetOfVesselsFixedCosts/text)"/> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.technicalEfficiency"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSetOfVesselsTechnicalEfficiency"/> + +<!-- + origin="$SetOfVessels/technicalEfficiencyEquation" renderer="name" firstNull="true" + actionCommand="Update($fieldSetOfVesselsTechnicalEfficiency/selectedItem/content, $fieldScriptSetOfVesselsTechnicalEfficiency/text)" +<ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "TechnicalEfficiency")'/> +--> + </cell> + </row> + <row> + <cell fill='both' weighty='0.7'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- + actionCommand='input.Input.saveEquationAsModel($SetOfVessels/technicalEfficiencyEquation);refreshView($fieldSetOfVesselsTechnicalEfficiency)' +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weightx='1.0' weighty='0.7'> + <JPanel/> + <!-- Fixme : editor + actionCommand='input.Input.openEditor($SetOfVessels/technicalEfficiencyEquation/category,$SetOfVessels/technicalEfficiencyEquation/name,$SetOfVessels/technicalEfficiencyEquation/javaInterface,$SetOfVessels/technicalEfficiencyEquation/content,$fieldScriptSetOfVesselsTechnicalEfficiency)' + <editor constraints="fieldScriptSetOfVesselsTechnicalEfficiency" askIfNotSaved="false" + id="fieldScriptSetOfVesselsTechnicalEfficiency" + origin="org.codelutin.util.FileUtil.getTempFile($SetOfVessels/technicalEfficiencyEquation/content, '.java')"> + <DocumentEvents onModified="Update"> + <UpdateOrigin + target="setEquationTechnicalEfficiency($SetOfVessels, $fieldScriptSetOfVesselsTechnicalEfficiency/text)"/> + </DocumentEvents> + </editor> +--> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.3'> + <JScrollPane> + <JTextArea id="fieldSetOfVesselsComment"> + +<!-- Fixme : DocumentEvents + origin="$SetOfVessels/comment" +<DocumentEvents onModified="Update($fieldSetOfVesselsComment/text)"/> +--> + </JTextArea> +<!-- +--> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.new"/> +<!-- + origin="$FisheryRegion" + actionCommand='input.Input.create("SetOfVessels")' +--> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.save"/> +<!-- +origin="$EntityModified" + actionCommand='input.Input.save("SetOfVessels", $SetOfVessels);refreshView($inputSetOfVessels)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("SetOfVessels", $SetOfVessels);refreshView($inputSetOfVessels)' +--> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.remove"/> +<!-- + origin="$SetOfVessels" + actionCommand="input.Input.remove($SetOfVessels)" +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,141 @@ +<!-- +/* *##% + * 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 $ + */ + --> + + + <!-- + + Species + +--> +<JPanel id="SpeciesTab" layout='{new BorderLayout()}'> + <JPanel name="isisfish.species.title" constraints='"inputSpecies"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/Species.xgl")}'> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + +<!-- Fixme : ContextDataSource + <ContextDataSource id="Species" context="current" source="Species"/> +--> + <JLabel constraints='"labelSpeciesName"' text="isisfish.species.name"/> + <JTextField constraints='"fieldSpeciesName"' id="fieldSpeciesName"> +<!-- Fixme : DocumentEvents + origin="$Species/name" +<DocumentEvents onModified="Update($fieldSpeciesName/text)"/> +--> + </JTextField> + <JLabel constraints='"labelSpeciesScientificName"' text="isisfish.species.scientificName"/> + <JTextField constraints='"fieldSpeciesScientificName"' id="fieldSpeciesScientificName"> +<!-- Fixme : DocumentEvents + origin="$Species/scientificName" + <DocumentEvents onModified="Update($fieldSpeciesScientificName/text)"/> +--> + </JTextField> + <JLabel constraints='"labelSpeciesCodeRubbin"' text="isisfish.species.rubbinCode"/> + <JTextField constraints='"fieldSpeciesCodeRubbin"' id="fieldSpeciesCodeRubbin"> +<!-- Fixme : DocumentEvents + origin="$Species/codeRubbin" + <DocumentEvents onModified="Update($fieldSpeciesCodeRubbin/text)"/> +--> + </JTextField> + <JLabel constraints='"labelSpeciesCEE"' text="isisfish.species.cee"/> + <JTextField constraints="fieldSpeciesCEE" id="fieldSpeciesCEE"> +<!-- + origin="$Species/codeCEE" + <DocumentEvents onModified="Update($fieldSpeciesCEE/text)"/> +--> + </JTextField> + <JLabel constraints='"labelSpeciesDynamic"' text="isisfish.species.structured"/> + <JPanel constraints='"panelFieldSpeciesDynamic"' layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/Species.xgl")}'> + <JRadioButton constraints='"fieldSpeciesDynamicAge"' id="fieldSpeciesDynamicAge" + text="isisfish.species.age" buttonGroup="structuredGroup"/> +<!-- + origin="$Species/ageGroupType" + actionCommand="Update($fieldSpeciesDynamicAge/selected)" +--> +<!-- Déjà commenté + <ItemEvents onStateChanged="Update($fieldSpeciesDynamicAge/selected)"/> + </radioButton> +--> + <JRadioButton constraints='"fieldSpeciesDynamicLength"' id="fieldSpeciesDynamicLength" + text="isisfish.species.length" buttonGroup="structuredGroup"/> +<!-- + origin="not(getAgeGroupType($Species))" + actionCommand="Update($fieldSpeciesDynamicAge/selected, $Species/ageGroupType)" +--> + <!-- Déjà commenté + <ItemEvents onStateChanged="Update($fieldSpeciesDynamicAge/selected, $Species/ageGroupType)"/> + </radioButton> + --> + </JPanel> + <JLabel constraints='"labelSpeciesComment"' text="isisfish.species.comments"/> + <JScrollPane constraints='"fieldSpeciesComment"'> + <JTextArea id="fieldSpeciesComment"> +<!-- Fixme : DocumentEvents + origin="$Species/comment" +<DocumentEvents onModified="Update($fieldSpeciesComment/text)"/> +<DocumentEvents onModified="Update($fieldSpeciesComment/text)"/> +--> + </JTextArea> + </JScrollPane> + <JPanel id="panelSpeciesButtonAction" constraints='"panelSpeciesButtonAction"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/ActionButton.xgl")}'> + <JButton constraints='"buttonCreate"' text="isisfish.common.new"/> +<!-- + origin="$FisheryRegion" + actionCommand='input.Input.create("Species")' +--> + <JButton constraints='"buttonSave"' text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Species", $Species);refreshView($inputSpecies)' +--> + <JButton constraints='"buttonCancel"' text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("Species", $Species);refreshView($inputSpecies)' +--> + <JButton constraints='"buttonRemove"' text="isisfish.common.remove"/> +<!-- + origin="$Species" + actionCommand="input.Input.remove($Species)" +--> + </JPanel> + </JPanel> + +<!-- +<xpanel id="inputSpecies" name="Species" xml="input/Species.xml"/> +--> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continuePopulations"/> +<!-- + actionCommand="UIHelper.setTreeSelectionFirstChild($Species)" +--> +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,103 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<JPanel layout='{new BorderLayout()}'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyJanuary'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyFebuary'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyMarch'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyApril'/> + </cell> + </row> + <row> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyMay'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyJune'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyJuly'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyAugust'/> + </cell> + </row> + <row> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategySeptember'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyOctober'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyNovember'/> + </cell> + <cell fill='both' weightx='0.25' weighty='0.3'> + <StrategyOneMonthInfoUI id='StrategyDecember'/> + </cell> + </row> + </Table> + + <!-- + | + | Button action + | + +--> + <Table constraints='BorderLayout.SOUTH'> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Strategy", $Strategy);refreshView($inputStrategyMonthInfo)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("Strategy", $Strategy);refreshView($inputStrategyMonthInfo)' +--> + </cell> + </row> + </Table> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,96 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell columns='2' fill='horizontal' weightx='1.0' anchor='west'> + <JLabel id='StrategieMonth'/> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JComboBox id="fieldStrategyMonthInfoTripType"> +<!--Fixme : JComboBoxModel + origin="$StrategyMonthInfo2/tripType" firstNull="true" + actionCommand="update($fieldStrategyMonthInfoTripType2/selectedItem, $StrategyMonthInfo2/tripType)" + <JComboBoxModel origin="$Strategy/setOfVessels/vesselType/tripType"/> +--> + </JComboBox> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5' anchor='west'> + <JLabel text="isisfish.strategyMonthInfo.numberOfTrips"/> + </cell> + <cell fill='horizontal' weightx='0.5' anchor='west'> + <JLabel id='numberOfTrips'/> +<!-- + origin="$StrategyMonthInfo2/numberOfTrips" +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5' anchor='west'> + <JLabel text="isisfish.strategyMonthInfo.minInactivityDays"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldStrategyMonthInfoMinInactivityDays2"> +<!-- Fixme : DocumentEvents + origin="$StrategyMonthInfo2/minInactivityDays" + <DocumentEvents onModified="Update($fieldStrategyMonthInfoMinInactivityDays2/text)"/> +--> + </JTextField> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JTable/> +<!-- + <MatrixPanel constraints='"fieldStrategyMonthInfoProportion"' + id="fieldStrategyMonthInfoProportion2" + linearModel="true" linearModelShowDefault="true" + origin="copy($StrategyMonthInfo2/proportionMetier)"> + <MatrixPanelEvents onMatrixChanged="Update(copy($fieldStrategyMonthInfoProportion2/matrix), $StrategyMonthInfo2/proportionMetier)"/> + </MatrixPanel> +--> + </cell> + </row> +</Table> + + + + + + + + \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,47 @@ +<!-- +/* *##% + * 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 $ + */ + --> + + <!-- + + Strategy + +--> +<JTabbedPane id="StrategyTab" name="Strategy" > + + <tab title='{_("isisfish.strategy.title")}'><StrategyUI/></tab> + <tab title='{_("isisfish.strategyMonthInfo.title")}'><StrategyMonthInfoUI/></tab> +<!-- +isisfish.strategy.title +isisfish.strategyMonthInfo.title + <xpanel xml="input/Strategy.xml" id="inputStrategy"/> + <xpanel xml="input/StrategyMonthInfo.xml" id="inputStrategyMonthInfo"/> +--> +</JTabbedPane> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,197 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell anchor='west'> + <JLabel text="isisfish.strategy.name"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldStrategyName"/> +<!-- Fixme : DocumentEvents + origin="$Strategy/name" +<DocumentEvents onModified="Update($fieldStrategyName/text)"/> +--> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text="isisfish.common.setOfVessels"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldStrategySetOfVessels"/> +<!-- Fixme : ComboBoxModel +origin="$Strategy/setOfVessels" renderer="name" firstNull="true" + actionCommand="update($fieldStrategySetOfVessels/selectedItem, $Strategy/setOfVessels)" +<ComboBoxModel origin="$FisheryRegion/setOfVessels"/> +--> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text="isisfish.strategy.proportionSetOfVessels"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldStrategyProportionSetOfVessels"/> +<!-- Fixme : DocumentEvents +origin="$Strategy/proportionSetOfVessels" +<DocumentEvents onModified="Update($fieldStrategyProportionSetOfVessels/text)"/> +--> + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldUseEquationInactivity"/> +<!-- Fixme : ItemEvents + origin="$Strategy/inactivityEquationUsed" text="isisfish.strategy.inactivityEquationUsed" +<ItemEvents onStateChanged="Update($fieldUseEquationInactivity/selected, $Strategy/inactivityEquationUsed, refreshView($hideablePanelInactivityEquation))"/> +--> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text="isisfish.strategy.inactivity"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldStrategyInactivity"/> +<!-- + actionCommand="Update($fieldStrategyInactivity/selectedItem/content, $fieldScriptStrategyInactivity/text)"> + <ComboBoxModel origin='fr.ifremer.isisfish.datastore.FormuleStorage.getFormules($TopiaContext, "Inactivity")'/> +--> + </cell> + </row> + <row> + <cell fill='both' weighty='0.7'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> +<!-- + actionCommand='input.Input.saveEquationAsModel($Strategy/inactivityEquation);refreshView($fieldStrategyInactivity)'/> +--> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> +<!-- +actionCommand='input.Input.openEditor($Strategy/inactivityEquation/category,$Strategy/inactivityEquation/name,$Strategy/inactivityEquation/javaInterface,$Strategy/inactivityEquation/content,$fieldScriptStrategyInactivity)'/> +--> + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell fill='both' weightx='1.0' weighty='0.7'> + <JPanel/> +<!-- + <editor constraints='"fieldScriptStrategyInactivity"' askIfNotSaved="false" + id="fieldScriptStrategyInactivity" + origin="org.codelutin.util.FileUtil.getTempFile($Strategy/inactivityEquation/content, '.java')"> + <Document </row> + </Table> + </cell>Events onModified="Update"> + <UpdateOrigin + target="setEquationInactivity($Strategy, $fieldScriptStrategyInactivity/text)"/> + </DocumentEvents> + </editor> +--> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text="isisfish.strategy.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.3'> + <JScrollPane> + <JTextArea id="fieldStrategyComment"> +<!-- Fixme : DocumentEvents + origin="$Strategy/comment" +<DocumentEvents onModified="Update($fieldStrategyComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.new"/> +<!-- + origin="$FisheryRegion" + actionCommand='input.Input.create("Strategy")' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Strategy", $Strategy);refreshView($inputStrategy)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("Strategy", $Strategy);refreshView($inputStrategy)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> +<!-- + origin="$Strategy" + actionCommand="input.Input.remove($Strategy)" +--> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,114 @@ +<!-- +/* *##% + * 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 $ + */ + --> + <!-- + + TripType + +--> +<JPanel id="TripTypeTab" layout='{new BorderLayout()}'> + <JPanel name="isisfish.tripType.title" constraints='"inputTripType"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/TripType.xgl")}'> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + +<!-- + <ContextDataSource id="TripType" context="current" source="TripType"/> +--> + <JLabel constraints='"labelTripTypeName"' text="isisfish.tripType.name"/> + <JTextField constraints='"fieldTripTypeName"' id="fieldTripTypeName"> +<!-- Fixme : DocumentEvents + origin="$TripType/name" +<DocumentEvents onModified="Update($fieldTripTypeName/text)"/> +--> + </JTextField> + <JLabel constraints='"labelTripTypeDuration"' text="isisfish.tripType.duration"/> + +<!-- + tooltips="In hours" +--> + <JTextField constraints='"fieldTripTypeDuration"' id="fieldTripTypeDuration"> +<!-- Fixme : DocumentEvents + origin="$TripType/tripDuration/hour" + tooltips="In hours" +<DocumentEvents onModified="Update($fieldTripTypeDuration/text * 3600, $TripType/tripDuration)"/> +--> + </JTextField> + <JLabel constraints='"labelTripTypeMinTimeBetweenTrip"' text="isisfish.tripType.minTime"/> + <JTextField constraints='"fieldTripTypeMinTimeBetweenTrip"' id="fieldTripTypeMinTimeBetweenTrip"> +<!-- Fixme : DocumentEvents + + origin="$TripType/minTimeBetweenTrip/hour" +<DocumentEvents onModified="Update($fieldTripTypeMinTimeBetweenTrip/text * 3600, $TripType/minTimeBetweenTrip)"/> +--> + </JTextField> + <JLabel constraints='"labelTripTypeComment"' text="isisfish.tripType.comments"/> + <JScrollPane constraints='"fieldTripTypeComment"'> + <JTextArea id="fieldTripTypeComment"> +<!-- Fixme : DocumentEvents + origin="$TripType/comment" + <DocumentEvents onModified="Update($fieldTripTypeComment/text)"/> +--> + </JTextArea> + </JScrollPane> + <JPanel id="panelTripTypeButtonAction" constraints='"panelTripTypeButtonAction"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/ActionButton.xgl")}'> + <JButton constraints='"buttonCreate"' text="isisfish.common.new"/> +<!-- + origin="$FisheryRegion" + actionCommand='input.Input.create("TripType")' +--> + <JButton constraints='"buttonSave"' text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("TripType", $TripType);refreshView($inputTripType)' +--> + <JButton constraints='"buttonCancel"' text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("TripType", $TripType);refreshView($inputTripType)' +--> + <JButton constraints='"buttonRemove"' text="isisfish.common.remove"/> +<!-- + origin="$TripType" + actionCommand="input.Input.remove($TripType)" +--> + </JPanel> + </JPanel> + +<!-- + <xpanel xml="input/TripType.xml" id="inputTripType" name="TripType"/> +--> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueVesselTypes"/> +<!-- + actionCommand="UIHelper.setTreeSelection('VesselTypes')" +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,204 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<JPanel layout='{new BorderLayout()}'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.name"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeName"/> +<!-- Fixme : DocumentEvents +origin="$VesselType/name" +<DocumentEvents onModified="Update($fieldVesselTypeName/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.length"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeLength"/> +<!-- Fixme : DocumentEvents +origin="$VesselType/length" +<DocumentEvents onModified="Update($fieldVesselTypeLength/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.speed"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeSpeed"/> +<!-- Fixme : DocumentEvents + origin="$VesselType/speed" +<DocumentEvents onModified="Update($fieldVesselTypeSpeed/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.maxDuration"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeMaxTripDuration"/> +<!-- Fixeme : DocumentEvents +origin="$VesselType/maxTripDuration/hour" tooltips="in hour" +<DocumentEvents onModified="Update(3600 * $fieldVesselTypeMaxTripDuration/text, $VesselType/maxTripDuration)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.activityRange"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeActivityRange"/> + <!-- Fixme : DocumentEvents +origin="$VesselType/activityRange" +<DocumentEvents onModified="Update($fieldVesselTypeActivityRange/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.miniCrew"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeMinCrewSize"/> +<!-- Fixme : DocumentEvents +origin="$VesselType/minCrewSize" +<DocumentEvents onModified="Update($fieldVesselTypeMinCrewSize/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.fuelCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeUnitFuelCostOfTravel"/> +<!-- Fixme : DocumentEvents +origin="$VesselType/unitFuelCostOfTravel" +<DocumentEvents onModified="Update($fieldVesselTypeUnitFuelCostOfTravel/text)"/> +--> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.common.tripType"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.7'> + <JScrollPane> + <JList id="vesselTypeTripType"> +<!-- Fixme : ListModel + origin="getTripType($VesselType)" renderer="name" +<ListModel origin="$FisheryRegion/tripType"/> +<MouseEvents onClicked="Update($vesselTypeTripType/selectedValues, $VesselType/tripType)"/> +--> + </JList> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.comments"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.3'> + <JScrollPane> + <JTextArea id="fieldVesselTypeComment"> +<!-- Fixme : DocumentEvents + origin="$VesselType/comment + <DocumentEvents onModified="Update($fieldVesselTypeComment/text)"/> +--> + </JTextArea> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill='both' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.new"/> +<!-- + origin="$FisheryRegion" +actionCommand='input.Input.create("VesselType")' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" +actionCommand='input.Input.save("VesselType", $VesselType);refreshView($inputVesselType)' +--> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" +actionCommand='input.Input.cancel("VesselType", $VesselType);refreshView($inputVesselType)' +--> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> +<!-- + origin="$VesselType" +actionCommand="input.Input.remove($VesselType)" +--> + </cell> + </row> + </Table> + </cell> + </row> + </Table> +<!-- + <xpanel xml="input/VesselType.xml" id="inputVesselType" name="VesselType"/> +--> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueSetOfVessels"/> +<!-- + actionCommand="UIHelper.setTreeSelection('SetOfVessels')" +--> +</JPanel> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,181 @@ +<!-- +/* *##% + * 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="wizardGroup" visible="true" size='{new Dimension(400,200)}' title="isisfish.wizardGroupCreation.title" + layout='{new BorderLayout()}'> +<!-- + Resizable="true" Closable="true" + bundle="org.codelutin.i18n.I18nBundleBridge" +--> + + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + +<!-- Fixme : ContextDataSource, cardPanel + <ContextDataSource id="Population" context="current" source="Population"/> + <ContextDataSource id="wizardModel" context="current" source="wizardModel"/> + + <cardPanel id="wizardPanels" origin="$wizardModel" constraints="CENTER"> + + <panel constraints="singleGroupAge" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> + <label constraints="beginGroupAgeTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" + horizontalAlignment="CENTER"/> + <label constraints="labelFirstAge" text="isisfish.wizardGroupCreation.firstAge"/> + <textfield constraints="firstAge" id="firstAge" + origin="$wizardModel/first"> + <DocumentEvents onModified="update($firstAge/text)"/> + </textfield> + <label constraints="labelLastAge" text="isisfish.wizardGroupCreation.lastAge"/> + <textfield constraints="lastAge" id="lastAge" + origin="$wizardModel/last"> + <DocumentEvents onModified="update($lastAge/text)"/> + </textfield> + <multilabel constraints="beginGroupAgeHelp"> +First age = minimal age +Last age = maximal age + +gap between to group is 1 year. + </multilabel> + </panel> + + <panel constraints="beginGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> + <label constraints="beginGroupLengthTitle" text="isisfish.wizardGroupCreation.selectGroupLengthType" + horizontalAlignment="CENTER"/> + <radioButton constraints="beginGroupLengthTypeInput" + id="beginGroupLengthTypeInput" buttonGroup="groupLengthType" + text="isisfish.wizardGroupCreation.allValues" origin="$wizardModel/inputType"> + <ItemEvents onStateChanged="update($beginGroupLengthTypeInput/selected)"/> + </radioButton> + + <radioButton constraints="beginGroupLengthTypeSameSize" + id="beginGroupLengthTypeSameSize" buttonGroup="groupLengthType" + text="isisfish.wizardGroupCreation.allGroupsSameSize" origin="$wizardModel/sameSizeType"> + <ItemEvents onStateChanged="update($beginGroupLengthTypeSameSize/selected)"/> + </radioButton> + + <radioButton constraints="beginGroupLengthTypeGrowthCurve" + id="beginGroupLengthTypeGrowthCurve" buttonGroup="groupLengthType" + text="isisfish.wizardGroupCreation.computedGrowthCurve" origin="$wizardModel/growthCurveType"> + <ItemEvents onStateChanged="update($beginGroupLengthTypeGrowthCurve/selected)"/> + </radioButton> + </panel> + + <panel constraints="endInputGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> + <label constraints="inputGroupLengthTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" + horizontalAlignment="CENTER"/> + <label constraints="labelFirstInputLength" text="isisfish.wizardGroupCreation.firstLength"/> + <textfield constraints="firstInputLength" id="firstInputLength" + origin="$wizardModel/first"> + <DocumentEvents onModified="update($firstInputLength/text)"/> + </textfield> + <label constraints="labelMaximalGroupsLenght" text="isisfish.wizardGroupCreation.maxGroupsLength"/> + <textfield constraints="maximalGroupsLenght" id="maximalGroupsLenght" + origin="$wizardModel/maxLength"> + <DocumentEvents onModified="update($maximalGroupsLenght/text)"/> + </textfield> + <multilabel constraints="inputGroupAgeHelp" text="A semicolon ';' must separe maximal length of each group"/> + </panel> + + <panel constraints="endSameSizeGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> + <label constraints="sameSizeGroupLengthTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" + horizontalAlignment="CENTER"/> + <label constraints="labelFirstSizeLength" text="isisfish.wizardGroupCreation.firstLength"/> + <textfield constraints="firstSizeLength" id="firstSizeLength" + origin="$wizardModel/first"> + <DocumentEvents onModified="update($firstSizeLength/text)"/> + </textfield> + <label constraints="labelSameSizeNumberOfGroup" text="isisfish.wizardGroupCreation.numberGroup"/> + <textfield constraints="sameSizeNumberOfGroup" id="sameSizeNumberOfGroup" + origin="$wizardModel/numberOfGroup"> + <DocumentEvents onModified="update($sameSizeNumberOfGroup/text)"/> + </textfield> + <label constraints="labelWidth" text="isisfish.wizardGroupCreation.groupWidth"/> + <textfield constraints="width" id="width" + origin="$wizardModel/groupSize"> + <DocumentEvents onModified="update($width/text)"/> + </textfield> + <multilabel constraints="sameSizeGroupLengthHelp"> +First length = minimal length of first group +number of Group = number of group wanted +Group width = width of group + </multilabel> + </panel> + + <panel constraints="endGrowthCurveGroupLength" layout="XMLGridLayout(fr/ifremer/isisfish/ui/input/WizardGroupCreation.xgl)"> + <label constraints="growthCurveGroupLengthTitle" text="isisfish.wizardGroupCreation.populationCharacteristics" + horizontalAlignment="CENTER"/> + <label constraints="labelGrowthCurveFirstGroup" text="isisfish.wizardGroupCreation.firstGroup"/> + <textfield constraints="growthCurveFirstGroup" id="growthCurveFirstGroup" + origin="$wizardModel/first"> + <DocumentEvents onModified="update($growthCurveFirstGroup/text)"/> + </textfield> + <label constraints="labelNumberOfGroup" text="isisfish.wizardGroupCreation.numberGroups"/> + <textfield constraints="numberOfGroup" id="numberOfGroup" + origin="$wizardModel/numberOfGroup"> + <DocumentEvents onModified="update($numberOfGroup/text)"/> + </textfield> + <label constraints="labelStep" text="isisfish.wizardGroupCreation.timeStep"/> + <textfield constraints="step" id="step" + origin="$wizardModel/step"> + <DocumentEvents onModified="update($step/text)"/> + </textfield> + <multilabel constraints="growthCurveGroupLengthHelp" text="The equation used is the population's growth curve, it needs to be defined first."/> + </panel> + </cardPanel> +--> + <JPanel id="navButton" constraints='"SOUTH"'> + <JButton text="isisfish.common.prev"/> +<!-- + origin="not(isBegin($wizardPanels))" + actionCommand="prev +--> + + <JButton text="isisfish.common.next"/> +<!-- + origin="not(isEnd($wizardPanels))" + actionCommand="next" +--> + + <JButton text="isisfish.common.finish"/> +<!-- + origin="$wizardPanels/end" + actionCommand="input.InputPopulation.wizardGroupFinish($wizardPanels/model)" +--> + + <JButton text="isisfish.common.cancel"/> +<!-- + actionCommand="cancel" + --> + </JPanel> + +</JFrame> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,115 @@ +<!-- +/* *##% + * 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 $ + */ + --> + + <!-- + + Zone + +--> +<JPanel layout='{new BorderLayout()}'> + <JSplitPane id="ZoneTab" name="Zones" + oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> + <JPanel name="isisfish.zone.title"> + +<!-- + <ContextDataSource id="Zone" context="current" source="Zone"/> +--> + <JLabel text="isisfish.zone.name"/> + <JTextField id="fieldZoneName"> +<!-- Fixme : DocumentEvents + origin="$Zone/name" + <DocumentEvents onModified="Update($fieldZoneName/text)"/> +--> + </JTextField> + <JLabel text="isisfish.zone.cells"/> + <JScrollPane> + <JList id="zoneCells"> +<!-- Fixme : ListModel + origin="getCell($Zone)" iterate="true" renderer="name" + <ListModel origin="$FisheryRegion/cell"/> + <ListSelectionEvents onValueChanged="Update($zoneCells/selectedValues, $Zone/cell, refreshView($zoneMap))"/> +--> + </JList> + </JScrollPane> + <JLabel text="isisfish.zone.comments"/> + <JScrollPane> + <JTextArea id="fieldZoneComment"> +<!-- Fixme : DocumentEvents + origin="$Zone/comment" + <DocumentEvents onModified="Update($fieldZoneComment/text)"/> +--> + </JTextArea> + </JScrollPane> + <JPanel id="panelZoneButtonAction"> + <JButton text="isisfish.common.new"/> +<!-- + origin="$FisheryRegion" + actionCommand='input.Input.create("Zone")' +--> + <JButton text="isisfish.common.save"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.save("Zone", $Zone);refreshView($inputZone)' +--> + <JButton text="isisfish.common.cancel"/> +<!-- + origin="$EntityModified" + actionCommand='input.Input.cancel("Zone", $Zone);refreshView($inputZone)' +--> + <JButton text="isisfish.common.remove"/> +<!-- +origin="$Zone" + actionCommand="input.Input.remove($Zone)" +--> + </JPanel> + </JPanel> + +<!-- + <xpanel xml="input/Zone.xml" id="inputZone"/> +--> + <JPanel id="zoneMapPanel" layout='{new BorderLayout()}'> +<!-- Fixme : OpenMapToolPanel, OpenMap + <OpenMapToolPanel constraints='"BorderLayout.NORTH"' id="zoneMapTool"> + <OpenMapToolSet id="zoneMapToolSet" origin="$zoneMap"/> + </OpenMapToolPanel> + <OpenMap id="zoneMap" origin="$FisheryRegion" selected="$Zone/cell" + selectionMode="2"> + <OpenMapEvents id="zoneMapEvents" mouseMode="Select" + onMouseClicked="Update($zoneMap/selectedCells, $Zone/cell, refreshView($zoneCells))"/> + </OpenMap> +--> + </JPanel> + </JSplitPane> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continuePorts"/> +<!-- + actionCommand="UIHelper.setTreeSelection('Ports')" +--> +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/logging (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging) Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/result/ResultUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,94 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel layout='{new BorderLayout()}'> + <Table constraints='BorderLayout.NORTH'> + <row> + <cell fill="horizontal" weightx="0.2"> + <JLabel text='isisfish.result.choose.simulation' toolTipText='isisfish.result.label'/> + </cell> + <cell fill="horizontal"> + <JComboBox id='selSimulation' editable='true' toolTipText='isisfish.result.simulation'/> +<!-- + addItemListener(new ItemListener(){ + public void itemStateChanged(ItemEvent e){ + on_simulation_selection_notify_event(e); + } + } +--> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id='filterSimulationButton' text='isisfish.filter' toolTipText='isisfish.filter.simulation'/> +<!-- + result.addMouseListener(new MouseAdapter(){ + public void mouseClicked(MouseEvent e){ + on_filterSimulationLogButton_clicked(); + } + }); +--> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id='openWindowButton' text='isisfish.result.new.window' toolTipText='isisfish.result.openWindowButton'/> +<!-- + result.addMouseListener(new MouseAdapter(){ + public void mouseClicked(MouseEvent e){ + on_openWindowButton_clicked(); + } + }); +--> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id="supprimerSimulationButton" text='isisfish.result.remove.simulation' toolTipText='isisfish.result.removeSimulationButton'/> +<!-- + result.addMouseListener(new MouseAdapter(){ + public void mouseClicked(MouseEvent e){ + on_supprimerSimulationButton_clicked(); + } + }); +--> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id='voirSimulationLogButton' text='isisfish.result.show.simulation.log' toolTipText='isisfish.result.tooltip.show.simulation.log'/> +<!-- + result.addMouseListener(new MouseAdapter(){ + public void mouseClicked(MouseEvent e){ + on_voirSimulationLogButton_clicked(); + } + }); +--> + + </cell> + </row> + </Table> + <JDesktopPane constraints='BorderLayout.CENTER'/> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,67 @@ +<JDialog modal="true" resizable='false' title='isisfish.script.export'> + <script> + // FIXME a refaire + +// public org.codelutin.vcs.ui.FieldModelUtil.ModuleFile model; + public Object model = null; + public boolean isOkEnabled() { + return !isEmpty(); // && model.getSelected(0).size() > 0; + } + public boolean isEmpty() { + return model == null; // || model.getRowCount() == 0; + } + + public void doCheckAll() { +// if (model!=null) model.checkAll(); + doRefresh(); + } + + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"items.enabled", + "checkAll.enabled","ok.enabled","chooseDir.enabled", + "archivePath.enabled"); + } + + </script> + <Table anchor='center'> + <!--row fill='horizontal'> + <cell columns='2' weightx="1"> + <JLabel id='label' font-size='12' foreground='{new Color(051,102,225)}'/> + </cell> + </row--> + <row weighty="2"> + <cell columns='2' fill='both'> + <JScrollPane id='table'> + <JTable id="items" autoResizeMode='3' + enabled='{!isEmpty()}' onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell weightx="1" fill='both'> + <JTextField id='archivePath' font-size='11' columns='30' height='25' enabled='{!isEmpty()}'/> + </cell> + <cell fill='both'> + <JButton id='chooseDir' + text='isisfish.script.export.chooseDir' + toolTipText='isisfish.script.export.tooltip.chooseDir' + enabled='{!isEmpty()}' + onActionPerformed="fr.ifremer.isisfish.ui.UIHelper.openDirChooser(archivePath,ok)"/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.script.export.checkAll' + toolTipText='isisfish.script.export.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()" /> + <JButton id='ok' text='isisfish.script.export.ok' + enabled='{isOkEnabled()}'/> + <JButton id='cancel' text='isisfish.script.export.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,107 @@ +<JDialog modal="true" resizable='false' title='isisfish.script.import'> + <script> + // FIXME a refaire + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; + +// protected ModuleFile modelItems; +// protected ModuleFile modelNewItems; + protected Object modelItems; + protected Object modelNewItems; + + public boolean isOkEnabled() { + return true; +// (!isItemEmpty() && modelItems.getSelected(0).size() > 0) || +// (!isNewItemEmpty() && modelNewItems.getSelected(0).size() > 0); + } + + protected boolean isItemEmpty() { + return modelItems == null;// || modelItems.getRowCount() == 0; + } + + protected boolean isNewItemEmpty() { + return modelNewItems == null;// || modelNewItems.getRowCount() == 0; + } + + public boolean isEmpty() { + return isItemEmpty() && isNewItemEmpty(); + } + + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"table1.visible", + "table2.visible","label2.visible", "label3.visible", + "checkAll.enabled", "ok.enabled"); + } + + public void doCheckAll() { +// if (!isItemEmpty()) modelItems.checkAll(); +// if (!isNewItemEmpty()) modelNewItems.checkAll(); + doRefresh(); + } +</script> + <Table> + <row fill='horizontal'> + <cell columns='3' weightx="1"> + <JLabel id='label' font-size='12' + foreground='{new Color(051,102,225)}'/> + </cell> + </row> + <row weighty="1" fill='both'> + <cell columns='3' weighty="1" weightx="1" fill="both"> + <Table> + <row> + <cell weightx="1"> + <JLabel id='label2' font-size='12' visible='{!isNewItemEmpty()}' + text='isisfish.script.import.labelAdd' + foreground='{new Color(051,102,225)}'/> + </cell> + </row> + <row fill='both'> + <cell weighty="1"> + <!-- TODO SHould put the both table in this cell --> + <JScrollPane id='table1' visible='{!isNewItemEmpty()}'> + <JTable id="newItems" autoResizeMode='3' + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell weightx="1"> + <JLabel id='label3' font-size='12' visible='{!isItemEmpty()}' + text='isisfish.script.import.labelOverwrite' + foreground='{Color.RED}'/> + </cell> + </row> + <row fill='both' > + <cell weighty="1"> + <!-- TODO SHould put the both table in this cell --> + <JScrollPane id='table2' visible='{!isItemEmpty()}'> + <JTable id="items" autoResizeMode='3' + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row fill='horizontal'> + <cell weightx="1" columns="3" fill='both'> + <JTextField id='archivePath' font-size='12' columns='28' + editable='false' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="3" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' text='isisfish.script.import.checkAll' + toolTipText='isisfish.script.import.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()" /> + <JButton id='ok' text='isisfish.script.import.ok' + enabled='{isOkEnabled()}'/> + <JButton id='cancel' text='isisfish.script.import.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,216 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<JPanel id="script" layout='{new BorderLayout()}'> +<!-- +title="isisfish.script.title" +visible="true" size='{new Dimension(620,400)}' +--> + +<!-- Fixme : WindowsEvents +<WindowEvents id="events" onOpened="script.Action.opened()" /> +Maximizable="true" Closable="true" +bundle="org.codelutin.i18n.I18nBundleBridge" +--> + +<!-- Fixme : ContextDataSource + <ContextDataSource id="ScriptStorage" context="current" source="ScriptStorage"/> + <ContextDataSource id="ActionLog" context="current" source="ActionLog"/> + <ContextDataSource id="ScriptType" context="current" source="ScriptType"/> + <ContextDataSource id="canCommit" context="current" source="canCommit"/> + <ContextDataSource id="canUpdate" context="current" source="canUpdate"/> + <ContextDataSource id="canDiff" context="current" source="canDiff"/> + <ContextDataSource id="canDelete" context="current" source="canDelete"/> +--> + + <!-- + | Toolbar + +--> + <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> + <JComboBox id="ScriptTypeChoice"> +<!-- +origin="ScriptType" +renderer="org.codelutin.i18n.I18n._(.)" +--> + + <!-- no change name in combo box, or change for menu and in Action.newScript too --> +<!-- Fixme : comboboxmodel + <comboboxmodel origin="fr.ifremer.isisfish.ui.script.Action.getScriptTypesNames()"/> +--> + </JComboBox> + <JButton id="buttonScriptNew" text="isisfish.script.new"/> +<!-- +ToolTipText="Create a new script" +actionCommand="script.Action.newScript($tree, $treeModel, $ScriptTypeChoice/selectedItem)" +--> + <JButton id="buttonScriptSave" text="isisfish.script.save"/> +<!-- +ToolTipText="Save current script" +origin="util:isValid($ScriptStorage)" +actionCommand="script.Action.saveScript($ScriptStorage, $scriptJedit/text)" +--> + <JButton id="buttonScriptExport" text="isisfish.script.txtExport"/> +<!-- +ToolTipText="Export selected script(s) to zip archive" +origin="$tree/selectionPaths" +actionCommand="script.Action.exportScript($tree)" +--> + <JButton id="buttonScriptCommit" text="isisfish.script.commit"/> +<!-- +ToolTipText="Commit script to CVS server" +origin="$canCommit" +actionCommand="script.Action.commitScript($tree, $ScriptStorage, $scriptJedit/text)" +--> + <JButton id="buttonScriptUpdate" text="isisfish.script.update"/> +<!-- +ToolTipText="Update current script from server" +origin="$canUpdate" +actionCommand="script.Action.updateScript($tree,$ScriptStorage)" +--> + <JButton id="buttonScriptCut" text="isisfish.script.cut"/> +<!-- +ToolTipText="Cut current selection (Ctrl-x)" +origin="util:isValid($ScriptStorage)" +actionCommand="xpath:cut($scriptJedit)" +--> + <JButton id="buttonScriptCopy" text="isisfish.script.copy"/> +<!-- +ToolTipText="Copy current selection (Ctrl-c)" +origin="util:isValid($ScriptStorage)" +actionCommand="xpath:copy($scriptJedit)" +--> + <JButton id="buttonScriptPaste" text="isisfish.script.paste"/> +<!-- +ToolTipText="Paste current selection (Ctrl-v)" +origin="util:isValid($ScriptStorage)" +actionCommand="xpath:paste($scriptJedit)" +--> + <JButton id="buttonScriptCheck" text="isisfish.script.check"/> +<!-- +ToolTipText="Check syntax of the current script" +origin="util:isInstance('fr.ifremer.isisfish.datastore.JavaSourceStorage', $ScriptStorage)" +actionCommand="script.Action.checkScript($ScriptStorage, $scriptJedit/text)" +--> + <JButton id="buttonScriptEval" text="isisfish.script.evaluate"/> +<!-- +ToolTipText="Try to eval current script (must be have main method)" +origin="util:isInstance('fr.ifremer.isisfish.datastore.JavaSourceStorage', $ScriptStorage)" +actionCommand="script.Action.evaluateScript($ScriptStorage, $scriptJedit/text)" +--> + </JPanel> + + <!-- + | Content editor + +--> + <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> + +<!-- Fixme : pas compris : JSplitPane does not accept constraints +constraints='"contentPanel"' +--> + <!-- + | Tree script selection + +--> + <JScrollPane> +<!-- Fixme : non plus : JScrollPane does not accept constraints +constraints='"tree"' +--> + <JTree id="tree" name="tree" rootVisible="false"> +<!-- Fixme : NestedTreeModel, TreeRenderer and TreeSelectionEvents + <NestedTreeModel id="treeModel"> + <TreeNode name="Root"> + <TreeNode name="Script" userObject="'Script'"> + <TreeNode origin="fr.ifremer.isisfish.datastore.ScriptStorage.getScriptNames()"/> + </TreeNode> + <TreeNode name="Simulator" userObject="'Simulator'"> + <TreeNode origin="fr.ifremer.isisfish.datastore.SimulatorStorage.getSimulatorNames()"/> + </TreeNode> + <TreeNode name="Export" userObject="'Export'"> + <TreeNode origin="fr.ifremer.isisfish.datastore.ExportStorage.getExportNames()"/> + </TreeNode> + <TreeNode name="Rule" userObject="'Rule'"> + <TreeNode origin="fr.ifremer.isisfish.datastore.RuleStorage.getRuleNames()"/> + </TreeNode> + <TreeNode name="AnalysePlan" userObject="'AnalysePlan'"> + <TreeNode origin="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getAnalysePlanNames()"/> + </TreeNode> + <TreeNode name="EquationModel" userObject="'EquationModel'"> + <TreeNode origin="fr.ifremer.isisfish.datastore.FormuleStorage.getCategories()"> + <TreeNode treeOrigin=".." childsPropertyName="fr.ifremer.isisfish.datastore.FormuleStorage.getFormuleNames(.)"/> + </TreeNode> + </TreeNode> + </TreeNode> + </NestedTreeModel> + + <TreeRenderer> + <DefaultTreeRenderer type="fr.ifremer.isisfish.datastore.RegionStorage" childsPropertyName="name"/> + <DefaultTreeRenderer type="java.lang.String" childsPropertyName="org.codelutin.i18n.I18n._(.)"/> + </TreeRenderer> + + <TreeSelectionEvents id="treeSelectionListener" + onValueChanged="thread:script.Action.loadScript($tree, $tree/selectionPath/path[2]/userObject, $tree/selectionPath/lastPathComponent)"/> +--> + </JTree> + </JScrollPane> + <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="VERTICAL"> + + <!-- + | Editor script + +--> +<!-- Fixme : editor + <editor id="scriptJedit" constraints='"fieldScriptEdit"'/> + +origin="$ScriptStorage/file" +--> + <!-- + | Log area + +--> + <JScrollPane> + <JTextArea id="actionLogArea" editable="false"/> +<!-- Fixme : Pas compris non plus (constraints) +constraints='"actionLogArea"' +origin="$ActionLog" +--> + </JScrollPane> + </JSplitPane> + </JSplitPane> + + <!-- + | Status bar + +--> + + +<!-- +<xpanel constraints='"scriptStatusBar"' xml="StatusBar.xml"/> +<StatusBar2/> +--> +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,224 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<Table> + <script> + <![CDATA[ + fieldSimulationStatistique.setSelected(getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()); + fieldSimulationCache.setSelected(getContextValue(SimulAction.class).getSimulationParameter().getUseOptimization()); + fieldSimulAdvParamsSimulLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulErrorLevel()); + fieldSimulAdvParamsSimulLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulWarnLevel()); + fieldSimulAdvParamsSimulLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulInfoLevel()); + fieldSimulAdvParamsSimulLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulDebugLevel()); + fieldSimulAdvParamsScriptLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptErrorLevel()); + fieldSimulAdvParamsScriptLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptWarnLevel()); + fieldSimulAdvParamsScriptLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptInfoLevel()); + fieldSimulAdvParamsScriptLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptDebugLevel()); + fieldSimulAdvParamsLibLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()); + fieldSimulAdvParamsLibLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibWarnLevel()); + fieldSimulAdvParamsLibLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()); + fieldSimulAdvParamsLibLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibDebugLevel()); + + public AdvancedParamsUI (SimulAction action){ + setContextValue(action); + } + protected void addTagValue(){ + getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText()); + } + protected void removeTagValue(){ + // getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(getSelectedRow(),0)); + } + protected void saveTagValue(){ + // getContextValue(SimulAction.class).saveTagValue(); + } + protected void setSimulName(){ + getContextValue(SimulAction.class).getSimulationParameter().setSimulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); + } + ]]> + </script> + <row> + <cell fill="horizontal" weightx="0.16"> + <Table> + <row> + <cell> + <JLabel text="isisfish.advancedParams.simulatorUse"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell columns="5" fill="horizontal" weightx="0.84"> + <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulName()'/> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="0.2"> + <JPanel/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.3"> + <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JPanel/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.3"> + <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache"/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="0.2"> + <JLabel text="isisfish.advancedParams.simulLevelLogger"/> + </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> + <cell columns="2" fill="horizontal" weightx="0.2"> + <JLabel text="isisfish.advancedParams.scriptLevelLogger"/> + </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> + <cell columns="2" fill="horizontal" weightx="0.2"> + <JLabel text="isisfish.advancedParams.libLevelLogger"/> + </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> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JLabel text="isisfish.advancedParams.freeParameters" horizontalAlignment="0"/> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="0.25"> + <JLabel text="isisfish.common.tag"/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.25"> + <JTextField id="fieldTag"/> + </cell> + <cell fill="horizontal" weightx="0.25"> + <JLabel text="isisfish.common.value"/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.25"> + <JTextField id="fieldValue"/> + </cell> + </row> + <row> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.add" onActionPerformed = 'addTagValue()'/> + </cell> + </row> + <row> + <cell columns="6" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="tableTagValue"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.remove" onActionPerformed = 'removeTagValue()'/> + </cell> + </row> + <row> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.saveNextSimulation" onActionPerformed = 'saveTagValue()'/> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,78 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> +<script><![CDATA[ + public ExportUI (SimulAction action){ + setContextValue(action); + } + ]]> + </script> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JList id="listSimulExportChoose" selectionMode="2"> +<!-- Fixme : ListModel + <ListModel origin="$ExportNames"/> + <ListSelectionEvents onValueChanged="Update($listSimulExportChoose/selectedValues, $SimulationParameter/exportNames)"/> + <ListRenderer> + <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createExportClassDocsModel($ExportNames)'/> + </ListRenderer> +--> + </JList> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.export.directory"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JTextField id="fieldSimulExportFolder"/> + </cell> + <cell> + <JButton text="isisfish.common.ellipsis"/> +<!-- +actionCommand="update(org.codelutin.util.FileUtil.getDirectory(), $SimulationParameter/exportDirectory);refreshView($fieldSimulExportFolder)" +--> + </cell> + <cell> + <JButton text="isisfish.common.saveNextSimulation"/> + </cell> + </row> + +<!-- +actionCommand="simulator.SimulatorAction.saveExport($SimulationParameter/exportDirectory, $SimulationParameter/exportNames)" +--> +</Table> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,375 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<Table> + <script><![CDATA[ + import static org.codelutin.i18n.I18nf._; + import fr.ifremer.isisfish.ui.Common; + import fr.ifremer.isisfish.datastore.RuleStorage; + import fr.ifremer.isisfish.ui.WelcomeUI; + import fr.ifremer.isisfish.ui.WelcomePanelUI; + import fr.ifremer.isisfish.simulator.SimulationParameter; + import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; + import fr.ifremer.isisfish.entities.Strategy; + import fr.ifremer.isisfish.entities.Population; + public ParamsUI(SimulAction action){ + setContextValue(action); + } + protected void regionChange(){ + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setInfoText(_("isisfish.message.loading.region")); + getContextValue(SimulAction.class).regionChange(fieldSimulParamsRegion.getSelectedItem().toString()); + setListSimulParamsStrategiesItems(); + setListSimulParamsPopulationsItems(); + root.setInfoText(_("isisfish.message.region.loaded")); + } + + public void setSimulationParameter(SimulAction simulAction){ + getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter()); + } + protected void loadOldSimulation(){ + + WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); + root.setInfoText(_("isisfish.message.loading.old.simulation")); + + Exception eee = getContextValue(SimulAction.class).loadOldSimulation(fieldSimulParamsSelect.getSelectedItem().toString()); + if (eee != null){ + // new OutputView("Error.xml", "error", eee.getMessage()); + } + fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName()); + fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimulationParameter().getDescription()); + setListSimulParamsStrategiesItems(); + setListSimulParamsPopulationsItems(); + if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()){ + SimulUI simul = getParentContainer(SimulUI.class); + simul.enablePreSimul(); + } + if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()){ + SimulUI simul = getParentContainer(SimulUI.class); + simul.enableAnalysePlan(); + } + root.setInfoText(_("isisfish.message.old.simulation.loaded")); + } + protected void addRules(){ + getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSelect.getSelectedItem().toString()); + listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray()); + } + protected void removeRules(){ + getContextValue(SimulAction.class).removeRules(listSimulParamsMesuresList.getSelectedValue().toString()); + listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray()); + } + protected void clearRules(){ + getContextValue(SimulAction.class).getSimulationParameter().clearRules(); + listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray()); + } + protected void simul(){ + getContextValue(SimulAction.class).simul(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); + SimulUI simul = getParentContainer(SimulUI.class); + simul.selTab(6); + } + protected void enablePreSimul(){ + if (fieldUseSimulPreScripts.isSelected()){ + SimulUI simul = getParentContainer(SimulUI.class); + simul.enablePreSimul(); + } + } + protected void enableAnalysePlan(){ + if (fieldSimulUseAnalysePlan.isSelected()){ + SimulUI simul = getParentContainer(SimulUI.class); + simul.enableAnalysePlan(); + } + } + protected void setNbAnnees(){ + getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnnees.getText()); + } + protected void setListSimulParamsStrategiesItems(){ + DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel(); + java.util.List<Strategy> strategies = getContextValue(SimulAction.class).getStrategies(); + for (Strategy s : strategies){ + listSimulParamsStrategiesModel.addElement(s); + } + listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel); + } + protected void setListSimulParamsPopulationsItems(){ + DefaultListModel listSimulParamsPopulationsModel = new DefaultListModel(); + java.util.List<Population> populations = getContextValue(SimulAction.class).getPopulations(); + for (Population p : populations){ + listSimulParamsPopulationsModel.addElement(p); + } + listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel); + //listSimulParamsPopulations.setListData(getContextValue(SimulAction.class).getPopulations().toArray()); + } + ]]> + </script> + <row> + <cell fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell columns="4" fill="horizontal"> + <JLabel text="isisfish.params.loadOldSimulation"/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="1.0"> + <JComboBox id="fieldSimulParamsSelect" model='{new DefaultComboBoxModel(Common.getOldSimulationItem())}' onActionPerformed='loadOldSimulation()'/> + </cell> + <cell> + <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter"/> + </cell> + <cell> + <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter"/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0" weighty="1.0"> + <Table> + <row> + <cell columns="2" fill="horizontal" weightx="0.5"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.params.simulationName" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/> + </cell> + <cell fill="both" weightx="1.0"> + <JTextField id="fieldSimulParamsName"/> + </cell> + </row> + </Table> + </cell> + <cell columns="2" fill="horizontal" weightx="0.5"> + <Table> + <row> + <cell columns="2" fill="horizontal"> + <JLabel text="isisfish.common.region"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' onActionPerformed='regionChange()'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns="4" fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell> + <JLabel text="isisfish.params.description"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="0.3"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTextArea id="fieldSimulParamsDesc" text='{getContextValue(SimulAction.class).getSimulationParameter().getDescription()}'/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="0.5"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.params.numberYear" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/> + </cell> + <cell fill="both" weightx="1.0"> + <JTextField id="fieldSimulParamsNbAnnees" text='{getContextValue(SimulAction.class).getSimulationParameter().getNumberOfYear()}' onFocusLost='setNbAnnees()'/> + </cell> + </row> + </Table> + </cell> + <cell columns="2" fill="horizontal" weightx="0.5"> + <JPanel/> + </cell> + </row> + <row> + <cell fill="both" weightx="0.2" weighty="0.1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.strategies"/> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="listSimulParamsStrategies" selectionMode="2"/> +<!-- + model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getStrategies().toArray())}' + --> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="0.4" weighty="0.1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.populations"/> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="listSimulParamsPopulations" selectionMode="2"/> +<!-- + model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getPopulations().toArray())}' + --> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="0.4" weighty="0.1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.rules"/> + </cell> + </row> + <row> + <cell fill="horizontal"> +<!-- TODO : Render --> + <JComboBox id="fieldSimulParamsMesuresSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getRuleNames().toArray())}' + onActionPerformed='buttonSimulParamsMesuresRemove.setEnabled(true)'/> +<!-- + setToolTipRenderContext(); + private void setToolTipRenderContext(){ + ToolTipComboBoxRenderer2 render = new ToolTipComboBoxRenderer2(); + render.setModel(ToolTipListModelFactory.createRuleDescriptionsModel(RuleStorage.getRuleNames())); + setContextValue(render); + } + + renderer='{getContextValue(ToolTipComboBoxRenderer2.class)}' +<SimpleToolTipComboBoxRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createRuleDescriptionsModel($RuleNames)'/> +--> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="listSimulParamsMesuresList" selectionMode="0" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulationParameter().getRules().toArray())}' onValueChanged='buttonSimulParamsMesuresClear.setEnabled(true)'/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weighty="0.1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text=" " minimumSize='{new Dimension(2,15)}' preferredSize='{new Dimension(2,15)}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="buttonSimulParamsMesuresAdd" text="isisfish.common.add" onActionPerformed='addRules()'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="buttonSimulParamsMesuresRemove" text="isisfish.common.remove" enabled="false" onActionPerformed='removeRules()'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="buttonSimulParamsMesuresClear" text="isisfish.common.clear" enabled="false" onActionPerformed='clearRules()'/> + </cell> + </row> + <row> + <cell fill='both' weighty="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> + <JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <tab title='{_("isisfish.params.populationNumbers")}'> + <!--JMatrixPanel id="simulParamsNumbers" name="isisfish.params.populationNumbers"/--> + </tab> + <tab title='{_("isisfish.params.ruleParameters")}'> + <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"> + </JTable> + </tab> + </JTabbedPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" onItemStateChanged='enablePreSimul()'/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" onItemStateChanged='enableAnalysePlan()'/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.params.onlyExportSimulation" id="fieldSimulOnlyExport"/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell> + <JLabel id="lblLauncher" text="isisfish.params.lblLauncher"/> + </cell> + <cell fill="horizontal" weightx="0.5"> + <JComboBox id="comboSelLauncher" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulationLauncher().toArray())}'/> + </cell> + <cell fill="horizontal" weightx="0.5"> + <JButton id="buttonSimulParamsSimulate" text="isisfish.common.simulate" onActionPerformed='simul()'/> + </cell> + </row> + </Table> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,55 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel id="simulPreScripts" layout='{new BorderLayout()}'> +<script><![CDATA[ + public PreScriptsUI (SimulAction action){ + setContextValue(action); + } + ]]> + </script> + + <JScrollPane constraints='BorderLayout.CENTER'> + <JTextArea id="fieldSimulPreScript"> +<!-- Fixme : DocmumentEvents +origin="$SimulationParameter/preScript" + <DocumentEvents onModified="Update($fieldSimulPreScript/text, $SimulationParameter/preScript)"/> +--> + </JTextArea> + </JScrollPane> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter"/> +<!-- +actionCommand="simulator.SimulatorAction.selectTab($simulTabs, 'true', '0')" +--> + +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,130 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> +<script><![CDATA[ + import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; + import fr.ifremer.isisfish.simulator.launcher.SimulationService; + import javax.swing.JProgressBar; + import javax.swing.ListSelectionModel; + import javax.swing.table.TableCellRenderer; + import org.jdesktop.beansbinding.AutoBinding; + import org.jdesktop.beansbinding.BeanProperty; + import org.jdesktop.beansbinding.Binding; + import org.jdesktop.beansbinding.BindingGroup; + import org.jdesktop.beansbinding.Bindings; + import org.jdesktop.beansbinding.ELProperty; + + init(); + + protected void init(){ + SimulationService ss = SimulationService.getService(); + BindingGroup bindingGroup = new BindingGroup(); + + setContextValue(new SimulationServiceTableModel(ss, true), "done"); + setContextValue(new SimulationServiceTableModel(ss, false), "new"); + queueTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + queueTableDone.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + queueTable.setDefaultRenderer(JProgressBar.class, new JProgressBarTableCellRenderer()); + queueTableDone.setDefaultRenderer(JProgressBar.class, new JProgressBarTableCellRenderer()); + + Binding binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ_WRITE, SimulationService.getService(), ELProperty.create("${autoLaunch}"),autoLaunchButton, BeanProperty.create("selected")); + bindingGroup.addBinding(binding); + + binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ,queueTable, ELProperty.create("${selectedElement != null}"),stopSimuButton, BeanProperty.create("enabled")); + binding.setSourceNullValue(false); + binding.setSourceUnreadableValue(false); + bindingGroup.addBinding(binding); + + binding = Bindings.createAutoBinding(AutoBinding.UpdateStrategy.READ, queueTableDone, ELProperty.create("${selectedElement != null}"), showLogButton, BeanProperty.create("enabled")); + binding.setSourceNullValue(false); + binding.setSourceUnreadableValue(false); + bindingGroup.addBinding(binding); + + bindingGroup.bind(); + } + + public QueueUI (SimulAction action){ + setContextValue(action); + } + public class JProgressBarTableCellRenderer implements TableCellRenderer { + public Component getTableCellRendererComponent(JTable table, + Object value, boolean isSelected, boolean hasFocus, + int row, int column) { + return (JProgressBar) value; + } + }// JProgressBarTableCellRenderer + protected void stopSimulation(){ + if (queueTable.getSelectedRow() >= 0){ + getContextValue(SimulAction.class).stopSimulation(getContextValue(SimulationServiceTableModel.class, "new").getJob(queueTable.getSelectedRow())); + } + } + protected void viewLog(){ + if (queueTable.getSelectedRow() >= 0){ + getContextValue(SimulAction.class).viewLog(getContextValue(SimulationServiceTableModel.class, "new").getJob(queueTable.getSelectedRow())); + } + } + protected void clearDoneJobs(){ + getContextValue(SimulAction.class).clearDoneJobs(); + } + ]]> + </script> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="0.5"> + <JScrollPane> + <JTable id="queueTable" model='{getContextValue(SimulationServiceTableModel.class, "new")}'/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="0.5"> + <JScrollPane> + <JTable id="queueTableDone" model='{getContextValue(SimulationServiceTableModel.class, "done")}'/> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="0.3"> + <JToggleButton id="autoLaunchButton" text="isisfish.queue.simulationLaunch"/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JButton id="stopSimuButton" text="isisfish.queue.stopSimulation" onActionPerformed='stopSimulation()'/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JButton id="showLogButton" text="isisfish.queue.showLog" onActionPerformed='viewLog()'/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JButton id="clearDoneJobsButton" text="Clear done jobs" onActionPerformed='clearDoneJobs()'/> + </cell> + </row> +</Table> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,70 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'> +<script><![CDATA[ + public ResultChoiceUI (SimulAction action){ + setContextValue(action); + } + ]]> + </script> + +<!-- Fixme : ContextDataSource + <ContextDataSource id="ResultNames" context="current" source="ResultNames"/> +--> + <!-- + | + | Result enabled + | + +--> + + <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"> +<!-- Fixme : ListModel, ListSelectionEvents and listRender + origin="$SimulationParameter/resultEnabled" + <ListModel origin="$ResultNames"/> + <ListSelectionEvents onValueChanged="Update($listResultNames/selectedValues, $SimulationParameter/resultEnabled)"/> + <ListRenderer> + <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createResultFieldsModel($ResultNames)'/> + </ListRenderer> +--> + </JList> + </JScrollPane> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation"/> +<!-- + actionCommand="simulator.SimulatorAction.saveResultNames($listResultNames/selectedValues)" +--> +</JPanel> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,116 @@ +<!-- +/* *##% + * 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 $ + */ + --> + +<Table> +<script><![CDATA[ + public SensUI (SimulAction action){ + setContextValue(action); + } + ]]> + </script> + <row> + <cell columns="2" fill="horizontal" weightx="1.0"> + <JComboBox id="fieldSimulParamsAnalysePlansSelect"/> + </cell> + </row> + <row> + <cell fill="both" weightx="0.5"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="listSimulParamsAnalysePlansList" selectionMode="0"/> + </JScrollPane> + </cell> + <cell fill="both" weightx="0.5"> + <Table id="simulSens" name="isisfish.sens.title"> + <row> + <cell fill="both" weightx="1.0"> + <JButton id="buttonSimulParamsAnalysePlansAdd" text="isisfish.common.add"/> +<!-- +actionCommand="xpath:addAnalysePlan($SimulationParameter, getNewAnalysePlanInstance(fr.ifremer.isisfish.datastore.AnalysePlanStorage.getAnalysePlan($fieldSimulParamsAnalysePlansSelect/selectedItem)));refreshView($listSimulParamsAnalysePlansList)" +--> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0"> + <JButton id="buttonSimulParamsAnalysePlansRemove" text="isisfish.common.remove"/> +<!-- + actionCommand="xpath:removeAnalysePlan($SimulationParameter, $listSimulParamsAnalysePlansList/selectedValue);refreshView($listSimulParamsAnalysePlansList)" +--> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0"> + <JButton id="buttonSimulParamsAnalysePlansClear" text="isisfish.common.clear"/> +<!-- +actionCommand="xpath:clearPlans($SimulationParameter);refreshView($listSimulParamsAnalysePlansList,$simulParamsAnalysePlans)" +--> + <!--TODO Doest not work! when calling use an AbstractCollection with no clear implementation text="Clear" actionCommand="xpath:clear($SimulationParameter/analysePlans);refreshView($listSimulParamsAnalysePlansList)"/>--> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="simulParamsAnalysePlans" name="isisfish.sens.planParameters"> +<!-- Fixme : JTableModel + <tableModel origin="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterNames($listSimulParamsAnalysePlansList/selectedValue)"> + <column title="Name" property="/" renderer="key"> + <tableColumnRenderer> + <SimpleToolTipTableColumnRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanParamsModel($listSimulParamsAnalysePlansList/selectedValue)'/> + </tableColumnRenderer> + </column> + <column title="Value" editable="true" + property="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterValue($listSimulParamsAnalysePlansList/selectedValue, /key)" + actionEdit="fr.ifremer.isisfish.datastore.AnalysePlanStorage.setParameterValue($listSimulParamsAnalysePlansList/selectedValue, $e/object/key, $e/value)"> + <tableColumnEditor><ParameterColumnEditor origin="$RegionStorage"/></tableColumnEditor> + <tableColumnRenderer> + <SimpleToolTipTableColumnRenderer origin=''/> + </tableColumnRenderer> + </column> + </tableModel> +--> + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.sens.backParameter"/> + </cell> + </row> +<!-- +actionCommand="simulator.SimulatorAction.selectTab($simulTabs, 'true', '0')" +--> +</Table> + Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,64 @@ +<JPanel name="isisfish.sensWizardPanels.title" id="sensWizardPanels" visible="true" + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + <JTabbedPane id="wizardTabPane" constraints='"wizardTabPane"'> + <tab title="isisfish.sensWizardPanels.type"> + <JPanel name="isisfish.sensWizardPanels.type" layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <JLabel constraints='"typeSensWizardLabel"' text="isisfish.sensWizardPanels.selectType"/> + <JRadioButton constraints='"buttonSimulSensWizardValuesList"' text="isisfish.sensWizardPanels.values" selected="true" buttonGroup="sensWizardPanelsGroup"/> + <JRadioButton constraints='"buttonSimulSensWizardScriptsList"' text="isisfish.sensWizardPanels.scripts" buttonGroup="sensWizardPanelsGroup"/> + </JPanel> + </tab> + <tab title="isisfish.sensWizardPanels.values"> + <JPanel name="isisfish.sensWizardPanels.values" layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <JPanel constraints='"valuesSensWizardLabelPanel"'> + <JLabel constraints='"valuesSensWizardObjectLabel"' text="isisfish.sensWizardPanels.object"/> + <JTextField constraints='"valuesSensWizardObjectField"' editable="false"/> +<!-- +origin="" +--> + <JLabel constraints='"valuesSensWizardFieldLabel"' text="isisfish.sensWizardPanels.field"/> + <JTextField constraints='"valuesSensWizardFieldField"' editable="false"/> +<!-- +origin="" +--> + <JLabel constraints='"valuesSensWizardTypeLabel"' text="isisfish.sensWizardPanels.type"/> + <JTextField constraints='"valuesSensWizardTypeField"' editable="false"/> +<!-- +origin="" +--> + </JPanel> + <JPanel constraints='"valuesSensWizardNewValuePanel"'> +<!-- +text="New Value" +--> + <JTextArea text="isisfish.common.blabla"/> <!-- TODO Peut dependre du type de l'obet --> +<!-- +origin="" +--> + </JPanel> + <JButton constraints='"buttonValuesSensWizardAdd"' id="buttonValuesSensWizardAdd" text="isisfish.sensWizardPanels.add" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardModify"' id="buttonValuesSensWizardModify" text="isisfish.sensWizardPanels.modify" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardRemove"' id="buttonValuesSensWizardRemove" text="isisfish.sensWizardPanels.remove" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardUp"' id="buttonValuesSensWizardUp" text="isisfish.sensWizardPanels.up" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardDown"' id="buttonValuesSensWizardDown" text="isisfish.sensWizardPanels.down" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardClear"' id="buttonValuesSensWizardClear" text="isisfish.sensWizardPanels.clear" actionCommand=""/> + <JScrollPane constraints='"fieldSensWizardList"'> + <JList id="listSensWizardList"> +<!-- Fixme : ListModel +origin="" SelectionMode="1" iterate="false" + <ListModel origin=""/> +--> + </JList> + </JScrollPane> + </JPanel> + </tab> + <tab title="isisfish.sensWizardPanels.validate"> + <JPanel name="isisfish.sensWizardPanels.validate" layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <JLabel constraints='"typeSensWizardLabel"' text="isisfish.sensWizardPanels.finish"/> + </JPanel> + </tab> + </JTabbedPane> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,66 @@ +<!-- +/* *##% + * 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="sensWizard" visible="true" size='{new Dimension(400,400)}' title="isisfish.sensibilityWizard.title" + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> +<!-- +bundle="org.codelutin.i18n.I18nBundleBridge" +--> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + <JPanel constraints='"sensWizardPanel"' layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> + <!--JPanel constraints='"sensWizardPanelContent"'--> +<!-- Fixme : WizardPanel + <WizardPanel id="wizpnl" constraints="sensWizardPanelContentPanel" xml="simulator/SensWizardPanels.xml" onChange="simulator.SensWizard.newTab($wizardPrev, $wizardNext, $wizardFinish, $wizardTabPane)"/> +--> + <!--/panel--> + <JPanel constraints='"sensWizardPanelButtons"'> + <JButton id="wizardPrev" text="isisfish.common.previous" enabled="false"/> +<!-- +actionCommand="prev" +--> + <JButton id="wizardNext" text="isisfish.common.next"/> +<!-- +actionCommand="next" +--> + <JButton id="wizardFinish" text="isisfish.common.finish" enabled="false"/> +<!-- +actionCommand="finishSensWizard" +--> + <JButton text="isisfish.common.cancel"/> +<!-- +actionCommand="cancel" +--> + </JPanel> + </JPanel> +</JFrame> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,40 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel visible="true" size='{new Dimension(400,400)}' layout='{new BorderLayout()}'> + +<!-- +bundle="org.codelutin.i18n.I18nBundleBridge" +<xpanel xml="simulator/Queue.xml"/> +--> + +</JPanel> Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,100 @@ +<!-- +/* *##% + * 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 $ + */ + --> +<JPanel size='{new Dimension(800,600)}' id="simul" layout='{new BorderLayout()}'> + <script><![CDATA[ + public SimulUI(SimulAction action){ + setContextValue(action); + } + protected void enablePreSimul(){ + simulTabs.setEnabledAt(1,true); + selTab(1); + } + protected void enableAnalysePlan(){ + simulTabs.setEnabledAt(2,true); + selTab(2); + } + protected void selTab(int i){ + simulTabs.setSelectedIndex(i); + } + ]]> + </script> +<!-- +title="isisfish.simulation.title" +visible="true" size='{new Dimension(700,500)}' location='{new Point(0,139)}' +--> + <!--onOpened="simulator.SimulatorAction.opened($simulTabs)"--> +<!-- + <WindowEvents id="events" + onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulQueueStart,$buttonSimulQueueRemove,$buttonSimulQueueShowLog,$queueTable,$queueTableDone,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)" + onClosing="UIHelper.closeContext()" /> + + <ContextDataSource id="OldSimulationName" context="current" source="OldSimulationName"/> + <ContextDataSource id="SimulationFilterModel" context="current" source="SimulationFilterModel"/> + <ContextDataSource id="SimulationParameter" context="current" source="SimulationParameter"/> + <ContextDataSource id="RegionStorage" context="current" source="RegionStorage"/> +--> +<!-- + <JMenuBar> + <JMenu text="isisfish.simulation.menu.file"> + <JMenuItem name="miClose" text="isisfish.simulation.menu.close" accelerator="accClose"/> + </JMenu> + + <JMenu text="txtSimulation" mnemonic="mnSimulation"> + <JMenuItem name="miSimulate" text="txtSimulate" icon="imgSimulate" + mnemonic="mnSimulate" ActionCommand="simulate" accelerator="accSimulate"/> + <JMenuItem name="miQueue" text="txtQueue" icon="imgQueue" + mnemonic="mnQueue" ActionCommand="queue" accelerator="accQueue"/> + </JMenu> + + <JMenu text="isisfish.simulation.menu.help"> + <JMenuItem name="miAbout" text="isisfish.simulation.menu.about" accelerator="accAbout"/> + </JMenu> + </JMenuBar> +--> + + <JTabbedPane id="simulTabs" constraints='BorderLayout.CENTER'> + <tab id="paramsUITab" title='isisfish.params.title'><ParamsUI id="paramUI" constructorParams='getContextValue(SimulAction.class)'/></tab> + <tab id="preScriptUITab" title='isisfish.preScript.title' enabled='false'><PreScriptsUI id="preScipt" constructorParams='getContextValue(SimulAction.class)'/></tab> + <tab id="sensUITab" title='isisfish.sens.title' enabled='false'><SensUI id="sensUI" constructorParams='getContextValue(SimulAction.class)'/></tab> + <tab id="exportUITab" title='isisfish.export.title'><ExportUI id="exportUI" constructorParams='getContextValue(SimulAction.class)'/></tab> + <tab id="resultChoiceUITab" title='isisfish.resultChoice.title'><ResultChoiceUI id="resultChoiceUI" constructorParams='getContextValue(SimulAction.class)'/></tab> + <tab id="advancedParamsUITab" title='isisfish.advancedParameters.title'><AdvancedParamsUI id="advencedParamsUI" constructorParams='getContextValue(SimulAction.class)'/></tab> + <tab id="queueUITab" title='isisfish.queue.title'><QueueUI id="queueUI" constructorParams='getContextValue(SimulAction.class)'/></tab> + </JTabbedPane> + + +<!-- + <StatutBar2 constraints='"statusBar"'/> + <JLabel icon="images/fish.jpg" constraints='"fishIcon"'/> +--> +</JPanel> \ No newline at end of file Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,3 @@ +<fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI modal="true"> + <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> +</fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI> Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,138 @@ +<fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI> + <script> + import fr.ifremer.isisfish.simulator.SimulationMeta; + + protected static java.text.SimpleDateFormat simpleDateFormat = + new java.text.SimpleDateFormat("dd/MM/yyyy"); + + public SimulationFilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { + super(dialog); + } + /** + * push param's ui value to model + * + * @throws Exception + */ + public synchronized void uiToModel() { + extractTextFieldParam(SimulationMeta.simulationName.name()); + extractTextFieldParam(SimulationMeta.simulatorName.name()); + extractTextFieldParam(SimulationMeta.regionName.name()); + extractTextFieldParam(SimulationMeta.description.name()); + + extractTextFieldParam(SimulationMeta.numberOfYear.name()); + extractTextFieldParam(SimulationMeta.analysePlanNumber.name()); + + extractCheckBoxParam(SimulationMeta.useAnalysePlan.name()); + extractCheckBoxParam(SimulationMeta.useOptimization.name()); + extractCheckBoxParam(SimulationMeta.usePreScript.name()); + extractCheckBoxParam(SimulationMeta.useStatistic.name()); + extractCheckBoxParam(SimulationMeta.local.name()); + + extractDateInterval(SimulationMeta.simulationInterval.name(), + SimulationMeta.simulationStart.name(), + SimulationMeta.simulationEnd.name()); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{simulationName}' + text='isisfish.filter.simulation.simulationName' + toolTipText='isisfish.filter.simulation.tooltip.simulationName'/> + </cell> + <cell> + <JTextField id="simulationName" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{simulatorName}' + text='isisfish.filter.simulation.simulatorName' + toolTipText='isisfish.filter.simulation.tooltip.simulatorName'/> + </cell> + <cell> + <JTextField id="simulatorName" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{regionName}' + text='isisfish.filter.simulation.regionName' + toolTipText='isisfish.filter.simulation.tooltip.regionName'/> + </cell> + <cell> + <JTextField id="regionName" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{description}' + text='isisfish.filter.simulation.description' + toolTipText='isisfish.filter.simulation.tooltip.description'/> + </cell> + <cell> + <JTextField id="description" onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2" anchor='west'> + <HBox> + <JLabel labelFor='{simulationStart}' + text='isisfish.filter.simulation.simulationStart' + toolTipText='isisfish.filter.simulation.tooltip.simulationStart'/> + <org.codelutin.widget.DatePicker + id="simulationStart" constructorParams="simpleDateFormat" + columns='7' onFocusLost="doCheck()"/> + <JLabel labelFor='{simulationEnd}' + text='isisfish.filter.simulation.simulationEnd' + toolTipText='isisfish.filter.simulation.tooltip.simulationEnd'/> + <org.codelutin.widget.DatePicker + id="simulationEnd" constructorParams="simpleDateFormat" + columns='7' onFocusLost="doCheck()"/> + </HBox> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2" anchor='west'> + <HBox> + <JLabel labelFor='{numberOfYear}' + text='isisfish.filter.simulation.numberOfYear' + toolTipText='isisfish.filter.simulation.tooltip.numberOfYear'/> + <JTextField id="numberOfYear" columns='5' + onKeyReleased="doCheck()" /> + <JLabel labelFor='{analysePlanNumber}' + text='isisfish.filter.simulation.analysePlanNumber' + toolTipText='isisfish.filter.simulation.tooltip.analysePlanNumber'/> + <JTextField id="analysePlanNumber" columns='5' + onKeyReleased="doCheck()" /> + </HBox> + </cell> + </row> + <row> + <cell columns="2" anchor='west' weightx="1" fill='horizontal'> + <HBox> + <JCheckBox id="useAnalysePlan" + text='isisfish.filter.simulation.useAnalysePlan' + toolTipText='isisfish.filter.simulation.tooltip.useAnalysePlan' + onActionPerformed="doCheck()" /> + <JCheckBox id="useOptimization" + text='isisfish.filter.simulation.useOptimization' + toolTipText='isisfish.filter.simulation.tooltip.useOptimization' + onActionPerformed="doCheck()" /> + <JCheckBox id="usePreScript" + text='isisfish.filter.simulation.usePreScript' + toolTipText='isisfish.filter.simulation.tooltip.usePreScript' + onActionPerformed="doCheck()" /> + <JCheckBox id="useStatistic" + text='isisfish.filter.simulation.useStatistic' + toolTipText='isisfish.filter.simulation.tooltip.useStatistic' + onActionPerformed="doCheck()" /> + <JCheckBox id="local" + text='isisfish.filter.simulation.local' + toolTipText='isisfish.filter.simulation.tooltip.local' + onActionPerformed="doCheck()" /> + </HBox> + </cell> + </row> + </Table> +</fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI> Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/versionning (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2008-10-13 18:38:55 UTC (rev 1559) @@ -35,7 +35,7 @@ import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.ui.input.EquationEditorPane; +import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; import javax.swing.JButton; import javax.swing.JTable; @@ -58,7 +58,7 @@ HashSet<CellEditorListener> listeners = new HashSet<CellEditorListener>(); - EquationEditorPane frame = null; + EquationEditorPaneUI frame = null; Equation equation = null; public EquationTableEditor(){ @@ -69,9 +69,9 @@ }); } - protected fr.ifremer.isisfish.ui.input.EquationEditorPane getFrame(){ + protected EquationEditorPaneUI getFrame(){ if(frame == null){ - frame = new fr.ifremer.isisfish.ui.input.EquationEditorPane(); + frame = new EquationEditorPaneUI(); frame.getOkButton().addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { stopCellEditing(); Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,191 @@ +<JDialog> + <script> + import jaxx.runtime.JAXXObject; + import javax.swing.text.html.HTMLEditorKit; + import javax.swing.text.html.HTMLDocument; + import javax.swing.event.HyperlinkListener; + import javax.swing.text.html.HTMLFrameHyperlinkEvent; + import javax.swing.event.HyperlinkEvent; + import java.io.PrintWriter; + import java.io.StringWriter; + + import org.codelutin.widget.DatePicker; + import org.codelutin.widget.InvalidDateException; + + /** filter model */ + protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; + + /** use to display filtered result in a comboBox */ + protected DefaultComboBoxModel modelResult; + + public fr.ifremer.isisfish.ui.widget.filter.FilterParamModel getParamModel(String paramKey) { + return model.getParamModel(paramKey); + } + @SuppressWarnings({"unchecked"}) + public java.util.List getOriginal() { + return model.getOriginal(); + } + /** @return list of last filter list obtain */ + @SuppressWarnings({"unchecked"}) + protected java.util.List getFilterResult() { + // obtain list filtered + return model.getFiltered(); + } + @SuppressWarnings({"unchecked"}) + public java.util.List obtainFilterResult() { + // compact dialog + setSize(getMinimumSize()); + repaint(); + doReset(); + // launch ui and waits for reply + setVisible(true); + return model.getFilteredResult(); + } + public String obtainSelectResult() { + // compact dialog + setSize(getMinimumSize()); + repaint(); + doReset(); + // launch ui and waits for reply + setVisible(true); + return (String) comboResult.getSelectedItem(); + } + /** + * user ui action : reset previous filter results (if any) and restore + * original dialogModel + * + * @see FilterModel#reset() + */ + @SuppressWarnings({"unchecked"}) + public void doReset() { + content.doReset(); + model.reset(); + model.selectAll(); + refreshResult(); + } + /** + * user ui action : check nb matchs found with current params (launch a + * filter process) + */ + public void doCheck() { + // launch new filter process (previous result is lost) + doFilter(); + // refresh ui nbMatchsFound + refreshResult(); + } + /** + * launch filter process with params grabbed in ui + * + * @see FilterModel#doFilter() + */ + public void doFilter() { + // rest model before all + model.reset(); + // synchronize ui values to model + content.uiToModel(); + // delegate to FilterModel the filter process + model.doFilter(); + } + public void doCancel() { + // reset ui + content.doReset(); + // reset model + model.reset(); + //refreshResult(); + dispose(); + } + protected boolean canReset() { + return !(model == null || model.getNbResult() == model.getNbOriginal()); + } + protected HyperlinkListener createHyperLinkListener() { + return new HyperlinkListener() { + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + if (e instanceof HTMLFrameHyperlinkEvent) { + ((HTMLDocument)doc.getDocument()).processHTMLFrameHyperlinkEvent( + (HTMLFrameHyperlinkEvent)e); + } else { + try { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + Desktop.getDesktop().browse(e.getURL().toURI()); + } else { + doc.setPage(e.getURL()); + } + } catch (Exception eee) { + System.out.println("Error for : " + e.getURL()); + eee.printStackTrace(); + } + } + } + } + }; + } + protected void refreshResult() { + if (model == null) return; + labelResult.setText(_("isisfish.filter.result2", model.getNbResult(), model.getNbOriginal())); + + if (getComboResult() != null) { + if (modelResult == null) { + modelResult = new DefaultComboBoxModel(); + getComboResult().setModel(modelResult); + } else { + modelResult.removeAllElements(); + for (Object o : model.getFilteredResult()) { + modelResult.addElement(o); + } + } + } + processDataBinding("comboResult.enabled"); + processDataBinding("ok.enabled"); + } + + setModalityType(Dialog.ModalityType.APPLICATION_MODAL); + doc.setEditable(false); + doc.setEditorKit(new HTMLEditorKit()); + doc.addHyperlinkListener(createHyperLinkListener()); + + </script> + <Table> + <row fill='horizontal'> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane height="200"> + <JEditorPane id="doc" /> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell columns='4' fill='both' weightx="1"> + <fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI id='content'/> + </cell> + </row> + <row> + <cell columns="2" weightx='1' fill='horizontal'> + <JSeparator orientation='horizontal'/> + </cell> + </row> + <row> + <cell anchor="west"> + <JLabel id='labelResult' labelFor='{comboResult}' + text='isisfish.filter.result'/> + </cell> + <cell weightx="1" anchor="east" fill='horizontal'> + <JComboBox id='comboResult' enabled='{comboResult.getModel().getSize()!=0}'/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal"> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JButton id='ok' text='isisfish.filter.apply' + onActionPerformed='dispose()' + enabled='{comboResult.getModel().getSize()!=0}'/> + <JButton id='reset' text='isisfish.filter.reset' + onActionPerformed='doReset()' + enabled='{canReset()}' /> + <JButton id='cancel' text='isisfish.filter.cancel' + onActionPerformed='doCancel()' /> + </JPanel> + </cell> + </row> + + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx (from rev 1555, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -0,0 +1,63 @@ +<JPanel> + <script> + import org.codelutin.widget.DatePicker; + import org.codelutin.widget.InvalidDateException; + + protected fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog; + + protected static java.text.SimpleDateFormat simpleDateFormat = + new java.text.SimpleDateFormat("dd/MM/yyyy"); + + protected FilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { + this.dialog = dialog; + } + + /** + * push param's ui value to model + * + * @throws Exception + */ + public void uiToModel() { + // implements me... + } + public void doCheck() { + if (dialog!=null) dialog.doCheck(); + } + @SuppressWarnings({"unchecked"}) + public void doReset() { + fr.ifremer.isisfish.ui.util.JaxxUtil.doReset(get$objectMap()); + } + + protected void extractTextFieldParam(String paramKey) { + JTextField field = (JTextField) getObjectById(paramKey); + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + if (paramModel.canUse(field.getText())) + paramModel.extractParam(field.getText()); + } + protected void extractCheckBoxParam(String paramKey) { + JCheckBox field = (JCheckBox) getObjectById(paramKey); + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(paramKey); + if (field.isSelected()) + paramModel.extractParam("true"); + } + protected void extractDateInterval(String name, String paramKey, String paramKey2) { + DatePicker field = (DatePicker) getObjectById(paramKey); + DatePicker field2 = (DatePicker) getObjectById(paramKey2); + fr.ifremer.isisfish.ui.widget.filter.FilterParamModel paramModel = dialog.getParamModel(name); + if (paramModel.canUse(field.getText(), field2.getText())) { + java.util.Date d0,d1; + try { + d0 = field.getDate(); + } catch (InvalidDateException e) { + d0=null; + } + try { + d1 = field2.getDate(); + } catch (InvalidDateException e) { + d1=null; + } + paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); + } + } + </script> +</JPanel> Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ApplicationMonitorUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,49 +0,0 @@ -<!-- -/* *##% - * 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 visible="true" size='{new Dimension(400,400)}' title="isisfish.monitor.title" - layout='{new BorderLayout()}'> -<!-- Fixme : ApplicationMonitor - maximizable="true" closable="true" - bundle="org.codelutin.i18n.I18nBundleBridge" - - ---> - <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> - Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ExitUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ExitUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/ExitUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,53 +0,0 @@ -<!-- -/* *##% - * 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="exitComment" name="isisfish.exit.title" visible="true" size='{new Dimension(400,100)}' title="isisfish.exit.title" - layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/Exit.xgl")}'> -<!-- - Resizable="true" - bundle="org.codelutin.i18n.I18nBundleBridge" ---> - <script> - import org.codelutin.widget.XMLGridLayout; - </script> - - <JLabel constraints='"labelExitComment"' text="isisfish.exit.text"/> - - <JTextArea constraints='"fieldExitComment"' id="fieldExitComment" /> - - <JButton constraints='"buttonExitOK"' id="buttonExitOK" text="isisfish.common.ok"/> - -<!-- -actionCommand="Saisie.saveCommentAndExit($fieldExitComment/text)" ---> - -</JFrame> \ No newline at end of file Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,60 +0,0 @@ -<!-- -/* *##% - * 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 $ - */ - --> -<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> -</Table> -<!-- Fixme : ActionMonitor - <ActionMonitor postThreadCommand="xpath:setVisible($stopCommand, 'false')" - progressStartTime="5" messageTime="7" - messageDisplayer="$labelStatus" progressDisplayer="$progressStatus"/> - --> - - - -<!-- - <org.codelutin.widget.MemoryStatus/> ---> \ No newline at end of file Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,118 +0,0 @@ -<!-- -/* *##% - * 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(), _("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> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,224 +0,0 @@ -<!-- -/* *##% - * 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 $ - */ - --> -<Table> - <script> - <![CDATA[ - fieldSimulationStatistique.setSelected(getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic()); - fieldSimulationCache.setSelected(getContextValue(SimulAction.class).getSimulationParameter().getUseOptimization()); - fieldSimulAdvParamsSimulLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulErrorLevel()); - fieldSimulAdvParamsSimulLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulWarnLevel()); - fieldSimulAdvParamsSimulLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulInfoLevel()); - fieldSimulAdvParamsSimulLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulDebugLevel()); - fieldSimulAdvParamsScriptLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptErrorLevel()); - fieldSimulAdvParamsScriptLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptWarnLevel()); - fieldSimulAdvParamsScriptLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptInfoLevel()); - fieldSimulAdvParamsScriptLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptDebugLevel()); - fieldSimulAdvParamsLibLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()); - fieldSimulAdvParamsLibLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibWarnLevel()); - fieldSimulAdvParamsLibLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel()); - fieldSimulAdvParamsLibLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibDebugLevel()); - - public AdvancedParamsUI (SimulAction action){ - setContextValue(action); - } - protected void addTagValue(){ - getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText()); - } - protected void removeTagValue(){ - // getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(getSelectedRow(),0)); - } - protected void saveTagValue(){ - // getContextValue(SimulAction.class).saveTagValue(); - } - protected void setSimulName(){ - getContextValue(SimulAction.class).getSimulationParameter().setSimulatorName(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString()); - } - ]]> - </script> - <row> - <cell fill="horizontal" weightx="0.16"> - <Table> - <row> - <cell> - <JLabel text="isisfish.advancedParams.simulatorUse"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JPanel/> - </cell> - </row> - </Table> - </cell> - <cell columns="5" fill="horizontal" weightx="0.84"> - <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulName()'/> - </cell> - </row> - <row> - <cell fill="horizontal" weightx="0.2"> - <JPanel/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> - <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique"/> - </cell> - <cell fill="horizontal" weightx="0.2"> - <JPanel/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.3"> - <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache"/> - </cell> - </row> - <row> - <cell columns="2" fill="horizontal" weightx="0.2"> - <JLabel text="isisfish.advancedParams.simulLevelLogger"/> - </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> - <cell columns="2" fill="horizontal" weightx="0.2"> - <JLabel text="isisfish.advancedParams.scriptLevelLogger"/> - </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> - <cell columns="2" fill="horizontal" weightx="0.2"> - <JLabel text="isisfish.advancedParams.libLevelLogger"/> - </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> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JLabel text="isisfish.advancedParams.freeParameters" horizontalAlignment="0"/> - </cell> - </row> - <row> - <cell fill="horizontal" weightx="0.25"> - <JLabel text="isisfish.common.tag"/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldTag"/> - </cell> - <cell fill="horizontal" weightx="0.25"> - <JLabel text="isisfish.common.value"/> - </cell> - <cell columns="2" fill="horizontal" weightx="0.25"> - <JTextField id="fieldValue"/> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.add" onActionPerformed = 'addTagValue()'/> - </cell> - </row> - <row> - <cell columns="6" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="tableTagValue"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.remove" onActionPerformed = 'removeTagValue()'/> - </cell> - </row> - <row> - <cell columns="6" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.common.saveNextSimulation" onActionPerformed = 'saveTagValue()'/> - </cell> - </row> -</Table> \ No newline at end of file Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,375 +0,0 @@ -<!-- -/* *##% - * 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 $ - */ - --> -<Table> - <script><![CDATA[ - import static org.codelutin.i18n.I18nf._; - import fr.ifremer.isisfish.ui.Common; - import fr.ifremer.isisfish.datastore.RuleStorage; - import fr.ifremer.isisfish.ui.WelcomeUI; - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.simulator.SimulationParameter; - import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; - import fr.ifremer.isisfish.entities.Strategy; - import fr.ifremer.isisfish.entities.Population; - public ParamsUI(SimulAction action){ - setContextValue(action); - } - protected void regionChange(){ - WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(_("isisfish.message.loading.region")); - getContextValue(SimulAction.class).regionChange(fieldSimulParamsRegion.getSelectedItem().toString()); - setListSimulParamsStrategiesItems(); - setListSimulParamsPopulationsItems(); - root.setInfoText(_("isisfish.message.region.loaded")); - } - - public void setSimulationParameter(SimulAction simulAction){ - getContextValue(SimulAction.class).setSimulationParameter(simulAction.getSimulationParameter()); - } - protected void loadOldSimulation(){ - - WelcomePanelUI root = getParentContainer(WelcomePanelUI.class); - root.setInfoText(_("isisfish.message.loading.old.simulation")); - - Exception eee = getContextValue(SimulAction.class).loadOldSimulation(fieldSimulParamsSelect.getSelectedItem().toString()); - if (eee != null){ - // new OutputView("Error.xml", "error", eee.getMessage()); - } - fieldSimulParamsName.setText(getContextValue(SimulAction.class).getSimulationStorage().getName()); - fieldSimulParamsDesc.setText(getContextValue(SimulAction.class).getSimulationParameter().getDescription()); - setListSimulParamsStrategiesItems(); - setListSimulParamsPopulationsItems(); - if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()){ - SimulUI simul = getParentContainer(SimulUI.class); - simul.enablePreSimul(); - } - if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()){ - SimulUI simul = getParentContainer(SimulUI.class); - simul.enableAnalysePlan(); - } - root.setInfoText(_("isisfish.message.old.simulation.loaded")); - } - protected void addRules(){ - getContextValue(SimulAction.class).addRules(fieldSimulParamsMesuresSelect.getSelectedItem().toString()); - listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray()); - } - protected void removeRules(){ - getContextValue(SimulAction.class).removeRules(listSimulParamsMesuresList.getSelectedValue().toString()); - listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray()); - } - protected void clearRules(){ - getContextValue(SimulAction.class).getSimulationParameter().clearRules(); - listSimulParamsMesuresList.setListData(getContextValue(SimulAction.class).getRules().toArray()); - } - protected void simul(){ - getContextValue(SimulAction.class).simul(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); - SimulUI simul = getParentContainer(SimulUI.class); - simul.selTab(6); - } - protected void enablePreSimul(){ - if (fieldUseSimulPreScripts.isSelected()){ - SimulUI simul = getParentContainer(SimulUI.class); - simul.enablePreSimul(); - } - } - protected void enableAnalysePlan(){ - if (fieldSimulUseAnalysePlan.isSelected()){ - SimulUI simul = getParentContainer(SimulUI.class); - simul.enableAnalysePlan(); - } - } - protected void setNbAnnees(){ - getContextValue(SimulAction.class).setNbAnnees(fieldSimulParamsNbAnnees.getText()); - } - protected void setListSimulParamsStrategiesItems(){ - DefaultListModel listSimulParamsStrategiesModel = new DefaultListModel(); - java.util.List<Strategy> strategies = getContextValue(SimulAction.class).getStrategies(); - for (Strategy s : strategies){ - listSimulParamsStrategiesModel.addElement(s); - } - listSimulParamsStrategies.setModel(listSimulParamsStrategiesModel); - } - protected void setListSimulParamsPopulationsItems(){ - DefaultListModel listSimulParamsPopulationsModel = new DefaultListModel(); - java.util.List<Population> populations = getContextValue(SimulAction.class).getPopulations(); - for (Population p : populations){ - listSimulParamsPopulationsModel.addElement(p); - } - listSimulParamsPopulations.setModel(listSimulParamsPopulationsModel); - //listSimulParamsPopulations.setListData(getContextValue(SimulAction.class).getPopulations().toArray()); - } - ]]> - </script> - <row> - <cell fill="horizontal" weightx="1.0"> - <Table> - <row> - <cell columns="4" fill="horizontal"> - <JLabel text="isisfish.params.loadOldSimulation"/> - </cell> - </row> - <row> - <cell columns="2" fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsSelect" model='{new DefaultComboBoxModel(Common.getOldSimulationItem())}' onActionPerformed='loadOldSimulation()'/> - </cell> - <cell> - <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter"/> - </cell> - <cell> - <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter"/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell fill="both" weightx="1.0" weighty="1.0"> - <Table> - <row> - <cell columns="2" fill="horizontal" weightx="0.5"> - <Table> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.params.simulationName" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/> - </cell> - <cell fill="both" weightx="1.0"> - <JTextField id="fieldSimulParamsName"/> - </cell> - </row> - </Table> - </cell> - <cell columns="2" fill="horizontal" weightx="0.5"> - <Table> - <row> - <cell columns="2" fill="horizontal"> - <JLabel text="isisfish.common.region"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsRegion" model='{new DefaultComboBoxModel(Common.getRegionItem())}' onActionPerformed='regionChange()'/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell columns="4" fill="horizontal" weightx="1.0"> - <Table> - <row> - <cell> - <JLabel text="isisfish.params.description"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JPanel/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell columns="4" fill="both" weightx="1.0" weighty="0.3"> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JTextArea id="fieldSimulParamsDesc" text='{getContextValue(SimulAction.class).getSimulationParameter().getDescription()}'/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="2" fill="horizontal" weightx="0.5"> - <Table> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.params.numberYear" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/> - </cell> - <cell fill="both" weightx="1.0"> - <JTextField id="fieldSimulParamsNbAnnees" text='{getContextValue(SimulAction.class).getSimulationParameter().getNumberOfYear()}' onFocusLost='setNbAnnees()'/> - </cell> - </row> - </Table> - </cell> - <cell columns="2" fill="horizontal" weightx="0.5"> - <JPanel/> - </cell> - </row> - <row> - <cell fill="both" weightx="0.2" weighty="0.1"> - <Table> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.common.strategies"/> - </cell> - </row> - <row> - <cell fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="listSimulParamsStrategies" selectionMode="2"/> -<!-- - model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getStrategies().toArray())}' - --> - </JScrollPane> - </cell> - </row> - </Table> - </cell> - <cell fill="both" weightx="0.4" weighty="0.1"> - <Table> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.common.populations"/> - </cell> - </row> - <row> - <cell fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="listSimulParamsPopulations" selectionMode="2"/> -<!-- - model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getPopulations().toArray())}' - --> - </JScrollPane> - </cell> - </row> - </Table> - </cell> - <cell fill="both" weightx="0.4" weighty="0.1"> - <Table> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.common.rules"/> - </cell> - </row> - <row> - <cell fill="horizontal"> -<!-- TODO : Render --> - <JComboBox id="fieldSimulParamsMesuresSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getRuleNames().toArray())}' - onActionPerformed='buttonSimulParamsMesuresRemove.setEnabled(true)'/> -<!-- - setToolTipRenderContext(); - private void setToolTipRenderContext(){ - ToolTipComboBoxRenderer2 render = new ToolTipComboBoxRenderer2(); - render.setModel(ToolTipListModelFactory.createRuleDescriptionsModel(RuleStorage.getRuleNames())); - setContextValue(render); - } - - renderer='{getContextValue(ToolTipComboBoxRenderer2.class)}' -<SimpleToolTipComboBoxRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createRuleDescriptionsModel($RuleNames)'/> ---> - </cell> - </row> - <row> - <cell fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="listSimulParamsMesuresList" selectionMode="0" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulationParameter().getRules().toArray())}' onValueChanged='buttonSimulParamsMesuresClear.setEnabled(true)'/> - </JScrollPane> - </cell> - </row> - </Table> - </cell> - <cell fill="both" weighty="0.1"> - <Table> - <row> - <cell fill="horizontal"> - <JLabel text=" " minimumSize='{new Dimension(2,15)}' preferredSize='{new Dimension(2,15)}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton id="buttonSimulParamsMesuresAdd" text="isisfish.common.add" onActionPerformed='addRules()'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton id="buttonSimulParamsMesuresRemove" text="isisfish.common.remove" enabled="false" onActionPerformed='removeRules()'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JButton id="buttonSimulParamsMesuresClear" text="isisfish.common.clear" enabled="false" onActionPerformed='clearRules()'/> - </cell> - </row> - <row> - <cell fill='both' weighty="1.0"> - <JPanel/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell columns="4" fill="both" weightx="1.0" weighty="0.6"> - <JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <tab title='{_("isisfish.params.populationNumbers")}'> - <!--JMatrixPanel id="simulParamsNumbers" name="isisfish.params.populationNumbers"/--> - </tab> - <tab title='{_("isisfish.params.ruleParameters")}'> - <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"> - </JTable> - </tab> - </JTabbedPane> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell fill="horizontal" weightx="1.0"> - <Table> - <row> - <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" onItemStateChanged='enablePreSimul()'/> - </cell> - <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" onItemStateChanged='enableAnalysePlan()'/> - </cell> - <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.onlyExportSimulation" id="fieldSimulOnlyExport"/> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell fill="horizontal" weightx="1.0"> - <Table> - <row> - <cell> - <JLabel id="lblLauncher" text="isisfish.params.lblLauncher"/> - </cell> - <cell fill="horizontal" weightx="0.5"> - <JComboBox id="comboSelLauncher" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulationLauncher().toArray())}'/> - </cell> - <cell fill="horizontal" weightx="0.5"> - <JButton id="buttonSimulParamsSimulate" text="isisfish.common.simulate" onActionPerformed='simul()'/> - </cell> - </row> - </Table> - </cell> - </row> -</Table> \ No newline at end of file Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,55 +0,0 @@ -<!-- -/* *##% - * 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 $ - */ - --> -<JPanel id="simulPreScripts" layout='{new BorderLayout()}'> -<script><![CDATA[ - public PreScriptsUI (SimulAction action){ - setContextValue(action); - } - ]]> - </script> - - <JScrollPane constraints='BorderLayout.CENTER'> - <JTextArea id="fieldSimulPreScript"> -<!-- Fixme : DocmumentEvents -origin="$SimulationParameter/preScript" - <DocumentEvents onModified="Update($fieldSimulPreScript/text, $SimulationParameter/preScript)"/> ---> - </JTextArea> - </JScrollPane> - - <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter"/> -<!-- -actionCommand="simulator.SimulatorAction.selectTab($simulTabs, 'true', '0')" ---> - -</JPanel> \ No newline at end of file Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,70 +0,0 @@ -<!-- -/* *##% - * 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 $ - */ - --> -<JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'> -<script><![CDATA[ - public ResultChoiceUI (SimulAction action){ - setContextValue(action); - } - ]]> - </script> - -<!-- Fixme : ContextDataSource - <ContextDataSource id="ResultNames" context="current" source="ResultNames"/> ---> - <!-- - | - | Result enabled - | - +--> - - <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"> -<!-- Fixme : ListModel, ListSelectionEvents and listRender - origin="$SimulationParameter/resultEnabled" - <ListModel origin="$ResultNames"/> - <ListSelectionEvents onValueChanged="Update($listResultNames/selectedValues, $SimulationParameter/resultEnabled)"/> - <ListRenderer> - <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createResultFieldsModel($ResultNames)'/> - </ListRenderer> ---> - </JList> - </JScrollPane> - - <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation"/> -<!-- - actionCommand="simulator.SimulatorAction.saveResultNames($listResultNames/selectedValues)" ---> -</JPanel> - Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,116 +0,0 @@ -<!-- -/* *##% - * 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 $ - */ - --> - -<Table> -<script><![CDATA[ - public SensUI (SimulAction action){ - setContextValue(action); - } - ]]> - </script> - <row> - <cell columns="2" fill="horizontal" weightx="1.0"> - <JComboBox id="fieldSimulParamsAnalysePlansSelect"/> - </cell> - </row> - <row> - <cell fill="both" weightx="0.5"> - <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> - <JList id="listSimulParamsAnalysePlansList" selectionMode="0"/> - </JScrollPane> - </cell> - <cell fill="both" weightx="0.5"> - <Table id="simulSens" name="isisfish.sens.title"> - <row> - <cell fill="both" weightx="1.0"> - <JButton id="buttonSimulParamsAnalysePlansAdd" text="isisfish.common.add"/> -<!-- -actionCommand="xpath:addAnalysePlan($SimulationParameter, getNewAnalysePlanInstance(fr.ifremer.isisfish.datastore.AnalysePlanStorage.getAnalysePlan($fieldSimulParamsAnalysePlansSelect/selectedItem)));refreshView($listSimulParamsAnalysePlansList)" ---> - </cell> - </row> - <row> - <cell fill="both" weightx="1.0"> - <JButton id="buttonSimulParamsAnalysePlansRemove" text="isisfish.common.remove"/> -<!-- - actionCommand="xpath:removeAnalysePlan($SimulationParameter, $listSimulParamsAnalysePlansList/selectedValue);refreshView($listSimulParamsAnalysePlansList)" ---> - </cell> - </row> - <row> - <cell fill="both" weightx="1.0"> - <JButton id="buttonSimulParamsAnalysePlansClear" text="isisfish.common.clear"/> -<!-- -actionCommand="xpath:clearPlans($SimulationParameter);refreshView($listSimulParamsAnalysePlansList,$simulParamsAnalysePlans)" ---> - <!--TODO Doest not work! when calling use an AbstractCollection with no clear implementation text="Clear" actionCommand="xpath:clear($SimulationParameter/analysePlans);refreshView($listSimulParamsAnalysePlansList)"/>--> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="simulParamsAnalysePlans" name="isisfish.sens.planParameters"> -<!-- Fixme : JTableModel - <tableModel origin="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterNames($listSimulParamsAnalysePlansList/selectedValue)"> - <column title="Name" property="/" renderer="key"> - <tableColumnRenderer> - <SimpleToolTipTableColumnRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanParamsModel($listSimulParamsAnalysePlansList/selectedValue)'/> - </tableColumnRenderer> - </column> - <column title="Value" editable="true" - property="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterValue($listSimulParamsAnalysePlansList/selectedValue, /key)" - actionEdit="fr.ifremer.isisfish.datastore.AnalysePlanStorage.setParameterValue($listSimulParamsAnalysePlansList/selectedValue, $e/object/key, $e/value)"> - <tableColumnEditor><ParameterColumnEditor origin="$RegionStorage"/></tableColumnEditor> - <tableColumnRenderer> - <SimpleToolTipTableColumnRenderer origin=''/> - </tableColumnRenderer> - </column> - </tableModel> ---> - </JTable> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="2" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.sens.backParameter"/> - </cell> - </row> -<!-- -actionCommand="simulator.SimulatorAction.selectTab($simulTabs, 'true', '0')" ---> -</Table> - Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2008-10-13 18:19:35 UTC (rev 1558) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2008-10-13 18:38:55 UTC (rev 1559) @@ -1,100 +0,0 @@ -<!-- -/* *##% - * 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 $ - */ - --> -<JPanel size='{new Dimension(800,600)}' id="simul" layout='{new BorderLayout()}'> - <script><![CDATA[ - public SimulUI(SimulAction action){ - setContextValue(action); - } - protected void enablePreSimul(){ - simulTabs.setEnabledAt(1,true); - selTab(1); - } - protected void enableAnalysePlan(){ - simulTabs.setEnabledAt(2,true); - selTab(2); - } - protected void selTab(int i){ - simulTabs.setSelectedIndex(i); - } - ]]> - </script> -<!-- -title="isisfish.simulation.title" -visible="true" size='{new Dimension(700,500)}' location='{new Point(0,139)}' ---> - <!--onOpened="simulator.SimulatorAction.opened($simulTabs)"--> -<!-- - <WindowEvents id="events" - onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulQueueStart,$buttonSimulQueueRemove,$buttonSimulQueueShowLog,$queueTable,$queueTableDone,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)" - onClosing="UIHelper.closeContext()" /> - - <ContextDataSource id="OldSimulationName" context="current" source="OldSimulationName"/> - <ContextDataSource id="SimulationFilterModel" context="current" source="SimulationFilterModel"/> - <ContextDataSource id="SimulationParameter" context="current" source="SimulationParameter"/> - <ContextDataSource id="RegionStorage" context="current" source="RegionStorage"/> ---> -<!-- - <JMenuBar> - <JMenu text="isisfish.simulation.menu.file"> - <JMenuItem name="miClose" text="isisfish.simulation.menu.close" accelerator="accClose"/> - </JMenu> - - <JMenu text="txtSimulation" mnemonic="mnSimulation"> - <JMenuItem name="miSimulate" text="txtSimulate" icon="imgSimulate" - mnemonic="mnSimulate" ActionCommand="simulate" accelerator="accSimulate"/> - <JMenuItem name="miQueue" text="txtQueue" icon="imgQueue" - mnemonic="mnQueue" ActionCommand="queue" accelerator="accQueue"/> - </JMenu> - - <JMenu text="isisfish.simulation.menu.help"> - <JMenuItem name="miAbout" text="isisfish.simulation.menu.about" accelerator="accAbout"/> - </JMenu> - </JMenuBar> ---> - - <JTabbedPane id="simulTabs" constraints='BorderLayout.CENTER'> - <tab id="paramsUITab" title='isisfish.params.title'><ParamsUI id="paramUI" constructorParams='getContextValue(SimulAction.class)'/></tab> - <tab id="preScriptUITab" title='isisfish.preScript.title' enabled='false'><PreScriptsUI id="preScipt" constructorParams='getContextValue(SimulAction.class)'/></tab> - <tab id="sensUITab" title='isisfish.sens.title' enabled='false'><SensUI id="sensUI" constructorParams='getContextValue(SimulAction.class)'/></tab> - <tab id="exportUITab" title='isisfish.export.title'><ExportUI id="exportUI" constructorParams='getContextValue(SimulAction.class)'/></tab> - <tab id="resultChoiceUITab" title='isisfish.resultChoice.title'><ResultChoiceUI id="resultChoiceUI" constructorParams='getContextValue(SimulAction.class)'/></tab> - <tab id="advancedParamsUITab" title='isisfish.advancedParameters.title'><AdvancedParamsUI id="advencedParamsUI" constructorParams='getContextValue(SimulAction.class)'/></tab> - <tab id="queueUITab" title='isisfish.queue.title'><QueueUI id="queueUI" constructorParams='getContextValue(SimulAction.class)'/></tab> - </JTabbedPane> - - -<!-- - <StatutBar2 constraints='"statusBar"'/> - <JLabel icon="images/fish.jpg" constraints='"fishIcon"'/> ---> -</JPanel> \ No newline at end of file