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

r3183 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui
by chatellier＠users.labs.libre-entreprise.org 18 Mar '11

18 Mar '11

Author: chatellier Date: 2011-03-18 11:30:44 +0000 (Fri, 18 Mar 2011) New Revision: 3183 Log: Fix configuration dialog Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-03-18 09:48:02 UTC (rev 3182) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2011-03-18 11:30:44 UTC (rev 3183) @@ -242,8 +242,8 @@ modelBuilder.addOption(IsisConfig.Option.SMTP_SERVER); modelBuilder.addOption(IsisConfig.Option.USER_MAIL); - ConfigUI configUI = modelBuilder.buildUI(welcomeUI, _("coser.config.category.path")); - JDialog dialogUI = new JDialog(welcomeUI, _("coser.ui.config.title")); + ConfigUI configUI = modelBuilder.buildUI(welcomeUI, _("isisfish.config.category.main")); + JDialog dialogUI = new JDialog(welcomeUI, _("isisfish.ui.config.title")); dialogUI.add(configUI); dialogUI.pack(); dialogUI.setLocationRelativeTo(welcomeUI);

1 0

18 Mar '11

Author: chatellier Date: 2011-03-18 09:48:02 +0000 (Fri, 18 Mar 2011) New Revision: 3182 Log: Update to jaxx 2.4.1 Modified: isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-18 09:48:02 UTC (rev 3182) @@ -105,7 +105,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> <scope>compile</scope> </dependency> @@ -488,7 +488,7 @@ <license.licenseName>gpl_v2</license.licenseName>  - <jaxxVersion>2.3</jaxxVersion> + <jaxxVersion>2.4.1-SNAPSHOT</jaxxVersion> <eugeneVersion>2.3.2</eugeneVersion> <topiaVersion>2.5.3-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>2.0</nuitonUtilsVersion> @@ -626,7 +626,7 @@ <configuration> <src>${basedir}/src/main/java</src> <addSourcesToClassPath>true</addSourcesToClassPath> - <addProjectClassPath>true</addProjectClassPath> + <addProjectClassPath>true</addProjectClassPath> </configuration> </execution> </executions> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-18 09:48:02 UTC (rev 3182) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.entities; -import org.nuiton.topia.TopiaException; - import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-18 09:48:02 UTC (rev 3182) @@ -25,8 +25,6 @@ package fr.ifremer.isisfish.entities; -import org.nuiton.topia.TopiaException; - import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.StorageException; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -18,13 +18,17 @@ *##%*/ --> <JPanel layout='{new BorderLayout()}' abstract="true"> + <import> + fr.ifremer.isisfish.ui.simulator.SimulAction; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.JFileChooser + java.io.File + </import> <fr.ifremer.isisfish.datastore.RegionStorage id="regionStorage" javaBean="null" /> <script><![CDATA[ - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_REGION_STORAGE, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -29,17 +29,17 @@ return getContextValue(WelcomeSaveVerifier.class); } - public void setContent(Component c) { + public void setContent(java.awt.Component c) { this.add(c, BorderLayout.CENTER); } - public void close(JFrame f) { + public void close(javax.swing.JFrame f) { if (getVerifier().allIsSaved()) { exit(f); } } - protected void exit(JFrame f) { + protected void exit(javax.swing.JFrame f) { f.dispose(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,13 +23,16 @@ #L% --> <JPanel layout='{new BorderLayout()}'> + <import> + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.ui.result.ResultAction; + jaxx.runtime.context.JAXXInitialContext; + fr.ifremer.isisfish.ui.input.InputAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + javax.swing.ImageIcon + </import> + <script><![CDATA[ - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.ui.result.ResultAction; - import jaxx.runtime.context.JAXXInitialContext; - import fr.ifremer.isisfish.ui.input.InputAction; - import fr.ifremer.isisfish.ui.input.InputSaveVerifier; - /** Change tab selection. */ public void setQueueTabSelection() { simulTabs.setSelectedIndex(5); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,7 +23,7 @@ #L% --> <JDialog resizable="false" title="isisfish.simulator.ssh.configuration.title" - layout="{new BoxLayout(this.getContentPane(), BoxLayout.PAGE_AXIS)}"> + layout="{new javax.swing.BoxLayout(this.getContentPane(), javax.swing.BoxLayout.PAGE_AXIS)}"> <SSHLauncherConfigAction id="action" javaBean="new SSHLauncherConfigAction(this)" /> <Boolean id="connected" javaBean="false" /> @@ -187,7 +187,7 @@ <row fill='horizontal'> <cell columns="2" fill='horizontal'> <JLabel id='messageLabel' text=' ' font-weight='bold' opaque='true' horizontalAlignment='center' - minimumSize='{new Dimension(0, 25)}' preferredSize='{new Dimension(0, 25)}' border='{BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)}' /> + minimumSize='{new java.awt.Dimension(0, 25)}' preferredSize='{new java.awt.Dimension(0, 25)}' border='{BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED)}' /> </cell> </row> <row fill='horizontal'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,19 +26,22 @@  <fr.ifremer.isisfish.entities.Cell id='bean' javaBean='null'/> - + + <import> + java.awt.event.MouseEvent; + fr.ifremer.isisfish.entities.Cell; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + com.bbn.openmap.event.SelectMouseMode; + fr.ifremer.isisfish.map.CellSelectionLayer; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.DefaultComboBoxModel; + </import> + <script><![CDATA[ -import java.awt.event.MouseEvent; -import fr.ifremer.isisfish.entities.Cell; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import com.bbn.openmap.event.SelectMouseMode; -import fr.ifremer.isisfish.map.CellSelectionLayer; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - protected OMToolSet toolSet = new OMToolSet(); boolean cellChanged = true; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -28,16 +28,19 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.EffortDescription id='effortDescription' javaBean='null'/> + <import> + java.util.ArrayList; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.types.TimeUnit; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import java.util.ArrayList; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.SetOfVessels; -import fr.ifremer.isisfish.types.TimeUnit; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,18 +27,20 @@  <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> + <import> + java.util.ArrayList; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.ui.input.setofvessels.MetierListModel; + fr.ifremer.isisfish.ui.input.setofvessels.MetierListRenderer; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> + <script><![CDATA[ -import java.util.ArrayList; -import fr.ifremer.isisfish.entities.EffortDescription; -import fr.ifremer.isisfish.entities.SetOfVessels; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.ui.input.setofvessels.MetierListModel; -import fr.ifremer.isisfish.ui.input.setofvessels.MetierListRenderer; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListModel; -import fr.ifremer.isisfish.ui.input.setofvessels.EffortDescriptionListRenderer; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - /** * Get input action from context. */ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -25,18 +25,22 @@ <JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" width="400" height="400" layout="{new BorderLayout()}"> + <import> + fr.ifremer.isisfish.util.CompileHelper; + fr.ifremer.isisfish.util.EvaluatorHelper; + org.nuiton.util.FileUtil; + javax.swing.text.html.HTMLEditorKit; + javax.swing.text.html.HTMLDocument; + javax.swing.event.HyperlinkListener; + javax.swing.text.html.HTMLFrameHyperlinkEvent; + javax.swing.event.HyperlinkEvent; + java.io.PrintWriter; + java.io.StringWriter; + java.awt.Color + java.awt.Desktop + </import> + <script><![CDATA[ -import fr.ifremer.isisfish.util.CompileHelper; -import fr.ifremer.isisfish.util.EvaluatorHelper; -import org.nuiton.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; - boolean ok = false; Class javaInterface = null; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,13 +27,19 @@  <fr.ifremer.isisfish.entities.FisheryRegion id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.DefaultListModel + javax.swing.JTabbedPane + javax.swing.JTable + </import> + <script><![CDATA[ -import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected OMToolSet toolSet = new OMToolSet(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,11 +27,13 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Gear; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Gear; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,9 +26,11 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> + <import> + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueMetiers")); @@ -70,10 +72,10 @@ ]]></script> <JPanel id="body"> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab"> - <tab title='{_("isisfish.gear.title")}'> + <tab title='isisfish.gear.title'> <GearTabUI id="gearTabUI" bean="{getBean()}" active="{isActive()}" constructorParams='this' /> </tab> - <tab title='{_("isisfish.selectivity.title")}'> + <tab title='isisfish.selectivity.title'> <SelectivityUI id="selectivityUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -54,19 +54,26 @@ <fr.ifremer.isisfish.ui.sensitivity.TableBlockingLayerUI id="tableLayerUI" constructorParams='this' /> + <import> + javax.swing.JComponent; + javax.swing.event.ChangeListener; + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils; + fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; + fr.ifremer.isisfish.ui.sensitivity.EditorHelper; + fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + fr.ifremer.isisfish.ui.WelcomePanelUI; + org.nuiton.topia.persistence.TopiaEntityContextable; + org.nuiton.topia.TopiaContext; + org.apache.commons.lang.StringUtils; + java.awt.Color + javax.swing.AbstractAction + javax.swing.JTable + javax.swing.JTabbedPane + </import> <script><![CDATA[ -import javax.swing.JComponent; -import javax.swing.event.ChangeListener; -import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils; -import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; -import fr.ifremer.isisfish.ui.sensitivity.EditorHelper; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import org.nuiton.topia.persistence.TopiaEntityContextable; -import org.nuiton.topia.TopiaContext; -import org.apache.commons.lang.StringUtils; + protected ChangeListener tabbedPaneChangeListener; /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -40,17 +40,22 @@  <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/> + <import> + java.lang.reflect.Method; + java.io.File; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; + org.apache.commons.lang.StringUtils; + org.nuiton.topia.TopiaContext; + javax.swing.event.DocumentListener; + javax.swing.event.DocumentEvent + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.io.IOException + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import java.lang.reflect.Method; -import java.io.File; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; -import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.TopiaContext; -import javax.swing.event.DocumentListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected DocumentListener listener = null; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,16 +31,21 @@ <Boolean id='metierSeasonSelected' javaBean='false'/> <Boolean id='targetSpeciesSelected' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.entities.TargetSpecies; + fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesTableModel; + fr.ifremer.isisfish.ui.input.metier.SpeciesComboModel; + fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + java.awt.Dimension + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.TargetSpecies; -import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoTargetSpeciesTableModel; -import fr.ifremer.isisfish.ui.input.metier.SpeciesComboModel; -import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,12 +31,15 @@ <Boolean id='metierSeasonInfoSelected' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierSeasonInfo; -import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -30,18 +30,23 @@ <Boolean id='metierSeasonInfoNotNull' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.entities.Season; + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.types.Month; + fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; + fr.ifremer.isisfish.ui.widget.Interval; + fr.ifremer.isisfish.ui.widget.IntervalPanel; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + java.awt.Dimension + </import> + <script><![CDATA[ - import fr.ifremer.isisfish.entities.Metier; - import fr.ifremer.isisfish.entities.MetierSeasonInfo; - import fr.ifremer.isisfish.entities.Season; - import fr.ifremer.isisfish.entities.Zone; - import fr.ifremer.isisfish.types.Month; - import fr.ifremer.isisfish.ui.input.metier.MetierSeasonInfoComboModel; - import fr.ifremer.isisfish.ui.widget.Interval; - import fr.ifremer.isisfish.ui.widget.IntervalPanel; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; - + protected Interval interval = null; protected boolean init = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,16 @@  <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Gear; + fr.ifremer.isisfish.entities.Metier; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.awt.Dimension + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Metier; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected boolean init = false; protected void $afterCompleteSetup() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,10 +26,14 @@ <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> + <import> + static org.nuiton.i18n.I18n._ + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueTripTypes")); setNextPath("$root/$tripTypes"); @@ -63,13 +67,13 @@ ]]></script> <JPanel id="body"> <JTabbedPane id="metierTab" constraints='BorderLayout.CENTER'> - <tab title='{_("isisfish.metier.title")}'> + <tab title='isisfish.metier.title'> <MetierTabUI id="metierTabUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.metierSeasonInfoZone.title")}'> + <tab title='isisfish.metierSeasonInfoZone.title'> <MetierSeasonInfoZoneUI id="metierSeasonInfoUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.metierSeasonInfoSpecies.title")}'> + <tab title='isisfish.metierSeasonInfoSpecies.title'> <MetierSeasonInfoSpeciesUI id="metierSeasonSpeciesUI" bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,18 +27,24 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.Population; + javax.swing.table.DefaultTableModel; + org.nuiton.topia.persistence.TopiaEntity; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.JOptionPane + javax.swing.JFrame + java.awt.BorderLayout + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.Population; -import javax.swing.table.DefaultTableModel; -import org.nuiton.topia.persistence.TopiaEntity; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,13 +27,16 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,11 +27,14 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.Population; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.Population; + @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -40,15 +40,18 @@ <Boolean id='popGroupNotNull' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationGroupImpl; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationImpl; + org.nuiton.math.matrix.MatrixND; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationGroupImpl; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; -import org.nuiton.math.matrix.MatrixND; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,17 +32,20 @@ <Boolean id='zoneDepartSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Zone; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -28,10 +28,13 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Population; + public void init(PopulationSeasonInfo populationSeasonInfo) { // add null before, for second to be considered as a changed event // otherwize, setBean has no effect Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,17 +32,20 @@ <Boolean id='zoneDepartSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> + <import> + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Zone; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -33,19 +33,22 @@ <Boolean id='zoneArrivalSelected' javaBean='false'/> <Boolean id='coefNonVide' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Zone; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -30,15 +30,17 @@ <Boolean id="selectedPopulationSeasonInfo" javaBean='false' /> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboModel; + fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.awt.CardLayout + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboModel; -import fr.ifremer.isisfish.ui.input.population.PopulationSeasonInfoComboRenderer; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getNewValue() == null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,13 +27,16 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,14 +31,17 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> <Boolean id='ageGroupType' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.ui.util.ErrorHelper; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEditor; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; + javax.swing.JOptionPane + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.ui.util.ErrorHelper; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEditor; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import org.nuiton.math.matrix.gui.MatrixPanelListener; protected void populationSeasonLengthMatrixChanged(MatrixPanelEvent event) { if (getPopulationSeasonInfo() != null && matrixPanelPopulationSeasonLengthChange.getMatrix() != null) { @@ -48,17 +51,6 @@ } } -/*addPropertyChangeListener("populationSeasonInfo", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - matrixPanelPopulationSeasonLengthChange.setMatrix(null); - } - if (evt.getNewValue() != null) { - matrixPanelPopulationSeasonLengthChange.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix().copy()); - } - } -});*/ - @Override public void refresh() { // TODO add only once @@ -113,7 +105,7 @@ } MatrixPanelEditor panel = new MatrixPanelEditor(false, 800, 300); panel.setMatrix(lengthChangeMatrix); - JOptionPane.showMessageDialog(null, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(this, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); } ]]></script> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,17 +31,20 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.types.Month; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.ui.widget.Interval; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; -import fr.ifremer.isisfish.types.Month; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.ui.widget.Interval; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import org.nuiton.math.matrix.gui.MatrixPanelListener; + protected Interval seasonInterval; protected boolean init = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,9 +27,12 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueGears")); setNextPath("$root/$gears"); @@ -68,35 +71,35 @@ <JPanel id='body'> <JTabbedPane id="populationTab">  - <tab title='{_("isisfish.populationBasics.title")}'> + <tab title='isisfish.populationBasics.title'> <PopulationBasicsUI id='populationBasicsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationZones.title")}'> + <tab title='isisfish.populationZones.title'> <PopulationZonesUI id='populationZoneUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationSeasons.title")}'> + <tab title='isisfish.populationSeasons.title'> <PopulationSeasonsUI id='populationSeasonsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationEquation.title")}'> + <tab title='isisfish.populationEquation.title'> <PopulationEquationUI id='populationEquationUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationRecruitment.title")}'> + <tab title='isisfish.populationRecruitment.title'> <PopulationRecruitmentUI id='populationRecruitementUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationGroup.title")}'> + <tab title='isisfish.populationGroup.title'> <PopulationGroupUI id='populationGroupUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationCapturability.title")}'> + <tab title='isisfish.populationCapturability.title'> <PopulationCapturabilityUI id='populationCapturabilityUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab>  - <tab title='{_("isisfish.populationMigration.title")}'> + <tab title='isisfish.populationMigration.title'> <PopulationMigrationUI id='populationMigrationUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,14 +27,19 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.ui.input.population.ZoneListModel; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + java.awt.Dimension + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.ui.input.population.ZoneListModel; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import org.nuiton.math.matrix.gui.MatrixPanelListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,10 +27,13 @@  <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Population; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Population; + @Override public void refresh() { Population population = getVerifier().getEntity(Population.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,17 +27,20 @@  <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Port; + fr.ifremer.isisfish.entities.Cell; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + fr.ifremer.isisfish.map.CellSelectionLayer; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + com.bbn.openmap.event.SelectMouseMode; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Port; -import fr.ifremer.isisfish.entities.Cell; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import fr.ifremer.isisfish.map.CellSelectionLayer; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import com.bbn.openmap.event.SelectMouseMode; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected OMToolSet toolSet = new OMToolSet(); boolean portChanged = true; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,16 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <script><![CDATA[ -import fr.ifremer.isisfish.types.RangeOfValues; -import fr.ifremer.isisfish.entities.Gear; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + <import> + fr.ifremer.isisfish.types.RangeOfValues; + fr.ifremer.isisfish.entities.Gear; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + </import> + <script><![CDATA[ + boolean init = false; protected void $afterCompleteSetup() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -31,18 +31,23 @@ <Boolean id='selectivityPopulationSelected' javaBean='false'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Gear; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.Selectivity; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel; + fr.ifremer.isisfish.ui.input.gear.PopulationComboModel; + fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.ArrayList + javax.swing.DefaultComboBoxModel + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Selectivity; -import fr.ifremer.isisfish.entities.Species; -import fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel; -import fr.ifremer.isisfish.ui.input.gear.PopulationComboModel; -import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,11 +27,14 @@  <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Gear; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Gear; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,15 +27,17 @@  <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> - <script><![CDATA[ -import fr.ifremer.isisfish.entities.Port; -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.VesselType; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.SetOfVessels; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + <import> + fr.ifremer.isisfish.entities.Port; + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.VesselType; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.SetOfVessels; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> + <script><![CDATA[ boolean init = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -56,13 +56,13 @@ ]]></script> <JPanel id="body"> <JTabbedPane id="setOfVesselsTab"> - <tab title='{_("isisfish.setOfVessels.title")}'> + <tab title='isisfish.setOfVessels.title'> <SetOfVesselsBasicsUI id='setOfVesselsBasicsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.effortDescription.title")}'> + <tab title='isisfish.effortDescription.title'> <EffortDescriptionUI id='effortDescriptionUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> - <tab title='{_("isisfish.effortDescription.parametersTitle")}'> + <tab title='isisfish.effortDescription.parametersTitle'> <EffortDescriptionParametersUI id='effortParametersUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,15 @@  <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Species; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Species; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continuePopulations")); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,11 +26,15 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> + <import> + org.apache.commons.lang.StringUtils; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + static org.nuiton.i18n.I18n._ + </import> <script><![CDATA[ -import org.apache.commons.lang.StringUtils; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,16 +32,19 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Strategy; + fr.ifremer.isisfish.entities.StrategyMonthInfo; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + jaxx.runtime.swing.editor.NumberEditor; + fr.ifremer.isisfish.entities.TripType; + org.nuiton.math.matrix.gui.MatrixPanelListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.StrategyMonthInfo; -import org.nuiton.math.matrix.gui.MatrixPanelEvent; -import jaxx.runtime.swing.editor.NumberEditor; -import fr.ifremer.isisfish.entities.TripType; -import org.nuiton.math.matrix.gui.MatrixPanelListener; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,14 +27,17 @@  <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Strategy; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.SetOfVessels; + org.nuiton.topia.persistence.TopiaEntity; + fr.ifremer.isisfish.ui.WelcomePanelUI; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.Formule; -import fr.ifremer.isisfish.entities.SetOfVessels; -import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.ui.WelcomePanelUI; + @Override public void refresh() { Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,12 +27,15 @@  <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.TripType; + fr.ifremer.isisfish.types.TimeUnit; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.TripType; -import fr.ifremer.isisfish.types.TimeUnit; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + setButtonTitle(_("isisfish.input.continueVesselTypes")); setNextPath("$root/$vesselTypes"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,15 +27,18 @@  <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/> + <import> + fr.ifremer.isisfish.entities.VesselType; + fr.ifremer.isisfish.entities.TripType; + fr.ifremer.isisfish.types.TimeUnit; + fr.ifremer.isisfish.ui.input.triptype.TripTypeListModel; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ -import fr.ifremer.isisfish.entities.VesselType; -import fr.ifremer.isisfish.entities.TripType; -import fr.ifremer.isisfish.types.TimeUnit; -import fr.ifremer.isisfish.ui.input.triptype.TripTypeListModel; -import jaxx.runtime.swing.editor.NumberEditor; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { setButtonTitle(_("isisfish.input.continueSetOfVessels")); setNextPath("$root/$setOfVessels"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,18 +23,21 @@ #L% --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> - <script> - <![CDATA[ + <import> + org.nuiton.topia.TopiaContext; + fr.ifremer.isisfish.IsisFishDAOHelper; + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationImpl; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationGroupDAO; + fr.ifremer.isisfish.entities.PopulationDAO; + java.awt.CardLayout + javax.swing.JFrame + </import> - import org.nuiton.topia.TopiaContext; - import fr.ifremer.isisfish.IsisFishDAOHelper; - import fr.ifremer.isisfish.entities.Equation; - import fr.ifremer.isisfish.entities.Population; - import fr.ifremer.isisfish.entities.PopulationImpl; - import fr.ifremer.isisfish.entities.PopulationGroup; - import fr.ifremer.isisfish.entities.PopulationGroupDAO; - import fr.ifremer.isisfish.entities.PopulationDAO; - + <script><![CDATA[ + protected String current = null; protected boolean ageType = false; protected boolean inputType = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,18 +27,24 @@  <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/> + <import> + javax.swing.event.ListSelectionEvent; + fr.ifremer.isisfish.entities.Cell; + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.map.CellSelectionLayer; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + com.bbn.openmap.event.SelectMouseMode; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.awt.event.MouseEvent + javax.swing.DefaultListModel + java.util.ArrayList + </import> <script><![CDATA[ -import javax.swing.event.ListSelectionEvent; -import fr.ifremer.isisfish.entities.Cell; -import fr.ifremer.isisfish.entities.Zone; -import fr.ifremer.isisfish.map.CellSelectionLayer; -import fr.ifremer.isisfish.map.CopyMapToClipboardListener; -import com.bbn.openmap.event.SelectMouseMode; -import com.bbn.openmap.gui.Tool; -import com.bbn.openmap.gui.OMToolSet; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected OMToolSet toolSet = new OMToolSet(); protected void $afterCompleteSetup() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,11 +23,14 @@ #L% --> <Table> + <import> + fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + javax.swing.JProgressBar; + javax.swing.ListSelectionModel; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; - import fr.ifremer.isisfish.simulator.launcher.SimulationService; - import javax.swing.JProgressBar; - import javax.swing.ListSelectionModel; + queueTable.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); queueTableDone.setDefaultRenderer(JProgressBar.class, new ComponentTableCellRenderer()); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,6 +23,10 @@ #L% --> <JDialog modal="true" resizable='false' title='isisfish.script.import'> + <import> + java.io.File + java.awt.Color + </import> <style source="ImportDialogUI.css" /> <FileSelectionTableModel id='newFilesTableModel' javaBean='null' /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,6 +26,10 @@ <ScriptAction id="scriptAction" javaBean="new ScriptAction(this)" /> + <import> + javax.swing.SwingWorker + java.awt.Font + </import> <script><![CDATA[ getScriptAction().postInit(); ]]></script> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,10 +23,12 @@ #L% --> <ContinuousPanelContainerUI> - <script><![CDATA[ -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - + <import> + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + javax.swing.JTextField + </import> + <script><![CDATA[ protected JTextField continueMax = null; protected JTextField continueMin = null; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -24,6 +24,24 @@ --> <ContinuousPanelContainerUI> + <import> + javax.swing.table.AbstractTableModel; + javax.swing.table.DefaultTableModel; + fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; + javax.swing.table.TableCellEditor; + javax.swing.table.TableModel; + java.util.regex.Matcher; + java.util.regex.Pattern; + org.apache.commons.lang.StringUtils; + javax.swing.JComboBox + javax.swing.DefaultCellEditor + java.util.EventObject + java.awt.Component + java.util.ArrayList + javax.swing.event.CellEditorListener + java.awt.Dimension + </import> + <String id='text' javaBean='null'/> <org.nuiton.topia.persistence.TopiaEntityContextable id='bean' javaBean='null'/> <String id='beanProperty' javaBean='null'/> @@ -35,15 +53,8 @@ <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/> <script><![CDATA[ -import javax.swing.table.AbstractTableModel; -import javax.swing.table.DefaultTableModel; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableModel; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; + protected String[] columnNames = { _("isisfish.sensitivity.equation.variable.name"), _("isisfish.sensitivity.equation.variable.value"), Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -24,6 +24,22 @@ --> <JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'> + <import> + org.apache.commons.lang.StringUtils; + org.nuiton.topia.persistence.TopiaEntityContextable; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.simulator.sensitivity.Domain; + fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; + fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; + fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; + jaxx.runtime.JAXXUtil; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + java.util.SortedMap + javax.swing.JComponent + </import> <Boolean id='continuePossible' javaBean='true'/> <Boolean id='continueSelected' javaBean='false'/> @@ -31,19 +47,8 @@ <Boolean id='existingValue' javaBean='false'/> <script><![CDATA[ -import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.persistence.TopiaEntityContextable; -import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.ui.input.InputSaveVerifier; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import fr.ifremer.isisfish.simulator.sensitivity.Domain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; -import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; -import jaxx.runtime.JAXXUtil; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; + protected JComponent cOrigine = null; protected TopiaEntityContextable bean = null; protected java.util.List<JComponent> discretComponents = new ArrayList<JComponent>(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,30 +23,35 @@ #L% --> <Table> + <import> + javax.swing.table.DefaultTableModel; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.simulator.sensitivity.Domain; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; + fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; + fr.ifremer.isisfish.export.SensitivityExport; + + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListModel; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer; + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel; + + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer; + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel; + java.awt.CardLayout + javax.swing.ComboBoxModel + </import> <script><![CDATA[ - import javax.swing.table.DefaultTableModel; - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.simulator.sensitivity.Domain; - import fr.ifremer.isisfish.simulator.sensitivity.Factor; - import fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator; - import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; - import fr.ifremer.isisfish.export.SensitivityExport; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListModel; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer; - import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel; - - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer; - import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel; import fr.ifremer.isisfish.ui.sensitivity.model.FactorCardinalityTableModel; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,17 +23,22 @@ #L% --> <Table> + <import> + java.util.ArrayList; + java.io.File; + org.nuiton.util.FileUtil; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.datastore.SimulationStorage; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + fr.ifremer.isisfish.simulator.launcher.SimulationJob; + fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + fr.ifremer.isisfish.ui.models.simulation.SimulationNamesComboModel; + javax.swing.ComboBoxModel + java.io.IOException + </import> <script><![CDATA[ - import java.util.ArrayList; - import java.io.File; - import org.nuiton.util.FileUtil; - import fr.ifremer.isisfish.ui.simulator.SimulAction; - import fr.ifremer.isisfish.datastore.SimulationStorage; - import fr.ifremer.isisfish.simulator.launcher.SimulationService; - import fr.ifremer.isisfish.simulator.launcher.SimulationJob; - import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; - import fr.ifremer.isisfish.ui.models.simulation.SimulationNamesComboModel; + // declaration sépérée de la variable d'instance (jaxx) SimulationServiceListener simulationListener; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,27 +23,33 @@ #L% --> <fr.ifremer.isisfish.ui.NavigationUI> + <import> + javax.swing.JPopupMenu; + javax.swing.tree.DefaultTreeModel; + javax.swing.tree.TreePath; + javax.swing.tree.DefaultMutableTreeNode; + javax.swing.tree.TreeNode; + fr.ifremer.isisfish.datastore.RegionStorage; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.input.InputAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.simulator.sensitivity.group.FactorGroup; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; + javax.swing.JComponent + java.awt.event.ActionListener + javax.swing.JMenuItem + java.awt.event.ActionEvent + </import> <SensitivityInputHandler id="handler" /> <fr.ifremer.isisfish.entities.FisheryRegion id='fisheryRegion' javaBean='null'/> <script><![CDATA[ -import javax.swing.JPopupMenu; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreePath; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.TreeNode; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import fr.ifremer.isisfish.ui.input.InputAction; -import fr.ifremer.isisfish.ui.input.InputSaveVerifier; -import fr.ifremer.isisfish.ui.simulator.SimulAction; -import fr.ifremer.isisfish.simulator.sensitivity.group.FactorGroup; -import fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; -import fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; protected void $afterCompleteSetup() { // end code constructor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -24,10 +24,12 @@ --> <fr.ifremer.isisfish.ui.SimulationUI> + <import> + fr.ifremer.isisfish.ui.input.InputAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + jaxx.runtime.context.JAXXInitialContext; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.ui.input.InputAction; - import fr.ifremer.isisfish.ui.input.InputSaveVerifier; - import jaxx.runtime.context.JAXXInitialContext; /** * Refresh all simulation launch UI. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2011-03-18 09:48:02 UTC (rev 3182) @@ -88,7 +88,7 @@ * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseEvent(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer) */ @Override - protected void processMouseEvent(MouseEvent event, JXLayer</*? extends */JComponent> layer) { + protected void processMouseEvent(MouseEvent event, JXLayer<? extends JComponent> layer) { // scrollbar can be moved if (!(event.getSource() instanceof JScrollBar)) { @@ -150,7 +150,7 @@ * @see org.jdesktop.jxlayer.plaf.AbstractLayerUI#processMouseMotionEvent(java.awt.event.MouseEvent, org.jdesktop.jxlayer.JXLayer) */ @Override - protected void processMouseMotionEvent(MouseEvent e, JXLayer<JComponent> l) { + protected void processMouseMotionEvent(MouseEvent e, JXLayer<? extends JComponent> l) { processMouseEvent(e, l); } } \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -27,9 +27,17 @@ <Boolean id='remove' javaBean='false'/> <Boolean id='changed' javaBean='false'/> + <import> + javax.swing.table.DefaultTableModel; + java.util.Map.Entry; + javax.swing.event.ListSelectionListener + java.util.Set + java.util.Iterator + javax.swing.DefaultComboBoxModel + javax.swing.event.ListSelectionEvent + </import> <script><![CDATA[ - import javax.swing.table.DefaultTableModel; - import java.util.Map.Entry; + protected void $afterCompleteSetup() { /** Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,11 +23,15 @@ #L% --> <Table> -<script><![CDATA[ - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.ui.models.export.ExportNameListModel; - import javax.swing.event.ListSelectionEvent; + <import> + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.models.export.ExportNameListModel; + javax.swing.event.ListSelectionEvent; + java.util.LinkedList + </import> + <script><![CDATA[ + protected void $afterCompleteSetup() { refresh(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -14,40 +14,53 @@  <Boolean id='sensitivity' javaBean='false' /> + <import> + java.util.EventObject; + java.text.ParseException; + fr.ifremer.isisfish.datastore.RegionStorage; + fr.ifremer.isisfish.datastore.StorageChangeEvent; + fr.ifremer.isisfish.datastore.StorageChangeListener; + fr.ifremer.isisfish.datastore.StorageException; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.Strategy; + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.ui.SimulationUI; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.WelcomeTabUI; + fr.ifremer.isisfish.ui.models.common.StringListModel; + fr.ifremer.isisfish.ui.models.rule.RuleComboModel; + fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; + fr.ifremer.isisfish.ui.models.rule.RuleListModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; + fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; + fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; + fr.ifremer.isisfish.rule.Rule; + fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + fr.ifremer.isisfish.simulator.launcher.SimulationJob; + fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + org.nuiton.topia.TopiaException; + org.nuiton.topia.TopiaContext; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEditor; + org.apache.commons.lang.ArrayUtils; + javax.swing.SwingUtilities + javax.swing.DefaultComboBoxModel + java.awt.CardLayout + java.awt.Dimension + java.io.IOException + java.awt.BorderLayout + javax.swing.AbstractAction + javax.swing.DefaultListModel + javax.swing.JComponent + javax.swing.ComboBoxModel + </import> <script><![CDATA[ -import java.util.EventObject; -import java.text.ParseException; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.datastore.StorageChangeEvent; -import fr.ifremer.isisfish.datastore.StorageChangeListener; -import fr.ifremer.isisfish.datastore.StorageException; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Strategy; -import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.ui.SimulationUI; -import fr.ifremer.isisfish.ui.WelcomePanelUI; -import fr.ifremer.isisfish.ui.WelcomeTabUI; -import fr.ifremer.isisfish.ui.models.common.StringListModel; -import fr.ifremer.isisfish.ui.models.rule.RuleComboModel; -import fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; -import fr.ifremer.isisfish.ui.models.rule.RuleListModel; -import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; -import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; -import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; -import fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; -import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; -import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; -import fr.ifremer.isisfish.simulator.launcher.SimulationService; -import fr.ifremer.isisfish.simulator.launcher.SimulationJob; -import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; -import fr.ifremer.isisfish.simulator.sensitivity.Factor; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaContext; -import org.nuiton.math.matrix.MatrixND; -import org.nuiton.math.matrix.gui.MatrixPanelEditor; -import org.apache.commons.lang.ArrayUtils; + // instances variables déclaration SimulationServiceListener simulationListener; StorageChangeListener regionStorageListener; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,10 +23,13 @@ #L% --> <JPanel layout='{new BorderLayout()}'> + <import> + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.models.result.ResultListModel; + javax.swing.event.ListSelectionEvent; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.ui.WelcomePanelUI; - import fr.ifremer.isisfish.ui.models.result.ResultListModel; - import javax.swing.event.ListSelectionEvent; + protected void $afterCompleteSetup() { refresh(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -32,17 +32,20 @@  <fr.ifremer.isisfish.datastore.RegionStorage id="regionStorage" javaBean="null"/> + <import> + fr.ifremer.isisfish.IsisFishException; + fr.ifremer.isisfish.datastore.RuleStorage; + fr.ifremer.isisfish.rule.Rule; + fr.ifremer.isisfish.ui.models.rule.RuleListModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; + fr.ifremer.isisfish.ui.util.ErrorHelper; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + </import> <script><![CDATA[ - import fr.ifremer.isisfish.IsisFishException; - import fr.ifremer.isisfish.datastore.RuleStorage; - import fr.ifremer.isisfish.rule.Rule; - import fr.ifremer.isisfish.ui.models.rule.RuleListModel; - import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; - import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; - import fr.ifremer.isisfish.ui.util.ErrorHelper; - import java.beans.PropertyChangeEvent; - import java.beans.PropertyChangeListener; + protected void $afterCompleteSetup() { // Manage rule list change Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,21 +23,25 @@ #L% --> <Table> + <import> + javax.swing.table.DefaultTableModel; + fr.ifremer.isisfish.datastore.AnalysePlanStorage; + fr.ifremer.isisfish.datastore.StorageChangeEvent; + fr.ifremer.isisfish.datastore.StorageChangeListener; + fr.ifremer.isisfish.simulator.AnalysePlan; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer; + java.awt.Dimension + </import> <SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' /> <script><![CDATA[ - import javax.swing.table.DefaultTableModel; - import fr.ifremer.isisfish.datastore.AnalysePlanStorage; - import fr.ifremer.isisfish.datastore.StorageChangeEvent; - import fr.ifremer.isisfish.datastore.StorageChangeListener; - import fr.ifremer.isisfish.simulator.AnalysePlan; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer; + // to be notified of storage change event StorageChangeListener analyzePlanStorageListener; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,5 +23,5 @@ #L% --> <fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI modal="true"> - <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> + <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> </fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -30,10 +30,10 @@ java.text.SimpleDateFormat </import> -<script> +<script><![CDATA[ protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); - public SimulationFilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { + public SimulationFilterPanelUI(FilterDialogUI dialog) { super(dialog); } /** @@ -60,8 +60,8 @@ SimulationMeta.simulationStart.name(), SimulationMeta.simulationEnd.name()); } - </script> - <Table> + ]]></script> +<Table> <row fill='horizontal'> <cell> <JLabel labelFor='{simulationName}' @@ -108,12 +108,12 @@ <JLabel labelFor='{simulationStart}' text='isisfish.filter.simulation.simulationStart' toolTipText='isisfish.filter.simulation.tooltip.simulationStart'/> - <org.jdesktop.swingx.JXDatePicker + <JXDatePicker id="simulationStart" onFocusLost="doCheck()"/> <JLabel labelFor='{simulationEnd}' text='isisfish.filter.simulation.simulationEnd' toolTipText='isisfish.filter.simulation.tooltip.simulationEnd'/> - <org.jdesktop.swingx.JXDatePicker + <JXDatePicker id="simulationEnd" onFocusLost="doCheck()"/> </HBox> </cell> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,12 +23,12 @@ #L% --> <JDialog modal="true" title='isisfish.vcs.commit'> + <import> + java.awt.Color + </import> <script><![CDATA[ // FIXME a refaire -// import org.nuiton.vcs.ui.FieldModelUtil.ModuleFile; -// import org.nuiton.vcs.VCSFileState; - // protected ModuleFile<VCSFileState> model; protected Object model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,13 +23,12 @@ #L% --> <JDialog modal="true" title='isisfish.vcs.updateconfirm'> + <import> + java.awt.Color + </import> <script><![CDATA[ // FIXME a refaire - -// import org.nuiton.vcs.ui.FieldModelUtil.ModuleFile; -// import org.nuiton.vcs.VCSFileState; - // protected ModuleFile<VCSFileState> model; protected Object model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -26,8 +26,6 @@ <script><![CDATA[ // FIXME a refaire -// import org.nuiton.vcs.VCSState; - // protected org.nuiton.vcs.VCSRepositoryState model; protected Object model; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,16 +23,21 @@ #L% --> <JDialog> + <import> + javax.swing.text.html.HTMLEditorKit; + javax.swing.text.html.HTMLDocument; + javax.swing.event.HyperlinkListener; + javax.swing.text.html.HTMLFrameHyperlinkEvent; + javax.swing.event.HyperlinkEvent; + java.io.PrintWriter; + java.io.StringWriter; + java.net.URL; + javax.swing.JComponent + java.awt.Color + java.awt.Desktop + </import> + <script><![CDATA[ - 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 java.net.URL; - public boolean cancel; protected boolean invalidFirstName; protected boolean invalidLastName; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,17 +23,22 @@ #L% --> <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> + <import> + com.jcraft.jsch.JSch; + com.jcraft.jsch.KeyPair; + org.nuiton.util.FileUtil; + java.io.File; + java.io.IOException; + java.util.ArrayList; + java.util.Arrays; + java.util.HashMap; + java.util.Map; + java.awt.Color + javax.swing.JComponent + </import> <script><![CDATA[ - import com.jcraft.jsch.JSch; - import com.jcraft.jsch.KeyPair; - import org.nuiton.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) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -23,6 +23,11 @@ #L% --> <JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> + <import> + java.io.BufferedReader + java.io.InputStreamReader + java.io.IOException + </import> <script><![CDATA[ private boolean cancel; private static VCSPassPhraseUI instance; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -37,15 +37,17 @@ fr.ifremer.isisfish.ui.widget.filter.FilterParamModel fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI java.util.List + java.awt.Desktop + javax.swing.DefaultComboBoxModel </import> - <script> + <script><![CDATA[ /** filter model */ - protected fr.ifremer.isisfish.ui.widget.filter.FilterModel model; + protected FilterModel model; /** use to display filtered result in a comboBox */ protected DefaultComboBoxModel modelResult; - public fr.ifremer.isisfish.ui.widget.filter.FilterParamModel getParamModel(String paramKey) { + public FilterParamModel getParamModel(String paramKey) { return model.getParamModel(paramKey); } @SuppressWarnings({"unchecked"}) @@ -54,12 +56,12 @@ } /** @return list of last filter list obtain */ @SuppressWarnings({"unchecked"}) - protected java.util.List getFilterResult() { + protected List getFilterResult() { // obtain list filtered return model.getFiltered(); } @SuppressWarnings({"unchecked"}) - public java.util.List obtainFilterResult() { + public List obtainFilterResult() { // compact dialog setSize(getMinimumSize()); repaint(); @@ -137,7 +139,7 @@ (HTMLFrameHyperlinkEvent)e); } else { try { - if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { + if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { Desktop.getDesktop().browse(e.getURL().toURI()); } else { doc.setPage(e.getURL()); @@ -176,7 +178,7 @@ doc.setEditorKit(new HTMLEditorKit()); doc.addHyperlinkListener(createHyperLinkListener()); - </script> + ]]></script> <Table> <row fill='horizontal'> <cell columns='4' weighty="1" fill='both'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-17 16:33:10 UTC (rev 3181) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2011-03-18 09:48:02 UTC (rev 3182) @@ -29,13 +29,15 @@ java.text.SimpleDateFormat fr.ifremer.isisfish.ui.widget.filter.FilterParamModel fr.ifremer.isisfish.ui.util.JaxxUtil + javax.swing.JTextField + javax.swing.JCheckBox </import> -<script> +<script><![CDATA[ protected FilterDialogUI dialog; protected static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy"); - protected FilterPanelUI(fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI dialog) { + protected FilterPanelUI(FilterDialogUI dialog) { this.dialog = dialog; } @@ -50,7 +52,7 @@ public void doCheck() { if (dialog!=null) dialog.doCheck(); } - @SuppressWarnings({"unchecked"}) + public void doReset() { JaxxUtil.doReset(get$objectMap()); } @@ -76,5 +78,5 @@ d1 = field2.getDate(); paramModel.extractParam(d0==null?null:d0.getTime()+"",d1==null?null:d1.getTime()+""); } - </script> + ]]></script> </JPanel>

