Author: chatellier Date: 2011-03-16 16:55:59 +0000 (Wed, 16 Mar 2011) New Revision: 3159 Log: Fix input UI for sensitivity use 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/GearTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 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/InputHandler.java 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/InputSaveVerifier.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.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/CellUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -124,12 +124,11 @@ // on ne sais jamais de quel type est le parent InputUI inputUI = getParentContainer(InputUI.class); if (inputUI != null) { - // FIXME echatellier 20110306 : use new tree api inputUI.getHandler().setTreeSelection(this, c.getTopiaId()); } else { SensitivityTabUI sensitivityTabUI = getParentContainer(SensitivityTabUI.class); - sensitivityTabUI.setTreeSelection("$root/$cells/"+c.getTopiaId()); + sensitivityTabUI.getHandler().setTreeSelection(this, c.getTopiaId()); } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -39,7 +39,7 @@ import java.beans.PropertyChangeListener; protected void $afterCompleteSetup() { - addPropertyChangeListener(PROPERTY_EFFORT_DESCRIPTION, new PropertyChangeListener() { + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { fieldEffortDescriptionFishingOperation.setText(""); @@ -125,10 +125,10 @@ <!--NumberEditor id='fieldEffortDescriptionFishingOperation' constructorParams='this' bean='{getEffortDescription()}' property='fishingOperation' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"FishingOperation"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"FishingOperation"'/--> <JFormattedTextField id="fieldEffortDescriptionFishingOperation" text='{String.valueOf(getEffortDescription().getFishingOperation())}' onKeyReleased='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"FishingOperation"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"FishingOperation"'/> </cell> </row> <row> @@ -139,7 +139,7 @@ <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{String.valueOf(getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour())}' toolTipText="isisfish.effortDescription.fishingOperationDuration.tooltip" onKeyReleased='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"FishingOperationDuration"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"FishingOperationDuration"'/> </cell> </row> <row> @@ -150,10 +150,10 @@ <!--NumberEditor id='fieldEffortDescriptionGearsNumberPerOperation' constructorParams='this' bean='{getEffortDescription()}' property='gearsNumberPerOperation' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"GearsNumberPerOperation"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"GearsNumberPerOperation"'/--> <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{String.valueOf(getEffortDescription().getGearsNumberPerOperation())}' onKeyReleased='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"GearsNumberPerOperation"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"GearsNumberPerOperation"'/> </cell> </row> </Table> @@ -170,10 +170,10 @@ <!--NumberEditor id='fieldEffortDescriptionCrewSize' constructorParams='this' bean='{getEffortDescription()}' property='crewSize' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"CrewSize"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"CrewSize"'/--> <JTextField id="fieldEffortDescriptionCrewSize" text='{String.valueOf(getEffortDescription().getCrewSize())}' onKeyReleased='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"CrewSize"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"CrewSize"'/> </cell> </row> <row> @@ -184,10 +184,10 @@ <!--NumberEditor id='fieldEffortDescriptionUnitCostOfFishing' constructorParams='this' bean='{getEffortDescription()}' property='unitCostOfFishing' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"UnitCostOfFishing"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"UnitCostOfFishing"'/--> <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{String.valueOf(getEffortDescription().getUnitCostOfFishing())}' onKeyReleased='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"UnitCostOfFishing"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"UnitCostOfFishing"'/> </cell> </row> <row> @@ -198,10 +198,10 @@ <!--NumberEditor id='fieldEffortDescriptionFixedCrewSalary' constructorParams='this' bean='{getEffortDescription()}' property='fixedCrewSalary' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"FixedCrewSalary"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"FixedCrewSalary"'/--> <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{String.valueOf(getEffortDescription().getFixedCrewSalary())}' onKeyReleased='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"FixedCrewSalary"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"FixedCrewSalary"'/> </cell> </row> <row> @@ -212,10 +212,10 @@ <!--NumberEditor id='fieldEffortDescriptionCrewFoodCost' constructorParams='this' bean='{getEffortDescription()}' property='crewFoodCost' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"CrewFoodCost"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"CrewFoodCost"'/--> <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{String.valueOf(getEffortDescription().getCrewFoodCost())}' onKeyReleased='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"CrewFoodCost"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"CrewFoodCost"'/> </cell> </row> <row> @@ -226,10 +226,10 @@ <!--NumberEditor id='fieldEffortDescriptionCrewShareRate' constructorParams='this' bean='{getEffortDescription()}' property='crewShareRate' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"CrewShareRate"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"CrewShareRate"'/--> <JTextField id="fieldEffortDescriptionCrewShareRate" text='{String.valueOf(getEffortDescription().getCrewShareRate())}' onKeyReleased='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"CrewShareRate"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"CrewShareRate"'/> </cell> </row> <row> @@ -239,11 +239,11 @@ <cell fill='horizontal' weightx='1.0' weighty='0.0'> <!--NumberEditor id='fieldEffortDescriptionRepairAndMaintenanceGearCost' constructorParams='this' bean='{getEffortDescription()}' property='repairAndMaintenanceGearCost' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' - _method='"RepairAndMaintenanceGearCost"' useSign='true'/--> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' + _sensitivityMethod='"RepairAndMaintenanceGearCost"' useSign='true'/--> <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{String.valueOf(getEffortDescription().getRepairAndMaintenanceGearCost())}' onKeyReleased='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"RepairAndMaintenanceGearCost"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"RepairAndMaintenanceGearCost"'/> </cell> </row> <row> @@ -254,10 +254,10 @@ <!--NumberEditor id='fieldEffortDescriptionLandingCosts' constructorParams='this' bean='{getEffortDescription()}' property='landingCosts' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"LandingCosts"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"LandingCosts"'/--> <JTextField id="fieldEffortDescriptionLandingCosts" text='{String.valueOf(getEffortDescription().getLandingCosts())}' onKeyReleased='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"LandingCosts"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"LandingCosts"'/> </cell> </row> <row> @@ -268,10 +268,10 @@ <!--NumberEditor id='fieldEffortDescriptionOtherRunningCost' constructorParams='this' bean='{getEffortDescription()}' property='otherRunningCost' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{EffortDescription.class}' _method='"OtherRunningCost"'/--> + _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"OtherRunningCost"'/--> <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{String.valueOf(getEffortDescription().getOtherRunningCost())}' onKeyReleased='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{EffortDescription.class}' _method='"OtherRunningCost"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{EffortDescription.class}' _sensitivityMethod='"OtherRunningCost"'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -104,11 +104,11 @@ <cell columns="2" fill='horizontal' weightx='1.0'> <!--NumberEditor id='fieldGearStandardisationFactor' constructorParams='this' bean='{getBean()}' property='standardisationFactor' - enabled='{isActive()}' decorator='boxed' _bean='{Gear.class}' - _method='"StandardisationFactor"' useSign='true'/--> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Gear.class}' + _sensitivityMethod='"StandardisationFactor"' useSign='true'/--> <JTextField id="fieldGearStandardisationFactor" text='{String.valueOf(getBean().getStandardisationFactor())}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{Gear.class}' _method='"StandardisationFactor"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Gear.class}' _sensitivityMethod='"StandardisationFactor"'/> </cell> </row> <row> @@ -125,8 +125,8 @@ <JLabel text="isisfish.gear.rangeValues" enabled='{isActive()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <RangeOfValuesUI id="rangeOfValues" active='{isActive()}' constructorParams='this' - decorator='boxed' _bean='{Gear.class}' _method='"PossibleValue"'/> + <RangeOfValuesUI id="rangeOfValues" bean="{getBean()}" active='{isActive()}' constructorParams='this' + decorator='boxed' _sensitivityBean='{Gear.class}' _sensitivityMethod='"PossibleValue"'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -53,8 +53,6 @@ @Override public void refresh() { - - //getVerifier().addCurrentPanel(gearTabUI, selectivityUI); } @@ -63,6 +61,12 @@ // active les bouton sur l'onglet courant setCurrentTabActionButtons(gearTab); } + + at Override +public void setLayer(boolean active) { + gearTabUI.setLayer(active); + selectivityUI.setLayer(active); +} ]]></script> <JPanel id="body"> <JTabbedPane constraints='BorderLayout.CENTER' id="gearTab"> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2011-03-16 16:55:59 UTC (rev 3159) @@ -52,29 +52,21 @@ import fr.ifremer.isisfish.entities.CellDAO; import fr.ifremer.isisfish.entities.EffortDescription; import fr.ifremer.isisfish.entities.EffortDescriptionDAO; -import fr.ifremer.isisfish.entities.EffortDescriptionImpl; import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.entities.FisheryRegionDAO; -import fr.ifremer.isisfish.entities.FisheryRegionImpl; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.GearDAO; import fr.ifremer.isisfish.entities.Metier; -import fr.ifremer.isisfish.entities.MetierDAO; -import fr.ifremer.isisfish.entities.MetierImpl; import fr.ifremer.isisfish.entities.MetierSeasonInfo; import fr.ifremer.isisfish.entities.MetierSeasonInfoDAO; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationDAO; import fr.ifremer.isisfish.entities.PopulationGroup; -import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoDAO; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.SelectivityDAO; import fr.ifremer.isisfish.entities.SetOfVessels; -import fr.ifremer.isisfish.entities.SetOfVesselsDAO; import fr.ifremer.isisfish.entities.Species; import fr.ifremer.isisfish.entities.SpeciesDAO; import fr.ifremer.isisfish.entities.TargetSpecies; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -152,14 +152,14 @@ if (this.get$objectMap() != null && active) { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { // Verifie si dans l'entré existe dans le fichier sensitivity.properties - Class classBean = (Class)boxed.getClientProperty("bean"); - String method = (String)boxed.getClientProperty("method"); + Class sensitivityBeanClass = (Class)boxed.getClientProperty("sensitivityBean"); + String method = (String)boxed.getClientProperty("sensitivityMethod"); // test if factor is enabled boolean isSensitivityFactorEnabled = false; - if (classBean != null) { - // classBean is defined in property file without "Impl" - String className = classBean.getSimpleName().replace("Impl", ""); + if (sensitivityBeanClass != null) { + // sensitivityBeanClass is defined in property file without "Impl" + String className = sensitivityBeanClass.getSimpleName().replace("Impl", ""); // ensure that method name is uncapitalized method = StringUtils.uncapitalize(method); @@ -202,14 +202,14 @@ } JComponent source = (JComponent) e.getSource(); - Class<? extends TopiaEntityContextable> classBean = (Class<? extends TopiaEntityContextable>)source.getClientProperty("bean"); - String beanID = (String)source.getClientProperty("beanID"); + Class<? extends TopiaEntityContextable> sensitivityBeanClass = (Class<? extends TopiaEntityContextable>)source.getClientProperty("sensitivityBean"); + String sensitivityBeanID = (String)source.getClientProperty("sensitivityBeanID"); /*TopiaEntity bean = null; - if (beanID == null) { - bean = getVerifier().getEntity(classBean); + if (sensitivityBeanID == null) { + bean = getVerifier().getEntity(sensitivityBeanClass); } else { - bean = getVerifier().getEntity(classBean, beanID); + bean = getVerifier().getEntity(sensitivityBeanClass, sensitivityBeanID); } if (bean != null) { FactorWizardUI wizard = new FactorWizardUI(this); @@ -218,28 +218,28 @@ wizard.setVisible(true); }*/ - String property = (String)source.getClientProperty("method"); - displayFactorWizard(source, classBean, beanID, property); + String sensitivityMethod = (String)source.getClientProperty("sensitivityMethod"); + displayFactorWizard(source, sensitivityBeanClass, sensitivityBeanID, sensitivityMethod); } /** * Display factor wizard for bean/property in registred in verifier. */ -public void displayFactorWizard(JComponent source, Class<? extends TopiaEntityContextable> classBean, String beanID, String property) { +public void displayFactorWizard(JComponent source, Class<? extends TopiaEntityContextable> sensitivityBeanClass, String sensitivityBeanID, String sensitivityMethod) { if (log.isDebugEnabled()) { log.debug("Event intercepted " + source); - log.debug(" client property (bean) : " + classBean); - log.debug(" client property (beanID) : " + beanID); - log.debug(" client property (method) : " + property); + log.debug(" client property (bean) : " + sensitivityBeanClass); + log.debug(" client property (beanID) : " + sensitivityBeanID); + log.debug(" client property (method) : " + sensitivityMethod); } TopiaEntityContextable bean = null; - if (beanID == null) { - bean = getVerifier().getEntity(classBean); + if (sensitivityBeanID == null) { + bean = getVerifier().getEntity(sensitivityBeanClass); } else { - bean = getVerifier().getEntity(classBean, beanID); + bean = getVerifier().getEntity(sensitivityBeanClass, sensitivityBeanID); } if (bean != null) { @@ -251,7 +251,7 @@ // we need to find a better component than // can display 'property' on 'bean' if (editor instanceof JTable) { - editor = EditorHelper.getEditorForValue(bean, property); + editor = EditorHelper.getEditorForValue(bean, sensitivityMethod); } if (editor != null) { @@ -261,12 +261,12 @@ wizard.setVisible(true); } else if (log.isWarnEnabled()) { - log.warn("Can't find editor for " + classBean.getSimpleName() + "#" + property); + log.warn("Can't find editor for " + sensitivityBeanClass.getSimpleName() + "#" + sensitivityMethod); } } else { if (log.isErrorEnabled()) { - log.error("Can't find bean in current verifier (classBean = " + classBean + ", beanID = " + beanID + ")"); + log.error("Can't find bean in current verifier (sensitivityBeanClass = " + sensitivityBeanClass + ", sensitivityBeanID = " + sensitivityBeanID + ")"); } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2011-03-16 16:55:59 UTC (rev 3159) @@ -32,7 +32,6 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -54,7 +53,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.util.FileUtil; @@ -65,7 +63,6 @@ import fr.ifremer.isisfish.datastore.update.ImportFromV2; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; -import fr.ifremer.isisfish.entities.FisheryRegionImpl; import fr.ifremer.isisfish.entities.Gear; import fr.ifremer.isisfish.entities.Metier; import fr.ifremer.isisfish.entities.Population; @@ -80,6 +77,7 @@ import fr.ifremer.isisfish.mexico.export.RegionExport; import fr.ifremer.isisfish.mexico.export.RegionExportFactorXML; import fr.ifremer.isisfish.ui.CommonHandler; +import fr.ifremer.isisfish.ui.NavigationUI; import fr.ifremer.isisfish.ui.input.tree.FisheryDataProvider; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeHelper; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; @@ -157,8 +155,6 @@ inputUI.getFisheryRegionTree().setModel(model); inputUI.getFisheryRegionTree().setCellRenderer(new FisheryTreeRenderer(dataProvider)); treeHelper.setUI(inputUI.getFisheryRegionTree(), true, false, null); - //setContextValue(model); - //setTreeSelection("$root"); // global context value : fisheryRegion, regionStorage, treeHelper inputUI.setContextValue(fisheryRegion); @@ -531,7 +527,7 @@ * @return ui for class * @throws Exception */ - protected InputContentUI<?> getUIInstanceForBeanClass(Class<?> internalClass, InputUI inputUI) throws Exception { + protected InputContentUI<?> getUIInstanceForBeanClass(Class<?> internalClass, NavigationUI navigationUI) throws Exception { Class<? extends InputContentUI<?>> uiClass = null; if (FisheryRegion.class.isAssignableFrom(internalClass)) { @@ -575,10 +571,10 @@ InputContentUI<?> result = uiInstanceCache.get(uiClass); if (result == null) { Constructor<?> constructor = uiClass.getConstructor(JAXXContext.class); - result = (InputContentUI<?>)constructor.newInstance(inputUI); + result = (InputContentUI<?>)constructor.newInstance(navigationUI); // fix parent container, doesn't work:( - result.setContextValue(inputUI, JAXXUtil.PARENT); + result.setContextValue(navigationUI, JAXXUtil.PARENT); uiInstanceCache.put(uiClass, result); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -57,7 +57,7 @@ protected void $afterCompleteSetup() { addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { + if (evt.getNewValue() == null) { formuleComboBox.setModel(new DefaultComboBoxModel()); try { File nullFile = org.nuiton.util.FileUtil.getTempFile("", ".java"); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2011-03-16 16:55:59 UTC (rev 3159) @@ -58,16 +58,12 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaEntityAbstract; import org.nuiton.topia.persistence.TopiaEntityContextable; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.ui.NavigationUI; import fr.ifremer.isisfish.ui.SaveVerifier; -import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI; -import fr.ifremer.isisfish.ui.util.ErrorHelper; /** * InputSaveVerifier. @@ -510,17 +506,17 @@ } public void addCurrentPanel(InputContentUI<?>... panels) { - for (InputContentUI<?> ui : panels) { + /*for (InputContentUI<?> ui : panels) { editable = !currentEntities.isEmpty(); this.currentPanels.add(ui); - /*if (rootUI == null) { - ui.setSensitivity(true); - ui.setLayer(true); - }*/ + //if (rootUI == null) { + // ui.setSensitivity(true); + // ui.setLayer(true); + //} ui.refresh(); // do not call refresh action buttons here ui.setActive(editable); - } + }*/ } public void removeAllPanels() { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -75,7 +75,6 @@ <JTree id="fisheryRegionTree" selectionModel='{fisheryRegionTreeSelectionModel}' rootVisible="true" selectionRow='0' model='{new javax.swing.tree.DefaultTreeModel(null)}' rowHeight="0" onValueChanged="getHandler().nodeSelectionChanged(this, event)" /> - <!-- cellRenderer='{new fr.ifremer.isisfish.ui.input.tree.FisheryRegionTreeRenderer()}' --> </JScrollPane> </JPanel> </JPanel> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -184,7 +184,7 @@ text='isisfish.metierSeasonInfoSpecies.targetFactor' bean='{getBean()}' formuleCategory='TargetFactor' clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}' - decorator='boxed' _bean='{Metier.class}' _method='""'/> + decorator='boxed' _sensitivityBean='{Metier.class}' _sensitivityMethod='""'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -97,6 +97,11 @@ } metierSeasonInfoSpeciesEditor.refresh(); } + at Override +public void setLayer(boolean active) { + super.setLayer(active); + metierSeasonInfoSpeciesEditor.setLayer(active); +} ]]></script> <JPanel id="body"> <Table> @@ -117,7 +122,7 @@ <MetierSeasonInfoSpeciesEditorUI id='metierSeasonInfoSpeciesEditor' constructorParams='this' bean='{getBean()}' metierSeasonInfo='{getMetierSeasonInfo()}' metierSeasonSelected='{isMetierSeasonInfoSelected()}' active='{isActive()}' - _bean='{MetierSeasonInfo.class}' _method='"SpeciesTargetSpecies"'/> + _sensitivityBean='{MetierSeasonInfo.class}' _sensitivityMethod='"SpeciesTargetSpecies"'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -92,6 +92,17 @@ setMetierSeasonInfoCombo(); } }); + + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + + } + if (evt.getNewValue() != null) { + refresh(); + } + } + }); } @Override @@ -107,7 +118,7 @@ Metier metier = getVerifier().getEntity(Metier.class); // don't add setBean(null) here : useless - setBean(metier); + //setBean(metier); if (getBean() != null) { // Model instanciation Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -111,7 +111,7 @@ <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActive()}' decorator='boxed' - _bean='{Metier.class}' _method='"GearParameterValue"' /> + _sensitivityBean='{Metier.class}' _sensitivityMethod='"GearParameterValue"' /> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -53,6 +53,13 @@ // active les bouton sur l'onglet courant setCurrentTabActionButtons(metierTab); } + + at Override +public void setLayer(boolean active) { + metierTabUI.setLayer(active); + metierSeasonInfoUI.setLayer(active); + metierSeasonSpeciesUI.setLayer(active); +} ]]></script> <JPanel id="body"> <JTabbedPane id="metierTab" constraints='BorderLayout.CENTER'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -205,7 +205,7 @@ <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' - enabled='{isActive()}' decorator='boxed' _bean='{Population.class}' _method='"PlusGroup"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"PlusGroup"'/> </cell> </row> <row> @@ -219,7 +219,7 @@ text='isisfish.populationBasics.growth' active='{isActive()}' bean='{getBean()}' beanProperty='growth' formuleCategory='Growth' clazz='{fr.ifremer.isisfish.equation.PopulationGrowth.class}' - decorator='boxed' _bean='{Population.class}' _method='"Growth"'/> + decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"Growth"'/> </cell> </row> <row> @@ -228,7 +228,7 @@ text='isisfish.populationBasics.growthReverse' active='{isActive()}' bean='{getBean()}' formuleCategory='GrowthReverse' beanProperty='GrowthReverse' clazz='{fr.ifremer.isisfish.equation.PopulationGrowthReverse.class}' - decorator='boxed' _bean='{Population.class}' _method='"GrowthReverse"'/> + decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"GrowthReverse"'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -94,7 +94,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' - enabled='{isActive()}' decorator='boxed' _bean='{Population.class}' _method='"Capturability"' + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"Capturability"' onMatrixChanged="populationCapturabilityMatrixChanged(event)" /> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -59,7 +59,7 @@ text='isisfish.populationEquation.naturalDeathRate' active="{isActive()}" bean='{getBean()}' formuleCategory='NaturalDeathRate' beanProperty='NaturalDeathRate' clazz='{fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class}' - decorator='boxed' _bean='{Population.class}' _method='"NaturalDeathRate"'/> + decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"NaturalDeathRate"'/> </cell> </row> <row> @@ -68,7 +68,7 @@ text='isisfish.populationEquation.meanWeight' active="{isActive()}" bean='{getBean()}' formuleCategory='MeanWeight' beanProperty='MeanWeight' clazz='{fr.ifremer.isisfish.equation.PopulationMeanWeight.class}' - decorator='boxed' _bean='{Population.class}' _method='"MeanWeight"'/> + decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"MeanWeight"'/> </cell> </row> <row> @@ -77,7 +77,7 @@ text='isisfish.populationEquation.price' active="{isActive()}" bean='{getBean()}' formuleCategory='Price' beanProperty='Price' clazz='{fr.ifremer.isisfish.equation.PopulationPrice.class}' - decorator='boxed' _bean='{Population.class}' _method='"Price"'/> + decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"Price"'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -177,7 +177,7 @@ </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='fieldPopulationGroupNaturalDeathRate' - enabled='false' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"' /> + enabled='false' decorator='boxed' _sensitivityBean='{PopulationImpl.class}' _sensitivityMethod='"NaturalDeathRateMatrix"' /> <!-- this bindings totally break UI matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' --> </cell> @@ -190,10 +190,10 @@ <!--NumberEditor id='fieldPopulationGroupReproductionRate' constructorParams='this' bean='{getPopulationGroup()}' property='reproductionRate' useSign='true' enabled='{isPopGroupNotNull()}' decorator='boxed' - _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/--> + _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"ReproductionRate"'/--> <JTextField id="fieldPopulationGroupReproductionRate" text='{String.valueOf(getPopulationGroup().getReproductionRate())}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' - enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/> + enabled='{isPopGroupNotNull()}' decorator='boxed' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"ReproductionRate"'/> </cell> </row> <row> @@ -205,7 +205,7 @@ <JTextField id="fieldPopulationGroupAge" text='{String.valueOf(getPopulationGroup().getAge())}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' - decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/> + decorator='boxed' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"Age"'/> </cell> </row> <row> @@ -217,14 +217,14 @@ <JTextField id="fieldPopulationGroupMinLength" text='{String.valueOf(getPopulationGroup().getMinLength())}' toolTipText="isisfish.populationGroup.minimumLength" onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' - enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/> + enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"MinLength"'/> </cell> <cell fill='both' weightx='0.5'> <!-- non editable max length field --> <JTextField id="fieldPopulationGroupMaxLength" text='{String.valueOf(getPopulationGroup().getMaxLength())}' toolTipText="isisfish.populationGroup.maximumLength" onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' - enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/> + enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"MaxLength"'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -58,7 +58,7 @@ text='isisfish.common.migration' active='{isActive()}' bean='{getPopInfo()}' formuleCategory='Migration' beanProperty='MigrationEquation' clazz='{fr.ifremer.isisfish.equation.MigrationEquation.class}' - decorator='boxed' _bean='{PopulationSeasonInfo.class}' _method='"MigrationEquation"'/> + decorator='boxed' _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"MigrationEquation"'/> </cell> </row> <row> @@ -67,7 +67,7 @@ text='isisfish.common.emigration' active='{isActive()}' bean='{getPopInfo()}' formuleCategory='Emigration' beanProperty='EmigrationEquation' clazz='{fr.ifremer.isisfish.equation.EmigrationEquation.class}' - decorator='boxed' _bean='{PopulationSeasonInfo.class}' _method='"EmigrationEquation"'/> + decorator='boxed' _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"EmigrationEquation"'/> </cell> </row> <row> @@ -76,7 +76,7 @@ text='isisfish.common.immigration' active='{isActive()}' bean='{getPopInfo()}' formuleCategory='Immigration' beanProperty='ImmigrationEquation' clazz='{fr.ifremer.isisfish.equation.ImmigrationEquation.class}' - decorator='boxed' _bean='{PopulationSeasonInfo.class}' _method='"ImmigrationEquation"'/> + decorator='boxed' _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"ImmigrationEquation"'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -157,15 +157,15 @@ <JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"' enabled='{isSelectedPopulationSeasonInfo()}'> <tab title='{_("isisfish.populationMigrationMigration.title")}'> <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' - _bean='{PopulationSeasonInfo.class}' _method='"MigrationMatrix"' active='{isSelectedPopulationSeasonInfo()}' /> + _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"MigrationMatrix"' active='{isSelectedPopulationSeasonInfo()}' /> </tab> <tab title='{_("isisfish.populationMigrationImmigration.title")}'> <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' - _bean='{PopulationSeasonInfo.class}' _method='"ImmigrationMatrix"' active='{isSelectedPopulationSeasonInfo()}' /> + _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"ImmigrationMatrix"' active='{isSelectedPopulationSeasonInfo()}' /> </tab> <tab title='{_("isisfish.populationMigrationEmigration.title")}'> <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' - _bean='{PopulationSeasonInfo.class}' _method='"EmigrationMatrix"' active='{isSelectedPopulationSeasonInfo()}' /> + _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"EmigrationMatrix"' active='{isSelectedPopulationSeasonInfo()}' /> </tab> </JTabbedPane> <PopulationMigrationEquationUI id='populationMigrationEquationUI' constraints='"fieldUseEquation"' constructorParams='this' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -97,7 +97,7 @@ text='isisfish.populationRecruitment.reproductionEquation' active="{isActive()}" bean='{getBean()}' formuleCategory='Reproduction' beanProperty='ReproductionEquation' clazz='{fr.ifremer.isisfish.equation.PopulationReproductionEquation.class}' - decorator='boxed' _bean='{Population.class}' _method='"ReproductionEquation"'/> + decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"ReproductionEquation"'/> </cell> </row> <row> @@ -107,11 +107,11 @@ <cell fill='horizontal' weightx='1.0'> <!--NumberEditor id='fieldPopulationMonthGapBetweenReproRecrutement' constructorParams='this' bean='{getBean()}' property='monthGapBetweenReproRecrutement' useSign='true' - enabled='{isActive()}' decorator='boxed' _bean='{PopulationImpl.class}' - _method='"MonthGapBetweenReproRecrutement"'/--> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{PopulationImpl.class}' + _sensitivityMethod='"MonthGapBetweenReproRecrutement"'/--> <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{String.valueOf(getBean().getMonthGapBetweenReproRecrutement())}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{Population.class}' _method='"MonthGapBetweenReproRecrutement"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"MonthGapBetweenReproRecrutement"'/> </cell> </row> <row> @@ -121,7 +121,7 @@ <cell fill='both' weightx='1.0' weighty='0.5'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' - enabled='{isActive()}' decorator='boxed' _bean='{Population.class}' _method='"RecruitmentDistribution"' + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"RecruitmentDistribution"' onMatrixChanged="populationRecruitmentDistributionMatrixChanged(event)" /> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -162,7 +162,7 @@ <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <org.nuiton.math.matrix.gui.MatrixPanelEditor id='matrixPanelPopulationSeasonLengthChange' enabled='{isPopSeasonInfoNotNull()}' - _bean='{PopulationSeasonInfo.class}' _method='"LengthChangeMatrix"' + _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"LengthChangeMatrix"' visible='{isAgeGroupType()}' decorator='boxed' matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix().copy()}' onMatrixChanged="populationSeasonLengthMatrixChanged(event)" /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -242,6 +242,12 @@ populationSeasonSpecializedUI.setVisible(result); return result; } + + at Override +public void setLayer(boolean active) { + super.setLayer(active); + populationSeasonSpecializedUI.setLayer(active); +} ]]> </script> <JPanel id='body'> @@ -272,13 +278,13 @@ </cell> <cell fill='both' weightx='1.0'> <JCheckBox id="fieldPopulationSeasonGroupChange" text="isisfish.populationSeasons.changeGroup" selected='{getPopulationSeasonInfo().getGroupChange()}' - decorator='boxed' _bean='{PopulationSeasonInfo.class}' _method='"GroupChange"' + decorator='boxed' _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"GroupChange"' onActionPerformed='seasonGroupChanged()' enabled='{isPopSeasonInfoNotNull()}' visible='{isAgeGroupType(getPopulationSeasonInfo().getPopulation().getSpecies().getAgeGroupType())}'/> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='0.6'> - <PopulationSeasonSpacializedUI id='populationSeasonSpecializedUI' bean='{getBean()}' + <PopulationSeasonSpacializedUI id='populationSeasonSpecializedUI' constructorParams='this' bean='{getBean()}' populationSeasonInfo='{getPopulationSeasonInfo()}' popSeasonInfoNotNull='{isPopSeasonInfoNotNull()}' ageGroupType='{isAgeGroupType(!getPopulationSeasonInfo().getPopulation().getSpecies().getAgeGroupType())}'/> </cell> @@ -290,7 +296,7 @@ <cell fill='horizontal' weightx='1.0'> <JCheckBox id="fieldPopulationSeasonReproduction" selected='{getPopulationSeasonInfo().getReproduction()}' onActionPerformed='getPopulationSeasonInfo().setReproduction(fieldPopulationSeasonReproduction.isSelected())' - text="isisfish.populationSeasons.Reproduction" enabled='{isPopSeasonInfoNotNull()}'/> + text="isisfish.populationSeasons.Reproduction" enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </cell> </row> <row> @@ -303,7 +309,7 @@ matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution().copy()}' enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}' - decorator='boxed' _bean='{PopulationSeasonInfo.class}' _method='"ReproductionDistribution"' + decorator='boxed' _sensitivityBean='{PopulationSeasonInfo.class}' _sensitivityMethod='"ReproductionDistribution"' onMatrixChanged="populationSeasonReproductionDistributionMatrixChanged(event)" /> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -51,6 +51,18 @@ // active les bouton sur l'onglet courant setCurrentTabActionButtons(populationTab); } + + at Override +public void setLayer(boolean active) { + populationBasicsUI.setLayer(active); + populationZoneUI.setLayer(active); + populationSeasonsUI.setLayer(active); + populationEquationUI.setLayer(active); + populationRecruitementUI.setLayer(active); + populationGroupUI.setLayer(active); + populationCapturabilityUI.setLayer(active); + populationMigrationUI.setLayer(active); +} ]]> </script> <JPanel id='body'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -56,7 +56,7 @@ <cell columns="2" fill='both' weightx='1.0' weighty='1'> <PopulationZonesEditorUI id='popZones' constructorParams='this' bean='{getBean()}' active='{isActive()}' decorator='boxed' - _bean='{Population.class}' _method='"MappingZoneReproZoneRecru"'/> + _sensitivityBean='{Population.class}' _sensitivityMethod='"MappingZoneReproZoneRecru"'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -33,19 +33,28 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getNewValue() == null) { - fieldGearParamPossibleValue.setText(""); - } - if (evt.getNewValue() != null) { +boolean init = false; +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + fieldGearParamPossibleValue.setText(""); + } + if (evt.getNewValue() != null) { + java.util.List<Object> values = new ArrayList<Object>(); + for (String value : RangeOfValues.getPossibleTypes()) { + values.add(value); + } + + init = true; + jaxx.runtime.SwingUtil.fillComboBox(fieldGearParamType, values, getBean().getPossibleValue() == null ? null : getBean().getPossibleValue().getType(), true); + init = false; + } } - } -}); + }); +} -boolean init = false; - @Override public void refresh() { Gear gear = getVerifier().getEntity(Gear.class); @@ -73,10 +82,8 @@ } protected void gearParamChanged() { - if (fieldGearParamType.getSelectedItem() != null) { - if (!init) { - getBean().setPossibleValue(new RangeOfValues(fieldGearParamType.getSelectedItem().toString().concat("[" + fieldGearParamPossibleValue.getText() + "]"))); - } + if (fieldGearParamType.getSelectedItem() != null && !init) { + getBean().setPossibleValue(new RangeOfValues(fieldGearParamType.getSelectedItem().toString().concat("[" + fieldGearParamPossibleValue.getText() + "]"))); } } ]]></script> @@ -87,9 +94,10 @@ <JAXXComboBox id="fieldGearParamType" onActionPerformed='gearParamChanged()' enabled='{isActive()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' onKeyReleased='gearParamChanged()' enabled='{isActive()}'/> + <JTextField id="fieldGearParamPossibleValue" text='{getBean().getPossibleValue() == null ? "" : getBean().getPossibleValue().getValues()}' + onKeyReleased='gearParamChanged()' enabled='{isActive()}'/> </cell> </row> </Table> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -40,8 +40,23 @@ import fr.ifremer.isisfish.ui.input.gear.GearPopulationSelectivityModel; import fr.ifremer.isisfish.ui.input.gear.PopulationComboModel; import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; -selectivityTable.addMouseListener(new MouseAdapter() { +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + + } + if (evt.getNewValue() != null) { + refresh(); + } + } + }); +} + +/*selectivityTable.addMouseListener(new MouseAdapter() { @Override public void mouseReleased(MouseEvent e) { // le bouton ne doit pas s'activer dans l'analyse de sensibilite @@ -49,7 +64,7 @@ removeSelectivityButton.setEnabled(selectivityTable.getSelectedRow() != -1); } } -}); +});*/ @Override public void refresh() { @@ -58,8 +73,8 @@ // add null before, for second to be considered as a changed event // otherwize, setBean has no effect - setBean(null); - setBean(gear); + //setBean(null); + //setBean(gear); if (getBean() != null) { setSelectivityPopulationSelected(false); @@ -143,7 +158,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JComboBox id="fieldSelectivityPopulation" onActionPerformed='selectivityChanged()' enabled='{isActive()}' - decorator='boxed' /> + decorator='boxed' /> </cell> </row> <row> @@ -158,20 +173,21 @@ <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="addSelectivityButton" text="isisfish.common.add" onActionPerformed='addSelectivity()' - enabled='{isSelectivityPopulationSelected()}' decorator='boxed' /> + enabled='{isSelectivityPopulationSelected()}' decorator='boxed' /> </cell> </row> <row> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> - <JTable id="selectivityTable" rowHeight='24' enabled='{isActive()}' decorator='boxed' /> + <JTable id="selectivityTable" rowHeight='24' enabled='{isActive()}' + decorator='boxed' /> </JScrollPane> </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JButton id="removeSelectivityButton" text="isisfish.common.remove" onActionPerformed='removeSelectivity()' - enabled='false' decorator='boxed' /> + enabled='{isActive() && selectivityTable.getSelectedRow() != -1}' decorator='boxed' /> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -39,7 +39,7 @@ } if (evt.getNewValue() != null) { - getVerifier().addCurrentPanel(editor); + //getVerifier().addCurrentPanel(editor); } } }); @@ -62,13 +62,19 @@ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); } + + at Override +public void setLayer(boolean active) { + super.setLayer(active); + editor.setLayer(active); +} ]]></script> <JPanel id='body'> <Table> <row> <cell columns="2" fill='both' weightx='1.0' weighty='1.0'> - <SelectivityEditorUI id='editor' constructorParams='this' bean='{getBean()}' - _bean='{Gear.class}' _method='"PopulationSelectivity"'/> + <SelectivityEditorUI id='editor' constructorParams='this' bean='{getBean()}' active="{isActive()}" + _sensitivityBean='{Gear.class}' _sensitivityMethod='"PopulationSelectivity"'/> </cell> </row> <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-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -28,17 +28,33 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> <script><![CDATA[ - -import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.entities.Port; import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.VesselType; import fr.ifremer.isisfish.entities.Formule; import fr.ifremer.isisfish.entities.SetOfVessels; import jaxx.runtime.swing.editor.NumberEditor; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; boolean init = false; +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + + } + if (evt.getNewValue() != null) { + init = true; + jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true); + jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true); + init=false; + } + } + }); +} + @Override public void refresh() { SetOfVessels setOfVessels = (SetOfVessels)getVerifier().getEntity(SetOfVessels.class); @@ -118,10 +134,10 @@ <!--NumberEditor id='fieldSetOfVesselsNumberOfVessels' constructorParams='this' bean='{getBean()}' property='numberOfVessels' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/--> + _sensitivityBean='{SetOfVesselsImpl.class}' _sensitivityMethod='"NumberOfVessels"'/--> <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{String.valueOf(getBean().getNumberOfVessels())}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{SetOfVessels.class}' _method='"NumberOfVessels"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{SetOfVessels.class}' _sensitivityMethod='"NumberOfVessels"'/> </cell> </row> <row> @@ -132,10 +148,10 @@ <!--NumberEditor id='fieldSetOfVesselsFixedCosts' constructorParams='this' bean='{getBean()}' property='fixedCosts' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/--> + _sensitivityBean='{SetOfVesselsImpl.class}' _sensitivityMethod='"FixedCosts"'/--> <JTextField id="fieldSetOfVesselsFixedCosts" text='{String.valueOf(getBean().getFixedCosts())}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{SetOfVessels.class}' _method='"FixedCosts"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{SetOfVessels.class}' _sensitivityMethod='"FixedCosts"'/> </cell> </row> <row> @@ -144,7 +160,7 @@ text='isisfish.setOfVessels.technicalEfficiency' bean='{getBean()}' formuleCategory='TechnicalEfficiency' beanProperty='TechnicalEfficiencyEquation' clazz='{fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class}' - decorator='boxed' _bean='{SetOfVessels.class}' _method='"TechnicalEfficiencyEquation"'/> + decorator='boxed' _sensitivityBean='{SetOfVessels.class}' _sensitivityMethod='"TechnicalEfficiencyEquation"'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -47,17 +47,23 @@ // active les bouton sur l'onglet courant setCurrentTabActionButtons(setOfVesselsTab); } + at Override +public void setLayer(boolean active) { + setOfVesselsBasicsUI.setLayer(active); + effortDescriptionUI.setLayer(active); + effortParametersUI.setLayer(active); +} ]]></script> <JPanel id="body"> <JTabbedPane id="setOfVesselsTab"> <tab title='{_("isisfish.setOfVessels.title")}'> - <SetOfVesselsBasicsUI id='setOfVesselsBasicsUI' bean="{getBean()}" constructorParams='this'/> + <SetOfVesselsBasicsUI id='setOfVesselsBasicsUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> <tab title='{_("isisfish.effortDescription.title")}'> - <EffortDescriptionUI id='effortDescriptionUI' bean="{getBean()}" constructorParams='this'/> + <EffortDescriptionUI id='effortDescriptionUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> <tab title='{_("isisfish.effortDescription.parametersTitle")}'> - <EffortDescriptionParametersUI id='effortParametersUI' bean="{getBean()}" constructorParams='this'/> + <EffortDescriptionParametersUI id='effortParametersUI' bean="{getBean()}" active="{isActive()}" constructorParams='this'/> </tab> </JTabbedPane> </JPanel> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -99,7 +99,7 @@ <cell fill='horizontal' columns='2' weightx='1.0'> <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' - enabled='{isActive()}' decorator='boxed' _bean='{Species.class}' _method='"ScientificName"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Species.class}' _sensitivityMethod='"ScientificName"'/> </cell> </row> <row> @@ -109,7 +109,7 @@ <cell fill='horizontal' columns='2' weightx='1.0'> <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActive()}' - decorator='boxed' _bean='{Species.class}' _method='"CodeRubbin"'/> + decorator='boxed' _sensitivityBean='{Species.class}' _sensitivityMethod='"CodeRubbin"'/> </cell> </row> <row> @@ -119,11 +119,11 @@ <cell fill='horizontal' columns='2' weightx='1.0'> <!--NumberEditor id='fieldSpeciesCEE' constructorParams='this' bean='{getBean()}' property='codeCEE' - decorator='boxed' _bean='{SpeciesImpl.class}' - useSign='true' _method='"CodeCEE"'/--> + decorator='boxed' _sensitivityBean='{SpeciesImpl.class}' + useSign='true' _sensitivityMethod='"CodeCEE"'/--> <JTextField id="fieldSpeciesCEE" text='{String.valueOf(getBean().getCodeCEE())}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{Species.class}' _method='"CodeCEE"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Species.class}' _sensitivityMethod='"CodeCEE"'/> </cell> </row> <row> @@ -132,7 +132,7 @@ </cell> <cell fill='horizontal' weightx='1' columns='2'> <SpeciesStructuredUI bean='{getBean()}' active='{isActive()}' decorator='boxed' - _bean='{Species.class}' _method='"AgeGroupType"'/> + _sensitivityBean='{Species.class}' _sensitivityMethod='"AgeGroupType"'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -28,25 +28,28 @@ <script><![CDATA[ import org.apache.commons.lang.StringUtils; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + + } + if (evt.getNewValue() != null) { + //refresh(); + } + } + }); +} + @Override public void refresh() { - strategyJanuary.init(0); - strategyFebuary.init(1); - strategyMarch.init(2); - strategyApril.init(3); - strategyMay.init(4); - strategyJune.init(5); - strategyJuly.init(6); - strategyAugust.init(7); - strategySeptember.init(8); - strategyOctober.init(9); - strategyNovember.init(10); - strategyDecember.init(11); - getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, + /*getVerifier().addCurrentPanel(strategyJanuary, strategyFebuary, strategyMarch, strategyApril, strategyMay, strategyJune, strategyJuly, strategyAugust, strategySeptember, - strategyOctober, strategyNovember, strategyDecember); + strategyOctober, strategyNovember, strategyDecember);*/ } @Override @@ -54,61 +57,76 @@ getVerifier().setSaveButton(save); getVerifier().setCancelButton(cancel); } + at Override +public void setLayer(boolean active) { + strategyJanuary.setLayer(active); + strategyFebuary.setLayer(active); + strategyMarch.setLayer(active); + strategyApril.setLayer(active); + strategyMay.setLayer(active); + strategyJune.setLayer(active); + strategyJuly.setLayer(active); + strategyAugust.setLayer(active); + strategySeptember.setLayer(active); + strategyOctober.setLayer(active); + strategyNovember.setLayer(active); + strategyDecember.setLayer(active); +} ]]></script> <JPanel id='body'> <Table constraints='BorderLayout.CENTER'> <row> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyJanuary' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.january"))}' /> + <StrategyOneMonthInfoUI id='strategyJanuary' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="0" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.january"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyFebuary' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.february"))}' /> + <StrategyOneMonthInfoUI id='strategyFebuary' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="1" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.february"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyMarch' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.march"))}' /> + <StrategyOneMonthInfoUI id='strategyMarch' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="2" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.march"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyApril' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.april"))}' /> + <StrategyOneMonthInfoUI id='strategyApril' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="3" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.april"))}' /> </cell> </row> <row> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyMay' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.may"))}' /> + <StrategyOneMonthInfoUI id='strategyMay' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="4" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.may"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyJune' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.june"))}' /> + <StrategyOneMonthInfoUI id='strategyJune' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="5" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.june"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyJuly' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.july"))}' /> + <StrategyOneMonthInfoUI id='strategyJuly' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="6" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.july"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyAugust' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.august"))}' /> + <StrategyOneMonthInfoUI id='strategyAugust' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="7" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.august"))}' /> </cell> </row> <row> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategySeptember' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.september"))}' /> + <StrategyOneMonthInfoUI id='strategySeptember' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="8" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.september"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyOctober' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.october"))}' /> + <StrategyOneMonthInfoUI id='strategyOctober' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="9" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.october"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyNovember' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.november"))}' /> + <StrategyOneMonthInfoUI id='strategyNovember' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="10" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.november"))}' /> </cell> <cell fill='both' weightx='1' weighty='1' insets='0'> - <StrategyOneMonthInfoUI id='strategyDecember' bean="{getBean()}" constructorParams='this' - strategieMonthText='{StringUtils.capitalize(_("isisfish.month.december"))}' /> + <StrategyOneMonthInfoUI id='strategyDecember' bean="{getBean()}" active="{isActive()}" constructorParams='this' + month="11" strategieMonthText='{StringUtils.capitalize(_("isisfish.month.december"))}' /> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -24,6 +24,7 @@ --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Strategy'> + <Integer id="month" javaBean="null"/> <String id="strategieMonthText" javaBean='null'/> <!-- bean property --> @@ -38,9 +39,22 @@ import jaxx.runtime.swing.editor.NumberEditor; import fr.ifremer.isisfish.entities.TripType; import org.nuiton.math.matrix.gui.MatrixPanelListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; -protected int month = 0; +protected void $afterCompleteSetup() { + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + } + if (evt.getNewValue() != null) { + refresh(); + } + } + }); +} + protected void strategyMonthInfoProportionMatrixChanged(MatrixPanelEvent event) { if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null) { if (log.isDebugEnabled()) { @@ -55,7 +69,7 @@ Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); // don't use setBean(null) here - setBean(strategy); + //setBean(strategy); if (getBean() != null) { Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); @@ -68,9 +82,9 @@ getVerifier().addCurrentEntity(getStrategyMonthInfo()); if (getStrategyMonthInfo() != null) { - numberOfTrips.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); - fieldStrategyMonthInfoProportion.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); - fieldStrategyMonthInfoMinInactivityDays.putClientProperty("beanID", getStrategyMonthInfo().getTopiaId()); + numberOfTrips.putClientProperty("sensitivityBeanID", getStrategyMonthInfo().getTopiaId()); + fieldStrategyMonthInfoProportion.putClientProperty("sensitivityBeanID", getStrategyMonthInfo().getTopiaId()); + fieldStrategyMonthInfoMinInactivityDays.putClientProperty("sensitivityBeanID", getStrategyMonthInfo().getTopiaId()); ActionListener[] listeners = fieldStrategyMonthInfoTripType.getActionListeners(); for (ActionListener listener : listeners) { fieldStrategyMonthInfoTripType.removeActionListener(listener); @@ -90,7 +104,6 @@ } } } - //fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener); } @Override @@ -98,10 +111,6 @@ } -public void init(int m) { - month = m; -} - protected void setProportionMetierMatrix() { if (getStrategyMonthInfo().getProportionMetier() != null) { fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().getProportionMetier().copy()); @@ -130,7 +139,7 @@ </cell> <cell fill='horizontal' weightx='0.5' anchor='west'> <JLabel id='numberOfTrips' text='{String.valueOf(getStrategyMonthInfo().getNumberOfTrips())}' enabled='{isActive()}' - decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/> + decorator='boxed' _sensitivityBean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _sensitivityMethod='"NumberOfTrips"'/> </cell> </row> <row> @@ -141,10 +150,10 @@ <!-- NumberEditor id='fieldStrategyMonthInfoMinInactivityDays' constructorParams='this' bean='{getStrategyMonthInfo()}' property='minInactivityDays' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/--> + _sensitivityBean='{StrategyMonthInfoImpl.class}' _sensitivityMethod='"MinInactivityDays"'/--> <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{String.valueOf(getStrategyMonthInfo().getMinInactivityDays())}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _sensitivityMethod='"MinInactivityDays"'/> </cell> </row> <row> @@ -152,7 +161,7 @@ <org.nuiton.math.matrix.gui.MatrixPanelEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' onMatrixChanged="strategyMonthInfoProportionMatrixChanged(event)" - enabled='{isActive()}' decorator='boxed' _bean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{fr.ifremer.isisfish.entities.StrategyMonthInfoImpl.class}' _sensitivityMethod='"ProportionMetier"'/> </cell> </row> </Table> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -119,10 +119,10 @@ <!-- NumberEditor id='fieldStrategyProportionSetOfVessels' constructorParams='this' bean='{getBean()}' property='proportionSetOfVessels' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/--> + _sensitivityBean='{StrategyImpl.class}' _sensitivityMethod='"ProportionSetOfVessels"'/--> <JTextField id="fieldStrategyProportionSetOfVessels" text='{String.valueOf(getBean().getProportionSetOfVessels())}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{Strategy.class}' _method='"ProportionSetOfVessels"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Strategy.class}' _sensitivityMethod='"ProportionSetOfVessels"'/> </cell> </row> <row> @@ -141,7 +141,7 @@ text='isisfish.strategy.inactivity' bean='{getBean()}' formuleCategory='Inactivity' beanProperty='InactivityEquation' clazz='{fr.ifremer.isisfish.equation.StrategyInactivityEquation.class}' - decorator='boxed' _bean='{Strategy.class}' _method='"Inactivity"'/> <!-- bindings not work well actif='{getBean().getInactivityEquationUsed()}' --> + decorator='boxed' _sensitivityBean='{Strategy.class}' _sensitivityMethod='"Inactivity"'/> <!-- bindings not work well actif='{getBean().getInactivityEquationUsed()}' --> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -32,6 +32,7 @@ // (depends on sensitivity can't be done on constructor) installChangeListener(strategyTab); } + @Override public void refresh() { @@ -43,6 +44,12 @@ // active les bouton sur l'onglet courant setCurrentTabActionButtons(strategyTab); } + + at Override +public void setLayer(boolean active) { + strategyTabUI.setLayer(active); + strategyMonthInfoUI.setLayer(active); +} ]]></script> <JPanel id="body"> <JTabbedPane id="strategyTab"> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -94,7 +94,7 @@ <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldTripTypeDuration" text='{String.valueOf(getBean().getTripDuration().getHour())}' toolTipText="isisfish.common.duration.inhours" onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' - enabled='{isActive()}' decorator='boxed' _bean='{TripType.class}' _method='"TripDuration"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{TripType.class}' _sensitivityMethod='"TripDuration"'/> </cell> </row> <row> @@ -104,7 +104,7 @@ <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{String.valueOf(getBean().getMinTimeBetweenTrip().getHour())}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' - enabled='{isActive()}' decorator='boxed' _bean='{TripType.class}' _method='"MinTimeBetweenTrip"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{TripType.class}' _sensitivityMethod='"MinTimeBetweenTrip"'/> </cell> </row> <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-03-15 15:50:27 UTC (rev 3158) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-03-16 16:55:59 UTC (rev 3159) @@ -36,25 +36,28 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -setButtonTitle(_("isisfish.input.continueSetOfVessels")); -setNextPath("$root/$setOfVessels"); -addPropertyChangeListener("bean", new PropertyChangeListener() { - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getOldValue() != null || evt.getNewValue() == null) { - fieldVesselTypeName.setText(""); - fieldVesselTypeLength.setText(""); - fieldVesselTypeSpeed.setText(""); - fieldVesselTypeMaxTripDuration.setText(""); - fieldVesselTypeActivityRange.setText(""); - fieldVesselTypeMinCrewSize.setText(""); - fieldVesselTypeSpeed.setText(""); - fieldVesselTypeUnitFuelCostOfTravel.setText(""); - fieldVesselTypeComment.setText(""); +protected void $afterCompleteSetup() { + setButtonTitle(_("isisfish.input.continueSetOfVessels")); + setNextPath("$root/$setOfVessels"); + addPropertyChangeListener(PROPERTY_BEAN, new PropertyChangeListener() { + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getOldValue() != null || evt.getNewValue() == null) { + fieldVesselTypeName.setText(""); + fieldVesselTypeLength.setText(""); + fieldVesselTypeSpeed.setText(""); + fieldVesselTypeMaxTripDuration.setText(""); + fieldVesselTypeActivityRange.setText(""); + fieldVesselTypeMinCrewSize.setText(""); + fieldVesselTypeSpeed.setText(""); + fieldVesselTypeUnitFuelCostOfTravel.setText(""); + fieldVesselTypeComment.setText(""); + } + if (evt.getNewValue() != null) { + + } } - if (evt.getNewValue() != null) { - } - } -}); + }); +} @Override public void refresh() { @@ -126,10 +129,10 @@ <!--NumberEditor id='fieldVesselTypeLength' constructorParams='this' bean='{getBean()}' property='length' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{VesselType.class}' _method='"Length"'/--> + _sensitivityBean='{VesselType.class}' _sensitivityMethod='"Length"'/--> <JTextField id="fieldVesselTypeLength" text='{String.valueOf(getBean().getLength())}' enabled='{isActive()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))' - decorator='boxed' _bean='{VesselType.class}' _method='"Length"'/> + decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"Length"'/> </cell> </row> <row> @@ -140,10 +143,10 @@ <!--NumberEditor id='fieldVesselTypeSpeed' constructorParams='this' bean='{getBean()}' property='speed' useSign='true' enabled='{isActive()}' decorator='boxed' - _bean='{VesselType.class}' _method='"Speed"'/--> + _sensitivityBean='{VesselType.class}' _sensitivityMethod='"Speed"'/--> <JTextField id="fieldVesselTypeSpeed" text='{String.valueOf(getBean().getSpeed())}' enabled='{isActive()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))' - decorator='boxed' _bean='{VesselType.class}' _method='"Speed"'/> + decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"Speed"'/> </cell> </row> <row> @@ -153,7 +156,7 @@ <cell fill='horizontal' weightx='1.0'> <JTextField id="fieldVesselTypeMaxTripDuration" text='{String.valueOf(getBean().getMaxTripDuration().getHour())}' toolTipText="isisfish.common.duration.inhours" enabled='{isActive()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))' - decorator='boxed' _bean='{VesselType.class}' _method='"MaxTripDuration"'/> + decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"MaxTripDuration"'/> </cell> </row> <row> @@ -164,10 +167,10 @@ <!--NumberEditor id='fieldVesselTypeActivityRange' constructorParams='this' bean='{getBean()}' property='activityRange' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{VesselType.class}' _method='"ActivityRange"'/--> + _sensitivityBean='{VesselType.class}' _sensitivityMethod='"ActivityRange"'/--> <JTextField id="fieldVesselTypeActivityRange" text='{String.valueOf(getBean().getActivityRange())}' enabled='{isActive()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))' - decorator='boxed' _bean='{VesselType.class}' _method='"ActivityRange"'/> + decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"ActivityRange"'/> </cell> </row> <row> @@ -177,11 +180,11 @@ <cell fill='horizontal' weightx='1.0'> <!--NumberEditor id='fieldVesselTypeMinCrewSize' constructorParams='this' bean='{getBean()}' property='minCrewSize' useSign='true' - enabled='{isActive()}' decorator='boxed' _bean='{VesselType.class}' - _method='"MinCrewSize"'/--> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{VesselType.class}' + _sensitivityMethod='"MinCrewSize"'/--> <JTextField id="fieldVesselTypeMinCrewSize" text='{String.valueOf(getBean().getMinCrewSize())}' enabled='{isActive()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))' - decorator='boxed' _bean='{VesselType.class}' _method='"MinCrewSize"'/> + decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"MinCrewSize"'/> </cell> </row> <row> @@ -192,10 +195,10 @@ <!--NumberEditor id='fieldVesselTypeUnitFuelCostOfTravel' constructorParams='this' bean='{getBean()}' property='unitFuelCostOfTravel' enabled='{isActive()}' decorator='boxed' useSign='true' - _bean='{VesselType.class}' _method='"UnitFuelCostOfTravel"'/--> + _sensitivityBean='{VesselType.class}' _sensitivityMethod='"UnitFuelCostOfTravel"'/--> <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{String.valueOf(getBean().getUnitFuelCostOfTravel())}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' - enabled='{isActive()}' decorator='boxed' _bean='{VesselType.class}' _method='"UnitFuelCostOfTravel"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"UnitFuelCostOfTravel"'/> </cell> </row> <row> @@ -207,7 +210,7 @@ <JAXXList id="vesselTypeTripType" selectedValues='{getBean().getTripType() == null ? null : getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' cellRenderer="{new fr.ifremer.isisfish.ui.input.triptype.TripTypeListRenderer()}" - enabled='{isActive()}' decorator='boxed' _bean='{VesselType.class}' _method='"TripType"'/> + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{VesselType.class}' _sensitivityMethod='"TripType"'/> </JScrollPane> </cell> </row>