r2031 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity resources - Isis-fish-commits

24 Mar 2009

Author: sletellier
Date: 2009-03-24 17:05:50 +0000 (Tue, 24 Mar 2009)
New Revision: 2031

Added:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx
Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
   isis-fish/trunk/src/main/resources/sensitivity.properties
Log:
Verifing component can be factored

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -91,7 +91,7 @@
                             <JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/>
                         </cell>
                         <cell columns="2" fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"EffortUnit"'/>
+                            <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>
@@ -107,7 +107,7 @@
                             <JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/>
                         </cell>
                         <cell columns="2" fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"ParameterName"'/>
+                            <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -206,7 +206,7 @@
                             <JLabel text="isisfish.metierSeasonInfoZone.season" enabled='{isMetierSeasonInfoNotNull()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}'  decorator='boxed' _bean='{MetierImpl.class}' _method='"Interval"'/>
+                            <IntervalPanel id='ip' enabled='{isMetierSeasonInfoNotNull()}'  decorator='boxed'/>
                         </cell>
                     </row>
                     <row>
@@ -215,7 +215,7 @@
                         </cell>
                         <cell fill='both' weightx='1.0' weighty='0.7'>
                             <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
-                                <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Zone"'/>
+                                <JList id="metierZones" onValueChanged='metierZonesChanged()' enabled='{isMetierSeasonInfoNotNull()}' decorator='boxed'/>
                             </JScrollPane>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -75,7 +75,7 @@
                             <JLabel text="isisfish.metier.name" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{MetierImpl.class}' _method='"Name"'/>
+                            <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>
@@ -83,7 +83,7 @@
                             <JLabel text="isisfish.common.gear" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal'  weightx='1.0'>
-                            <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}'/>
+                            <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>
@@ -91,7 +91,7 @@
                             <JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed' editable='{false}'/>
+                            <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -176,7 +176,7 @@
                                         <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{isActif()}'/>
                                     </cell>
                                     <cell fill='horizontal' weightx='0.5'>
-                                        <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MaturityGroup"'/>
+                                        <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}' decorator='boxed'/>
                                     </cell>
                                     <cell fill='horizontal' weightx='0.5'>
                                         <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"PlusGroup"'/>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -217,7 +217,7 @@
                             <JLabel text="isisfish.common.season" enabled='{isPopSeasonInfoNotNull()}'/>
                         </cell>
                         <cell  fill='horizontal' weightx='1.0'>
-                            <IntervalPanel id='ip' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"Interval"'/>
+                            <IntervalPanel id='ip' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -156,7 +156,7 @@
                         <row>
                             <cell columns='2' fill='both' weighty='0.7' weightx='1.0'>
                                 <JScrollPane>
-                                    <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{PortImpl.class}' _method='"Cell"'/>
+                                    <JList id="portCell" selectedValue='{getBean().getCell()}' selectionMode="0" onMouseClicked='portChanged()' enabled='{isActif()}' decorator='boxed'/>
                                 </JScrollPane>
                             </cell>
                         </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -181,8 +181,7 @@
                             <InputOneEquationUI id='selectivityEquation' constructorParams='this'
                                 lblText='{_("isisfish.selectivity.equation")}'
                                 bean='{getBean()}'  nameEquation='Selectivity' actif='{isActif()}'
-                                clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}'
-                                decorator='boxed' _bean='{GearImpl.class}' _method='""'/>
+                                clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}'/>
                         </cell>
                     </row>
                 </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -104,7 +104,7 @@
                             <JLabel text="isisfish.common.port" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"Port"'/>
+                            <JComboBox id="fieldSetOfVesselsPort" onActionPerformed='portChanged()' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>
@@ -112,7 +112,7 @@
                             <JLabel text="isisfish.setOfVessels.vesselType" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"VesselType"'/>