1 0

r3181 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 16:33:10 +0000 (Thu, 17 Mar 2011) New Revision: 3181 Log: Import Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:32:56 UTC (rev 3180) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:33:10 UTC (rev 3181) @@ -29,7 +29,6 @@ import java.io.IOException; import org.apache.commons.io.FileUtils; -import org.h2.engine.Constants; import org.junit.Assert; import org.junit.Test;

1 0

r3180 - isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 16:32:56 +0000 (Thu, 17 Mar 2011) New Revision: 3180 Log: Remove h2 version test Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:32:11 UTC (rev 3179) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2011-03-17 16:32:56 UTC (rev 3180) @@ -64,17 +64,4 @@ Assert.assertTrue("File is not valide for Windows on line " + index, lines[index].endsWith("\r")); } } - - /** - * Test that h2 version is < 1.2.129. - * - * Upgrading from < 1.1.x to 1.2.129 doesn't work - * Since page store has been changed in 1.2.x release, and removed since 1.2.129. - */ - @Test - public void testH2Version() { - Assert.assertEquals(1, Constants.VERSION_MAJOR); - Assert.assertEquals(2, Constants.VERSION_MINOR); - Assert.assertTrue("Using H2 >= 1.2.129 will not work", Constants.BUILD_ID < 129); - } }

