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

Oct. 13, 2008

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> </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 @@ + +<JFrame id="aboutFrame" visible="true" size='{new Dimension(250,180)}' title="isisfish.about.title" + layout='{new BorderLayout()}'> + + <JPanel constraints='"BorderLayout.NORTH"' layout='{new GridBagLayout()}'> + <JLabel id="version"> + + </JLabel> + <JLabel text="isisfish.about.text"> + + </JLabel> + <JLabel text="isisfish.about.site"> + + </JLabel> + <JButton text="isisfish.common.ok" actionCommand="cancel"> + + </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 @@ + + +<JFrame visible="true" size='{new Dimension(400,400)}' title="isisfish.monitor.title" + layout='{new BorderLayout()}'> + + <org.codelutin.widget.ApplicationMonitor + smtpServer="fr.ifremer.isisfish.IsisConfig.getSmtpServer()" + emailFrom="fr.ifremer.isisfish.IsisConfig.getUserMail()" + emailTo="fr.ifremer.isisfish.IsisConfig.BUG_REPORT_EMAIL" + /> + +</JFrame> + 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 @@ + +<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")}'> + + <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"/> + + + +</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 @@ + +<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> + + + + + \ 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 @@ + + <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 @@ + +<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 @@ + +<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" /> + + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.close"/> + + </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"))'/> + + <JSeparator/> + <JMenu text="isisfish.welcome.menu.configuration"> + <JMenuItem text="isisfish.welcome.menu.configuration"/> + + <JMenuItem text="isisfish.welcome.menu.vcs.configuration"/> + + </JMenu> + </JMenu> + <JMenu text="isisfish.welcome.menu.help"> + <JMenuItem text="isisfish.welcome.menu.help"/> + + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.monitor"/> + + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.about"/> + + </JMenu> + </JMenuBar> + <WelcomePanelUI id="welcomePanelUI"/> + +</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 @@ + + +  +<JPanel layout='{new BorderLayout()}'> + <JSplitPane id="CellTab" name="Cells" + oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> + <JPanel name="isisfish.cell.title"> + +  + <JComboBox id="fieldCell"> + + </JComboBox> + <JLabel text="isisfish.cell.name"/> + <JTextField id="fieldCellName"> + + </JTextField> + <JLabel text="isisfish.cell.latitude"/> + <JTextField id="fieldCellLatitude" editable="false"/> + + <JLabel text="isisfish.cell.longitude"/> + <JTextField id="fieldCellLongitude" editable="false"/> + + <JLabel text="isisfish.cell.land"/> + <JCheckBox id="fieldCellLand"> + + </JCheckBox> + <JLabel text="isisfish.cell.comments"/> + <JScrollPane> + <JTextArea id="fieldCellComment"> + + </JTextArea> + </JScrollPane> + <JPanel id="panelCellButtonAction"> + <JButton text="isisfish.common.save"/> + + <JButton text="isisfish.common.cancel"/> + + </JPanel> + </JPanel> + + + <JPanel id="cellMapPanel" layout='{new BorderLayout()}'> + + </JPanel> + </JSplitPane> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueZones"/> + +</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 @@ + +<Table> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JList id="fieldEffortDescriptionMetierList" selectionMode="0"> + + </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"/> + + </cell> + </row> + <row> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JList id="fieldEffortDescriptionEffortDescriptionList" + selectionMode="0"> +  + </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"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.fishingOperationDuration"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionFishingOperationDuration"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.gearsNumberPerOperation"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionGearsNumberPerOperation"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.crewSize"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionCrewSize"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.unitCostOfFishing"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionUnitCostOfFishing"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.fixedCrewSalary"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionFixedCrewSalary"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.crewFoodCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionCrewFoodCost"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.crewShareRate"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionCrewShareRate"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.landingCosts"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionLandingCosts"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.effortDescription.otherRunningCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldEffortDescriptionOtherRunningCost"/> + + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.3'> + <JButton text="isisfish.common.save"/> + + </cell> + <cell fill='horizontal' weightx='0.3'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.3'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + +  +<JPanel id="inputFisheryRegion" layout='{new BorderLayout()}'> + <JSplitPane id="FisheryRegionTab" name="FisheryRegion" + oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> + <JPanel name="isisfish.fisheryRegion.title"> + + + + +  + <JLabel text="isisfish.fisheryRegion.name"/> + <JTextField id="fieldRegion"> + + </JTextField> + <JLabel text="isisfish.fisheryRegion.area"/> + <JLabel text="isisfish.fisheryRegion.latitude.min"/> + <JTextField id="fieldLatMin"> + + </JTextField> + <JLabel text="isisfish.fisheryRegion.latitude.max"/> + <JTextField id="fieldLatMax"> + + </JTextField> + <JLabel text="isisfish.fisheryRegion.longitude.min"/> + <JTextField id="fieldLongMin"> + + </JTextField> + <JLabel text="isisfish.fisheryRegion.longitude.max"/> + <JTextField id="fieldLongMax"> + + </JTextField> + <JLabel text="isisfish.fisheryRegion.spatial"/> + <JLabel text="isisfish.fisheryRegion.latitude"/> + <JTextField id="fieldCellLengthLatitude"> + + </JTextField> + <JLabel text="isisfish.fisheryRegion.longitude"/> + <JTextField id="fieldCellLengthLongitude"> + + </JTextField> + <JScrollPane> + <JList id="fieldMapfiles"> + + </JList> + </JScrollPane> + <JPanel> + <JButton id="buttonAddMap" text="isisfish.fisheryRegion.addMap"/> + + <JButton id="buttonRemoveMap" text="isisfish.fisheryRegion.delMap"/> + + </JPanel> + <JLabel text="isisfish.fisheryRegion.comments"/> + <JScrollPane> + <JTextArea id="fieldComment"> + + </JTextArea> + </JScrollPane> + <JLabel text="isisfish.fisheryRegion.selectFile"/> + <JLabel text="isisfish.fisheryRegion.ofCells"/> + <JPanel> + <JTextField id="fieldCellFile"/> + <JButton id="buttonCellFile" text="isisfish.common.ellipsis"/> + + </JPanel> + <JPanel id="panelRegionButtonAction"> + <JButton text="isisfish.common.save"/> + + <JButton text="isisfish.common.cancel"/> + + <JButton text="isisfish.common.check"/> + + </JPanel> + </JPanel> + + <JPanel id="fisheryRegionMapPanel" layout='{new BorderLayout()}'> + + </JPanel> + </JSplitPane> + <JButton text="isisfish.input.continueCells"/> + +</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 @@ + + + +  +<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> + + </JTabbedPane> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueMetiers"/> + +</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 @@ + +<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"/> + + </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"/> + + </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"/> + + </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"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.gear.rangeValues"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldGearParamType"/> +  + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldGearParamPossibleValue"/> +  + </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"> + + </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"/> +  + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + +<JPanel id="input" visible="true" size='{new Dimension(700,500)}' layout='{new BorderLayout()}' location='{new Point(0,139)}'> + + <script> + + setContextValue(new InputAction()); + </script> + + <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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id="JButtonNewRegion" text="isisfish.input.newRegion"/> + + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JComboBox id="fieldCurrentRegion"/> + + + + + </cell> + </row> + </Table> + <JPanel id="treePanel" name="treePanel" layout='{new BorderLayout()}'> + <JScrollPane constraints='BorderLayout.CENTER'> + <JTree id="tree" name="tree"> + +  + + </JTree> + </JScrollPane> + </JPanel> + </JPanel> + <JPanel id="inputPane" layout='{new BorderLayout()}'> + + + + <PopulationTabUI/> + + + + + + </JPanel> + </JSplitPane> + + +</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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoSpecies.selectSpecies"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldTargetSpecies"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoSpecies.targetFactor"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldTargetFactorEquation"/> + + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </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 fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + + </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"/> + + </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"> + + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="buttonMetierSpeciesRemoveTargetSpecies" + text="isisfish.common.remove"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metierSeasonInfoZone.season"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JPanel/> + + + </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"> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + +  +<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"/> + +</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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.common.gear"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldMetierGear"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.metier.rangeValues"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldMetierParam"/> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.geographicID"/> + </cell> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationBasicsGeographicID"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.numberGroup"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JTextField id="fieldPopulationBasicsNbClasses" editable="false"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.maturityGroup"/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JComboBox id="fieldPopulationBasicsMatureClass"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup"/> + + </cell> + </row> + <row> + <cell columns='3' fill='both' weightx='1.0'> + <JTable> + + </JTable> + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.growth"/> + </cell> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationBasicsGrowth"/> + + </cell> + </row> + <row> + <cell fill='both'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </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/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationBasics.growthReverse"/> + </cell> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationBasicsGrowthReverse"/> + + </cell> + </row> + <row> + <cell fill='both'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </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/> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + + +<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/> + + </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"> + + </JTextArea> + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </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 @@ + +<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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </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 @@ + + +<Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.common.populationGroup"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.meanWeigth"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupMeanWeight"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.price"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupPrice"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.naturalDeathRate"/> + </cell> + <cell fill='both' weightx='1.0' weighty='0.5'> + <JTable/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.reproductionRate"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupReproductionRate"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationGroup.age"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupAge"/> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + </row> + </Table> + </cell> + </row> +</Table> + \ 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 @@ + + + +<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"/> + + </cell> + </row> + <row columns='4'> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JTable/> + + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationMigrationEmigrationRemove" text="isisfish.common.remove"/> + + </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 @@ + +<JPanel name="isisfish.populationMigrationEquation.title" constraints='"inputPopulationMigrationEquation"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/PopulationMigrationEquation.xgl")}'> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> +  + <JLabel constraints='"labelPopulationMigrationEquationMigration"' + text="isisfish.common.migration"/> + <JComboBox constraints='"fieldPopulationMigrationEquationMigration"' + id="fieldPopulationMigrationEquationMigration"> + + </JComboBox> + + <JButton constraints='"buttonPopulationMigrationEquationMigrationSaveAsModel"' + text="isisfish.common.saveModel"/> + + + + <JButton constraints='"buttonPopulationMigrationEquationMigrationEquationEditor"' text="isisfish.common.openEditor"/> + + + <JScrollPane constraints='"fieldScriptPopulationMigrationEquationMigration"'> + + </JScrollPane> + +  + <JLabel constraints='"labelPopulationMigrationEquationEmigration"' text="isisfish.common.emigration"/> + <JComboBox constraints='"fieldPopulationMigrationEquationEmigration"' + id="fieldPopulationMigrationEquationEmigration"> + + </JComboBox> + + <JButton constraints='"buttonPopulationMigrationEquationEmigrationSaveAsModel"' + text="isisfish.common.saveModel"/> + + + <JButton constraints='"buttonPopulationMigrationEquationEmigrationEquationEditor"' text="isisfish.common.openEditor"/> + + + <JScrollPane constraints='"fieldScriptPopulationMigrationEquationEmigration"'> + + </JScrollPane> + +  + <JLabel constraints='"labelPopulationMigrationEquationImmigration"' + text="isisfish.common.immigration"/> + <JComboBox constraints='"fieldPopulationMigrationEquationImmigration"' + id="fieldPopulationMigrationEquationImmigration"> + + </JComboBox> + + <JButton constraints='"buttonPopulationMigrationEquationImmigrationSaveAsModel"' + text="isisfish.common.saveModel"/> + + + <JButton constraints='"buttonPopulationMigrationEquationImmigrationEquationEditor"' text="isisfish.common.openEditor"/> + + <JScrollPane constraints='"fieldScriptPopulationMigrationEquationImmigration"'> + + </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 @@ + + +<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"/> + + </cell> + </row> + <row columns='4'> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JTable/> + + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationImmigrationMigrationRemove" text="isisfish.common.remove"/> + + </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 @@ + + +<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"/> + + </cell> + </row> + <row columns='4'> + <cell fill='both' weightx='1.0' weighty='1.0'> + <JTable/> + + </cell> + </row> + <row> + <cell columns='4' fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationMigrationMigrationRemove" + text="isisfish.common.remove"/> + + </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 @@ + + +<Table> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationMigration.selectSeason"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationMigrationSeasonChooser"/> + + </cell> + </row> + <row> + <cell columns='2' anchor='west'> + <JCheckBox id="fieldUseEquationMigration" text="isisfish.populationMigration.useEquation"> + + </JCheckBox> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='0.7'> + <JPanel id="hideablePanel"> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </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 @@ + + +<Table> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.populationEquation.naturalDeathRate"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldPopulationNaturalDeathRate"/> + + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.openEditor"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weighty='1.0'> + + + <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"/> + + </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 @@ + +<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"/> + + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </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 fill='both' weightx='1.0' weighty='1.0'> + <JTextArea/> + + </cell> + </row> + <row> + <cell anchor='east'> + + <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/> + + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton id="buttonPopulationRecruitmentDistributionNew" text="isisfish.common.newMatrix"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationRecruitment.comments"/> + </cell> + <cell fill='both' weightx='1.0'> + <JScrollPane> + <JTextArea id="fieldPopulationRecruitmentComment"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.common.season"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JPanel/> + + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.populationSeasons.distributionSpawning"/> + </cell> + <cell fill='both' weightx='1.0'> + <JTable/> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + + + +  +<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'/> + +</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 @@ + + +<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"> + + </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"> + + </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"> + + </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/> +  + </cell> + </row> + <row> + <cell columns='3' fill='horizontal' weightx='1.0'> + <Table> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + + </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 @@ + + + +  +<JPanel layout='{new BorderLayout()}'> + <JSplitPane id="PortTab" name="Ports" + oneTouchExpandable="true" dividerLocation="270" orientation="VERTICAL"> + <JPanel name="isisfish.port.title"> + + + <JLabel text="isisfish.port.name"/> + <JTextField id="fieldPortName"> + + </JTextField> + <JLabel text="isisfish.port.cell"/> + <JScrollPane> + <JList id="portCell"> + + </JList> + </JScrollPane> + <JLabel text="isisfish.port.comments"/> + <JScrollPane> + <JTextArea id="fieldPortComment"> + + </JTextArea> + </JScrollPane> + <JPanel id="panelPortButtonAction"> + <JButton text="isisfish.common.new"/> + + <JButton text="isisfish.common.save"/> + + <JButton text="isisfish.common.cancel"/> + + <JButton text="isisfish.common.remove"/> + + </JPanel> + </JPanel> + + + <JPanel id="portMapPanel" layout='{new BorderLayout()}'> + + </JPanel> + </JSplitPane> + <JButton text="isisfish.input.continueSpecies"/> + +</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 @@ + +<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"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.selectivity.equation"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSelectivityEquation"/> + + </cell> + </row> + <row> + <cell fill='both' weighty='1.0'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </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 fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + + </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"/> + + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JScrollPane> + <JTable id="selectivityTable"> + + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal' weightx='1.0'> + <JButton id="buttonSelectivityRemove" text="isisfish.common.remove"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.save"/> + + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.cancel"/> + + </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 @@ + + + +  +<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> + + </JTabbedPane> + <JButton text="isisfish.input.continueStrategies" constraints='BorderLayout.SOUTH'/> + +</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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.common.port"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSetOfVesselsPort"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.vesselType"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSetOfVesselsVesselType"/> + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.numberOfVessels"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldSetOfVesselsNumberOfVessels"/> + + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.fixedCosts"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldSetOfVesselsFixedCosts"/> + + + </cell> + </row> + <row> + <cell anchor='east'> + <JLabel text="isisfish.setOfVessels.technicalEfficiency"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldSetOfVesselsTechnicalEfficiency"/> + + + </cell> + </row> + <row> + <cell fill='both' weighty='0.7'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </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/> +  + </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"> + + + </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"/> + + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='1.0'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + + + +  +<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> + + + <JLabel constraints='"labelSpeciesName"' text="isisfish.species.name"/> + <JTextField constraints='"fieldSpeciesName"' id="fieldSpeciesName"> + + </JTextField> + <JLabel constraints='"labelSpeciesScientificName"' text="isisfish.species.scientificName"/> + <JTextField constraints='"fieldSpeciesScientificName"' id="fieldSpeciesScientificName"> + + </JTextField> + <JLabel constraints='"labelSpeciesCodeRubbin"' text="isisfish.species.rubbinCode"/> + <JTextField constraints='"fieldSpeciesCodeRubbin"' id="fieldSpeciesCodeRubbin"> + + </JTextField> + <JLabel constraints='"labelSpeciesCEE"' text="isisfish.species.cee"/> + <JTextField constraints="fieldSpeciesCEE" id="fieldSpeciesCEE"> + + </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"/> + + + <JRadioButton constraints='"fieldSpeciesDynamicLength"' id="fieldSpeciesDynamicLength" + text="isisfish.species.length" buttonGroup="structuredGroup"/> + +  + </JPanel> + <JLabel constraints='"labelSpeciesComment"' text="isisfish.species.comments"/> + <JScrollPane constraints='"fieldSpeciesComment"'> + <JTextArea id="fieldSpeciesComment"> + + </JTextArea> + </JScrollPane> + <JPanel id="panelSpeciesButtonAction" constraints='"panelSpeciesButtonAction"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/ActionButton.xgl")}'> + <JButton constraints='"buttonCreate"' text="isisfish.common.new"/> + + <JButton constraints='"buttonSave"' text="isisfish.common.save"/> + + <JButton constraints='"buttonCancel"' text="isisfish.common.cancel"/> + + <JButton constraints='"buttonRemove"' text="isisfish.common.remove"/> + + </JPanel> + </JPanel> + + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continuePopulations"/> + +</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 @@ + + +<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> + +  + <Table constraints='BorderLayout.SOUTH'> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </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 @@ + + +<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"> + + </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'/> + + </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"> + + </JTextField> + </cell> + </row> + <row> + <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <JTable/> + + </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 @@ + + +  +<JTabbedPane id="StrategyTab" name="Strategy" > + + <tab title='{_("isisfish.strategy.title")}'><StrategyUI/></tab> + <tab title='{_("isisfish.strategyMonthInfo.title")}'><StrategyMonthInfoUI/></tab> + +</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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text="isisfish.common.setOfVessels"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldStrategySetOfVessels"/> + + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text="isisfish.strategy.proportionSetOfVessels"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldStrategyProportionSetOfVessels"/> + + </cell> + </row> + <row> + <cell> + <JPanel/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JCheckBox id="fieldUseEquationInactivity"/> + + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel text="isisfish.strategy.inactivity"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JComboBox id="fieldStrategyInactivity"/> + + </cell> + </row> + <row> + <cell fill='both' weighty='0.7'> + <Table> + <row> + <cell fill='horizontal'> + <JButton text="isisfish.common.saveModel"/> + + </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 fill='both' weightx='1.0' weighty='0.7'> + <JPanel/> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> + + </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 @@ + +  +<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> + + + <JLabel constraints='"labelTripTypeName"' text="isisfish.tripType.name"/> + <JTextField constraints='"fieldTripTypeName"' id="fieldTripTypeName"> + + </JTextField> + <JLabel constraints='"labelTripTypeDuration"' text="isisfish.tripType.duration"/> + + + <JTextField constraints='"fieldTripTypeDuration"' id="fieldTripTypeDuration"> + + </JTextField> + <JLabel constraints='"labelTripTypeMinTimeBetweenTrip"' text="isisfish.tripType.minTime"/> + <JTextField constraints='"fieldTripTypeMinTimeBetweenTrip"' id="fieldTripTypeMinTimeBetweenTrip"> + + </JTextField> + <JLabel constraints='"labelTripTypeComment"' text="isisfish.tripType.comments"/> + <JScrollPane constraints='"fieldTripTypeComment"'> + <JTextArea id="fieldTripTypeComment"> + + </JTextArea> + </JScrollPane> + <JPanel id="panelTripTypeButtonAction" constraints='"panelTripTypeButtonAction"' + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/input/ActionButton.xgl")}'> + <JButton constraints='"buttonCreate"' text="isisfish.common.new"/> + + <JButton constraints='"buttonSave"' text="isisfish.common.save"/> + + <JButton constraints='"buttonCancel"' text="isisfish.common.cancel"/> + + <JButton constraints='"buttonRemove"' text="isisfish.common.remove"/> + + </JPanel> + </JPanel> + + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueVesselTypes"/> + +</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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.length"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeLength"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.speed"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeSpeed"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.maxDuration"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeMaxTripDuration"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.activityRange"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeActivityRange"/> +  + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.miniCrew"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeMinCrewSize"/> + + </cell> + </row> + <row> + <cell fill='horizontal' anchor='east'> + <JLabel text="isisfish.vesselType.fuelCost"/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldVesselTypeUnitFuelCostOfTravel"/> + + </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"> + + </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"> + + </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"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.save"/> + + </cell> + </row> + <row> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.cancel"/> + + </cell> + <cell fill='horizontal' weightx='0.5'> + <JButton text="isisfish.common.remove"/> + + </cell> + </row> + </Table> + </cell> + </row> + </Table> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continueSetOfVessels"/> + +</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 @@ + +<JFrame id="wizardGroup" visible="true" size='{new Dimension(400,200)}' title="isisfish.wizardGroupCreation.title" + layout='{new BorderLayout()}'> + + + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + + + <JPanel id="navButton" constraints='"SOUTH"'> + <JButton text="isisfish.common.prev"/> + + + <JButton text="isisfish.common.next"/> + + + <JButton text="isisfish.common.finish"/> + + + <JButton text="isisfish.common.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 @@ + + +  +<JPanel layout='{new BorderLayout()}'> + <JSplitPane id="ZoneTab" name="Zones" + oneTouchExpandable="true" dividerLocation="200" orientation="VERTICAL"> + <JPanel name="isisfish.zone.title"> + + + <JLabel text="isisfish.zone.name"/> + <JTextField id="fieldZoneName"> + + </JTextField> + <JLabel text="isisfish.zone.cells"/> + <JScrollPane> + <JList id="zoneCells"> + + </JList> + </JScrollPane> + <JLabel text="isisfish.zone.comments"/> + <JScrollPane> + <JTextArea id="fieldZoneComment"> + + </JTextArea> + </JScrollPane> + <JPanel id="panelZoneButtonAction"> + <JButton text="isisfish.common.new"/> + + <JButton text="isisfish.common.save"/> + + <JButton text="isisfish.common.cancel"/> + + <JButton text="isisfish.common.remove"/> + + </JPanel> + </JPanel> + + + <JPanel id="zoneMapPanel" layout='{new BorderLayout()}'> + + </JPanel> + </JSplitPane> + <JButton constraints='BorderLayout.SOUTH' text="isisfish.input.continuePorts"/> + +</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 @@ + +<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'/> + + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id='filterSimulationButton' text='isisfish.filter' toolTipText='isisfish.filter.simulation'/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id='openWindowButton' text='isisfish.result.new.window' toolTipText='isisfish.result.openWindowButton'/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id="supprimerSimulationButton" text='isisfish.result.remove.simulation' toolTipText='isisfish.result.removeSimulationButton'/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JButton id='voirSimulationLogButton' text='isisfish.result.show.simulation.log' toolTipText='isisfish.result.tooltip.show.simulation.log'/> + + + </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 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"> +  + <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"> +  + <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 @@ + + +<JPanel id="script" layout='{new BorderLayout()}'> + + + + + + +  + <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> + <JComboBox id="ScriptTypeChoice"> + + +  + + </JComboBox> + <JButton id="buttonScriptNew" text="isisfish.script.new"/> + + <JButton id="buttonScriptSave" text="isisfish.script.save"/> + + <JButton id="buttonScriptExport" text="isisfish.script.txtExport"/> + + <JButton id="buttonScriptCommit" text="isisfish.script.commit"/> + + <JButton id="buttonScriptUpdate" text="isisfish.script.update"/> + + <JButton id="buttonScriptCut" text="isisfish.script.cut"/> + + <JButton id="buttonScriptCopy" text="isisfish.script.copy"/> + + <JButton id="buttonScriptPaste" text="isisfish.script.paste"/> + + <JButton id="buttonScriptCheck" text="isisfish.script.check"/> + + <JButton id="buttonScriptEval" text="isisfish.script.evaluate"/> + + </JPanel> + +  + <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="HORIZONTAL" constraints='BorderLayout.CENTER'> + + +  + <JScrollPane> + + <JTree id="tree" name="tree" rootVisible="false"> + + </JTree> + </JScrollPane> + <JSplitPane oneTouchExpandable="true" dividerLocation="250" orientation="VERTICAL"> + +  + +  + <JScrollPane> + <JTextArea id="actionLogArea" editable="false"/> + + </JScrollPane> + </JSplitPane> + </JSplitPane> + +  + + + +</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 @@ + +<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"/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + + </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"/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + + </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"/> + + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + + </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"/> + + </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 @@ + + +<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"> + + </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"/> + + </cell> + <cell> + <JButton text="isisfish.common.saveNextSimulation"/> + </cell> + </row> + + +</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 @@ + +<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"/> + + </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"/> + + </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"> + + <JComboBox id="fieldSimulParamsMesuresSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getRuleNames().toArray())}' + onActionPerformed='buttonSimulParamsMesuresRemove.setEnabled(true)'/> + + </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")}'> +  + </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 @@ + +<JPanel id="simulPreScripts" layout='{new BorderLayout()}'> +<script><![CDATA[ + public PreScriptsUI (SimulAction action){ + setContextValue(action); + } + ]]> + </script> + + <JScrollPane constraints='BorderLayout.CENTER'> + <JTextArea id="fieldSimulPreScript"> + + </JTextArea> + </JScrollPane> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter"/> + + +</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 @@ + + +<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 @@ + +<JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'> +<script><![CDATA[ + public ResultChoiceUI (SimulAction action){ + setContextValue(action); + } + ]]> + </script> + + +  + + <JLabel text="isisfish.resultChoice.save" horizontalAlignment="0" constraints='BorderLayout.NORTH'/> + <JScrollPane constraints='BorderLayout.CENTER'> +  + <JList id="listResultNames" selectionMode="2"> + + </JList> + </JScrollPane> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation"/> + +</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 @@ + + +<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"/> + + </cell> + </row> + <row> + <cell fill="both" weightx="1.0"> + <JButton id="buttonSimulParamsAnalysePlansRemove" text="isisfish.common.remove"/> + + </cell> + </row> + <row> + <cell fill="both" weightx="1.0"> + <JButton id="buttonSimulParamsAnalysePlansClear" text="isisfish.common.clear"/> + +  + </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"> + + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.sens.backParameter"/> + </cell> + </row> + +</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"/> + + <JLabel constraints='"valuesSensWizardFieldLabel"' text="isisfish.sensWizardPanels.field"/> + <JTextField constraints='"valuesSensWizardFieldField"' editable="false"/> + + <JLabel constraints='"valuesSensWizardTypeLabel"' text="isisfish.sensWizardPanels.type"/> + <JTextField constraints='"valuesSensWizardTypeField"' editable="false"/> + + </JPanel> + <JPanel constraints='"valuesSensWizardNewValuePanel"'> + + <JTextArea text="isisfish.common.blabla"/>  + + </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"> + + </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 @@ + +<JFrame id="sensWizard" visible="true" size='{new Dimension(400,400)}' title="isisfish.sensibilityWizard.title" + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> + + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + <JPanel constraints='"sensWizardPanel"' layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> +  + +  + <JPanel constraints='"sensWizardPanelButtons"'> + <JButton id="wizardPrev" text="isisfish.common.previous" enabled="false"/> + + <JButton id="wizardNext" text="isisfish.common.next"/> + + <JButton id="wizardFinish" text="isisfish.common.finish" enabled="false"/> + + <JButton text="isisfish.common.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 @@ + +<JPanel visible="true" size='{new Dimension(400,400)}' layout='{new BorderLayout()}'> + + + +</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 @@ + +<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> + +  + + + + <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> + + + +</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 @@ - - -<JFrame visible="true" size='{new Dimension(400,400)}' title="isisfish.monitor.title" - layout='{new BorderLayout()}'> - - <org.codelutin.widget.ApplicationMonitor - smtpServer="fr.ifremer.isisfish.IsisConfig.getSmtpServer()" - emailFrom="fr.ifremer.isisfish.IsisConfig.getUserMail()" - emailTo="fr.ifremer.isisfish.IsisConfig.BUG_REPORT_EMAIL" - /> - -</JFrame> - 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 @@ - -<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")}'> - - <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"/> - - - -</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 @@ - -<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> - - - - - \ 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 @@ - -<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" /> - - <JSeparator/> - <JMenuItem text="isisfish.welcome.menu.close"/> - - </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"))'/> - - <JSeparator/> - <JMenu text="isisfish.welcome.menu.configuration"> - <JMenuItem text="isisfish.welcome.menu.configuration"/> - - <JMenuItem text="isisfish.welcome.menu.vcs.configuration"/> - - </JMenu> - </JMenu> - <JMenu text="isisfish.welcome.menu.help"> - <JMenuItem text="isisfish.welcome.menu.help"/> - - <JSeparator/> - <JMenuItem text="isisfish.welcome.menu.monitor"/> - - <JSeparator/> - <JMenuItem text="isisfish.welcome.menu.about"/> - - </JMenu> - </JMenuBar> - <WelcomePanelUI id="welcomePanelUI"/> - -</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 @@ - -<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"/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> - - </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"/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> - - </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"/> - - </cell> - <cell fill="horizontal" weightx="0.2"> - <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> - - </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"/> - - </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 @@ - -<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"/> - - </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"/> - - </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"> - - <JComboBox id="fieldSimulParamsMesuresSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getRuleNames().toArray())}' - onActionPerformed='buttonSimulParamsMesuresRemove.setEnabled(true)'/> - - </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")}'> -  - </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 @@ - -<JPanel id="simulPreScripts" layout='{new BorderLayout()}'> -<script><![CDATA[ - public PreScriptsUI (SimulAction action){ - setContextValue(action); - } - ]]> - </script> - - <JScrollPane constraints='BorderLayout.CENTER'> - <JTextArea id="fieldSimulPreScript"> - - </JTextArea> - </JScrollPane> - - <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter"/> - - -</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 @@ - -<JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'> -<script><![CDATA[ - public ResultChoiceUI (SimulAction action){ - setContextValue(action); - } - ]]> - </script> - - -  - - <JLabel text="isisfish.resultChoice.save" horizontalAlignment="0" constraints='BorderLayout.NORTH'/> - <JScrollPane constraints='BorderLayout.CENTER'> -  - <JList id="listResultNames" selectionMode="2"> - - </JList> - </JScrollPane> - - <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation"/> - -</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 @@ - - -<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"/> - - </cell> - </row> - <row> - <cell fill="both" weightx="1.0"> - <JButton id="buttonSimulParamsAnalysePlansRemove" text="isisfish.common.remove"/> - - </cell> - </row> - <row> - <cell fill="both" weightx="1.0"> - <JButton id="buttonSimulParamsAnalysePlansClear" text="isisfish.common.clear"/> - -  - </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"> - - </JTable> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="2" fill="horizontal" weightx="1.0"> - <JButton text="isisfish.sens.backParameter"/> - </cell> - </row> - -</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 @@ - -<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> - -  - - - - <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> - - - -</JPanel> \ No newline at end of file

