Author: chatellier Date: 2011-04-18 15:47:36 +0000 (Mon, 18 Apr 2011) New Revision: 3268 Log: Activation du bouton "supprimer" seulement si un bean est charg?\195?\169 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/MetierSeasonInfoSpeciesEditorUI.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/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/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 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -171,7 +171,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-04-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -182,7 +182,7 @@ <InputOneEquationUI id='targetFactor' constructorParams='this' active='{isTargetSpeciesSelected()}' text='isisfish.metierSeasonInfoSpecies.targetFactor' - bean='{getBean()}' formuleCategory='TargetFactor' + bean='{getMetierSeasonInfo()}' formuleCategory='TargetFactor' clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' decorator='boxed' _sensitivityBean='{Metier.class}' _sensitivityMethod='""'/> </cell> 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -158,7 +158,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -196,7 +196,7 @@ </row> <row> <cell anchor='east'> - <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{isActive()}'/> + <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{getBean() != null}'/> </cell> <cell fill='horizontal' weightx='1.0'> <JAXXComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' @@ -281,7 +281,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -203,7 +203,7 @@ <cell fill='horizontal' weightx='1.0'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -191,7 +191,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -198,7 +198,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -147,7 +147,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row> 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-18 15:47:11 UTC (rev 3267) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-04-18 15:47:36 UTC (rev 3268) @@ -256,7 +256,7 @@ <cell fill='horizontal' weightx='0.5'> <JButton id='delete' decorator='boxed' text="isisfish.common.remove" - enabled="{!validator.isChanged()}" + enabled="{!validator.isChanged() && getBean() != null}" onActionPerformed="getSaveVerifier().delete()"/> </cell> </row>