1 0

r3179 - in isis-fish/branches/3.3.1: . src/main/java/fr/ifremer/isisfish/simulator/launcher src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/util
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 16:32:11 +0000 (Thu, 17 Mar 2011) New Revision: 3179 Log: Disable charset converter Modified: isis-fish/branches/3.3.1/changelog.txt isis-fish/branches/3.3.1/pom.xml isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Modified: isis-fish/branches/3.3.1/changelog.txt =================================================================== --- isis-fish/branches/3.3.1/changelog.txt 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/changelog.txt 2011-03-17 16:32:11 UTC (rev 3179) @@ -1,5 +1,6 @@ isis-fish (3.3.1.0-rc1) stable; urgency=low + * Disable charset converter (need to be retested) * Add a new button to check all script in one action in script UI * Improve UI to enable some fields/tabs only after region loading * Enable to put population effectives into factors Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:32:11 UTC (rev 3179) @@ -343,12 +343,12 @@ <scope>compile</scope> </dependency> - <dependency> +  <dependency> <groupId>com.sun</groupId> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -1128,7 +1128,7 @@ // // Convertion // - CompileHelper.convertToUnicode(fileToConvert); + //CompileHelper.convertToUnicode(fileToConvert); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -26,27 +26,12 @@ package fr.ifremer.isisfish.util; import static org.nuiton.i18n.I18n._; -import info.monitorenter.cpdetector.io.ASCIIDetector; -import info.monitorenter.cpdetector.io.ByteOrderMarkDetector; -import info.monitorenter.cpdetector.io.CodepageDetectorProxy; -import info.monitorenter.cpdetector.io.JChardetFacade; -import info.monitorenter.cpdetector.io.ParsingDetector; import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.Reader; -import java.io.Writer; import java.lang.reflect.Method; -import java.net.MalformedURLException; import java.net.URL; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -58,7 +43,6 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -89,7 +73,7 @@ private static final Log log = LogFactory.getLog(CompileHelper.class); /** CP detector proxy. */ - protected static CodepageDetectorProxy detector; + //protected static CodepageDetectorProxy detector; /** * Recherche tous les fichiers qui un source plus recent que la version compilé. @@ -386,7 +370,7 @@ return result; } - protected static CodepageDetectorProxy getCodepageDetector() { + /*protected static CodepageDetectorProxy getCodepageDetector() { if (detector == null) { detector = CodepageDetectorProxy.getInstance(); // A singleton. @@ -402,15 +386,14 @@ detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. } return detector; - } - + }*/ - /** + /* * Convert all files to UTF-8. * * @param files fiels to convert * @return converted file list - */ + * public static List<File> convertToUnicode(List<File> files) { CodepageDetectorProxy myDetector = getCodepageDetector(); @@ -477,5 +460,5 @@ } return files; - } + }*/ } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-03-17 16:25:23 UTC (rev 3178) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2011-03-17 16:32:11 UTC (rev 3179) @@ -182,12 +182,12 @@ FileUtil.deleteRecursively(dest); } - /** + /* * Save a file as non utf-8 encoded. * Convert to uft-8. * Assert that file has been converted. * @throws IOException - */ + * @Test public void convertToUnicodeTest() throws IOException { String content = getFirstClassContent("ConvertToUnicode"); @@ -209,13 +209,13 @@ Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); nonUnicodeFile.delete(); - } + }*/ - /** + /* * Try to convert file already in UTF-8. * * @throws IOException - */ + * @Test public void convertToUnicodeUselessTest() throws IOException { String content = getFirstClassContent("UselessConvertToUnicode"); @@ -237,5 +237,5 @@ Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); nonUnicodeFile.delete(); - } + }*/ }