1 0

r1558 - isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 18:19:35 +0000 (Mon, 13 Oct 2008) New Revision: 1558 Removed: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/ Log: remove jaxx package

1 0

r1557 - isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 18:10:36 +0000 (Mon, 13 Oct 2008) New Revision: 1557 Removed: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ Log: remove jaxx package

1 0

r1556 - in isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui: script versionning
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 18:10:09 +0000 (Mon, 13 Oct 2008) New Revision: 1556 Removed: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/ Log: remove jaxx package

1 0

r1555 - in isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning: . jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 18:09:00 +0000 (Mon, 13 Oct 2008) New Revision: 1555 Added: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx Removed: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx Log: remove jaxx package Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,64 @@ +<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> +  + <script> + // FIXME a refaire + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public CommitDialogUI(Dialog owner, boolean modal) { + super(owner, modal); + } + public boolean isEmpty() { + return items.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); + } + protected void reSize(JTable table) { + // implements me... + } + + </script> + <Table weightx="1"> + <row> + <cell columns='2'> + <JLabel id='label' font-size='12' + foreground='{new Color(051,102,225)}' + text='isisfish.vcs.commit.label'/> + </cell> + </row> + <row> + <cell columns='2' weighty="1" weightx='1' fill='both'> + <JScrollPane id='scroll' verticalScrollBarPolicy='20' > + <JTable id="items" onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal'> + <JScrollPane height='50' verticalScrollBarPolicy='21' + horizontalScrollBarPolicy='30'> + <JTextArea id='message' rows='2' columns='80'/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell> + <JButton id='ok' text='isisfish.vcs.commit.ok' + enabled='{isOkEnabled()}' + onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> + </cell> + <cell> + <JButton id='cancel' text='isisfish.vcs.commit.cancel' + onActionPerformed='dispose()'/> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/CommitDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,70 @@ +<JDialog modal="true" title='isisfish.vcs.updateconfirm'> + <script> + // FIXME a refaire + + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public void doCheckAll() { +// if (model != null && model.getRowCount()>0) { +// model.checkAll(); +// doRefresh(); +// } + } + public boolean isEmpty() { + return model==null; // || model.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); // && model.getSelectedSize(0)>0; + } + protected void reSize(JTable table) { + // implements me... + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + </script> + <Table weightx="1"> + <row> + <cell columns='4'> + <JLabel font-size='12' foreground='{new Color(051,102,225)}' + text='isisfish.vcs.updateconfirm.label'/> + </cell> + </row> + <row> + <cell columns='4'> + <JLabel id='label2' font-size='12' foreground='{Color.RED}' + text='isisfish.vcs.updateconfirm.label2'/> + </cell> + </row> + <row> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane id='table'> + <JTable id="items" autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()" + onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="2" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.updateconfirm.checkAll' + toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' + enabled='{isOkEnabled()}'/> + <JButton id='cancel' + text='isisfish.vcs.updateconfirm.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateConfirmDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,165 @@ +<JDialog modal="true" title='isisfish.vcs.update'> + <script> + // FIXME a refaire + +// import static org.codelutin.vcs.VCSState.*; +// import org.codelutin.vcs.VCSState; + +// protected org.codelutin.vcs.VCSRepositoryState model; + protected Object model; + + public void doCheckAll() { +// if (model!=null) { +// model.checkAll(checkAll.isSelected()); +// doRefresh(); +// } + } + + public boolean isEmpty() { + return model==null; // || model.isModelEmpty(); + } + + public boolean isOkEnabled() { + return !isEmpty(); // && model.getModelSelectedSize()>0; + } + + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + +// protected void reSize(VCSState state,JTable table) { +// +// } + </script> + <Table weightx="1"> + <row> + <cell columns='3' weighty="1" fill='both'> + <JSplitPane id='splitPane' orientation='vertical' + oneTouchExpandable='true'> + <JSplitPane id='splitPane2' orientation='horizontal' + oneTouchExpandable='true'> + <Table weightx="1" id='tableRemote'> + <row> + <cell columns="2" anchor='northwest'> + <JLabel text='isisfish.vcs.update.remote' + toolTipText='isisfish.vcs.update.tooltip.remote'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_missing' + text='isisfish.vcs.update.remote.missing' + toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_missing'> + <JTable id="table_missing" + autoResizeMode='3' + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdate' + text='isisfish.vcs.update.remote.outofdate' + toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdate'> + <JTable id="table_outofdate" + autoResizeMode='3' + onMouseClicked="doRefresh()" + rowSelectionAllowed="true"/> + </JScrollPane> + </cell> + </row> + </Table> + <Table weightx="1" id='tableLocal'> + <row> + <cell columns="2" anchor='west'> + <JLabel text='isisfish.vcs.update.local' + toolTipText='isisfish.vcs.update.tooltip.local'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_unversionned' + text='isisfish.vcs.update.local.unversionned' + toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_unversionned'> + <JTable id="table_unversionned" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_modified' + text='isisfish.vcs.update.local.modified' + toolTipText='isisfish.vcs.update.local.tooltip.modified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_modified'> + <JTable id="table_modified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdateAndModified' + text='isisfish.vcs.update.local.outofdateAndModified' + toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdateAndModified'> + <JTable id="table_outofdateAndModified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + </Table> + </JSplitPane> + <JScrollPane> + <JTextPane id="logText" editable="false" + focusable='false'/> + </JScrollPane> + </JSplitPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="3" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.update.checkAll' + toolTipText='isisfish.vcs.update.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.update.ok' + enabled='{isOkEnabled()}' + onActionPerformed="dispose()"/> + <JButton id='cancel' text='isisfish.vcs.update.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/UpdateDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,170 @@ +<JDialog> + <script> + 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; + + public boolean cancel; + protected boolean invalidFirstName; + protected boolean invalidLastName; + protected boolean invalidKey; + protected boolean invalidEmail; + protected boolean invalidLogin; + + private String oldEmail; + private String oldServerLogin; + private boolean oldUseSsh; + private boolean oldNoPassPhrase; + private String oldLastname; + private String oldFirstname; + private String oldServerPrivateKeyFile; + + protected void saveOld() { + this.oldFirstname=firstname.getText(); + this.oldLastname=lasstname.getText(); + this.oldEmail =email.getText(); + this.oldServerLogin=serverLogin.getText(); + this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); + this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); + this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); + doCheck(); + } + + protected void restoreOld() { + firstname.setText(oldFirstname); + lasstname.setText(oldLastname); + email.setText(oldEmail); + serverLogin.setText(oldServerLogin); + serverPrivateKeyFile.setText(oldServerPrivateKeyFile); + serverAuthenticationMethodSsh.setSelected(oldUseSsh); + serverNoPassPhrase.setSelected(oldNoPassPhrase); + doCheck(); + } + public boolean isConfigValid() { + return check(serverAuthenticationMethodSsh.isSelected()); + } + + protected boolean check(boolean ssh) { + invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); + invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); + invalidEmail=email.isVisible() && email.getText().isEmpty(); + if (ssh) { + String file = serverPrivateKeyFile.getText(); + invalidKey=file.isEmpty() || !new java.io.File(file).exists(); + invalidLogin=serverLogin.getText().isEmpty(); + } else { + invalidLogin=false; + invalidKey=false; + } + return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); + } + + protected void doCheck() { + boolean ssh = serverAuthenticationMethodSsh.isSelected(); + ok.setEnabled(check(ssh)); + if (ssh) { + serverPrivateKeyGenerate.setEnabled(!invalidLogin); + } else { + serverPrivateKeyGenerate.setEnabled(false); + } + setColor(invalidFirstName, firstnameLabel); + setColor(invalidLastName, lasstnameLabel); + setColor(invalidEmail, emailLabel); + setColor(invalidLogin, serverLoginLabel); + setColor(invalidKey, serverPrivateKeyFileLabel); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.red: Color.black); + } + </script> + <Table> + <row fill='horizontal'> + <cell columns='2' weighty="1" fill='both'> + <JScrollPane height="60"> + <JEditorPane id="doc" /> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> + </cell> + <cell> + <JTextField id='firstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> + </cell> + <cell> + <JTextField id='lasstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='emailLabel' text='isisfish.launch.email'/> + </cell> + <cell> + <JTextField id='email' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> + </cell> + <cell> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> + <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false'/> + <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSConfigUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx (from rev 1554, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,124 @@ +<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> + <script> + import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; + import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; + import org.codelutin.util.FileUtil; + import java.io.File; + import java.io.IOException; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.HashMap; + import java.util.Map; + + private static VCSGenerateSshKeyUI instance; + + public static VCSGenerateSshKeyUI getInstance(JDialog parent) { + if (instance == null) { + instance = new VCSGenerateSshKeyUI(parent); + } + return instance; + } + + public boolean cancel; + public boolean noPassPhrase; + public Exception error; + protected boolean invalidPassPhrase; + protected String vcsLogin; + + private VCSGenerateSshKeyUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + + public void setData(String vcsLogin, File privateKeyFile) { + this.vcsLogin = vcsLogin ; + serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); + serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); + noPassPhrase=true; + error=null; + doCheck(); + } + + protected boolean doGenerate() { + File f = new File(getServerPrivateKeyFile().getText()); + try { + SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); + char[] password = getServerPassPhrase().getPassword(); + noPassPhrase=password.length==0; + if (password.length > 0) { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); + Arrays.fill(password, '0'); + } else { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); + } + // convert to openSSH ? + File publicKeyFile = new File(serverPublicKeyFile.getText()); + log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); + String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); + log.info("public key OpenSsh : "+openSshPublicKey); + FileUtil.writeString(publicKeyFile, openSshPublicKey); + } catch (Exception e) { + error=e; + return true; + } + return false; + } + protected boolean check() { + invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.getPassword()); + return !invalidPassPhrase; + } + + protected void doCheck() { + ok.setEnabled(check()); + setColor(invalidPassPhrase, serverPassPhraseLabel); + setColor(invalidPassPhrase, serverConfirmPassPhraseLabel); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.red: Color.black); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> + </cell> + <cell> + <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSGenerateSshKeyUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx (from rev 1553, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -0,0 +1,62 @@ +<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> + <script> + private boolean cancel; + private static VCSPassPhraseUI instance; + + public static char[] getPassPhrase(boolean useUI) { + if (!useUI) { + System.out.print("Enter passphrase: "); + java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); + try { + java.lang.String s = ""; + s = bufferedreader.readLine(); + return s.toCharArray(); + } catch (IOException e) { + return null; + } finally { + if (bufferedreader!=null) { + try { + bufferedreader.close(); + } catch (IOException e) { + // ignore + } + } + } + } + if (instance == null) { + instance = new VCSPassPhraseUI(); + } + instance.setVisible(true); + if (instance.cancel) { + // use cancel + return null; + } + return instance.getServerPassPhrase().getPassword(); + } + private VCSPassPhraseUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.vcs.ask.passphrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JPasswordField id='serverPassPhrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> + <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/VCSPassPhraseUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,64 +0,0 @@ -<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> -  - <script> - // FIXME a refaire - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public CommitDialogUI(Dialog owner, boolean modal) { - super(owner, modal); - } - public boolean isEmpty() { - return items.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); - } - protected void reSize(JTable table) { - // implements me... - } - - </script> - <Table weightx="1"> - <row> - <cell columns='2'> - <JLabel id='label' font-size='12' - foreground='{new Color(051,102,225)}' - text='isisfish.vcs.commit.label'/> - </cell> - </row> - <row> - <cell columns='2' weighty="1" weightx='1' fill='both'> - <JScrollPane id='scroll' verticalScrollBarPolicy='20' > - <JTable id="items" onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal'> - <JScrollPane height='50' verticalScrollBarPolicy='21' - horizontalScrollBarPolicy='30'> - <JTextArea id='message' rows='2' columns='80'/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell> - <JButton id='ok' text='isisfish.vcs.commit.ok' - enabled='{isOkEnabled()}' - onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> - </cell> - <cell> - <JButton id='cancel' text='isisfish.vcs.commit.cancel' - onActionPerformed='dispose()'/> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,70 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.updateconfirm'> - <script> - // FIXME a refaire - - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public void doCheckAll() { -// if (model != null && model.getRowCount()>0) { -// model.checkAll(); -// doRefresh(); -// } - } - public boolean isEmpty() { - return model==null; // || model.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); // && model.getSelectedSize(0)>0; - } - protected void reSize(JTable table) { - // implements me... - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - </script> - <Table weightx="1"> - <row> - <cell columns='4'> - <JLabel font-size='12' foreground='{new Color(051,102,225)}' - text='isisfish.vcs.updateconfirm.label'/> - </cell> - </row> - <row> - <cell columns='4'> - <JLabel id='label2' font-size='12' foreground='{Color.RED}' - text='isisfish.vcs.updateconfirm.label2'/> - </cell> - </row> - <row> - <cell columns='4' weighty="1" fill='both'> - <JScrollPane id='table'> - <JTable id="items" autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()" - onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="2" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.updateconfirm.checkAll' - toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' - enabled='{isOkEnabled()}'/> - <JButton id='cancel' - text='isisfish.vcs.updateconfirm.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,165 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.update'> - <script> - // FIXME a refaire - -// import static org.codelutin.vcs.VCSState.*; -// import org.codelutin.vcs.VCSState; - -// protected org.codelutin.vcs.VCSRepositoryState model; - protected Object model; - - public void doCheckAll() { -// if (model!=null) { -// model.checkAll(checkAll.isSelected()); -// doRefresh(); -// } - } - - public boolean isEmpty() { - return model==null; // || model.isModelEmpty(); - } - - public boolean isOkEnabled() { - return !isEmpty(); // && model.getModelSelectedSize()>0; - } - - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - -// protected void reSize(VCSState state,JTable table) { -// -// } - </script> - <Table weightx="1"> - <row> - <cell columns='3' weighty="1" fill='both'> - <JSplitPane id='splitPane' orientation='vertical' - oneTouchExpandable='true'> - <JSplitPane id='splitPane2' orientation='horizontal' - oneTouchExpandable='true'> - <Table weightx="1" id='tableRemote'> - <row> - <cell columns="2" anchor='northwest'> - <JLabel text='isisfish.vcs.update.remote' - toolTipText='isisfish.vcs.update.tooltip.remote'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_missing' - text='isisfish.vcs.update.remote.missing' - toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_missing'> - <JTable id="table_missing" - autoResizeMode='3' - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdate' - text='isisfish.vcs.update.remote.outofdate' - toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdate'> - <JTable id="table_outofdate" - autoResizeMode='3' - onMouseClicked="doRefresh()" - rowSelectionAllowed="true"/> - </JScrollPane> - </cell> - </row> - </Table> - <Table weightx="1" id='tableLocal'> - <row> - <cell columns="2" anchor='west'> - <JLabel text='isisfish.vcs.update.local' - toolTipText='isisfish.vcs.update.tooltip.local'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_unversionned' - text='isisfish.vcs.update.local.unversionned' - toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_unversionned'> - <JTable id="table_unversionned" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_modified' - text='isisfish.vcs.update.local.modified' - toolTipText='isisfish.vcs.update.local.tooltip.modified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_modified'> - <JTable id="table_modified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdateAndModified' - text='isisfish.vcs.update.local.outofdateAndModified' - toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdateAndModified'> - <JTable id="table_outofdateAndModified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - </Table> - </JSplitPane> - <JScrollPane> - <JTextPane id="logText" editable="false" - focusable='false'/> - </JScrollPane> - </JSplitPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="3" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.update.checkAll' - toolTipText='isisfish.vcs.update.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.update.ok' - enabled='{isOkEnabled()}' - onActionPerformed="dispose()"/> - <JButton id='cancel' text='isisfish.vcs.update.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,170 +0,0 @@ -<JDialog> - <script> - 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; - - public boolean cancel; - protected boolean invalidFirstName; - protected boolean invalidLastName; - protected boolean invalidKey; - protected boolean invalidEmail; - protected boolean invalidLogin; - - private String oldEmail; - private String oldServerLogin; - private boolean oldUseSsh; - private boolean oldNoPassPhrase; - private String oldLastname; - private String oldFirstname; - private String oldServerPrivateKeyFile; - - protected void saveOld() { - this.oldFirstname=firstname.getText(); - this.oldLastname=lasstname.getText(); - this.oldEmail =email.getText(); - this.oldServerLogin=serverLogin.getText(); - this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); - this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); - this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); - doCheck(); - } - - protected void restoreOld() { - firstname.setText(oldFirstname); - lasstname.setText(oldLastname); - email.setText(oldEmail); - serverLogin.setText(oldServerLogin); - serverPrivateKeyFile.setText(oldServerPrivateKeyFile); - serverAuthenticationMethodSsh.setSelected(oldUseSsh); - serverNoPassPhrase.setSelected(oldNoPassPhrase); - doCheck(); - } - public boolean isConfigValid() { - return check(serverAuthenticationMethodSsh.isSelected()); - } - - protected boolean check(boolean ssh) { - invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); - invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); - invalidEmail=email.isVisible() && email.getText().isEmpty(); - if (ssh) { - String file = serverPrivateKeyFile.getText(); - invalidKey=file.isEmpty() || !new java.io.File(file).exists(); - invalidLogin=serverLogin.getText().isEmpty(); - } else { - invalidLogin=false; - invalidKey=false; - } - return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); - } - - protected void doCheck() { - boolean ssh = serverAuthenticationMethodSsh.isSelected(); - ok.setEnabled(check(ssh)); - if (ssh) { - serverPrivateKeyGenerate.setEnabled(!invalidLogin); - } else { - serverPrivateKeyGenerate.setEnabled(false); - } - setColor(invalidFirstName, firstnameLabel); - setColor(invalidLastName, lasstnameLabel); - setColor(invalidEmail, emailLabel); - setColor(invalidLogin, serverLoginLabel); - setColor(invalidKey, serverPrivateKeyFileLabel); - } - - protected void setColor(boolean invalid, JComponent component) { - component.setForeground(invalid ? Color.red: Color.black); - } - </script> - <Table> - <row fill='horizontal'> - <cell columns='2' weighty="1" fill='both'> - <JScrollPane height="60"> - <JEditorPane id="doc" /> - </JScrollPane> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> - </cell> - <cell> - <JTextField id='firstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> - </cell> - <cell> - <JTextField id='lasstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='emailLabel' text='isisfish.launch.email'/> - </cell> - <cell> - <JTextField id='email' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> - </cell> - <cell> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> - <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false'/> - <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,124 +0,0 @@ -<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> - <script> - import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; - import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; - import org.codelutin.util.FileUtil; - import java.io.File; - import java.io.IOException; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.HashMap; - import java.util.Map; - - private static VCSGenerateSshKeyUI instance; - - public static VCSGenerateSshKeyUI getInstance(JDialog parent) { - if (instance == null) { - instance = new VCSGenerateSshKeyUI(parent); - } - return instance; - } - - public boolean cancel; - public boolean noPassPhrase; - public Exception error; - protected boolean invalidPassPhrase; - protected String vcsLogin; - - private VCSGenerateSshKeyUI(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - - public void setData(String vcsLogin, File privateKeyFile) { - this.vcsLogin = vcsLogin ; - serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); - serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); - noPassPhrase=true; - error=null; - doCheck(); - } - - protected boolean doGenerate() { - File f = new File(getServerPrivateKeyFile().getText()); - try { - SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); - char[] password = getServerPassPhrase().getPassword(); - noPassPhrase=password.length==0; - if (password.length > 0) { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); - Arrays.fill(password, '0'); - } else { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); - } - // convert to openSSH ? - File publicKeyFile = new File(serverPublicKeyFile.getText()); - log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); - String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); - log.info("public key OpenSsh : "+openSshPublicKey); - FileUtil.writeString(publicKeyFile, openSshPublicKey); - } catch (Exception e) { - error=e; - return true; - } - return false; - } - protected boolean check() { - invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.getPassword()); - return !invalidPassPhrase; - } - - protected void doCheck() { - ok.setEnabled(check()); - setColor(invalidPassPhrase, serverPassPhraseLabel); - setColor(invalidPassPhrase, serverConfirmPassPhraseLabel); - } - - protected void setColor(boolean invalid, JComponent component) { - component.setForeground(invalid ? Color.red: Color.black); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> - </cell> - <cell> - <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 18:09:00 UTC (rev 1555) @@ -1,62 +0,0 @@ -<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> - <script> - private boolean cancel; - private static VCSPassPhraseUI instance; - - public static char[] getPassPhrase(boolean useUI) { - if (!useUI) { - System.out.print("Enter passphrase: "); - java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); - try { - java.lang.String s = ""; - s = bufferedreader.readLine(); - return s.toCharArray(); - } catch (IOException e) { - return null; - } finally { - if (bufferedreader!=null) { - try { - bufferedreader.close(); - } catch (IOException e) { - // ignore - } - } - } - } - if (instance == null) { - instance = new VCSPassPhraseUI(); - } - instance.setVisible(true); - if (instance.cancel) { - // use cancel - return null; - } - return instance.getServerPassPhrase().getPassword(); - } - private VCSPassPhraseUI(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.vcs.ask.passphrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPasswordField id='serverPassPhrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> - <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog>

