Author: chatellier Date: 2011-06-07 09:19:29 +0000 (Tue, 07 Jun 2011) New Revision: 3354 Log: Fix tab char 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/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/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/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/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/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/PopulationZonesEditorUI.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/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/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/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/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/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/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/widget/filter/FilterDialogUI.jaxx 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,9 +24,9 @@ --> <JPanel layout='{new BorderLayout()}' abstract="true"> <import> - fr.ifremer.isisfish.ui.simulator.SimulAction; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.ui.simulator.SimulAction; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; javax.swing.JFileChooser java.io.File </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,10 +24,10 @@ --> <JPanel layout='{new BorderLayout()}'> <import> - fr.ifremer.isisfish.ui.simulator.SimulAction - jaxx.runtime.context.JAXXInitialContext - fr.ifremer.isisfish.ui.input.InputAction - fr.ifremer.isisfish.ui.input.InputSaveVerifier + fr.ifremer.isisfish.ui.simulator.SimulAction + jaxx.runtime.context.JAXXInitialContext + fr.ifremer.isisfish.ui.input.InputAction + fr.ifremer.isisfish.ui.input.InputSaveVerifier fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier javax.swing.ImageIcon </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,7 +33,7 @@ // fill default values getAction().resetSSHConfiguration(); - ]]></script> + ]]></script> <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.connection"))}' fill='horizontal'> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -31,13 +31,13 @@ <import> java.util.ArrayList; - fr.ifremer.isisfish.entities.EffortDescription; - fr.ifremer.isisfish.entities.SetOfVessels; - fr.ifremer.isisfish.types.TimeUnit; - fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; - fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.types.TimeUnit; + fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' context="effortdescriptionparameters" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,16 +28,16 @@ <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.model.MetierListModel; - fr.ifremer.isisfish.ui.input.renderer.MetierListRenderer; - fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; - fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + java.util.ArrayList; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.ui.input.model.MetierListModel; + fr.ifremer.isisfish.ui.input.renderer.MetierListRenderer; + fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' context="effortdescription" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,16 +29,16 @@ <Boolean id="resultOk" javaBean="false" /> <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; + 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> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,12 +29,12 @@ <import> static org.nuiton.i18n.I18n.n_ - 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; + 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 </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,8 +28,8 @@ <import> static org.nuiton.i18n.I18n.n_ - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <script><![CDATA[ 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -61,14 +61,14 @@ <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' /> --> <import> - javax.swing.JComponent - javax.swing.event.ChangeListener - fr.ifremer.isisfish.entities.FisheryRegion - fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils - fr.ifremer.isisfish.ui.WelcomePanelUI - org.nuiton.topia.persistence.TopiaEntityContextable - org.nuiton.topia.TopiaContext - org.apache.commons.lang.StringUtils + javax.swing.JComponent + javax.swing.event.ChangeListener + fr.ifremer.isisfish.entities.FisheryRegion + fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils + 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 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -43,17 +43,17 @@ <Boolean id="autoSaveModification" javaBean="true" /> <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; + 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.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.io.IOException javax.swing.DefaultComboBoxModel </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,8 +32,8 @@ <fr.ifremer.isisfish.entities.Species id='species' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.MetierSeasonInfo; - fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; fr.ifremer.isisfish.entities.Equation; fr.ifremer.isisfish.entities.Metier; fr.ifremer.isisfish.entities.Species; 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -30,16 +30,16 @@ <fr.ifremer.isisfish.entities.MetierSeasonInfo id='metierSeasonInfo' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Metier; - fr.ifremer.isisfish.entities.MetierSeasonInfo; - fr.ifremer.isisfish.entities.Zone; - fr.ifremer.isisfish.types.Month; - fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.types.Month; + fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; fr.ifremer.isisfish.ui.input.model.ZoneListModel; - fr.ifremer.isisfish.ui.widget.Interval; - fr.ifremer.isisfish.ui.widget.IntervalPanel; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + 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> @@ -103,7 +103,7 @@ } protected void create() { - MetierSeasonInfo newMSI = getContextValue(InputAction.class).createMetierSeasonInfo(getBean()); + MetierSeasonInfo newMSI = getContextValue(InputAction.class).createMetierSeasonInfo(getBean()); setMetierSeasonInfo(newMSI); setMetierSeasonInfoCombo(); } 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Gear; - fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.Gear; + fr.ifremer.isisfish.entities.Metier; fr.ifremer.isisfish.ui.input.model.GearComboModel; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.awt.Dimension </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,12 +28,12 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Species; - fr.ifremer.isisfish.entities.PopulationGroup; - fr.ifremer.isisfish.entities.Population; - javax.swing.table.DefaultTableModel; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.Population; + javax.swing.table.DefaultTableModel; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; javax.swing.JOptionPane javax.swing.JFrame java.awt.BorderLayout 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,11 +28,11 @@ <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; + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; </import> <BeanValidator id='validator' context="capturability" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.Population; </import> <BeanValidator id='validator' context="equation" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -40,11 +40,11 @@ <fr.ifremer.isisfish.entities.PopulationGroup id='populationGroup' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.PopulationGroup; - fr.ifremer.isisfish.entities.Population; - org.nuiton.math.matrix.MatrixND; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.MatrixND; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' context="group" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,15 +33,15 @@ <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; + 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[ 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -30,8 +30,8 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; </import> <script><![CDATA[ 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,15 +33,15 @@ <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; + 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[ 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -34,16 +34,16 @@ <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; + 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; javax.swing.text.Document </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -30,12 +30,12 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel; - fr.ifremer.isisfish.ui.input.renderer.PopulationSeasonInfoComboRenderer; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel; + fr.ifremer.isisfish.ui.input.renderer.PopulationSeasonInfoComboRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.awt.CardLayout </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,11 +28,11 @@ <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; + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; </import> <BeanValidator id='validator' context="recruitement" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,12 +32,12 @@ <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; + 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> @@ -110,19 +110,19 @@ </cell> <cell fill='horizontal' weightx='0.5'> <JRadioButton id="radioPopulationSeasonGroupChangeLengthNoSpacialized" - buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" - selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - enabled='{getPopulationSeasonInfo() != null}' - text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()' - visible='{isAgeGroupType()}' decorator='boxed' /> + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + enabled='{getPopulationSeasonInfo() != null}' + text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='0.5'> <JRadioButton id="radioPopulationSeasonGroupChangeLengthSpacialized" - buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" - selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - enabled='{getPopulationSeasonInfo() != null}' - text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()' - visible='{isAgeGroupType()}' decorator='boxed' /> + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + enabled='{getPopulationSeasonInfo() != null}' + text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> </row> <row> @@ -136,9 +136,9 @@ </cell> <cell fill='horizontal' weightx='0.5'> <JButton id="buttonPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" - enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected() && getPopulationSeasonInfo() != null}' - onActionPerformed='showSpacializedMatrixChangeOfGroup()' - visible='{isAgeGroupType()}' decorator='boxed'/> + enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected() && getPopulationSeasonInfo() != null}' + onActionPerformed='showSpacializedMatrixChangeOfGroup()' + visible='{isAgeGroupType()}' decorator='boxed'/> </cell> </row> <row> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,13 +33,13 @@ java.beans.PropertyChangeEvent java.beans.PropertyChangeListener fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel - 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 - org.nuiton.math.matrix.gui.MatrixPanelListener + 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 + org.nuiton.math.matrix.gui.MatrixPanelListener </import> <BeanValidator id='validator' context="seasons" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,12 +28,12 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Zone - fr.ifremer.isisfish.ui.input.model.ZoneListModel - org.nuiton.math.matrix.gui.MatrixPanelEvent - org.nuiton.math.matrix.gui.MatrixPanelListener - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.Zone + fr.ifremer.isisfish.ui.input.model.ZoneListModel + org.nuiton.math.matrix.gui.MatrixPanelEvent + org.nuiton.math.matrix.gui.MatrixPanelListener + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener java.util.List java.util.ArrayList java.awt.Dimension 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,15 +29,15 @@ <import> static org.nuiton.i18n.I18n.n_ - 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 + 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 java.awt.event.MouseEvent </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,10 +28,10 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.types.RangeOfValues - fr.ifremer.isisfish.entities.Gear - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener + fr.ifremer.isisfish.types.RangeOfValues + fr.ifremer.isisfish.entities.Gear + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener java.util.ArrayList </import> @@ -45,7 +45,7 @@ fieldGearParamPossibleValue.setText(""); } if (evt.getNewValue() != null) { - java.util.List<Object> values = new ArrayList<Object>(); + java.util.List<Object> values = new ArrayList<Object>(); for (String value : RangeOfValues.getPossibleTypes()) { values.add(value); } 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -38,16 +38,16 @@ valid="{validator.isValid()}" /> <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.model.GearPopulationSelectivityModel - fr.ifremer.isisfish.ui.input.model.PopulationComboModel - fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + 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.model.GearPopulationSelectivityModel + fr.ifremer.isisfish.ui.input.model.PopulationComboModel + fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener java.util.ArrayList javax.swing.DefaultComboBoxModel </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,14 +28,14 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Port - fr.ifremer.isisfish.entities.VesselType - fr.ifremer.isisfish.entities.SetOfVessels + fr.ifremer.isisfish.entities.Port + fr.ifremer.isisfish.entities.VesselType + fr.ifremer.isisfish.entities.SetOfVessels fr.ifremer.isisfish.ui.input.model.PortComboModel fr.ifremer.isisfish.ui.input.model.VesselTypeComboModel - jaxx.runtime.swing.editor.NumberEditor - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + jaxx.runtime.swing.editor.NumberEditor + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener </import> <BeanValidator id='validator' context="basics" 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,10 +29,10 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.Species; - jaxx.runtime.swing.editor.NumberEditor; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Species; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -40,9 +40,9 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo11' javaBean='null'/> <import> - org.apache.commons.lang.StringUtils - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + org.apache.commons.lang.StringUtils + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener static org.nuiton.i18n.I18n._ </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,14 +32,14 @@ <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 + 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 fr.ifremer.isisfish.ui.input.model.TripTypeComboModel </import> @@ -53,7 +53,7 @@ } if (evt.getNewValue() != null) { - init = true; + init = true; refresh(); init = false; } 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,8 +28,8 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Strategy - fr.ifremer.isisfish.entities.SetOfVessels + fr.ifremer.isisfish.entities.Strategy + fr.ifremer.isisfish.entities.SetOfVessels java.beans.PropertyChangeEvent java.beans.PropertyChangeListener fr.ifremer.isisfish.ui.input.model.SetOfVesselsComboModel 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,10 +29,10 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.TripType - fr.ifremer.isisfish.types.TimeUnit - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.TripType + fr.ifremer.isisfish.types.TimeUnit + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener </import> <BeanValidator id='validator' 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,13 +29,13 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.VesselType - fr.ifremer.isisfish.entities.TripType - fr.ifremer.isisfish.types.TimeUnit - fr.ifremer.isisfish.ui.input.model.TripTypeListModel - jaxx.runtime.swing.editor.NumberEditor - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.VesselType + fr.ifremer.isisfish.entities.TripType + fr.ifremer.isisfish.types.TimeUnit + fr.ifremer.isisfish.ui.input.model.TripTypeListModel + jaxx.runtime.swing.editor.NumberEditor + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener </import> <BeanValidator id='validator' 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,15 +24,15 @@ --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> <import> - org.nuiton.topia.TopiaContext - fr.ifremer.isisfish.IsisFishDAOHelper - fr.ifremer.isisfish.entities.Equation - fr.ifremer.isisfish.entities.Population - fr.ifremer.isisfish.entities.PopulationGroup - fr.ifremer.isisfish.entities.PopulationGroupDAO + org.nuiton.topia.TopiaContext + fr.ifremer.isisfish.IsisFishDAOHelper + fr.ifremer.isisfish.entities.Equation + fr.ifremer.isisfish.entities.Population + fr.ifremer.isisfish.entities.PopulationGroup + fr.ifremer.isisfish.entities.PopulationGroupDAO java.awt.CardLayout javax.swing.JFrame - </import> + </import> <script><![CDATA[ @@ -454,7 +454,7 @@ </cell> </row> </Table> - <Table constraints='"endInputGroupLength"'> + <Table constraints='"endInputGroupLength"'> <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JLabel text="isisfish.wizardGroupCreation.populationCharacteristics" horizontalAlignment="CENTER"/> @@ -466,7 +466,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="firstInputLength" onFocusLost='firstInputLengthChanged()'/> - </cell> + </cell> </row> <row> <cell> @@ -474,7 +474,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="maximalGroupsLength" onFocusLost='maximalGroupsLengthChanged()'/> - </cell> + </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> @@ -528,7 +528,7 @@ </cell> </row> </Table> - <Table constraints='"endGrowthCurveGroupLength"'> + <Table constraints='"endGrowthCurveGroupLength"'> <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JLabel text="isisfish.wizardGroupCreation.populationCharacteristics" horizontalAlignment="CENTER"/> @@ -563,7 +563,7 @@ <JLabel text="isisfish.wizardGroupCreation.undefinedGrowthEquation"/> </cell> </row> - </Table> + </Table> </JPanel> <Table id="navButton" constraints='BorderLayout.SOUTH'> <row> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,17 +29,17 @@ <import> static org.nuiton.i18n.I18n.n_ - javax.swing.event.ListSelectionEvent - fr.ifremer.isisfish.entities.Cell - fr.ifremer.isisfish.entities.Zone - fr.ifremer.isisfish.map.CellSelectionLayer - fr.ifremer.isisfish.map.CopyMapToClipboardListener + javax.swing.event.ListSelectionEvent + fr.ifremer.isisfish.entities.Cell + fr.ifremer.isisfish.entities.Zone + fr.ifremer.isisfish.map.CellSelectionLayer + fr.ifremer.isisfish.map.CopyMapToClipboardListener fr.ifremer.isisfish.ui.input.model.TopiaEntityListModel - com.bbn.openmap.event.SelectMouseMode - com.bbn.openmap.gui.Tool - com.bbn.openmap.gui.OMToolSet - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + 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 java.util.ArrayList </import> @@ -198,7 +198,7 @@ decorator='boxed' constraints='BorderLayout.NORTH'/> <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' - selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" + selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()==null?null:bean.getCell()}' decorator='boxed' constraints='BorderLayout.CENTER'/> <!-- FIXME echatellier 20110429 : binding --> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,10 +24,10 @@ --> <Table> <import> - fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; - fr.ifremer.isisfish.simulator.launcher.SimulationService; - javax.swing.JProgressBar; - javax.swing.ListSelectionModel; + fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + javax.swing.JProgressBar; + javax.swing.ListSelectionModel; </import> <script><![CDATA[ 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -60,8 +60,8 @@ } protected void performImport() { - File archiveFile = new File(archivePath.getText()); - getContextValue(ScriptAction.class).performImportScript(archiveFile, newFilesTableModel, conflictFilesTableModel); + File archiveFile = new File(archivePath.getText()); + getContextValue(ScriptAction.class).performImportScript(archiveFile, newFilesTableModel, conflictFilesTableModel); } protected void cancel() { @@ -119,7 +119,7 @@ <JButton id='okButton' text='isisfish.script.import.import' enabled='{isOkEnabled()}'/> <JButton id='cancelButton' text='isisfish.script.import.cancel' - onActionPerformed="cancel()" /> + onActionPerformed="cancel()" /> </JPanel> </cell> </row> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -52,7 +52,7 @@ <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" /> <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" /> <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.EquationModel)' icon="script.png" /> - </JMenu> + </JMenu> <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> <JSeparator/> <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" icon="page_white_compressed.png" /> @@ -82,7 +82,7 @@ </JMenu> </JMenuBar> - <!-- Toolbar --> + <!-- Toolbar --> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JComboBox id="scriptTypeChoice" model='{new ScriptTypesComboModel()}'/> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,15 +32,15 @@ java.util.List java.util.regex.Matcher java.util.regex.Pattern - javax.swing.table.AbstractTableModel - javax.swing.table.DefaultTableModel + javax.swing.table.AbstractTableModel + javax.swing.table.DefaultTableModel javax.swing.table.TableCellEditor javax.swing.table.TableModel javax.swing.JComboBox javax.swing.DefaultCellEditor javax.swing.event.CellEditorListener - fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain - org.apache.commons.lang.StringUtils + fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain + org.apache.commons.lang.StringUtils </import> <String id='text' javaBean='null'/> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -25,18 +25,18 @@ <JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'> <import> - org.apache.commons.lang.StringUtils; - org.nuiton.topia.persistence.TopiaEntityContextable; + org.apache.commons.lang.StringUtils; + org.nuiton.topia.persistence.TopiaEntityContextable; fr.ifremer.isisfish.ui.SimulationUI; - 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; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + 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; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.util.SortedMap javax.swing.JComponent </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -26,27 +26,27 @@ <import> java.awt.CardLayout javax.swing.ComboBoxModel - javax.swing.table.DefaultTableModel + javax.swing.table.DefaultTableModel fr.ifremer.isisfish.datastore.RegionStorage fr.ifremer.isisfish.export.SensitivityExport - 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.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.ui.models.common.StringListModel - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer - 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 + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer + 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 fr.ifremer.isisfish.ui.simulator.SimulAction </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,16 +24,16 @@ --> <Table> <import> - java.util.ArrayList - java.io.File + java.util.ArrayList + java.io.File java.io.IOException javax.swing.ComboBoxModel - org.nuiton.util.FileUtil + org.nuiton.util.FileUtil 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.simulator.SimulAction + fr.ifremer.isisfish.ui.simulator.SimulAction fr.ifremer.isisfish.ui.models.common.StringComboModel </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,21 +24,21 @@ --> <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; + 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.FactorGroup; - fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; - fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; + 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.FactorGroup; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; fr.ifremer.isisfish.ui.sensitivity.model.FactorTree javax.swing.JComponent java.awt.event.ActionListener 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -25,9 +25,9 @@ <fr.ifremer.isisfish.ui.SimulationUI> <import> - fr.ifremer.isisfish.ui.input.InputAction + fr.ifremer.isisfish.ui.input.InputAction fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier - jaxx.runtime.context.JAXXInitialContext + jaxx.runtime.context.JAXXInitialContext jaxx.runtime.JAXXContext </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,8 +28,8 @@ <Boolean id='changed' javaBean='false'/> <import> - javax.swing.table.DefaultTableModel; - java.util.Map.Entry; + javax.swing.table.DefaultTableModel; + java.util.Map.Entry; javax.swing.event.ListSelectionListener java.util.Set java.util.Iterator 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,8 +24,8 @@ --> <Table> <import> - fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.models.common.StringListModel; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.models.common.StringListModel; javax.swing.event.ListSelectionEvent; java.util.LinkedList </import> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,38 +29,38 @@ <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.StringComboModel; - 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; + 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.StringComboModel; + 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 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,9 +24,9 @@ --> <JPanel layout='{new BorderLayout()}'> <import> - fr.ifremer.isisfish.ui.WelcomePanelUI - fr.ifremer.isisfish.ui.models.common.StringListModel - javax.swing.event.ListSelectionEvent + fr.ifremer.isisfish.ui.WelcomePanelUI + fr.ifremer.isisfish.ui.models.common.StringListModel + javax.swing.event.ListSelectionEvent </import> <script><![CDATA[ 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -25,18 +25,18 @@ <Table> <import> java.awt.Dimension - 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; + 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; fr.ifremer.isisfish.datastore.RegionStorage; </import> <SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' /> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -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/vcs/VCSConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,14 +24,14 @@ --> <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.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 @@ -152,8 +152,8 @@ <row fill='horizontal'> <cell columns='2' weighty="1" fill='both'> <JScrollPane height="60"> - <JEditorPane id="helpEditor" editable="false" /> - </JScrollPane> + <JEditorPane id="helpEditor" editable="false" /> + </JScrollPane> </cell> </row> <row fill='horizontal'> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,15 +24,15 @@ --> <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; + 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> 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-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -183,8 +183,8 @@ <row fill='horizontal'> <cell columns='4' weighty="1" fill='both'> <JScrollPane height="200"> - <JEditorPane id="doc" /> - </JScrollPane> + <JEditorPane id="doc" /> + </JScrollPane> </cell> </row> <row fill='horizontal'>