1 0

r3178 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 16:25:23 +0000 (Thu, 17 Mar 2011) New Revision: 3178 Log: Update h2 Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-03-17 15:49:25 UTC (rev 3177) +++ isis-fish/branches/3.3.1/pom.xml 2011-03-17 16:25:23 UTC (rev 3178) @@ -244,10 +244,18 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.2.128</version> + <version>1.3.153</version> <scope>compile</scope> </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2mig_pagestore_addon</artifactId> + <version>1.3.153</version> + <scope>runtime</scope> + </dependency> +  <dependency> <groupId>aspectwerkz</groupId> @@ -673,28 +681,16 @@ <repositories> <repository> - <id>javanet.repository</id> - <url>http://download.java.net/maven/2/</url> + <id>nuiton.public</id> + <url>http://maven.nuiton.org/nexus/content/groups/public</url> </repository> - <repository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </repository> - <repository> - <id>nuiton.snapshot</id> - <url>http://maven.nuiton.org/snapshot</url> - </repository> </repositories> <pluginRepositories> <pluginRepository> - <id>nuiton.plugin.release</id> - <url>http://maven.nuiton.org/release</url> + <id>nuiton.plugin.public</id> + <url>http://maven.nuiton.org/nexus/content/groups/public</url> </pluginRepository> - <pluginRepository> - <id>nuiton.plugin.snapshot</id> - <url>http://maven.nuiton.org/snapshot</url> - </pluginRepository> </pluginRepositories> <profiles>