+                            <JComboBox id="fieldSetOfVesselsVesselType" onActionPerformed='vesselTypeChanged()' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>

Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx	                        (rev 0)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -0,0 +1,20 @@
+<Table>
+    <fr.ifremer.isisfish.entities.SpeciesImpl id='bean' javaBean='null'/>
+    <Boolean id='actif' javaBean='false'/>
+    <script><![CDATA[
+    protected void dynamicChanged(){
+        if (getBean() != null){
+            getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected());
+        }
+    }
+    ]]>
+    </script>
+    <row>
+        <cell  fill='horizontal' weightx='0.5'>
+            <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean() == null ? true : getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='dynamicChanged()' enabled='{isActif()}'/>
+        </cell>
+        <cell fill='horizontal' weightx='0.5'>
+            <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{getBean() == null ? false : !getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}'/>
+        </cell>
+    </row>
+</Table>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -115,12 +115,9 @@
                         <cell>
                             <JLabel text="isisfish.species.structured" enabled='{isActif()}'/>
                         </cell>
-                        <cell  fill='horizontal' weightx='0.5'>
-                            <JRadioButton id="fieldSpeciesDynamicAge" text="isisfish.species.age" selected='{getBean().getAgeGroupType()}' buttonGroup="structuredGroup" onItemStateChanged='getBean().setAgeGroupType(fieldSpeciesDynamicAge.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/>
+                        <cell  fill='horizontal' weightx='1' columns='2'>
+                            <SpeciesStructuredUI bean='{getBean()}' actif='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/>
                         </cell>
-                        <cell fill='horizontal' weightx='0.5'>
-                            <JRadioButton id="fieldSpeciesDynamicLength" text="isisfish.species.length" selected='{!getBean().getAgeGroupType()}' buttonGroup="structuredGroup" enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"AgeGroupType"'/>
-                        </cell>
                     </row>
                     <row>
                         <cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -104,7 +104,7 @@
                             <JLabel text="isisfish.common.setOfVessels" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"SetOfVessels"'/>