1 0

r1554 - in isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui: versionning/jaxx widget/filter
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 18:06:35 +0000 (Mon, 13 Oct 2008) New Revision: 1554 Modified: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx Log: remove logger (is generated by jaxx) Modified: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) @@ -1,7 +1,5 @@ <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> <script> - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; import org.codelutin.util.FileUtil; @@ -12,8 +10,6 @@ import java.util.HashMap; import java.util.Map; - static protected final Log log = LogFactory.getLog(VCSGenerateSshKeyUI.class); - private static VCSGenerateSshKeyUI instance; public static VCSGenerateSshKeyUI getInstance(JDialog parent) { Modified: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) @@ -9,13 +9,9 @@ import java.io.PrintWriter; import java.io.StringWriter; - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; import org.codelutin.widget.DatePicker; import org.codelutin.widget.InvalidDateException; - protected static final Log log = LogFactory.getLog(FilterDialogUI.class); - /** filter model */ protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; @@ -58,7 +54,7 @@ * user ui action : reset previous filter results (if any) and restore * original dialogModel * - * @see FilterModel#doReset() + * @see FilterModel#reset() */ @SuppressWarnings({"unchecked"}) public void doReset() { Modified: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2008-10-13 18:06:35 UTC (rev 1554) @@ -2,11 +2,7 @@ <script> import org.codelutin.widget.DatePicker; import org.codelutin.widget.InvalidDateException; - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - - protected static final Log log = LogFactory.getLog(FilterPanelUI.class); - + protected fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog; protected static java.text.SimpleDateFormat simpleDateFormat =