1 0

r3177 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: input sensitivity
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 15:49:25 +0000 (Thu, 17 Mar 2011) New Revision: 3177 Log: Fix add factor Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -258,6 +258,7 @@ FactorWizardUI wizard = new FactorWizardUI(this); wizard.initNew(editor, bean, EditorHelper.canBeContinue(editor, bean)); wizard.pack(); + wizard.setLocationRelativeTo(this); wizard.setVisible(true); } else if (log.isWarnEnabled()) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/ContinuousPanelContainerUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -28,6 +28,6 @@ <Boolean id='continueSelected' javaBean='false'/> - <JPanel id='content' constraints='BorderLayout.CENTER'/> + <JPanel id='content' layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'/> </JPanel> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -24,26 +24,30 @@ --> <ContinuousPanelContainerUI> <script><![CDATA[ +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; protected JTextField continueMax = null; protected JTextField continueMin = null; -addPropertyChangeListener("continuePossible", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setVisible((Boolean)evt.getNewValue()); - continueMin.setVisible((Boolean)evt.getNewValue()); - } -}); +protected void $afterCompleteSetup() { + addPropertyChangeListener("continuePossible", new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setVisible((Boolean)evt.getNewValue()); + continueMin.setVisible((Boolean)evt.getNewValue()); + } + }); + + addPropertyChangeListener("continueSelected", new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + continueMax.setEnabled((Boolean)evt.getNewValue()); + continueMin.setEnabled((Boolean)evt.getNewValue()); + } + }); +} -addPropertyChangeListener("continueSelected", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - continueMax.setEnabled((Boolean)evt.getNewValue()); - continueMin.setEnabled((Boolean)evt.getNewValue()); - } -}); - public void init(JTextField cMin, JTextField cMax) { continueMax = cMax; continueMin = cMin; @@ -63,22 +67,23 @@ public String getMax() { return continueMax.getText(); } - ]]> - </script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> - </cell> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> - </cell> - </row> - </Table> + ]]></script> + <JPanel id="content"> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.firstValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMinPanel' layout='{new BorderLayout()}'/> + </cell> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.lastValue' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='0.5'> + <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> + </cell> + </row> + </Table> + </JPanel> </ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2011-03-17 15:49:25 UTC (rev 3177) @@ -39,7 +39,8 @@ import javax.swing.JTextField; import javax.swing.text.JTextComponent; -import jaxx.runtime.JAXXInitialContext; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.context.JAXXInitialContext; import jaxx.runtime.swing.editor.NumberEditor; import org.apache.commons.lang.StringUtils; @@ -51,6 +52,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.Formule; @@ -96,7 +98,7 @@ * @return property value */ public static String getMethod(JComponent component) { - String method = (String)component.getClientProperty("method"); + String method = (String)component.getClientProperty("sensitivityMethod"); return method; } @@ -107,7 +109,7 @@ * @param entity entity * @return component copy */ - public static JComponent getEditor(JComponent component, TopiaEntity entity) { + public static JComponent getEditor(JComponent component, TopiaEntityContextable entity) { JComponent result = null; try { String fieldName = getMethod(component); @@ -175,7 +177,7 @@ //ui.setMethodSet(origine.getMethodSet()); ui.setBeanProperty(origine.getBeanProperty()); ui.setBean(entity); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof IntervalPanel) { @@ -193,9 +195,9 @@ origine.getRegion()).add( new InputSaveVerifier())); ui.setBean(origine.getBean()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); - ui.setActif(true); + ui.setActive(true); result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI) { MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI) component; @@ -207,7 +209,7 @@ if (origine.getMetierSeasonInfo() != null) { ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); ui.setMetierSeasonSelected(true); - ui.setActif(true); + ui.setActive(true); } ui.refresh(); result = ui; @@ -215,7 +217,7 @@ PopulationZonesEditorUI origine = (PopulationZonesEditorUI) component; PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion())); ui.setBean(origine.getBean()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof PopulationMigrationMigrationUI) { @@ -224,7 +226,7 @@ new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationEmigrationUI) { @@ -232,7 +234,7 @@ PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationImmigrationUI) { @@ -240,7 +242,7 @@ PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction())); ui.setBean(origine.getBean()); ui.setPopInfo(origine.getPopInfo()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } @@ -263,7 +265,7 @@ * @param entity entity * @return component copy */ - public static ContinuousPanelContainerUI getContinuousPanel(JComponent component, TopiaEntity entity) { + public static ContinuousPanelContainerUI getContinuousPanel(JComponent component, TopiaEntityContextable entity) { ContinuousPanelContainerUI result = null; String fieldName = getMethod(component); DefaultContinuousPanelUI continuousPanel = null; @@ -453,7 +455,7 @@ /// ??? was not set before ui.setBeanProperty(origine.getBeanProperty()); ui.setFormule((Formule) value); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof IntervalPanel) { @@ -469,9 +471,9 @@ origine.getRegion()).add(new InputSaveVerifier())); ui.setBean(origine.getBean()); ui.getBean().setPopulationSelectivity((Collection<Selectivity>) value); - ui.setActif(true); + ui.setActive(true); ui.refresh(); - ui.setActif(true); + ui.setActive(true); result = ui; } else if (result instanceof MetierSeasonInfoSpeciesEditorUI) { MetierSeasonInfoSpeciesEditorUI origine = (MetierSeasonInfoSpeciesEditorUI) component; @@ -484,7 +486,7 @@ ui.setMetierSeasonInfo(origine.getMetierSeasonInfo()); ui.getMetierSeasonInfo().setSpeciesTargetSpecies((Collection<TargetSpecies>) value); ui.setMetierSeasonSelected(true); - ui.setActif(true); + ui.setActive(true); } ui.refresh(); result = ui; @@ -495,7 +497,7 @@ ui.setBean(origine.getBean()); MatrixND m = (MatrixND) value; ui.getFieldPopulationMappingZoneReproZoneRecru().setMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refresh(); result = ui; } else if (result instanceof PopulationMigrationMigrationUI) { @@ -506,7 +508,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setMigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationEmigrationUI) { @@ -517,7 +519,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setEmigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } else if (result instanceof PopulationMigrationImmigrationUI) { @@ -528,7 +530,7 @@ ui.setPopInfo(origine.getPopInfo()); MatrixND m = (MatrixND) value; ui.getPopInfo().setImmigrationMatrix(m == null ? null : m.clone()); - ui.setActif(true); + ui.setActive(true); ui.refreshPanel(); result = ui; } @@ -650,7 +652,7 @@ */ public static boolean canBeContinue(JComponent component, TopiaEntity entity) { - String fieldName = (String) component.getClientProperty("method"); + String fieldName = (String) component.getClientProperty("sensitivityMethod"); if (component instanceof JTextComponent) { Object o = getMethodValue(entity, fieldName); return canBeContinue(component, o); @@ -887,9 +889,9 @@ InputOneEquationUI equationComponent = new InputOneEquationUI( new JAXXInitialContext().add(new InputAction())); equationComponent.setFormuleCategory(basicEquation.getCategory()); - equationComponent.setBean((TopiaEntity)bean); + equationComponent.setBean((TopiaEntityContextable)bean); equationComponent.setBeanProperty(beanProperty); - equationComponent.putClientProperty("method", beanProperty); + equationComponent.putClientProperty("sensitivityMethod", beanProperty); component = equationComponent; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -25,7 +25,7 @@ <ContinuousPanelContainerUI> <String id='text' javaBean='null'/> - <org.nuiton.topia.persistence.TopiaEntity id='bean' javaBean='null'/> + <org.nuiton.topia.persistence.TopiaEntityContextable id='bean' javaBean='null'/> <String id='beanProperty' javaBean='null'/>  <Class id='clazz' javaBean='null'/> @@ -243,30 +243,32 @@ } } ]]></script> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <JScrollPane preferredSize="{new Dimension(200, 150)}"> - <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' + <JPanel id='content'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JScrollPane preferredSize="{new Dimension(200, 150)}"> + <JTable id='params' visible='{isContinuePossible()}' model='{getTableModel()}' enabled='{isContinueSelected()}' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill='horizontal' weightx='0.5'> - <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> - </cell> - <cell fill='horizontal' weightx='0.5'> - <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> - </cell> - </row> - <row> - <cell fill='both' columns='2' weightx='1' weighty='0.5'> - <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' text='{getText()}' - constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' actif='{isContinueSelected()}' - formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' - visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - </Table> -</ContinuousPanelContainerUI> \ No newline at end of file + </JScrollPane> + </cell> + </row> + <row> + <cell fill='horizontal' weightx='1'> + <JButton id='add' text='isisfish.common.add' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='add()'/> + </cell> + <cell fill='horizontal' weightx='1'> + <JButton id='remove' text='isisfish.common.remove' visible='{isContinuePossible()}' enabled='{isContinueSelected()}' onActionPerformed='remove()'/> + </cell> + </row> + <row> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <fr.ifremer.isisfish.ui.input.InputOneEquationUI id='editor' formule='{getFormule()}' text='{getText()}' + constructorParams='this' bean='{getBean()}' clazz='{getClazz()}' beanProperty='{getBeanProperty()}' active='{isContinueSelected()}' + formuleCategory='{getFormuleCategory()}' selectedEquation='{getSelectedEquation()}' + visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + </Table> + </JPanel> +</ContinuousPanelContainerUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2010 Ifremer, CodeLutin + Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -28,13 +28,11 @@ <Boolean id='continueSelected' javaBean='false'/> - <Boolean id='saveEnabled' javaBean='false'/> - <Boolean id='existingValue' javaBean='false'/> <script><![CDATA[ import org.apache.commons.lang.StringUtils; -import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.input.InputSaveVerifier; import fr.ifremer.isisfish.simulator.sensitivity.Factor; @@ -42,33 +40,38 @@ import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; import fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; +import jaxx.runtime.JAXXUtil; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; protected JComponent cOrigine = null; -protected TopiaEntity bean = null; +protected TopiaEntityContextable bean = null; protected java.util.List<JComponent> discretComponents = new ArrayList<JComponent>(); protected String path = null; protected ContinuousPanelContainerUI continuousPanel = null; protected Factor factor = null; -addPropertyChangeListener("continuePossible", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null) { - continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_CONTINUE_POSSIBLE, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null) { + continuousPanel.setContinuePossible((Boolean)evt.getNewValue()); + } } - } -}); - -addPropertyChangeListener("continueSelected", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (continuousPanel != null) { - continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); + }); + + addPropertyChangeListener(PROPERTY_CONTINUE_SELECTED, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (continuousPanel != null) { + continuousPanel.setContinueSelected((Boolean)evt.getNewValue()); + } } - } -}); + }); +} -public void initNew(JComponent c, TopiaEntity be, Boolean b) { +public void initNew(JComponent c, TopiaEntityContextable be, Boolean b) { this.bean = be; this.cOrigine = c; @@ -106,7 +109,6 @@ continuousPanel.setContinueSelected(selected); } setContinueSelected(EditorHelper.isContinue(cOrigine)); - setSaveEnabled(!factorName.getText().equals("")); } public void initExisting(JComponent cOrigine, Factor f) { @@ -173,7 +175,6 @@ this.pack(); } - setSaveEnabled(!factorName.getText().equals("")); } protected void init() { continuousPanelContainer.add(continuousPanel, BorderLayout.CENTER); @@ -206,12 +207,12 @@ } else { getSensitivityAction().saveDiscret(cOrigine, factorName.getText(), comment.getText(), path, discretComponents, getSimulAction(), isExistingValue()); } - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + getContextValue(SensitivityTabUI.class, JAXXUtil.PARENT).setFactorModel(); exit(); } protected void remove() { getSimulAction().removeFactor(factor); - getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); + getContextValue(SensitivityTabUI.class, JAXXUtil.PARENT).setFactorModel(); exit(); } protected void exit() { @@ -224,38 +225,41 @@ <cell columns='1' fill='horizontal'> <JLabel text='isisfish.sensitivity.name'/> </cell> - <cell columns='3' fill='horizontal' weightx='1'> - <JTextField id='factorName' onKeyReleased='setSaveEnabled(!factorName.getText().equals(""))'/> + <cell columns='3' fill='horizontal'> + <JTextField id='factorName'/> </cell> </row> <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='continueRadio' text='isisfish.sensitivity.continue' buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> + <cell columns='4' fill='horizontal'> + <JRadioButton id='continueRadio' text='isisfish.sensitivity.continue' + buttonGroup='factorType' visible='{isContinuePossible()}' selected='{false}' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.5'> + <cell columns='4' fill='both' weightx='1' weighty='2'> <JPanel id='continuousPanelContainer' layout='{new BorderLayout()}'/> </cell> </row> <row> - <cell columns='4' fill='horizontal' weightx='1'> - <JRadioButton id='discret' text='isisfish.sensitivity.discret' selected='{true}' buttonGroup='factorType' onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> + <cell columns='4' fill='horizontal'> + <JRadioButton id='discret' text='isisfish.sensitivity.discret' + selected='{true}' buttonGroup='factorType' + onActionPerformed='setContinueSelected(continueRadio.isSelected())'/> </cell> </row> <row> <cell fill='horizontal'> <JLabel text='isisfish.sensitivity.selectDiscretNumber' enabled='{!isContinueSelected()}'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal'> <JTextField id='discretNumber' enabled='{!isContinueSelected()}'/> </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> + <cell columns='2' fill='horizontal'> <JButton text='isisfish.sensitivity.validDiscretNumber' enabled='{!isContinueSelected()}' onActionPerformed='addTabs(discretNumber.getText())'/> </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <cell columns='4' fill='both' weightx='1' weighty='2'> <JTabbedPane id='tabPane' visible='{!isContinueSelected()}' enabled='{!isContinueSelected()}'/> </cell> </row> @@ -265,21 +269,21 @@ </cell> </row> <row> - <cell columns='4' fill='both' weightx='1' weighty='0.3'> + <cell columns='4' fill='both' weighty='1'> <JScrollPane> <JTextArea id='comment'/> </JScrollPane> </cell> </row> <row> - <cell fill='horizontal' weightx='0.25'> + <cell fill='horizontal'> <JButton id='cancel' text='isisfish.common.cancel' onActionPerformed='exit()'/> </cell> - <cell fill='horizontal' weightx='0.25'> + <cell fill='horizontal'> <JButton id='remove' text='isisfish.common.remove' visible='{isExistingValue()}' onActionPerformed='remove()'/> </cell> - <cell columns='2' fill='horizontal' weightx='0.5'> - <JButton id='save' text='isisfish.common.save' enabled='{isSaveEnabled()}' onActionPerformed='save()'/> + <cell columns='2' fill='horizontal'> + <JButton id='save' text='isisfish.common.save' enabled='{!getFactorName().getText().isEmpty()}' onActionPerformed='save()'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -26,37 +26,39 @@ <org.nuiton.math.matrix.MatrixND id='matrix' javaBean='null'/> - <Table id='content' constraints='BorderLayout.CENTER'> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' weightx='1' weighty='1'> - <org.nuiton.math.matrix.gui.MatrixPanelEditor id='componentPanel' dimensionEdit='{false}' - matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' - enabled='{isContinueSelected()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='both' columns='2' weightx='1' weighty='1'> - <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='1' columns='3'> - <JComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> - <item id='plus' value="+"/> - <item id='moins' value="-"/> - <item id='mult' value="*"/> - <item id='div' value="/"/> - </JComboBox> - </cell> - </row> - </Table> + <JPanel id='content'> + <Table constraints='BorderLayout.CENTER'> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' weightx='1' weighty='1'> + <org.nuiton.math.matrix.gui.MatrixPanelEditor id='componentPanel' dimensionEdit='{false}' + matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' + enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.coefficient' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='both' columns='2' weightx='1' weighty='1'> + <JTextField id='coef' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JLabel text='isisfish.sensitivity.operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> + </cell> + <cell fill='horizontal' weightx='1' columns='3'> + <JAXXComboBox id='operator' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'> + <item id='plus' value="+"/> + <item id='moins' value="-"/> + <item id='mult' value="*"/> + <item id='div' value="/"/> + </JAXXComboBox> + </cell> + </row> + </Table> + </JPanel> </ContinuousPanelContainerUI> \ No newline at end of file Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -37,26 +37,28 @@ // declaration sépérée de la variable d'instance (jaxx) SimulationServiceListener simulationListener; - // permet de rafaichir la liste les simulations - // des qu'une simulation se termine - simulationListener = new SimulationServiceListener() { - @Override - public void simulationStart(SimulationService simService, SimulationJob job) { - } - - @Override - public void simulationStop(SimulationService simService, SimulationJob job) { - if (log.isDebugEnabled()) { - log.debug("Refresh second pass UI simulations list"); + protected void $afterCompleteSetup() { + // permet de rafaichir la liste les simulations + // des qu'une simulation se termine + simulationListener = new SimulationServiceListener() { + @Override + public void simulationStart(SimulationService simService, SimulationJob job) { } - fieldSensitivitySimulationSelect.setModel(getSensitivitySimulationModel()); - } - - @Override - public void clearJobDone(SimulationService simService) { - } + + @Override + public void simulationStop(SimulationService simService, SimulationJob job) { + if (log.isDebugEnabled()) { + log.debug("Refresh second pass UI simulations list"); + } + fieldSensitivitySimulationSelect.setModel(getSensitivitySimulationModel()); + } + + @Override + public void clearJobDone(SimulationService simService) { + } + }; + SimulationService.getService().addSimulationServiceListener(simulationListener); } - SimulationService.getService().addSimulationServiceListener(simulationListener); /** * Model de contenu de la liste des nom de simulations @@ -129,7 +131,7 @@ <row> <cell columns="3" fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> - <JTextArea id='textAreaSensitivitySecondpassResult' text='' editable="false" /> + <JTextArea id='textAreaSensitivitySecondpassResult' editable="false" /> </JScrollPane> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 14:31:00 UTC (rev 3176) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-03-17 15:49:25 UTC (rev 3177) @@ -47,7 +47,7 @@ protected void $afterCompleteSetup() { // end code constructor - getVerifier().setSensPanel(this); + //getVerifier().setSensPanel(this); } protected InputAction getInputAction() {

1 0

r3176 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/datastore test/java/fr/ifremer/isisfish/entity test/java/fr/ifremer/isisfish/simulator
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 14:31:00 +0000 (Thu, 17 Mar 2011) New Revision: 3176 Log: Back to standalone topia migration service configuration Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -202,28 +202,15 @@ /** * Returns the storage. * - * Storage is auto configured to perform shema migration. - * * @return Returns the storage. */ public TopiaContext getStorage() { - TopiaContext topiaContext = getStorage(true); - return topiaContext; - } - - /** - * Returns the storage. - * - * @param performMigration if {@code true} perform migration - * @return Returns the storage. - */ - public TopiaContext getStorage(boolean performMigration) { if (storage == null || storage.isClosed()) { log.info("Create new storage for " + getName()); try { // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, getDirectory(), performMigration); + IsisH2Config.addDatabaseConfig(config, getDirectory()); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext @@ -301,7 +288,7 @@ // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); // false = don't perform, schema is empty - IsisH2Config.addDatabaseConfig(config, rootDirDest, false); + IsisH2Config.addDatabaseConfig(config, rootDirDest); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -140,10 +140,9 @@ * * @param config l'objet properties dans lequel il faut ajouter les informations * @param directory le repertoire dans lequel la base de données doit se trouver - * @param performMigration if {@code true} perform migration * @return l'objet config passe en parametre */ - public static Properties addDatabaseConfig(Properties config, File directory, boolean performMigration) { + public static Properties addDatabaseConfig(Properties config, File directory) { File databasePath = getStorageDataDirectory(directory); databasePath.mkdirs(); @@ -160,9 +159,9 @@ // migration configuration, seulement pour les fichiers, pas pour les bases memoires config.put(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); config.put(TopiaMigrationService.MIGRATION_CALLBACK, databaseMigrationClass.getName()); - if (!performMigration) { + /*if (!performMigration) { config.put(TopiaMigrationService.MIGRATION_MIGRATE_ON_INIT, databaseMigrationClass.getName()); - } + }*/ return config; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -202,7 +202,7 @@ if (region != null) { File file = region.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = region.getStorage(false).beginTransaction(); + TopiaContext tx = region.getStorage().beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -280,7 +280,7 @@ RegionStorage result = new RegionStorage(directory, name); try { - TopiaContext context = result.getStorage(false).beginTransaction(); + TopiaContext context = result.getStorage().beginTransaction(); context.createSchema(); FisheryRegionDAO regionDAO = IsisFishDAOHelper .getFisheryRegionDAO(context); @@ -436,7 +436,7 @@ if (result != null) { File data = result.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = result.getStorage(false).beginTransaction(); + TopiaContext tx = result.getStorage().beginTransaction(); tx.restore(data); if (newName != null) { FisheryRegion region = getFisheryRegion(tx); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -597,7 +597,7 @@ checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + name); SimulationStorage sim = getSimulation(name); File file = sim.getDataBackupFile(); - TopiaContext tx = sim.getStorage(false).beginTransaction(); + TopiaContext tx = sim.getStorage().beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -686,7 +686,7 @@ File data = result.getDataBackupFile(); // FIXME was file.exists() ? if (data.exists()) { - TopiaContext tx = result.getStorage(false).beginTransaction(); + TopiaContext tx = result.getStorage().beginTransaction(); tx.restore(data); tx.commitTransaction(); tx.closeContext(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -66,7 +66,7 @@ SimulationParameter parameters = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("testdao", parameters); - TopiaContext rootContext = simulation.getStorage(false); + TopiaContext rootContext = simulation.getStorage(); TopiaContext context = rootContext.beginTransaction(); context.createSchema(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -125,7 +125,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_1_int", params); - TopiaContext storageContext = simulation.getStorage(false); + TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(childStorageContext); @@ -225,7 +225,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_2_matrix", params); - TopiaContext storageContext = simulation.getStorage(false); + TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); PopulationSeasonInfoDAO populationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(childStorageContext);

1 0

r3175 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . datastore entities logging mexico ui/script ui/script/action
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:35:55 +0000 (Thu, 17 Mar 2011) New Revision: 3175 Log: Fix isis exception constructors. Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, CodeLutin + * Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -53,13 +53,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.math.matrix.DoubleBigVector; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; -import org.nuiton.util.LocaleConverter; import org.nuiton.util.Version; -import org.nuiton.widget.SwingUtil; +import org.nuiton.util.converter.LocaleConverter; import fr.ifremer.isisfish.cron.CronService; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; @@ -119,69 +119,71 @@ System.exit(0); } - public static void main(String... args) { + public static void main(String... args) throws Exception { - try { - // permet de faire fonctionner la compilation en webstart - System.setSecurityManager(null); + // catch wall application exception + Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() { + public void uncaughtException(Thread t, Throwable cause) { + if (cause instanceof LinkageError) { + if (log.isFatalEnabled()) { + log.fatal("Linkage error detected", cause); + } - // initialisation de l'application - IsisFish.init(args); + // a real java.lang.Error sometimes happen when + // using non recompiled script due to dependency changes + // this is the better solution found : + // remove isis build directory + FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - if (log.isDebugEnabled()) { - log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + ErrorHelper.showErrorDialog(null, _("isisfish.error.linkageerror.title"), cause); + } + else { + if (log.isErrorEnabled()) { + log.error("Global application exception", cause); + } + ErrorHelper.showErrorDialog(null, cause.getMessage(), cause); + } } + }); - // action after init - config.doAction(IsisConfig.STEP_AFTER_INIT); + // permet de faire fonctionner la compilation en webstart + System.setSecurityManager(null); - // initVCS ask for passphrase, ui must be set before - initLookAndFeel(); - - // static vcs init (needed for some actions) - try { - initVCS(); - } catch (Exception eee) { - log.warn(_("Error during vcs initialisation"), eee); - } + // initialisation de l'application + init(args); - if (log.isInfoEnabled()) { - log.info(_("isisfish.launching", config.getElapsedTimeAsString())); - } - - // after init vcs and local data - config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); - - doNuitonMigration(); + if (log.isDebugEnabled()) { + log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + } - launchUI(); + // action after init + config.doAction(IsisConfig.STEP_AFTER_INIT); - // action after ui launched - config.doAction(IsisConfig.STEP_AFTER_UI); - - startCronService(); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Global IsisFish exception", e); - } - quit(); - } catch (LinkageError e) { - - if (log.isFatalEnabled()) { - log.fatal("Linkage error detected", e); - } - - // a real java.lang.Error sometimes happen when - // using non recompiled script due to dependency changes - // this is the better solution found : - // remove isis build directory - FileUtil.deleteRecursively(IsisFish.config.getCompileDirectory()); - // display message - JOptionPane.showMessageDialog(null, _("isisfish.error.linkageerror.message"), - _("isisfish.error.linkageerror.title"), JOptionPane.ERROR_MESSAGE); - // restart isis - quit(); + // initVCS ask for passphrase, ui must be set before + initLookAndFeel(); + + // static vcs init (needed for some actions) + try { + initVCS(); + } catch (Exception eee) { + log.warn(_("Error during vcs initialisation"), eee); } + + if (log.isInfoEnabled()) { + log.info(_("isisfish.launching", config.getElapsedTimeAsString())); + } + + // after init vcs and local data + config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); + + doNuitonMigration(); + + launchUI(); + + // action after ui launched + config.doAction(IsisConfig.STEP_AFTER_UI); + + startCronService(); } /** @@ -329,17 +331,17 @@ } // first load converter and matrixFactory - initConvertersAndMatrixFactory(); - - // after init shutdown hook - Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); + //initConvertersAndMatrixFactory(); // parsing des options à partir des arguments passés config = new IsisConfig(); config.parse(args); // init i18n - I18n.init(config.getLocale()); + I18n.init(new ClassPathI18nInitializer(), config.getLocale()); + + // after init shutdown hook + Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); } /** @@ -620,7 +622,8 @@ welcome.addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent e) { - ((WelcomeUI)e.getSource()).close(); + WelcomeUI ui = (WelcomeUI)e.getSource(); + ui.getHandler().close(ui); } }); @@ -634,7 +637,7 @@ log.error("Can't set frame icon", ex); } } - SwingUtil.center(welcome); + welcome.setLocationRelativeTo(null); welcome.setVisible(true); } else { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2010 Ifremer, CodeLutin + * Copyright (C) 2005 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -25,24 +25,32 @@ package fr.ifremer.isisfish; +/** + * Isis non runtime exception. + * + * @author poussin + */ public class IsisFishException extends Exception { /** serialVersionUID. */ private static final long serialVersionUID = -9012018415761616627L; - public IsisFishException() { - super(); - } - + /** + * Constructor with message. + * + * @param message message + */ public IsisFishException(String message) { super(message); } + /** + * Constructor with message and cause. + * + * @param message message + * @param cause cause + */ public IsisFishException(String message, Throwable cause) { super(message, cause); } - - public IsisFishException(Throwable cause) { - super(cause); - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,8 +26,9 @@ package fr.ifremer.isisfish; /** + * Isis runtime exception. + * * @author poussin - * */ public class IsisFishRuntimeException extends RuntimeException { @@ -35,32 +36,21 @@ private static final long serialVersionUID = 3388901195563202616L; /** + * Constructor with message. * + * @param message message */ - public IsisFishRuntimeException() { - super(); - } - - /** - * @param message - */ public IsisFishRuntimeException(String message) { super(message); } /** - * @param message - * @param cause + * Constructor with message and cause. + * + * @param message message + * @param cause cause */ public IsisFishRuntimeException(String message, Throwable cause) { super(message, cause); } - - /** - * @param cause - */ - public IsisFishRuntimeException(Throwable cause) { - super(cause); - } - } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -152,7 +152,7 @@ lastContentUpdate = System.nanoTime(); lastContentLength = getFile().length(); } catch (IOException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get content", eee); } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 Ifremer, CodeLutin + * Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -27,24 +27,36 @@ import fr.ifremer.isisfish.IsisFishException; +/** + * Storage exception. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ public class StorageException extends IsisFishException { /** serialVersionUID. */ private static final long serialVersionUID = -8193638893951824873L; - public StorageException() { - super(); - } - + /** + * Constructor with message. + * + * @param message message + */ public StorageException(String message) { super(message); } + /** + * Constructor with message and cause. + * + * @param message message + * @param cause cause + */ public StorageException(String message, Throwable cause) { super(message, cause); } - - public StorageException(Throwable cause) { - super(cause); - } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -106,7 +106,7 @@ List<Port> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get port", eee); } } @@ -119,7 +119,7 @@ List<Cell> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get cell", eee); } } @@ -133,7 +133,7 @@ List<VesselType> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get vessel type", eee); } } @@ -146,7 +146,7 @@ List<Gear> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get gear", eee); } } @@ -159,7 +159,7 @@ List<Metier> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get metier", eee); } } @@ -173,7 +173,7 @@ List<SetOfVessels> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get setOfVessels", eee); } } @@ -186,7 +186,7 @@ List<Species> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get species", eee); } } @@ -200,7 +200,7 @@ List<Strategy> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get strategy", eee); } } @@ -214,7 +214,7 @@ List<TripType> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get tripType", eee); } } @@ -227,7 +227,7 @@ List<Zone> result = dao.findAll(); return result; } catch (TopiaException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get zone", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -52,7 +52,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -55,7 +55,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -70,10 +70,10 @@ /** serialVersionUID */ private static final long serialVersionUID = 1L; - /** + /* * Overwrite delete. * @throws TopiaException - */ + * @Override public void delete() throws TopiaException { // chatellier 20090317 fix hibernate exception @@ -82,7 +82,7 @@ this.getSpecies().getPopulation().remove(this); super.delete(); - } + }*/ /* * @see fr.ifremer.isisfish.entities.PopulationAbstract#toString() Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -64,7 +64,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -67,7 +67,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } @@ -130,8 +130,7 @@ if (!month.equals(result.getMonth())) { // normalement les StrategyMonthInfo sont dans l'ordre mais // pour etre sur que ca fonctionne on fait un petit test - log - .warn("StrategyMonthInfo not in month order, i take time to find good StrategyMonthInfo"); + log.warn("StrategyMonthInfo not in month order, i take time to find good StrategyMonthInfo"); result = null; for (StrategyMonthInfo smi : smis) { if (month.equals(smi.getMonth())) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -65,7 +65,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } @@ -90,8 +90,7 @@ mat.setValue(metier, value); setProportionMetier(mat); } else { - log - .warn("Can't set proportion of metier, not enough information available"); + log.warn("Can't set proportion of metier, not enough information available"); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -48,11 +48,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) - * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() - */ - @Override - public void postCreate() throws TopiaException { + public TripTypeImpl() { setMinTimeBetweenTrip(new TimeUnit(0)); setTripDuration(new TimeUnit(0)); } @@ -63,7 +59,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -48,11 +48,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /* (non-Javadoc) - * @see org.nuiton.topia.persistence.TopiaEntityAbstract#postCreate() - */ - @Override - public void postCreate() throws TopiaException { + public VesselTypeImpl() { setMaxTripDuration(new TimeUnit(0)); } @@ -62,7 +58,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -51,7 +51,7 @@ .getFisheryRegion(getTopiaContext()); return result; } catch (StorageException eee) { - throw new IsisFishRuntimeException(eee); + throw new IsisFishRuntimeException("Can't get fishery region", eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -140,9 +140,9 @@ if (log.isDebugEnabled()) { log.debug(_("isisfish.log.addAppender", appenderId)); } - } catch (IOException e) { - log.error(_("isisfish.error.log.createAppender", appenderId, e.getMessage())); - throw new IsisFishException(e); + } catch (IOException ex) { + log.error(_("isisfish.error.log.createAppender", appenderId, ex.getMessage())); + throw new IsisFishException("Can't add appender", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -196,11 +196,11 @@ return out.toString(); } catch (IOException e) { - throw new IsisFishRuntimeException(e); + throw new IsisFishRuntimeException("Can't format xml", e); } catch (ParserConfigurationException e) { - throw new IllegalArgumentException(e); + throw new IllegalArgumentException("Can't format xml", e); } catch (SAXException e) { - throw new IllegalArgumentException(e); + throw new IllegalArgumentException("Can't format xml", e); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -973,8 +973,8 @@ FileUtil.copy(sourceFile, dst); } } - } catch (Exception ee) { - throw new IsisFishRuntimeException(ee); + } catch (Exception ex) { + throw new IsisFishRuntimeException("Can't backup scripts", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -97,8 +97,8 @@ for (String path : paths) { backup(new File(src, path), path, suffix); } - } catch (Exception ee) { - throw new IsisFishRuntimeException(ee); + } catch (Exception ex) { + throw new IsisFishRuntimeException("Can't backup scripts", ex); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-03-17 10:35:24 UTC (rev 3174) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2011-03-17 10:35:55 UTC (rev 3175) @@ -153,8 +153,8 @@ + " files] (size " + dst.length() + ")"); } - } catch (IOException e1) { - throw new IsisFishRuntimeException(e1); + } catch (IOException ex) { + throw new IsisFishRuntimeException("Can't export script", ex); } } } \ No newline at end of file

1 0

r3174 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . actions
by chatellier＠users.labs.libre-entreprise.org 17 Mar '11

17 Mar '11

Author: chatellier Date: 2011-03-17 10:35:24 +0000 (Thu, 17 Mar 2011) New Revision: 3174 Log: Fix i18n init Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-03-17 10:34:38 UTC (rev 3173) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2011-03-17 10:35:24 UTC (rev 3174) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, CHatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -26,6 +26,7 @@ package fr.ifremer.isisfish; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import java.io.File; import java.net.MalformedURLException; @@ -868,7 +869,7 @@ * @throws org.nuiton.util.ArgumentsParserException */ @Override - public void parse(String[] args) throws ArgumentsParserException { + public void parse(String... args) throws ArgumentsParserException { super.parse(args); // dans la version precedente (3.1) seul le fichier user existe, il est // donc le seul a devoir etre modifie @@ -954,89 +955,89 @@ */ public static enum Option implements OptionDef { - COMPILATION_DIRECTORY("compilation.directory", _("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), - MONITORING_DIRECTORY("monitoring.directory", _("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"), - JAVADOC_DIRECTORY("javadoc.directory", _("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), - CONFIG_FILE(CONFIG_FILE_NAME, _("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), - BACKUP_DIRECTORY("backup.directory", _("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), + COMPILATION_DIRECTORY("compilation.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"), + MONITORING_DIRECTORY("monitoring.directory", n_("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"), + JAVADOC_DIRECTORY("javadoc.directory", n_("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"), + CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME), + BACKUP_DIRECTORY("backup.directory", n_("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"), - DEFAULT_EXPORT_NAMES("default.export.names", _("isisfish.config.main.defaultExportNames.description"), ""), - DEFAULT_RESULT_NAMES("default.result.names", _("isisfish.config.main.defaultResultNames.description"), ""), - DEFAULT_MAP_FILENAME("default.map.filename", _("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), - DEFAULT_TAG_VALUE("default.tagvalue", _("isisfish.config.main.defaultTagValue.description"), ""), - ENCODING("encoding", _("isisfish.config.main.encoding.description"), "UTF-8"), - JAVADOC_URL("javadoc.url", _("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"), + DEFAULT_EXPORT_NAMES("default.export.names", n_("isisfish.config.main.defaultExportNames.description"), ""), + DEFAULT_RESULT_NAMES("default.result.names", n_("isisfish.config.main.defaultResultNames.description"), ""), + DEFAULT_MAP_FILENAME("default.map.filename", n_("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"), + DEFAULT_TAG_VALUE("default.tagvalue", n_("isisfish.config.main.defaultTagValue.description"), ""), + ENCODING("encoding", n_("isisfish.config.main.encoding.description"), "UTF-8"), + JAVADOC_URL("javadoc.url", n_("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"), - SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), + SIMULATOR_CLASSFILE("simulator.classfile", n_("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"), /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */ - SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), - SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), - SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", n_("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()), + SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", n_("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), + SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n_("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), /** Serveur accessible par ssh : address */ - SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), + SIMULATOR_SSH_SERVER("simulation.ssh.server", n_("isisfish.config.main.simulation.ssh.server.description"), "caparmor"), /** Serveur accessible par ssh : login */ - SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""), + SIMULATOR_SSH_USER_NAME("simulation.ssh.username", n_("isisfish.config.main.simulation.ssh.username.description"), ""), /** Serveur accessible par ssh : user home directory */ - SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", _("isisfish.config.main.simulation.ssh.userhome.description"), ""), + SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", n_("isisfish.config.main.simulation.ssh.userhome.description"), ""), /** Serveur accessible par ssh : remote data path */ - SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"), + SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", n_("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"), /** Serveur accessible par ssh : remote isis home install */ - SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), + SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", n_("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()), /** Serveur accessible par ssh : remote tmp path */ - SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", _("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), + SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", n_("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"), /** Serveur accessible par SSH : emplacement de Java (full path) */ - SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", _("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"), + SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", n_("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"), /** Serveur accessible par SSH : emplacement des executables pbs */ - SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", _("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), + SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", n_("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"), /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */ - SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", _("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), + SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", n_("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"), /** Serveur accessible par SSH : interval de check du fichier de control */ - SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), + SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", n_("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ - SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", n_("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), /** Application locale (for i18n init). */ - LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"), - SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"), + LOCALE("locale", n_("isisfish.config.main.locale.description"), "fr_FR"), + SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", n_("isisfish.config.main.simulationShowOnlyError.description"), "false"), /** Perform ui launch option. */ - LAUNCH_UI("launch.ui", _("isisfish.config.main.launchUI.description"), "true"), + LAUNCH_UI("launch.ui", n_("isisfish.config.main.launchUI.description"), "true"), /** Perform data migration option. */ - PERFORM_MIGRATION("perform.migration", _("isisfish.config.main.performmigration.description"), "true"), + PERFORM_MIGRATION("perform.migration", n_("isisfish.config.main.performmigration.description"), "true"), /** Perform vcs update option. */ - PERFORM_VCS_UPDATE("perform.vcsupdate", _("isisfish.config.main.performvcsupdate.description"), "true"), + PERFORM_VCS_UPDATE("perform.vcsupdate", n_("isisfish.config.main.performvcsupdate.description"), "true"), /** Perform cron option. */ - PERFORM_CRON("perform.cron", _("isisfish.config.main.performcron.description"), "true"), + PERFORM_CRON("perform.cron", n_("isisfish.config.main.performcron.description"), "true"), /** Database directory. */ - DATABASE_DIRECTORY("database.directory", _("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), + DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"), /** Database lock mode (h2).*/ - DATABASE_LOCK_MODE("database.lockmode", _("isisfish.config.database.lockmode.description"), "file"), + DATABASE_LOCK_MODE("database.lockmode", n_("isisfish.config.database.lockmode.description"), "file"), // SSH (global, for both VCS and caparmor) - SSH_KEY_FILE("ssh.key.file", _("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), + SSH_KEY_FILE("ssh.key.file", n_("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"), //SSH_PASSPHRASE_ENABLED("ssh.passphrase.enabled", _("isisfish.config.vcs.noPassPhrase.description"), "false"), //SSH_PASSPHRASE("ssh.passphrase", _("isisfish.config.vcs.passphrase.description"), ""), // can be None, CVS or SVN. only None or SVN work - VCS_TYPE(VCS.VCS_TYPE, _("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), + VCS_TYPE(VCS.VCS_TYPE, n_("isisfish.config.vcs.type.description"), VCS.TYPE_SVN), // depend of VCS_TYPE, for SVN can be svn, svn+ssh, http or file - VCS_PROTOCOL(VCS.VCS_PROTOCOL, _("isisfish.config.vcs.useSshConnexion.description"), "svn"), + VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.useSshConnexion.description"), "svn"), // user login to access vcs - 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_USER_NAME(VCS.VCS_USER_NAME, n_("isisfish.config.vcs.userName.description"), ""), + VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n_("isisfish.config.vcs.userPassword.description"), ""), + VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"), + VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"), - USER_NAME("user.name", _("isisfish.config.main.userName.description"), System.getProperty("user.name")), - SMTP_SERVER("smtpServer", _("isisfish.config.main.smtpServer.description"), "smtp"), - USER_MAIL("userMail", _("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key); + USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")), + SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"), + USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key); - public final String key; - public final String description; - public final String defaultValue; + public String key; + public String description; + public String defaultValue; private Option(String key, String description, String defaultValue) { this.key = key; @@ -1057,7 +1058,7 @@ */ @Override public String getDescription() { - return description; + return _(description); } /* @@ -1091,6 +1092,30 @@ public boolean isTransient() { return false; } + + /* + * @see org.nuiton.util.ApplicationConfig.OptionDef#setDefaultValue(java.lang.String) + */ + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + /* + * @see org.nuiton.util.ApplicationConfig.OptionDef#setTransient(boolean) + */ + @Override + public void setTransient(boolean isTransient) { + + } + + /* + * @see org.nuiton.util.ApplicationConfig.OptionDef#setFinal(boolean) + */ + @Override + public void setFinal(boolean isFinal) { + + } } ////////////////////////////////////////////////// @@ -1098,58 +1123,70 @@ ////////////////////////////////////////////////// public static enum Action { - HELP(_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), - VERSION(_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"), + HELP(n_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), + VERSION(n_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"), - IMPORT_ANALYSE_PLAN(_(""), ImportAction.class.getName() + "#importAnalysePlan", "--importAnalysePlan"), - IMPORT_EXPORT(_(""), ImportAction.class.getName() + "#importExport", "--importExport"), - IMPORT_RULE(_(""), ImportAction.class.getName() + "#importRule", "--importRule"), - IMPORT_SCRIPT(_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"), - IMPORT_SIMULATOR(_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"), - IMPORT_FORMULA(_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"), - IMPORT_REGION(_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"), - IMPORT_REGION_AND_RENAME(_(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"), - IMPORT_SIMULATION(_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"), - IMPORT_SCRIPT_MODULE(_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"), + IMPORT_ANALYSE_PLAN(n_(""), ImportAction.class.getName() + "#importAnalysePlan", "--importAnalysePlan"), + IMPORT_EXPORT(n_(""), ImportAction.class.getName() + "#importExport", "--importExport"), + IMPORT_RULE(n_(""), ImportAction.class.getName() + "#importRule", "--importRule"), + IMPORT_SCRIPT(n_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"), + IMPORT_SIMULATOR(n_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"), + IMPORT_FORMULA(n_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"), + IMPORT_REGION(n_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"), + IMPORT_REGION_AND_RENAME(n_(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"), + IMPORT_SIMULATION(n_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"), + IMPORT_SCRIPT_MODULE(n_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"), - LIST_ANALYSE_PLAN(_(""), ExportAction.class.getName() + "#listAnalysePlan", "--listAnalysePlan"), - LIST_EXPORT(_(""), ExportAction.class.getName() + "#listExport", "--listExport"), - LIST_RULE(_(""), ExportAction.class.getName() + "#listRule", "--listRule"), - LIST_SCRIPT(_(""), ExportAction.class.getName() + "#listScript", "--listScript"), - LIST_SIMULATOR(_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"), - LIST_FORMULA(_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"), - LIST_REGION(_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"), - LIST_SIMULATION(_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"), + LIST_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#listAnalysePlan", "--listAnalysePlan"), + LIST_EXPORT(n_(""), ExportAction.class.getName() + "#listExport", "--listExport"), + LIST_RULE(n_(""), ExportAction.class.getName() + "#listRule", "--listRule"), + LIST_SCRIPT(n_(""), ExportAction.class.getName() + "#listScript", "--listScript"), + LIST_SIMULATOR(n_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"), + LIST_FORMULA(n_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"), + LIST_REGION(n_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"), + LIST_SIMULATION(n_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"), - EXPORT_ANALYSE_PLAN(_(""), ExportAction.class.getName() + "#exportAnalysePlan", "--exportAnalysePlan"), - EXPORT_EXPORT(_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"), - EXPORT_RULE(_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"), - EXPORT_SCRIPT(_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"), - EXPORT_SIMULATOR(_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"), - EXPORT_FORMULA(_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"), - EXPORT_REGION(_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"), - EXPORT_SIMULATION(_(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"), + EXPORT_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#exportAnalysePlan", "--exportAnalysePlan"), + EXPORT_EXPORT(n_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"), + EXPORT_RULE(n_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"), + EXPORT_SCRIPT(n_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"), + EXPORT_SIMULATOR(n_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"), + EXPORT_FORMULA(n_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"), + EXPORT_REGION(n_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"), + EXPORT_SIMULATION(n_(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"), - VCS_SSH_CREATE_KEY(_(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"), - VCS_UPDATE(_(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"), - VCS_ADD(_(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"), - VCS_REMOVE(_(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"), - VCS_COMMIT(_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"), + VCS_SSH_CREATE_KEY(n_(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"), + VCS_UPDATE(n_(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"), + VCS_ADD(n_(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"), + VCS_REMOVE(n_(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"), + VCS_COMMIT(n_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"), - SIMULATE_WITH_REGION(_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), - SIMULATE_WITH_SIMULATION(_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), - SIMULATE_WITH_SIMULATION_AND_SCRIPT(_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), - SIMULATE_REMOTELLY(_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"), - SIMULATE_REMOTELLY_WITH_PRESCRIPT(_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript"); + SIMULATE_WITH_REGION(n_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"), + SIMULATE_WITH_SIMULATION(n_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"), + SIMULATE_WITH_SIMULATION_AND_SCRIPT(n_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"), + SIMULATE_REMOTELLY(n_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"), + SIMULATE_REMOTELLY_WITH_PRESCRIPT(n_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript"); - public String description; - public String action; - public String[] aliases; + protected String description; + protected String action; + protected String[] aliases; private Action(String description, String action, String ... aliases) { this.description = description; this.action = action; this.aliases = aliases; - } + } + + public String getDescription() { + return _(description); + } + + public String getAction() { + return action; + } + + public String[] getAliases() { + return aliases; + } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2011-03-17 10:34:38 UTC (rev 3173) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2011-03-17 10:35:24 UTC (rev 3174) @@ -58,7 +58,7 @@ System.out.println("Actions:"); for (IsisConfig.Action a : IsisConfig.Action.values()) { - System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + ") : " + a.description); + System.out.println("\t" + Arrays.toString(a.getAliases()) + "(" + a.getAction() + ") : " + a.getDescription()); } System.exit(0); }

1 0