+                            <JComboBox id="fieldStrategySetOfVessels" onActionPerformed='getBean().setSetOfVessels((SetOfVessels)fieldStrategySetOfVessels.getSelectedItem())' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>
@@ -122,7 +122,7 @@
                             <JPanel/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected());strategyInactivity.setActif(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"InactivityEquationUsed"'/>
+                            <JCheckBox id="fieldUseEquationInactivity" selected='{getBean().getInactivityEquationUsed()}' text="isisfish.strategy.inactivityEquationUsed" onActionPerformed='getBean().setInactivityEquationUsed(fieldUseEquationInactivity.isSelected());strategyInactivity.setActif(fieldUseEquationInactivity.isSelected())' enabled='{isActif()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2009-03-24 17:05:50 UTC (rev 2031)
@@ -150,7 +150,7 @@
                                 <JScrollPane>
                                     <JList id="zoneCells" enabled='{isActif()}' selectedValues='{getBean().getCell().toArray()}'
                                     onMouseClicked='if ( isActif() ) { zoneCellsChange(); }'
-                                    decorator='boxed' _bean='{ZoneImpl.class}' _method='"Cell"'/>
+                                    decorator='boxed'/>
                                 </JScrollPane>
                             </cell>
                         </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java	2009-03-24 17:05:50 UTC (rev 2031)
@@ -34,6 +34,7 @@
 import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI;
 import fr.ifremer.isisfish.ui.input.PopulationMigrationMigrationUI;
 import fr.ifremer.isisfish.ui.input.PopulationZonesEditorUI;
+import fr.ifremer.isisfish.ui.input.SpeciesStructuredUI;
 import fr.ifremer.isisfish.ui.widget.IntervalPanel;
 import java.lang.reflect.Method;
 import java.util.logging.Level;
@@ -114,7 +115,12 @@
             } else if (result instanceof JRadioButton){
                 ((JRadioButton) result).setSelected((Boolean)callMethod(e, fieldName));
 
-            } else if (result instanceof InputOneEquationUI){
+            } else if (result instanceof SpeciesStructuredUI){
+                SpeciesStructuredUI origine = (SpeciesStructuredUI)c;
+                SpeciesStructuredUI ui = new SpeciesStructuredUI();
+                ui.setActif(true);
+                result = ui;
+            }else if (result instanceof InputOneEquationUI){
                 InputOneEquationUI origine = (InputOneEquationUI) c;
                 InputOneEquationUI ui = new InputOneEquationUI(new JAXXInitialContext().add(new InputAction()));
                 ui.setSelectedEquation(origine.getSelectedEquation());
@@ -318,6 +324,12 @@
             } else if (result instanceof JRadioButton){
                 ((JRadioButton) result).setSelected((Boolean)value);
 
+            } else if (result instanceof SpeciesStructuredUI){
+                SpeciesStructuredUI origine = (SpeciesStructuredUI)c;
+                SpeciesStructuredUI ui = new SpeciesStructuredUI();
+                ui.getFieldSpeciesDynamicAge().setSelected((Boolean)value);
+                ui.setActif(true);
+                result = ui;
             } else if (result instanceof InputOneEquationUI){
                 InputOneEquationUI origine = (InputOneEquationUI) c;
                 InputOneEquationUI ui = new InputOneEquationUI(new JAXXInitialContext().add(new InputAction()));
@@ -431,6 +443,9 @@
     } else if (c instanceof IntervalPanel){
 //                ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName)));
 
+    } else if (c instanceof SpeciesStructuredUI){
+        result = ((SpeciesStructuredUI)c).getFieldSpeciesDynamicAge().isSelected();
+        
     } else if (c instanceof SelectivityEditorUI){
         result = ((SelectivityEditorUI)c).getBean().getPopulationSelectivity();
         

Modified: isis-fish/trunk/src/main/resources/sensitivity.properties
===================================================================
--- isis-fish/trunk/src/main/resources/sensitivity.properties	2009-03-24 15:46:42 UTC (rev 2030)
+++ isis-fish/trunk/src/main/resources/sensitivity.properties	2009-03-24 17:05:50 UTC (rev 2031)
@@ -1,6 +1,3 @@
-Cell.Latitude
-Cell.Longitude
-Cell.Land
 EffortDescription.FishingOperation
 EffortDescription.FishingOperationDuration
 EffortDescription.GearsNumberPerOperation
@@ -12,10 +9,9 @@
 EffortDescription.RepairAndMaintenanceGearCost
 EffortDescription.LandingCosts
 EffortDescription.OtherRunningCost
-Gear.EffortUnit
 Gear.StandardisationFactor
-Gear.ParameterName
 Gear.PossibleValue
+Gear.PopulationSelectivity
 Metier.GearParameterValue
 Metier.Zone
 MetierSeasonInfo.SpeciesTargetSpecies
@@ -47,7 +43,6 @@
 Population.MonthGapBetweenReproRecrutement
 Population.RecruitmentDistribution
 StrategyMonthInfo.LengthChangeMatrix
-Port.Cell
 SetOfVessels.NumberOfVessels
 SetOfVessels.FixedCosts
 Species.ScientificName
@@ -55,15 +50,12 @@
 Species.CodeCEE
 Species.AgeGroupType
 Species.AgeGroupType
-SetOfVessels.Port
-SetOfVessels.VesselType
 SetOfVessels.NumberOfVessels
 SetOfVessels.FixedCosts
 SetOfVessels.TechnicalEfficiencyEquation
 StrategyMonthInfo.MinInactivityDays
 StrategyMonthInfo.ProportionMetier
 Strategy.ProportionSetOfVessels
-Strategy.InactivityEquationUsed
 Strategy.SetOfVessels
 Strategy.Inactivity
 TripType.TripDuration
@@ -74,5 +66,4 @@
 VesselType.ActivityRange
 VesselType.MinCrewSize
 VesselType.UnitFuelCostOfTravel
-VesselType.TripType
-Zone.Cell
\ No newline at end of file
+VesselType.TripType
\ No newline at end of file

    

r2031 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/ui/input java/fr/ifremer/isisfish/ui/sensitivity resources

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)