1 0

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 17:01:29 +0000 (Mon, 13 Oct 2008) New Revision: 1553 Added: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx Removed: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogConsoleUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java Log: normalize jaxx file name: all in ***UI.jaxx in ui package remove jaxx package Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2008-10-13 17:01:29 UTC (rev 1553) @@ -37,6 +37,7 @@ import java.io.IOException; import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.ui.logging.console.LogConsoleUI; /** * this is the console of log Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2008-10-13 17:01:29 UTC (rev 1553) @@ -55,6 +55,8 @@ import java.awt.event.ActionListener; import java.awt.event.ActionEvent; +import fr.ifremer.isisfish.ui.logging.console.LogMailUI; + /** * This is the dialog to send mail from LogConsole * Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogConsoleUI.jaxx =================================================================== (Binary files differ) Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,57 +0,0 @@ -<JDialog> - <script> - public boolean isEmailValid(String text) { - if (text==null || "".equals(text)) { - return false; - } - //TODO make it better - //return text.match("^.*@.*\..*$"); - return true; - } - </script> - <Table> - <row fill='horizontal'> - <cell anchor="east" fill="both" columns="2"> - <JCheckBox id='sendAll' selected='true' - text='isisfish.log.sendAll' - toolTipText='isisfish.log.tooltip.sendAll'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel labelFor='{mailTo}' - text='isisfish.log.mailTo' - toolTipText='isisfish.log.tooltip.mailTo'/> - </cell> - <cell> - <JTextField id='mailTo' font-size='11' columns='30' - height='20'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JLabel labelFor='{content}' - text='isisfish.log.body' - toolTipText='isisfish.log.tooltip.body'/> - </cell> - </row> - <row fill='both'> - <cell columns='2' weighty="1" fill='both'> - <JScrollPane height="200"> - <JEditorPane id="content"/> - </JScrollPane> - </cell> - </row> - <row fill="horizontal"> - <cell columns="2" fill="both"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='sendMail' text='isisfish.log.sendMail' - toolTipText='isisfish.log.tooltip.sendMail' - enabled='{isEmailValid(mailTo.getText())}'/> - <JButton id='cancel' text='isisfish.common.cancel' - onActionPerformed='dispose()'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> \ No newline at end of file Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogConsoleUI.jaxx) =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -0,0 +1,57 @@ +<JDialog> + <script> + public boolean isEmailValid(String text) { + if (text==null || "".equals(text)) { + return false; + } + //TODO make it better + //return text.match("^.*@.*\..*$"); + return true; + } + </script> + <Table> + <row fill='horizontal'> + <cell anchor="east" fill="both" columns="2"> + <JCheckBox id='sendAll' selected='true' + text='isisfish.log.sendAll' + toolTipText='isisfish.log.tooltip.sendAll'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{mailTo}' + text='isisfish.log.mailTo' + toolTipText='isisfish.log.tooltip.mailTo'/> + </cell> + <cell> + <JTextField id='mailTo' font-size='11' columns='30' + height='20'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JLabel labelFor='{content}' + text='isisfish.log.body' + toolTipText='isisfish.log.tooltip.body'/> + </cell> + </row> + <row fill='both'> + <cell columns='2' weighty="1" fill='both'> + <JScrollPane height="200"> + <JEditorPane id="content"/> + </JScrollPane> + </cell> + </row> + <row fill="horizontal"> + <cell columns="2" fill="both"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='sendMail' text='isisfish.log.sendMail' + toolTipText='isisfish.log.tooltip.sendMail' + enabled='{isEmailValid(mailTo.getText())}'/> + <JButton id='cancel' text='isisfish.common.cancel' + onActionPerformed='dispose()'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -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 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/uimodel/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/uimodel/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -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"> +  + <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"> +  + <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/uimodel/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,67 +0,0 @@ -<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 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> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,107 +0,0 @@ -<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"> -  - <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"> -  - <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> Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -0,0 +1,64 @@ +<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> +  + <script> + // FIXME a refaire + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public CommitDialogUI(Dialog owner, boolean modal) { + super(owner, modal); + } + public boolean isEmpty() { + return items.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); + } + protected void reSize(JTable table) { + // implements me... + } + + </script> + <Table weightx="1"> + <row> + <cell columns='2'> + <JLabel id='label' font-size='12' + foreground='{new Color(051,102,225)}' + text='isisfish.vcs.commit.label'/> + </cell> + </row> + <row> + <cell columns='2' weighty="1" weightx='1' fill='both'> + <JScrollPane id='scroll' verticalScrollBarPolicy='20' > + <JTable id="items" onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal'> + <JScrollPane height='50' verticalScrollBarPolicy='21' + horizontalScrollBarPolicy='30'> + <JTextArea id='message' rows='2' columns='80'/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell> + <JButton id='ok' text='isisfish.vcs.commit.ok' + enabled='{isOkEnabled()}' + onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> + </cell> + <cell> + <JButton id='cancel' text='isisfish.vcs.commit.cancel' + onActionPerformed='dispose()'/> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/CommitDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -0,0 +1,70 @@ +<JDialog modal="true" title='isisfish.vcs.updateconfirm'> + <script> + // FIXME a refaire + + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public void doCheckAll() { +// if (model != null && model.getRowCount()>0) { +// model.checkAll(); +// doRefresh(); +// } + } + public boolean isEmpty() { + return model==null; // || model.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); // && model.getSelectedSize(0)>0; + } + protected void reSize(JTable table) { + // implements me... + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + </script> + <Table weightx="1"> + <row> + <cell columns='4'> + <JLabel font-size='12' foreground='{new Color(051,102,225)}' + text='isisfish.vcs.updateconfirm.label'/> + </cell> + </row> + <row> + <cell columns='4'> + <JLabel id='label2' font-size='12' foreground='{Color.RED}' + text='isisfish.vcs.updateconfirm.label2'/> + </cell> + </row> + <row> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane id='table'> + <JTable id="items" autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()" + onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="2" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.updateconfirm.checkAll' + toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' + enabled='{isOkEnabled()}'/> + <JButton id='cancel' + text='isisfish.vcs.updateconfirm.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateConfirmDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -0,0 +1,165 @@ +<JDialog modal="true" title='isisfish.vcs.update'> + <script> + // FIXME a refaire + +// import static org.codelutin.vcs.VCSState.*; +// import org.codelutin.vcs.VCSState; + +// protected org.codelutin.vcs.VCSRepositoryState model; + protected Object model; + + public void doCheckAll() { +// if (model!=null) { +// model.checkAll(checkAll.isSelected()); +// doRefresh(); +// } + } + + public boolean isEmpty() { + return model==null; // || model.isModelEmpty(); + } + + public boolean isOkEnabled() { + return !isEmpty(); // && model.getModelSelectedSize()>0; + } + + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + +// protected void reSize(VCSState state,JTable table) { +// +// } + </script> + <Table weightx="1"> + <row> + <cell columns='3' weighty="1" fill='both'> + <JSplitPane id='splitPane' orientation='vertical' + oneTouchExpandable='true'> + <JSplitPane id='splitPane2' orientation='horizontal' + oneTouchExpandable='true'> + <Table weightx="1" id='tableRemote'> + <row> + <cell columns="2" anchor='northwest'> + <JLabel text='isisfish.vcs.update.remote' + toolTipText='isisfish.vcs.update.tooltip.remote'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_missing' + text='isisfish.vcs.update.remote.missing' + toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_missing'> + <JTable id="table_missing" + autoResizeMode='3' + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdate' + text='isisfish.vcs.update.remote.outofdate' + toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdate'> + <JTable id="table_outofdate" + autoResizeMode='3' + onMouseClicked="doRefresh()" + rowSelectionAllowed="true"/> + </JScrollPane> + </cell> + </row> + </Table> + <Table weightx="1" id='tableLocal'> + <row> + <cell columns="2" anchor='west'> + <JLabel text='isisfish.vcs.update.local' + toolTipText='isisfish.vcs.update.tooltip.local'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_unversionned' + text='isisfish.vcs.update.local.unversionned' + toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_unversionned'> + <JTable id="table_unversionned" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_modified' + text='isisfish.vcs.update.local.modified' + toolTipText='isisfish.vcs.update.local.tooltip.modified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_modified'> + <JTable id="table_modified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdateAndModified' + text='isisfish.vcs.update.local.outofdateAndModified' + toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdateAndModified'> + <JTable id="table_outofdateAndModified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + </Table> + </JSplitPane> + <JScrollPane> + <JTextPane id="logText" editable="false" + focusable='false'/> + </JScrollPane> + </JSplitPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="3" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.update.checkAll' + toolTipText='isisfish.vcs.update.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.update.ok' + enabled='{isOkEnabled()}' + onActionPerformed="dispose()"/> + <JButton id='cancel' text='isisfish.vcs.update.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/UpdateDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -0,0 +1,170 @@ +<JDialog> + <script> + 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; + + public boolean cancel; + protected boolean invalidFirstName; + protected boolean invalidLastName; + protected boolean invalidKey; + protected boolean invalidEmail; + protected boolean invalidLogin; + + private String oldEmail; + private String oldServerLogin; + private boolean oldUseSsh; + private boolean oldNoPassPhrase; + private String oldLastname; + private String oldFirstname; + private String oldServerPrivateKeyFile; + + protected void saveOld() { + this.oldFirstname=firstname.getText(); + this.oldLastname=lasstname.getText(); + this.oldEmail =email.getText(); + this.oldServerLogin=serverLogin.getText(); + this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); + this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); + this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); + doCheck(); + } + + protected void restoreOld() { + firstname.setText(oldFirstname); + lasstname.setText(oldLastname); + email.setText(oldEmail); + serverLogin.setText(oldServerLogin); + serverPrivateKeyFile.setText(oldServerPrivateKeyFile); + serverAuthenticationMethodSsh.setSelected(oldUseSsh); + serverNoPassPhrase.setSelected(oldNoPassPhrase); + doCheck(); + } + public boolean isConfigValid() { + return check(serverAuthenticationMethodSsh.isSelected()); + } + + protected boolean check(boolean ssh) { + invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); + invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); + invalidEmail=email.isVisible() && email.getText().isEmpty(); + if (ssh) { + String file = serverPrivateKeyFile.getText(); + invalidKey=file.isEmpty() || !new java.io.File(file).exists(); + invalidLogin=serverLogin.getText().isEmpty(); + } else { + invalidLogin=false; + invalidKey=false; + } + return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); + } + + protected void doCheck() { + boolean ssh = serverAuthenticationMethodSsh.isSelected(); + ok.setEnabled(check(ssh)); + if (ssh) { + serverPrivateKeyGenerate.setEnabled(!invalidLogin); + } else { + serverPrivateKeyGenerate.setEnabled(false); + } + setColor(invalidFirstName, firstnameLabel); + setColor(invalidLastName, lasstnameLabel); + setColor(invalidEmail, emailLabel); + setColor(invalidLogin, serverLoginLabel); + setColor(invalidKey, serverPrivateKeyFileLabel); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.red: Color.black); + } + </script> + <Table> + <row fill='horizontal'> + <cell columns='2' weighty="1" fill='both'> + <JScrollPane height="60"> + <JEditorPane id="doc" /> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> + </cell> + <cell> + <JTextField id='firstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> + </cell> + <cell> + <JTextField id='lasstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='emailLabel' text='isisfish.launch.email'/> + </cell> + <cell> + <JTextField id='email' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> + </cell> + <cell> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> + <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false'/> + <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSConfigUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -0,0 +1,128 @@ +<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> + <script> + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; + import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; + import org.codelutin.util.FileUtil; + import java.io.File; + import java.io.IOException; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.HashMap; + import java.util.Map; + + static protected final Log log = LogFactory.getLog(VCSGenerateSshKeyUI.class); + + private static VCSGenerateSshKeyUI instance; + + public static VCSGenerateSshKeyUI getInstance(JDialog parent) { + if (instance == null) { + instance = new VCSGenerateSshKeyUI(parent); + } + return instance; + } + + public boolean cancel; + public boolean noPassPhrase; + public Exception error; + protected boolean invalidPassPhrase; + protected String vcsLogin; + + private VCSGenerateSshKeyUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + + public void setData(String vcsLogin, File privateKeyFile) { + this.vcsLogin = vcsLogin ; + serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); + serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); + noPassPhrase=true; + error=null; + doCheck(); + } + + protected boolean doGenerate() { + File f = new File(getServerPrivateKeyFile().getText()); + try { + SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); + char[] password = getServerPassPhrase().getPassword(); + noPassPhrase=password.length==0; + if (password.length > 0) { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); + Arrays.fill(password, '0'); + } else { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); + } + // convert to openSSH ? + File publicKeyFile = new File(serverPublicKeyFile.getText()); + log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); + String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); + log.info("public key OpenSsh : "+openSshPublicKey); + FileUtil.writeString(publicKeyFile, openSshPublicKey); + } catch (Exception e) { + error=e; + return true; + } + return false; + } + protected boolean check() { + invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.getPassword()); + return !invalidPassPhrase; + } + + protected void doCheck() { + ok.setEnabled(check()); + setColor(invalidPassPhrase, serverPassPhraseLabel); + setColor(invalidPassPhrase, serverConfirmPassPhraseLabel); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.red: Color.black); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> + </cell> + <cell> + <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSGenerateSshKeyUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx (from rev 1552, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -0,0 +1,62 @@ +<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> + <script> + private boolean cancel; + private static VCSPassPhraseUI instance; + + public static char[] getPassPhrase(boolean useUI) { + if (!useUI) { + System.out.print("Enter passphrase: "); + java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); + try { + java.lang.String s = ""; + s = bufferedreader.readLine(); + return s.toCharArray(); + } catch (IOException e) { + return null; + } finally { + if (bufferedreader!=null) { + try { + bufferedreader.close(); + } catch (IOException e) { + // ignore + } + } + } + } + if (instance == null) { + instance = new VCSPassPhraseUI(); + } + instance.setVisible(true); + if (instance.cancel) { + // use cancel + return null; + } + return instance.getServerPassPhrase().getPassword(); + } + private VCSPassPhraseUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.vcs.ask.passphrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JPasswordField id='serverPassPhrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> + <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/versionning/jaxx/VCSPassPhraseUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,64 +0,0 @@ -<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> -  - <script> - // FIXME a refaire - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public CommitDialogUI(Dialog owner, boolean modal) { - super(owner, modal); - } - public boolean isEmpty() { - return items.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); - } - protected void reSize(JTable table) { - // implements me... - } - - </script> - <Table weightx="1"> - <row> - <cell columns='2'> - <JLabel id='label' font-size='12' - foreground='{new Color(051,102,225)}' - text='isisfish.vcs.commit.label'/> - </cell> - </row> - <row> - <cell columns='2' weighty="1" weightx='1' fill='both'> - <JScrollPane id='scroll' verticalScrollBarPolicy='20' > - <JTable id="items" onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal'> - <JScrollPane height='50' verticalScrollBarPolicy='21' - horizontalScrollBarPolicy='30'> - <JTextArea id='message' rows='2' columns='80'/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell> - <JButton id='ok' text='isisfish.vcs.commit.ok' - enabled='{isOkEnabled()}' - onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> - </cell> - <cell> - <JButton id='cancel' text='isisfish.vcs.commit.cancel' - onActionPerformed='dispose()'/> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,70 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.updateconfirm'> - <script> - // FIXME a refaire - - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public void doCheckAll() { -// if (model != null && model.getRowCount()>0) { -// model.checkAll(); -// doRefresh(); -// } - } - public boolean isEmpty() { - return model==null; // || model.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); // && model.getSelectedSize(0)>0; - } - protected void reSize(JTable table) { - // implements me... - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - </script> - <Table weightx="1"> - <row> - <cell columns='4'> - <JLabel font-size='12' foreground='{new Color(051,102,225)}' - text='isisfish.vcs.updateconfirm.label'/> - </cell> - </row> - <row> - <cell columns='4'> - <JLabel id='label2' font-size='12' foreground='{Color.RED}' - text='isisfish.vcs.updateconfirm.label2'/> - </cell> - </row> - <row> - <cell columns='4' weighty="1" fill='both'> - <JScrollPane id='table'> - <JTable id="items" autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()" - onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="2" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.updateconfirm.checkAll' - toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' - enabled='{isOkEnabled()}'/> - <JButton id='cancel' - text='isisfish.vcs.updateconfirm.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,165 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.update'> - <script> - // FIXME a refaire - -// import static org.codelutin.vcs.VCSState.*; -// import org.codelutin.vcs.VCSState; - -// protected org.codelutin.vcs.VCSRepositoryState model; - protected Object model; - - public void doCheckAll() { -// if (model!=null) { -// model.checkAll(checkAll.isSelected()); -// doRefresh(); -// } - } - - public boolean isEmpty() { - return model==null; // || model.isModelEmpty(); - } - - public boolean isOkEnabled() { - return !isEmpty(); // && model.getModelSelectedSize()>0; - } - - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - -// protected void reSize(VCSState state,JTable table) { -// -// } - </script> - <Table weightx="1"> - <row> - <cell columns='3' weighty="1" fill='both'> - <JSplitPane id='splitPane' orientation='vertical' - oneTouchExpandable='true'> - <JSplitPane id='splitPane2' orientation='horizontal' - oneTouchExpandable='true'> - <Table weightx="1" id='tableRemote'> - <row> - <cell columns="2" anchor='northwest'> - <JLabel text='isisfish.vcs.update.remote' - toolTipText='isisfish.vcs.update.tooltip.remote'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_missing' - text='isisfish.vcs.update.remote.missing' - toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_missing'> - <JTable id="table_missing" - autoResizeMode='3' - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdate' - text='isisfish.vcs.update.remote.outofdate' - toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdate'> - <JTable id="table_outofdate" - autoResizeMode='3' - onMouseClicked="doRefresh()" - rowSelectionAllowed="true"/> - </JScrollPane> - </cell> - </row> - </Table> - <Table weightx="1" id='tableLocal'> - <row> - <cell columns="2" anchor='west'> - <JLabel text='isisfish.vcs.update.local' - toolTipText='isisfish.vcs.update.tooltip.local'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_unversionned' - text='isisfish.vcs.update.local.unversionned' - toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_unversionned'> - <JTable id="table_unversionned" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_modified' - text='isisfish.vcs.update.local.modified' - toolTipText='isisfish.vcs.update.local.tooltip.modified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_modified'> - <JTable id="table_modified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdateAndModified' - text='isisfish.vcs.update.local.outofdateAndModified' - toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdateAndModified'> - <JTable id="table_outofdateAndModified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - </Table> - </JSplitPane> - <JScrollPane> - <JTextPane id="logText" editable="false" - focusable='false'/> - </JScrollPane> - </JSplitPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="3" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.update.checkAll' - toolTipText='isisfish.vcs.update.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.update.ok' - enabled='{isOkEnabled()}' - onActionPerformed="dispose()"/> - <JButton id='cancel' text='isisfish.vcs.update.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,170 +0,0 @@ -<JDialog> - <script> - 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; - - public boolean cancel; - protected boolean invalidFirstName; - protected boolean invalidLastName; - protected boolean invalidKey; - protected boolean invalidEmail; - protected boolean invalidLogin; - - private String oldEmail; - private String oldServerLogin; - private boolean oldUseSsh; - private boolean oldNoPassPhrase; - private String oldLastname; - private String oldFirstname; - private String oldServerPrivateKeyFile; - - protected void saveOld() { - this.oldFirstname=firstname.getText(); - this.oldLastname=lasstname.getText(); - this.oldEmail =email.getText(); - this.oldServerLogin=serverLogin.getText(); - this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); - this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); - this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); - doCheck(); - } - - protected void restoreOld() { - firstname.setText(oldFirstname); - lasstname.setText(oldLastname); - email.setText(oldEmail); - serverLogin.setText(oldServerLogin); - serverPrivateKeyFile.setText(oldServerPrivateKeyFile); - serverAuthenticationMethodSsh.setSelected(oldUseSsh); - serverNoPassPhrase.setSelected(oldNoPassPhrase); - doCheck(); - } - public boolean isConfigValid() { - return check(serverAuthenticationMethodSsh.isSelected()); - } - - protected boolean check(boolean ssh) { - invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); - invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); - invalidEmail=email.isVisible() && email.getText().isEmpty(); - if (ssh) { - String file = serverPrivateKeyFile.getText(); - invalidKey=file.isEmpty() || !new java.io.File(file).exists(); - invalidLogin=serverLogin.getText().isEmpty(); - } else { - invalidLogin=false; - invalidKey=false; - } - return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); - } - - protected void doCheck() { - boolean ssh = serverAuthenticationMethodSsh.isSelected(); - ok.setEnabled(check(ssh)); - if (ssh) { - serverPrivateKeyGenerate.setEnabled(!invalidLogin); - } else { - serverPrivateKeyGenerate.setEnabled(false); - } - setColor(invalidFirstName, firstnameLabel); - setColor(invalidLastName, lasstnameLabel); - setColor(invalidEmail, emailLabel); - setColor(invalidLogin, serverLoginLabel); - setColor(invalidKey, serverPrivateKeyFileLabel); - } - - protected void setColor(boolean invalid, JComponent component) { - component.setForeground(invalid ? Color.red: Color.black); - } - </script> - <Table> - <row fill='horizontal'> - <cell columns='2' weighty="1" fill='both'> - <JScrollPane height="60"> - <JEditorPane id="doc" /> - </JScrollPane> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> - </cell> - <cell> - <JTextField id='firstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> - </cell> - <cell> - <JTextField id='lasstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='emailLabel' text='isisfish.launch.email'/> - </cell> - <cell> - <JTextField id='email' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> - </cell> - <cell> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> - <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false'/> - <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,128 +0,0 @@ -<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> - <script> - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; - import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; - import org.codelutin.util.FileUtil; - import java.io.File; - import java.io.IOException; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.HashMap; - import java.util.Map; - - static protected final Log log = LogFactory.getLog(VCSGenerateSshKeyUI.class); - - private static VCSGenerateSshKeyUI instance; - - public static VCSGenerateSshKeyUI getInstance(JDialog parent) { - if (instance == null) { - instance = new VCSGenerateSshKeyUI(parent); - } - return instance; - } - - public boolean cancel; - public boolean noPassPhrase; - public Exception error; - protected boolean invalidPassPhrase; - protected String vcsLogin; - - private VCSGenerateSshKeyUI(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - - public void setData(String vcsLogin, File privateKeyFile) { - this.vcsLogin = vcsLogin ; - serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); - serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); - noPassPhrase=true; - error=null; - doCheck(); - } - - protected boolean doGenerate() { - File f = new File(getServerPrivateKeyFile().getText()); - try { - SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); - char[] password = getServerPassPhrase().getPassword(); - noPassPhrase=password.length==0; - if (password.length > 0) { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); - Arrays.fill(password, '0'); - } else { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); - } - // convert to openSSH ? - File publicKeyFile = new File(serverPublicKeyFile.getText()); - log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); - String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); - log.info("public key OpenSsh : "+openSshPublicKey); - FileUtil.writeString(publicKeyFile, openSshPublicKey); - } catch (Exception e) { - error=e; - return true; - } - return false; - } - protected boolean check() { - invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.getPassword()); - return !invalidPassPhrase; - } - - protected void doCheck() { - ok.setEnabled(check()); - setColor(invalidPassPhrase, serverPassPhraseLabel); - setColor(invalidPassPhrase, serverConfirmPassPhraseLabel); - } - - protected void setColor(boolean invalid, JComponent component) { - component.setForeground(invalid ? Color.red: Color.black); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> - </cell> - <cell> - <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 17:01:29 UTC (rev 1553) @@ -1,62 +0,0 @@ -<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> - <script> - private boolean cancel; - private static VCSPassPhraseUI instance; - - public static char[] getPassPhrase(boolean useUI) { - if (!useUI) { - System.out.print("Enter passphrase: "); - java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); - try { - java.lang.String s = ""; - s = bufferedreader.readLine(); - return s.toCharArray(); - } catch (IOException e) { - return null; - } finally { - if (bufferedreader!=null) { - try { - bufferedreader.close(); - } catch (IOException e) { - // ignore - } - } - } - } - if (instance == null) { - instance = new VCSPassPhraseUI(); - } - instance.setVisible(true); - if (instance.cancel) { - // use cancel - return null; - } - return instance.getServerPassPhrase().getPassword(); - } - private VCSPassPhraseUI(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.vcs.ask.passphrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPasswordField id='serverPassPhrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> - <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog>

1 0

r1552 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/logging/console java/fr/ifremer/isisfish/ui/simulator/filter uimodel/fr/ifremer/isisfish/logging/console uimodel/fr/ifremer/isisfish/ui/script/jaxx uimodel/fr/ifremer/isisfish/ui/simulator/filter uimodel/fr/ifremer/isisfish/ui/widget/filter uimodel/fr/ifremer/isisfish/versionning/ui/jaxx
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 16:53:11 +0000 (Mon, 13 Oct 2008) New Revision: 1552 Added: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogConsoleUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx Removed: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogConsole.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogMail.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JExportDialog.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JImportDialog.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JCommitDialog.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateConfirmDialog.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateDialog.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSConfig.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSGenerateSshKey.jaxx isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSPassPhrase.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java Log: normalize jaxx file name: all in ***UI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2008-10-13 16:53:11 UTC (rev 1552) @@ -43,7 +43,7 @@ * * @author chemit */ -public class LogConsole extends JLogConsole implements ChangeListener { +public class LogConsole extends LogConsoleUI implements ChangeListener { static private Log log = LogFactory.getLog(LogConsole.class); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2008-10-13 16:53:11 UTC (rev 1552) @@ -61,7 +61,7 @@ * @author chemit */ -public class LogMail extends JLogMail { +public class LogMail extends LogMailUI { static private final Log log = getLog(LogMail.class); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2008-10-13 16:53:11 UTC (rev 1552) @@ -4,7 +4,7 @@ import fr.ifremer.isisfish.ui.widget.filter.FilterDialog; import fr.ifremer.isisfish.ui.widget.filter.FilterModel; -public class SimulationFilterDialog extends JSimulationFilterDialog implements FilterDialog<SimulationProperties, String> { +public class SimulationFilterDialog extends SimulationFilterDialogUI implements FilterDialog<SimulationProperties, String> { private static final long serialVersionUID = -3855836958371282956L; Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogConsole.jaxx =================================================================== (Binary files differ) Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogMail.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogMail.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogMail.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,57 +0,0 @@ -<JDialog> - <script> - public boolean isEmailValid(String text) { - if (text==null || "".equals(text)) { - return false; - } - //TODO make it better - //return text.match("^.*@.*\..*$"); - return true; - } - </script> - <Table> - <row fill='horizontal'> - <cell anchor="east" fill="both" columns="2"> - <JCheckBox id='sendAll' selected='true' - text='isisfish.log.sendAll' - toolTipText='isisfish.log.tooltip.sendAll'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel labelFor='{mailTo}' - text='isisfish.log.mailTo' - toolTipText='isisfish.log.tooltip.mailTo'/> - </cell> - <cell> - <JTextField id='mailTo' font-size='11' columns='30' - height='20'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JLabel labelFor='{content}' - text='isisfish.log.body' - toolTipText='isisfish.log.tooltip.body'/> - </cell> - </row> - <row fill='both'> - <cell columns='2' weighty="1" fill='both'> - <JScrollPane height="200"> - <JEditorPane id="content"/> - </JScrollPane> - </cell> - </row> - <row fill="horizontal"> - <cell columns="2" fill="both"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='sendMail' text='isisfish.log.sendMail' - toolTipText='isisfish.log.tooltip.sendMail' - enabled='{isEmailValid(mailTo.getText())}'/> - <JButton id='cancel' text='isisfish.common.cancel' - onActionPerformed='dispose()'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> \ No newline at end of file Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogConsoleUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogConsole.jaxx) =================================================================== (Binary files differ) Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogConsoleUI.jaxx ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/JLogMail.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,57 @@ +<JDialog> + <script> + public boolean isEmailValid(String text) { + if (text==null || "".equals(text)) { + return false; + } + //TODO make it better + //return text.match("^.*@.*\..*$"); + return true; + } + </script> + <Table> + <row fill='horizontal'> + <cell anchor="east" fill="both" columns="2"> + <JCheckBox id='sendAll' selected='true' + text='isisfish.log.sendAll' + toolTipText='isisfish.log.tooltip.sendAll'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel labelFor='{mailTo}' + text='isisfish.log.mailTo' + toolTipText='isisfish.log.tooltip.mailTo'/> + </cell> + <cell> + <JTextField id='mailTo' font-size='11' columns='30' + height='20'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JLabel labelFor='{content}' + text='isisfish.log.body' + toolTipText='isisfish.log.tooltip.body'/> + </cell> + </row> + <row fill='both'> + <cell columns='2' weighty="1" fill='both'> + <JScrollPane height="200"> + <JEditorPane id="content"/> + </JScrollPane> + </cell> + </row> + <row fill="horizontal"> + <cell columns="2" fill="both"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='sendMail' text='isisfish.log.sendMail' + toolTipText='isisfish.log.tooltip.sendMail' + enabled='{isEmailValid(mailTo.getText())}'/> + <JButton id='cancel' text='isisfish.common.cancel' + onActionPerformed='dispose()'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> \ No newline at end of file Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/logging/console/LogMailUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JExportDialog.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -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 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/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ExportDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JImportDialog.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -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"> +  + <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"> +  + <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/uimodel/fr/ifremer/isisfish/ui/script/jaxx/ImportDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JExportDialog.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JExportDialog.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JExportDialog.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,67 +0,0 @@ -<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 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> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JImportDialog.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JImportDialog.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/script/jaxx/JImportDialog.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,107 +0,0 @@ -<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"> -  - <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"> -  - <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> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,3 +0,0 @@ -<fr.ifremer.isisfish.ui.widget.filter.JFilterDialog modal="true"> - <fr.ifremer.isisfish.ui.simulator.filter.JSimulationFilterPanel id='content' constructorParams='this'/> -</fr.ifremer.isisfish.ui.widget.filter.JFilterDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,138 +0,0 @@ -<fr.ifremer.isisfish.ui.widget.filter.JFilterPanel> - <script> - import fr.ifremer.isisfish.simulator.SimulationMeta; - - protected static java.text.SimpleDateFormat simpleDateFormat = - new java.text.SimpleDateFormat("dd/MM/yyyy"); - - public JSimulationFilterPanel(fr.ifremer.isisfish.ui.widget.filter.JFilterDialog 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.JFilterPanel> Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterDialog.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -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/uimodel/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/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/JSimulationFilterPanel.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -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/uimodel/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/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,195 @@ +<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.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import org.codelutin.widget.DatePicker; + import org.codelutin.widget.InvalidDateException; + + protected static final Log log = LogFactory.getLog(FilterDialogUI.class); + + /** 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#doReset() + */ + @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/uimodel/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/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,67 @@ +<JPanel> + <script> + import org.codelutin.widget.DatePicker; + import org.codelutin.widget.InvalidDateException; + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + + protected static final Log log = LogFactory.getLog(FilterPanelUI.class); + + 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/uimodel/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/widget/filter/JFilterDialog.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterDialog.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,195 +0,0 @@ -<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.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - import org.codelutin.widget.DatePicker; - import org.codelutin.widget.InvalidDateException; - - protected static final Log log = LogFactory.getLog(JFilterDialog.class); - - /** 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#doReset() - */ - @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.JFilterPanel 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> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/ui/widget/filter/JFilterPanel.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,67 +0,0 @@ -<JPanel> - <script> - import org.codelutin.widget.DatePicker; - import org.codelutin.widget.InvalidDateException; - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - - protected static final Log log = LogFactory.getLog(JFilterPanel.class); - - protected fr.ifremer.isisfish.ui.widget.filter.JFilterDialog dialog; - - protected static java.text.SimpleDateFormat simpleDateFormat = - new java.text.SimpleDateFormat("dd/MM/yyyy"); - - protected JFilterPanel(fr.ifremer.isisfish.ui.widget.filter.JFilterDialog 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> Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JCommitDialog.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,64 @@ +<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> +  + <script> + // FIXME a refaire + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public CommitDialogUI(Dialog owner, boolean modal) { + super(owner, modal); + } + public boolean isEmpty() { + return items.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); + } + protected void reSize(JTable table) { + // implements me... + } + + </script> + <Table weightx="1"> + <row> + <cell columns='2'> + <JLabel id='label' font-size='12' + foreground='{new Color(051,102,225)}' + text='isisfish.vcs.commit.label'/> + </cell> + </row> + <row> + <cell columns='2' weighty="1" weightx='1' fill='both'> + <JScrollPane id='scroll' verticalScrollBarPolicy='20' > + <JTable id="items" onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns='2' fill='horizontal'> + <JScrollPane height='50' verticalScrollBarPolicy='21' + horizontalScrollBarPolicy='30'> + <JTextArea id='message' rows='2' columns='80'/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell> + <JButton id='ok' text='isisfish.vcs.commit.ok' + enabled='{isOkEnabled()}' + onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> + </cell> + <cell> + <JButton id='cancel' text='isisfish.vcs.commit.cancel' + onActionPerformed='dispose()'/> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/CommitDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JCommitDialog.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JCommitDialog.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JCommitDialog.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,64 +0,0 @@ -<JDialog id="Update" modal="true" title='isisfish.vcs.commit'> -  - <script> - // FIXME a refaire - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public JCommitDialog(Dialog owner, boolean modal) { - super(owner, modal); - } - public boolean isEmpty() { - return items.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"ok.enabled"); - } - protected void reSize(JTable table) { - // implements me... - } - - </script> - <Table weightx="1"> - <row> - <cell columns='2'> - <JLabel id='label' font-size='12' - foreground='{new Color(051,102,225)}' - text='isisfish.vcs.commit.label'/> - </cell> - </row> - <row> - <cell columns='2' weighty="1" weightx='1' fill='both'> - <JScrollPane id='scroll' verticalScrollBarPolicy='20' > - <JTable id="items" onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns='2' fill='horizontal'> - <JScrollPane height='50' verticalScrollBarPolicy='21' - horizontalScrollBarPolicy='30'> - <JTextArea id='message' rows='2' columns='80'/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell> - <JButton id='ok' text='isisfish.vcs.commit.ok' - enabled='{isOkEnabled()}' - onActionPerformed='/*fr.ifremer.isisfish.versionning.ui.VCSUIHelper.COMMIT_MSG=message.getText();*/dispose()'/> - </cell> - <cell> - <JButton id='cancel' text='isisfish.vcs.commit.cancel' - onActionPerformed='dispose()'/> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateConfirmDialog.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateConfirmDialog.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateConfirmDialog.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,70 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.updateconfirm'> - <script> - // FIXME a refaire - - -// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; -// import org.codelutin.vcs.VCSFileState; - -// protected ModuleFile<VCSFileState> model; - protected Object model; - - public void doCheckAll() { -// if (model != null && model.getRowCount()>0) { -// model.checkAll(); -// doRefresh(); -// } - } - public boolean isEmpty() { - return model==null; // || model.getRowCount()==0; - } - public boolean isOkEnabled() { - return !isEmpty(); // && model.getSelectedSize(0)>0; - } - protected void reSize(JTable table) { - // implements me... - } - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - </script> - <Table weightx="1"> - <row> - <cell columns='4'> - <JLabel font-size='12' foreground='{new Color(051,102,225)}' - text='isisfish.vcs.updateconfirm.label'/> - </cell> - </row> - <row> - <cell columns='4'> - <JLabel id='label2' font-size='12' foreground='{Color.RED}' - text='isisfish.vcs.updateconfirm.label2'/> - </cell> - </row> - <row> - <cell columns='4' weighty="1" fill='both'> - <JScrollPane id='table'> - <JTable id="items" autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()" - onComponentResized="reSize(items)"/> - </JScrollPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="2" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.updateconfirm.checkAll' - toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' - enabled='{isOkEnabled()}'/> - <JButton id='cancel' - text='isisfish.vcs.updateconfirm.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateDialog.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateDialog.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateDialog.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,165 +0,0 @@ -<JDialog modal="true" title='isisfish.vcs.update'> - <script> - // FIXME a refaire - -// import static org.codelutin.vcs.VCSState.*; -// import org.codelutin.vcs.VCSState; - -// protected org.codelutin.vcs.VCSRepositoryState model; - protected Object model; - - public void doCheckAll() { -// if (model!=null) { -// model.checkAll(checkAll.isSelected()); -// doRefresh(); -// } - } - - public boolean isEmpty() { - return model==null; // || model.isModelEmpty(); - } - - public boolean isOkEnabled() { - return !isEmpty(); // && model.getModelSelectedSize()>0; - } - - public void doRefresh() { - fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); - } - -// protected void reSize(VCSState state,JTable table) { -// -// } - </script> - <Table weightx="1"> - <row> - <cell columns='3' weighty="1" fill='both'> - <JSplitPane id='splitPane' orientation='vertical' - oneTouchExpandable='true'> - <JSplitPane id='splitPane2' orientation='horizontal' - oneTouchExpandable='true'> - <Table weightx="1" id='tableRemote'> - <row> - <cell columns="2" anchor='northwest'> - <JLabel text='isisfish.vcs.update.remote' - toolTipText='isisfish.vcs.update.tooltip.remote'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_missing' - text='isisfish.vcs.update.remote.missing' - toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_missing'> - <JTable id="table_missing" - autoResizeMode='3' - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdate' - text='isisfish.vcs.update.remote.outofdate' - toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdate'> - <JTable id="table_outofdate" - autoResizeMode='3' - onMouseClicked="doRefresh()" - rowSelectionAllowed="true"/> - </JScrollPane> - </cell> - </row> - </Table> - <Table weightx="1" id='tableLocal'> - <row> - <cell columns="2" anchor='west'> - <JLabel text='isisfish.vcs.update.local' - toolTipText='isisfish.vcs.update.tooltip.local'/> - </cell> - </row> - <row> - <cell> - <JLabel id='label_unversionned' - text='isisfish.vcs.update.local.unversionned' - toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_unversionned'> - <JTable id="table_unversionned" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_modified' - text='isisfish.vcs.update.local.modified' - toolTipText='isisfish.vcs.update.local.tooltip.modified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_modified'> - <JTable id="table_modified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - <row> - <cell> - <JLabel id='label_outofdateAndModified' - text='isisfish.vcs.update.local.outofdateAndModified' - toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> - </cell> - </row> - <row> - <cell weighty="1" fill='both'> - <JScrollPane id='scroll_outofdateAndModified'> - <JTable id="table_outofdateAndModified" - autoResizeMode='3' - rowSelectionAllowed="true" - onMouseClicked="doRefresh()"/> - </JScrollPane> - </cell> - </row> - </Table> - </JSplitPane> - <JScrollPane> - <JTextPane id="logText" editable="false" - focusable='false'/> - </JScrollPane> - </JSplitPane> - </cell> - </row> - <row weightx="1" fill='horizontal'> - <cell columns="3" fill='both'> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JCheckBox id='checkAll' - text='isisfish.vcs.update.checkAll' - toolTipText='isisfish.vcs.update.tooltip.checkAll' - enabled='{!isEmpty()}' - onActionPerformed="doCheckAll()"/> - <JButton id='ok' text='isisfish.vcs.update.ok' - enabled='{isOkEnabled()}' - onActionPerformed="dispose()"/> - <JButton id='cancel' text='isisfish.vcs.update.cancel'/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSConfig.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSConfig.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSConfig.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,170 +0,0 @@ -<JDialog> - <script> - 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; - - public boolean cancel; - protected boolean invalidFirstName; - protected boolean invalidLastName; - protected boolean invalidKey; - protected boolean invalidEmail; - protected boolean invalidLogin; - - private String oldEmail; - private String oldServerLogin; - private boolean oldUseSsh; - private boolean oldNoPassPhrase; - private String oldLastname; - private String oldFirstname; - private String oldServerPrivateKeyFile; - - protected void saveOld() { - this.oldFirstname=firstname.getText(); - this.oldLastname=lasstname.getText(); - this.oldEmail =email.getText(); - this.oldServerLogin=serverLogin.getText(); - this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); - this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); - this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); - doCheck(); - } - - protected void restoreOld() { - firstname.setText(oldFirstname); - lasstname.setText(oldLastname); - email.setText(oldEmail); - serverLogin.setText(oldServerLogin); - serverPrivateKeyFile.setText(oldServerPrivateKeyFile); - serverAuthenticationMethodSsh.setSelected(oldUseSsh); - serverNoPassPhrase.setSelected(oldNoPassPhrase); - doCheck(); - } - public boolean isConfigValid() { - return check(serverAuthenticationMethodSsh.isSelected()); - } - - protected boolean check(boolean ssh) { - invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); - invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); - invalidEmail=email.isVisible() && email.getText().isEmpty(); - if (ssh) { - String file = serverPrivateKeyFile.getText(); - invalidKey=file.isEmpty() || !new java.io.File(file).exists(); - invalidLogin=serverLogin.getText().isEmpty(); - } else { - invalidLogin=false; - invalidKey=false; - } - return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); - } - - protected void doCheck() { - boolean ssh = serverAuthenticationMethodSsh.isSelected(); - ok.setEnabled(check(ssh)); - if (ssh) { - serverPrivateKeyGenerate.setEnabled(!invalidLogin); - } else { - serverPrivateKeyGenerate.setEnabled(false); - } - setColor(invalidFirstName, firstnameLabel); - setColor(invalidLastName, lasstnameLabel); - setColor(invalidEmail, emailLabel); - setColor(invalidLogin, serverLoginLabel); - setColor(invalidKey, serverPrivateKeyFileLabel); - } - - protected void setColor(boolean invalid, JComponent component) { - component.setForeground(invalid ? Color.red: Color.black); - } - </script> - <Table> - <row fill='horizontal'> - <cell columns='2' weighty="1" fill='both'> - <JScrollPane height="60"> - <JEditorPane id="doc" /> - </JScrollPane> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> - </cell> - <cell> - <JTextField id='firstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> - </cell> - <cell> - <JTextField id='lasstname' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='emailLabel' text='isisfish.launch.email'/> - </cell> - <cell> - <JTextField id='email' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> - </cell> - <cell> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> - <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> - <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> - </JPanel> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false'/> - <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSGenerateSshKey.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSGenerateSshKey.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSGenerateSshKey.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,128 +0,0 @@ -<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> - <script> - import org.apache.commons.logging.Log; - import org.apache.commons.logging.LogFactory; - import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; - import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; - import org.codelutin.util.FileUtil; - import java.io.File; - import java.io.IOException; - import java.util.ArrayList; - import java.util.Arrays; - import java.util.HashMap; - import java.util.Map; - - static protected final Log log = LogFactory.getLog(JVCSGenerateSshKey.class); - - private static JVCSGenerateSshKey instance; - - public static JVCSGenerateSshKey getInstance(JDialog parent) { - if (instance == null) { - instance = new JVCSGenerateSshKey(parent); - } - return instance; - } - - public boolean cancel; - public boolean noPassPhrase; - public Exception error; - protected boolean invalidPassPhrase; - protected String vcsLogin; - - private JVCSGenerateSshKey(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - - public void setData(String vcsLogin, File privateKeyFile) { - this.vcsLogin = vcsLogin ; - serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); - serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); - noPassPhrase=true; - error=null; - doCheck(); - } - - protected boolean doGenerate() { - File f = new File(getServerPrivateKeyFile().getText()); - try { - SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); - char[] password = getServerPassPhrase().getPassword(); - noPassPhrase=password.length==0; - if (password.length > 0) { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); - Arrays.fill(password, '0'); - } else { - sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); - } - // convert to openSSH ? - File publicKeyFile = new File(serverPublicKeyFile.getText()); - log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); - String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); - log.info("public key OpenSsh : "+openSshPublicKey); - FileUtil.writeString(publicKeyFile, openSshPublicKey); - } catch (Exception e) { - error=e; - return true; - } - return false; - } - protected boolean check() { - invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.getPassword()); - return !invalidPassPhrase; - } - - protected void doCheck() { - ok.setEnabled(check()); - setColor(invalidPassPhrase, serverPassPhraseLabel); - setColor(invalidPassPhrase, serverConfirmPassPhraseLabel); - } - - protected void setColor(boolean invalid, JComponent component) { - component.setForeground(invalid ? Color.red: Color.black); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> - </cell> - <cell> - <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> - </cell> - <cell> - <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> - </cell> - <cell> - <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> - <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Deleted: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSPassPhrase.jaxx =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSPassPhrase.jaxx 2008-10-13 16:15:02 UTC (rev 1551) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSPassPhrase.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -1,62 +0,0 @@ -<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> - <script> - private boolean cancel; - private static JVCSPassPhrase instance; - - public static char[] getPassPhrase(boolean useUI) { - if (!useUI) { - System.out.print("Enter passphrase: "); - java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); - try { - java.lang.String s = ""; - s = bufferedreader.readLine(); - return s.toCharArray(); - } catch (IOException e) { - return null; - } finally { - if (bufferedreader!=null) { - try { - bufferedreader.close(); - } catch (IOException e) { - // ignore - } - } - } - } - if (instance == null) { - instance = new JVCSPassPhrase(); - } - instance.setVisible(true); - if (instance.cancel) { - // use cancel - return null; - } - return instance.getServerPassPhrase().getPassword(); - } - private JVCSPassPhrase(JDialog instance) { - super(instance); - // block close operation - setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); - } - </script> - <Table> - <row fill='horizontal'> - <cell> - <JLabel text='isisfish.vcs.ask.passphrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell> - <JPasswordField id='serverPassPhrase'/> - </cell> - </row> - <row fill='horizontal'> - <cell columns="2"> - <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> - <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> - <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> - </JPanel> - </cell> - </row> - </Table> -</JDialog> Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateConfirmDialog.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,70 @@ +<JDialog modal="true" title='isisfish.vcs.updateconfirm'> + <script> + // FIXME a refaire + + +// import org.codelutin.vcs.ui.FieldModelUtil.ModuleFile; +// import org.codelutin.vcs.VCSFileState; + +// protected ModuleFile<VCSFileState> model; + protected Object model; + + public void doCheckAll() { +// if (model != null && model.getRowCount()>0) { +// model.checkAll(); +// doRefresh(); +// } + } + public boolean isEmpty() { + return model==null; // || model.getRowCount()==0; + } + public boolean isOkEnabled() { + return !isEmpty(); // && model.getSelectedSize(0)>0; + } + protected void reSize(JTable table) { + // implements me... + } + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + </script> + <Table weightx="1"> + <row> + <cell columns='4'> + <JLabel font-size='12' foreground='{new Color(051,102,225)}' + text='isisfish.vcs.updateconfirm.label'/> + </cell> + </row> + <row> + <cell columns='4'> + <JLabel id='label2' font-size='12' foreground='{Color.RED}' + text='isisfish.vcs.updateconfirm.label2'/> + </cell> + </row> + <row> + <cell columns='4' weighty="1" fill='both'> + <JScrollPane id='table'> + <JTable id="items" autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()" + onComponentResized="reSize(items)"/> + </JScrollPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="2" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.updateconfirm.checkAll' + toolTipText='isisfish.vcs.updateconfirm.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.updateconfirm.ok' + enabled='{isOkEnabled()}'/> + <JButton id='cancel' + text='isisfish.vcs.updateconfirm.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateConfirmDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JUpdateDialog.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,165 @@ +<JDialog modal="true" title='isisfish.vcs.update'> + <script> + // FIXME a refaire + +// import static org.codelutin.vcs.VCSState.*; +// import org.codelutin.vcs.VCSState; + +// protected org.codelutin.vcs.VCSRepositoryState model; + protected Object model; + + public void doCheckAll() { +// if (model!=null) { +// model.checkAll(checkAll.isSelected()); +// doRefresh(); +// } + } + + public boolean isEmpty() { + return model==null; // || model.isModelEmpty(); + } + + public boolean isOkEnabled() { + return !isEmpty(); // && model.getModelSelectedSize()>0; + } + + public void doRefresh() { + fr.ifremer.isisfish.ui.util.JaxxUtil.refresh(this,"checkAll.enabled","ok.enabled"); + } + +// protected void reSize(VCSState state,JTable table) { +// +// } + </script> + <Table weightx="1"> + <row> + <cell columns='3' weighty="1" fill='both'> + <JSplitPane id='splitPane' orientation='vertical' + oneTouchExpandable='true'> + <JSplitPane id='splitPane2' orientation='horizontal' + oneTouchExpandable='true'> + <Table weightx="1" id='tableRemote'> + <row> + <cell columns="2" anchor='northwest'> + <JLabel text='isisfish.vcs.update.remote' + toolTipText='isisfish.vcs.update.tooltip.remote'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_missing' + text='isisfish.vcs.update.remote.missing' + toolTipText='isisfish.vcs.update.remote.tooltip.missing'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_missing'> + <JTable id="table_missing" + autoResizeMode='3' + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdate' + text='isisfish.vcs.update.remote.outofdate' + toolTipText='isisfish.vcs.update.remote.tooltip.outofdate'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdate'> + <JTable id="table_outofdate" + autoResizeMode='3' + onMouseClicked="doRefresh()" + rowSelectionAllowed="true"/> + </JScrollPane> + </cell> + </row> + </Table> + <Table weightx="1" id='tableLocal'> + <row> + <cell columns="2" anchor='west'> + <JLabel text='isisfish.vcs.update.local' + toolTipText='isisfish.vcs.update.tooltip.local'/> + </cell> + </row> + <row> + <cell> + <JLabel id='label_unversionned' + text='isisfish.vcs.update.local.unversionned' + toolTipText='isisfish.vcs.update.local.tooltip.unversionned'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_unversionned'> + <JTable id="table_unversionned" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_modified' + text='isisfish.vcs.update.local.modified' + toolTipText='isisfish.vcs.update.local.tooltip.modified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_modified'> + <JTable id="table_modified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel id='label_outofdateAndModified' + text='isisfish.vcs.update.local.outofdateAndModified' + toolTipText='isisfish.vcs.update.local.tooltip.outofdateAndModified'/> + </cell> + </row> + <row> + <cell weighty="1" fill='both'> + <JScrollPane id='scroll_outofdateAndModified'> + <JTable id="table_outofdateAndModified" + autoResizeMode='3' + rowSelectionAllowed="true" + onMouseClicked="doRefresh()"/> + </JScrollPane> + </cell> + </row> + </Table> + </JSplitPane> + <JScrollPane> + <JTextPane id="logText" editable="false" + focusable='false'/> + </JScrollPane> + </JSplitPane> + </cell> + </row> + <row weightx="1" fill='horizontal'> + <cell columns="3" fill='both'> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JCheckBox id='checkAll' + text='isisfish.vcs.update.checkAll' + toolTipText='isisfish.vcs.update.tooltip.checkAll' + enabled='{!isEmpty()}' + onActionPerformed="doCheckAll()"/> + <JButton id='ok' text='isisfish.vcs.update.ok' + enabled='{isOkEnabled()}' + onActionPerformed="dispose()"/> + <JButton id='cancel' text='isisfish.vcs.update.cancel'/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/UpdateDialogUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSConfig.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,170 @@ +<JDialog> + <script> + 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; + + public boolean cancel; + protected boolean invalidFirstName; + protected boolean invalidLastName; + protected boolean invalidKey; + protected boolean invalidEmail; + protected boolean invalidLogin; + + private String oldEmail; + private String oldServerLogin; + private boolean oldUseSsh; + private boolean oldNoPassPhrase; + private String oldLastname; + private String oldFirstname; + private String oldServerPrivateKeyFile; + + protected void saveOld() { + this.oldFirstname=firstname.getText(); + this.oldLastname=lasstname.getText(); + this.oldEmail =email.getText(); + this.oldServerLogin=serverLogin.getText(); + this.oldServerPrivateKeyFile=serverPrivateKeyFile.getText(); + this.oldUseSsh=serverAuthenticationMethodSsh.isSelected(); + this.oldNoPassPhrase =serverNoPassPhrase.isSelected(); + doCheck(); + } + + protected void restoreOld() { + firstname.setText(oldFirstname); + lasstname.setText(oldLastname); + email.setText(oldEmail); + serverLogin.setText(oldServerLogin); + serverPrivateKeyFile.setText(oldServerPrivateKeyFile); + serverAuthenticationMethodSsh.setSelected(oldUseSsh); + serverNoPassPhrase.setSelected(oldNoPassPhrase); + doCheck(); + } + public boolean isConfigValid() { + return check(serverAuthenticationMethodSsh.isSelected()); + } + + protected boolean check(boolean ssh) { + invalidFirstName=firstname.isVisible() && firstname.getText().isEmpty(); + invalidLastName=lasstname.isVisible() && lasstname.getText().isEmpty(); + invalidEmail=email.isVisible() && email.getText().isEmpty(); + if (ssh) { + String file = serverPrivateKeyFile.getText(); + invalidKey=file.isEmpty() || !new java.io.File(file).exists(); + invalidLogin=serverLogin.getText().isEmpty(); + } else { + invalidLogin=false; + invalidKey=false; + } + return !(invalidEmail||invalidFirstName||invalidLastName||invalidLogin||invalidKey); + } + + protected void doCheck() { + boolean ssh = serverAuthenticationMethodSsh.isSelected(); + ok.setEnabled(check(ssh)); + if (ssh) { + serverPrivateKeyGenerate.setEnabled(!invalidLogin); + } else { + serverPrivateKeyGenerate.setEnabled(false); + } + setColor(invalidFirstName, firstnameLabel); + setColor(invalidLastName, lasstnameLabel); + setColor(invalidEmail, emailLabel); + setColor(invalidLogin, serverLoginLabel); + setColor(invalidKey, serverPrivateKeyFileLabel); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.red: Color.black); + } + </script> + <Table> + <row fill='horizontal'> + <cell columns='2' weighty="1" fill='both'> + <JScrollPane height="60"> + <JEditorPane id="doc" /> + </JScrollPane> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='firstnameLabel' text='isisfish.launch.firstname'/> + </cell> + <cell> + <JTextField id='firstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='lasstnameLabel' text='isisfish.launch.lasstname'/> + </cell> + <cell> + <JTextField id='lasstname' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='emailLabel' text='isisfish.launch.email'/> + </cell> + <cell> + <JTextField id='email' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverAuthenticationMethodLabel' text='isisfish.launch.server.authenticationMethod'/> + </cell> + <cell> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JRadioButton id='serverAuthenticationMethodAnonymous' text='isisfish.launch.anonymous' buttonGroup='serverMethod' value='anonymous' onActionPerformed="doCheck()"/> + <JRadioButton id='serverAuthenticationMethodSsh' text='isisfish.launch.ssh' buttonGroup='serverMethod' value='ssh' onActionPerformed="doCheck()"/> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginLabel' text='isisfish.launch.server.login' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverLogin' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverLoginNoPassPhraseLabel' text='isisfish.launch.server.ssh.no.passphrase' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JCheckBox id='serverNoPassPhrase' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}' selected="true"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPrivateKeyFileLabel' text='isisfish.launch.server.ssh.privateKeyFile' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' columns='28' height='25' onKeyReleased="doCheck()" enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='serverPrivateKeyChangeFile' text='isisfish.launch.server.ssh.key.change' enabled='{serverAuthenticationMethodSsh.isSelected()}'/> + <JButton id='serverPrivateKeyGenerate' text='isisfish.launch.server.ssh.key.generate' /> + </JPanel> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 3, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false'/> + <JButton id='reset' text='isisfish.common.reset' onActionPerformed="restoreOld();"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSConfigUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSGenerateSshKey.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,128 @@ +<JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> + <script> + import org.apache.commons.logging.Log; + import org.apache.commons.logging.LogFactory; + import com.sshtools.j2ssh.transport.publickey.OpenSSHPublicKeyFormat; + import com.sshtools.j2ssh.transport.publickey.SshKeyGenerator; + import org.codelutin.util.FileUtil; + import java.io.File; + import java.io.IOException; + import java.util.ArrayList; + import java.util.Arrays; + import java.util.HashMap; + import java.util.Map; + + static protected final Log log = LogFactory.getLog(VCSGenerateSshKeyUI.class); + + private static VCSGenerateSshKeyUI instance; + + public static VCSGenerateSshKeyUI getInstance(JDialog parent) { + if (instance == null) { + instance = new VCSGenerateSshKeyUI(parent); + } + return instance; + } + + public boolean cancel; + public boolean noPassPhrase; + public Exception error; + protected boolean invalidPassPhrase; + protected String vcsLogin; + + private VCSGenerateSshKeyUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + + public void setData(String vcsLogin, File privateKeyFile) { + this.vcsLogin = vcsLogin ; + serverPrivateKeyFile.setText(privateKeyFile.getAbsolutePath()); + serverPublicKeyFile.setText(privateKeyFile.getAbsolutePath() + ".pub"); + noPassPhrase=true; + error=null; + doCheck(); + } + + protected boolean doGenerate() { + File f = new File(getServerPrivateKeyFile().getText()); + try { + SshKeyGenerator sshkeygenerator = new SshKeyGenerator(); + char[] password = getServerPassPhrase().getPassword(); + noPassPhrase=password.length==0; + if (password.length > 0) { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, Arrays.toString(password)); + Arrays.fill(password, '0'); + } else { + sshkeygenerator.generateKeyPair("dsa", 1024, f.getAbsolutePath(), vcsLogin, ""); + } + // convert to openSSH ? + File publicKeyFile = new File(serverPublicKeyFile.getText()); + log.info("public key before OpenSsh : "+ FileUtil.readAsString(publicKeyFile)); + String openSshPublicKey = SshKeyGenerator.convertPublicKeyFile(publicKeyFile, new OpenSSHPublicKeyFormat(vcsLogin + "@forIsisFish 1024-bit dsa")); + log.info("public key OpenSsh : "+openSshPublicKey); + FileUtil.writeString(publicKeyFile, openSshPublicKey); + } catch (Exception e) { + error=e; + return true; + } + return false; + } + protected boolean check() { + invalidPassPhrase=!Arrays.equals(serverPassPhrase.getPassword(),serverConfirmPassPhrase.getPassword()); + return !invalidPassPhrase; + } + + protected void doCheck() { + ok.setEnabled(check()); + setColor(invalidPassPhrase, serverPassPhraseLabel); + setColor(invalidPassPhrase, serverConfirmPassPhraseLabel); + } + + protected void setColor(boolean invalid, JComponent component) { + component.setForeground(invalid ? Color.red: Color.black); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.privateKeyFile'/> + </cell> + <cell> + <JTextField id='serverPrivateKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.launch.server.ssh.publicKeyFile'/> + </cell> + <cell> + <JTextField id='serverPublicKeyFile' font-size='12' editable='false' columns='28' height='25'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverPassPhraseLabel' text='isisfish.launch.server.ssh.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel id='serverConfirmPassPhraseLabel' text='isisfish.launch.server.ssh.confirm.passphrase'/> + </cell> + <cell> + <JPasswordField id='serverConfirmPassPhrase' onKeyReleased="doCheck()"/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='ok' text='isisfish.common.apply' enabled='false' onActionPerformed="cancel = doGenerate();dispose()"/> + <JButton id='cancelAction' text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSGenerateSshKeyUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx (from rev 1548, isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/JVCSPassPhrase.jaxx) =================================================================== --- isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx (rev 0) +++ isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx 2008-10-13 16:53:11 UTC (rev 1552) @@ -0,0 +1,62 @@ +<JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> + <script> + private boolean cancel; + private static VCSPassPhraseUI instance; + + public static char[] getPassPhrase(boolean useUI) { + if (!useUI) { + System.out.print("Enter passphrase: "); + java.io.BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(java.lang.System.in)); + try { + java.lang.String s = ""; + s = bufferedreader.readLine(); + return s.toCharArray(); + } catch (IOException e) { + return null; + } finally { + if (bufferedreader!=null) { + try { + bufferedreader.close(); + } catch (IOException e) { + // ignore + } + } + } + } + if (instance == null) { + instance = new VCSPassPhraseUI(); + } + instance.setVisible(true); + if (instance.cancel) { + // use cancel + return null; + } + return instance.getServerPassPhrase().getPassword(); + } + private VCSPassPhraseUI(JDialog instance) { + super(instance); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='isisfish.vcs.ask.passphrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JPasswordField id='serverPassPhrase'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton text='isisfish.common.apply' onActionPerformed="dispose()"/> + <JButton text='isisfish.common.cancel' onActionPerformed="cancel = true;dispose()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog> Property changes on: isis-fish/trunk/src/main/uimodel/fr/ifremer/isisfish/versionning/ui/jaxx/VCSPassPhraseUI.jaxx ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

1 0

r1551 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 16:15:02 +0000 (Mon, 13 Oct 2008) New Revision: 1551 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java Log: use new location for isis-fish-data Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-10-13 16:03:42 UTC (rev 1550) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2008-10-13 16:15:02 UTC (rev 1551) @@ -599,7 +599,7 @@ VCS_USER_NAME(VCS.VCS_USER_NAME, _("isisfish.config.vcs.userName.description"), ""), VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, _("isisfish.config.vcs.userPassword.description"), ""), VCS_HOST_NAME(VCS.VCS_HOST_NAME, _("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"), - VCS_PATH(VCS.VCS_PATH, _("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data"), + VCS_PATH(VCS.VCS_PATH, _("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish/isis-fish-data/"), // VCS_TAG(VCS.VCS_TAG, _("isisfish.config.vcs.remoteDatabase.description"), "/trunk"), // TYPE_REPO_PROPERTY_KEY = newConfigPropertyKey("typeRepo", VCSTypeRepo.class, 9, n_("isisfish.config.vcs.typeRepo.description"), "TAG"), // PROJECT_NAME_PROPERTY_KEY = newConfigPropertyKey("projectName", String.class, 11, n_("isisfish.config.main.projectName.description"), "Isis-Fish"),

1 0

r1550 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: tchemit Date: 2008-10-13 16:03:42 +0000 (Mon, 13 Oct 2008) New Revision: 1550 Modified: isis-fish/trunk/pom.xml Log: utilisation de variable pour definir les versions de nos librairies : jaxx.version topia.version lutinwidget.version... utilisation generatro 0.60 suppression libraires specifique plateforme car ?\195?\167a marche sans... Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2008-10-13 11:42:39 UTC (rev 1549) +++ isis-fish/trunk/pom.xml 2008-10-13 16:03:42 UTC (rev 1550) @@ -51,7 +51,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.0.27-SNAPSHOT</version> + <version>${topia.version}</version> <scope>compile</scope>  <exclusions> @@ -79,7 +79,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> - <version>0.10-SNAPSHOT</version> + <version>${lutinwidget.version}</version> <scope>compile</scope> </dependency>  <labs.id>8</labs.id>  +  <current.version>3.2.0.0-SNAPSHOT</current.version> +  <jaxx.version>0.5-SNAPSHOT</jaxx.version> +  + <generator.version>0.60</generator.version> + +  + <topia.version>2.0.27-SNAPSHOT</topia.version> + +  + <lutinwidget.version>0.10-SNAPSHOT</lutinwidget.version> +  <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> @@ -530,7 +541,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.51-SNAPSHOT</version> + <version>${generator.version}</version> <executions> <execution> <id>Generator</id> @@ -562,7 +573,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.0.27-SNAPSHOT</version> + <version>${topia.version}</version> <scope>compile</scope> </dependency> </dependencies> @@ -586,7 +597,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinwidget</artifactId> - <version>0.10-SNAPSHOT</version> + <version>${lutinwidget.version}</version> <scope>compile</scope> </dependency> </dependencies> @@ -753,7 +764,7 @@ </configuration> <executions> <execution> - <phase>package</phase> + <phase>verify</phase> <goals> <goal>attached</goal> </goals> @@ -788,7 +799,7 @@ </repository> </repositories-->  - <profile> +  </profiles> </project> \ No newline at end of file

1 0