[Isis-fish-commits] r3271 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input

Author: chatellier Date: 2011-04-19 12:08:37 +0000 (Tue, 19 Apr 2011) New Revision: 3271 Log: Fix validator code 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/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/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/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/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/PopulationSeasonsUI.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/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/SpeciesStructuredUI.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/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/ZoneUI.jaxx 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -42,11 +42,11 @@ javax.swing.DefaultComboBoxModel; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' + <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Cell' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldCellName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected OMToolSet toolSet = new OMToolSet(); 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -39,10 +39,10 @@ java.beans.PropertyChangeListener; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="effortdescriptionparameters" + <BeanValidator id='validator' context="effortdescriptionparameters" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -40,10 +40,10 @@ java.beans.PropertyChangeListener; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="effortdescription" + <BeanValidator id='validator' context="effortdescription" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ /** 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -40,11 +40,11 @@ javax.swing.JTable </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' + <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.FisheryRegion' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldRegion" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -34,12 +34,12 @@ java.beans.PropertyChangeListener; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="gear" + <BeanValidator id='validator' context="gear" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Gear' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldGearName" /> <field name="effortUnit" component="fieldGearEffortUnit" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -40,10 +40,10 @@ javax.swing.DefaultComboBoxModel </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="seasonspecies" + <BeanValidator id='validator' context="seasonspecies" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Metier' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -44,10 +44,10 @@ java.awt.Dimension </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="seasonzones" + <BeanValidator id='validator' context="seasonzones" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Metier' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -35,11 +35,11 @@ java.awt.Dimension </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="metier" + <BeanValidator id='validator' context="metier" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Metier' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldMetierName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -41,11 +41,11 @@ java.awt.BorderLayout </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="basics" + <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldPopulationBasicsName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -35,10 +35,10 @@ org.nuiton.math.matrix.gui.MatrixPanelListener; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="capturability" + <BeanValidator id='validator' context="capturability" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -32,10 +32,10 @@ fr.ifremer.isisfish.entities.Population; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="equation" + <BeanValidator id='validator' context="equation" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ /*public void refresh() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -47,10 +47,10 @@ java.beans.PropertyChangeListener; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="group" + <BeanValidator id='validator' context="group" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -40,10 +40,10 @@ java.awt.CardLayout </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="migration" + <BeanValidator id='validator' context="migration" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -35,10 +35,10 @@ org.nuiton.math.matrix.gui.MatrixPanelListener; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="recruitement" + <BeanValidator id='validator' context="recruitement" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -42,11 +42,17 @@ org.nuiton.math.matrix.gui.MatrixPanelListener </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="seasons" + <BeanValidator id='validator' context="seasons" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> + <BeanValidator id='validatorSeason' context="population" + bean='{getPopulationSeasonInfo()}' beanClass='fr.ifremer.isisfish.entities.PopulationSeasonInfo' + uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI" + parentValidator="{getValidator()}"> + </BeanValidator> + <script><![CDATA[ protected Interval seasonInterval; @@ -285,7 +291,7 @@ <JPanel/> </cell> <cell fill='horizontal' weightx='1.0'> - <JCheckBox id="fieldPopulationSeasonReproduction" selected='{getPopulationSeasonInfo().getReproduction()}' + <JCheckBox id="fieldPopulationSeasonReproduction" selected='{getPopulationSeasonInfo().isReproduction()}' onActionPerformed='getPopulationSeasonInfo().setReproduction(fieldPopulationSeasonReproduction.isSelected())' text="isisfish.populationSeasons.Reproduction" enabled='{getPopulationSeasonInfo() != null}' decorator='boxed'/> </cell> @@ -293,13 +299,13 @@ <row> <cell anchor='east'> <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{getPopulationSeasonInfo() != null}' - visible='{getPopulationSeasonInfo().getReproduction()}'/> + visible='{getPopulationSeasonInfo().isReproduction()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.2'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='fieldPopulationSeasonReproductionDistribution' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution().copy()}' enabled='{getPopulationSeasonInfo() != null}' - visible='{getPopulationSeasonInfo().getReproduction()}' + visible='{getPopulationSeasonInfo().isReproduction()}' decorator='boxed' _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"ReproductionDistribution"' onMatrixChanged="populationSeasonReproductionDistributionMatrixChanged(event)" /> </cell> 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -27,10 +27,10 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="zones" + <BeanValidator id='validator' context="zones" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Population' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ /*public void refresh() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -40,12 +40,12 @@ java.beans.PropertyChangeListener </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' + <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Port' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldPortName" /> <field name="cell" component="spPortCell" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected OMToolSet toolSet = new OMToolSet(); 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -29,8 +29,6 @@ <fr.ifremer.isisfish.entities.Population id='population' javaBean='null'/> - <Boolean id='selectivityPopulationSelected' javaBean='false'/> - <import> fr.ifremer.isisfish.entities.Equation fr.ifremer.isisfish.entities.Gear @@ -80,7 +78,6 @@ //setBean(gear); if (getBean() != null) { - setSelectivityPopulationSelected(false); setSelectivityTableModel(); fieldSelectivityPopulation.setModel(getSelectivityPopulationModel()); } @@ -89,7 +86,6 @@ // reset to false after addCurrentPanel refresh selectivityEquation.setActive(false); - setSelectivityPopulationSelected(false); removeSelectivityButton.setEnabled(false); } @@ -143,9 +139,8 @@ } protected void selectivityChanged() { - setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedItem() != null); setPopulation((Population)fieldSelectivityPopulation.getSelectedItem()); - addSelectivityButton.setEnabled(isSelectivityPopulationSelected()); + addSelectivityButton.setEnabled(getPopulation() != null); } ]]></script> <JPanel id='body'> @@ -163,7 +158,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0' insets="0"> <InputOneEquationUI id='selectivityEquation' constructorParams='this' text='isisfish.selectivity.equation' - bean='{getBean()}' formuleCategory='Selectivity' active='{isSelectivityPopulationSelected()}' + bean='{getBean()}' formuleCategory='Selectivity' active='{getPopulation() != null}' clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}' decorator='boxed' /> </cell> @@ -171,7 +166,7 @@ <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="addSelectivityButton" text="isisfish.common.add" onActionPerformed='addSelectivity()' - enabled='{isSelectivityPopulationSelected()}' decorator='boxed' /> + enabled='{getPopulation() != null}' decorator='boxed' /> </cell> </row> <row> 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -27,10 +27,10 @@ <!-- bean property --> <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="selectivity" + <BeanValidator id='validator' context="selectivity" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Gear' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <import> fr.ifremer.isisfish.entities.Gear 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -38,11 +38,11 @@ java.beans.PropertyChangeListener </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="basics" + <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.SetOfVessels' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldSetOfVesselsName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ boolean init = false; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2011-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -25,7 +25,6 @@ <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Species'> <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/> - <Boolean id='actif' javaBean='false'/> <script><![CDATA[ protected void dynamicChanged() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -35,11 +35,11 @@ java.beans.PropertyChangeListener; </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' + <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Species' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldSpeciesName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -33,10 +33,10 @@ static org.nuiton.i18n.I18n._ </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="month" + <BeanValidator id='validator' context="month" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Strategy' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -38,11 +38,11 @@ java.beans.PropertyChangeListener </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' context="basics" + <BeanValidator id='validator' context="basics" bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Strategy' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldStrategyName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -35,11 +35,11 @@ java.beans.PropertyChangeListener </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' + <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.TripType' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldTripTypeName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -38,11 +38,11 @@ java.beans.PropertyChangeListener </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' + <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.VesselType' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldVesselTypeName" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected void $afterCompleteSetup() { 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-04-19 08:51:10 UTC (rev 3270) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-04-19 12:08:37 UTC (rev 3271) @@ -44,12 +44,12 @@ java.util.ArrayList </import> - <jaxx.runtime.validator.swing.SwingValidator id='validator' + <BeanValidator id='validator' bean='{getBean()}' beanClass='fr.ifremer.isisfish.entities.Zone' uiClass="jaxx.runtime.validator.swing.ui.ImageValidationUI"> <field name="name" component="fieldZoneName" /> <field name="cell" component="spZoneCells" /> - </jaxx.runtime.validator.swing.SwingValidator> + </BeanValidator> <script><![CDATA[ protected OMToolSet toolSet = new OMToolSet();