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

5 Mar 2009

Author: sletellier
Date: 2009-03-05 23:48:46 +0000 (Thu, 05 Mar 2009)
New Revision: 1915

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.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/PopulationEquationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.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/StrategyTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx
   isis-fish/trunk/src/main/resources/sensitivity.properties
Log:
Equations can be factored

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -44,7 +44,10 @@
     return getContextValue(FisheryRegion.class);
 }
 public void setInfoText(String msg){
-    getParentContainer(WelcomePanelUI.class).setInfoText(msg);
+    WelcomePanelUI root = getParentContainer(WelcomePanelUI.class);
+    if (root != null){
+        getParentContainer(WelcomePanelUI.class).setInfoText(msg);
+    }
 }
 protected void goTo(){
     getParentContainer(InputUI.class).setTreeSelection(getNextPath());

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -35,10 +35,13 @@
 
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.Formule id='formule' javaBean='null'/>
-
     <String id='lblText' javaBean='null'/>
-
     <org.codelutin.topia.persistence.TopiaEntity id='bean' javaBean='null'/>
+    <Class id='clazz' javaBean='null'/>
+    <String id='methodGet' javaBean='null'/>
+    <String id='methodSet' javaBean='null'/>
+    <String id='nameEquation' javaBean='null'/>
+    <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/>
 
     <script><![CDATA[
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
@@ -55,15 +58,8 @@
 import fr.ifremer.isisfish.IsisFishDAOHelper;
 import jaxx.runtime.swing.Item;
 
-protected Class clazz;
-//protected TopiaEntity bean;
-protected String methodGet;
-protected String methodSet;
-protected String name;
-protected Equation selectedEquation;
 protected DocumentListener listener = null;
 
-
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -106,21 +102,6 @@
     setComboModel();
     editor.getCurrentEditor().addDocumentListener(listener);
 }
-public void init(String lblText, TopiaEntity bean, String name, String methodGet, String methodSet, Class c){
-    editor.getCurrentEditor().removeDocumentListener(listener);
-     setLblText(lblText);
-//     this.bean = bean;
-    setBean(bean);
-     this.methodGet = methodGet;
-     this.methodSet = methodSet;
-     this.name = name;
-     this.clazz = c;
-     selectedEquation = getEquation();
-     setComboModel();
-     setFormule((Formule)combo.getSelectedItem());
-     setEditorText();
-     editor.getCurrentEditor().addDocumentListener(listener);
-}
 protected Equation getEquation(){
     Equation result = null;
     try {
@@ -150,34 +131,34 @@
     } catch (IOException ex) {
         Logger.getLogger(InputOneEquationUI.class.getName()).log(Level.SEVERE, null, ex);
     }
-    if (name != null){
+    if (nameEquation != null){
         setComboModel();
         setFormule((Formule)combo.getSelectedItem());
         setEditorText();
+        selectedEquation = getEquation();
     }
     editor.getCurrentEditor().addDocumentListener(listener);
  }
 protected void setComboModel(){
-    TopiaContext isisContext = getVerifier().getIsisContext();
-    if (isisContext == null && getBean() !=  null){
-        isisContext = getBean().getTopiaContext();
-    }
-    java.util.List<Formule> formules = null;
-    if (name != null){
-        formules = getAction().getFormules(isisContext, name);
-    }
-    if (formules != null){
-        java.util.List<Item> items = new ArrayList<Item>();
-        items.add(new Item("null", " ", null, false));
-        for (Formule f : formules) {
-            boolean selected = f.equals(selectedEquation);
-            items.add(new Item(f.getName(), f.getName(), f, selected));
+    if (getBean() !=  null){
+        TopiaContext isisContext = getBean().getTopiaContext();
+        java.util.List<Formule> formules = null;
+        if (nameEquation != null){
+            formules = getAction().getFormules(isisContext, nameEquation);
         }
-        combo.setItems(items);
+        if (formules != null){
+            java.util.List<Item> items = new ArrayList<Item>();
+            items.add(new Item("null", " ", null, false));
+            for (Formule f : formules) {
+                boolean selected = f.equals(selectedEquation);
+                items.add(new Item(f.getName(), f.getName(), f, selected));
+            }
+            combo.setItems(items);
+        }
     }
 }
 protected void saveModel(){
-    getContextValue(InputAction.class).saveAsModel(name, "Java", editor.getText());
+    getContextValue(InputAction.class).saveAsModel(nameEquation, "Java", editor.getText());
     setComboModel();
     setInfoText(_("isisfish.message.saveModel.finished"));
 }
@@ -187,7 +168,7 @@
          getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(),  clazz, e.getContent(), editor);
     }
     else{
-        getContextValue(InputAction.class).openEditor(name, "new", clazz, editor.getText(), editor);
+        getContextValue(InputAction.class).openEditor(nameEquation, "new", clazz, editor.getText(), editor);
     }
 }
 protected void setEditorText(){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -63,7 +63,6 @@
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
             // remove previous binding on getBean()
             //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
-            targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetFactor", null, null, fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -112,8 +111,6 @@
             setTargetSpeciesModel();
         }
         setTableTargetSpeciesModel();
-// TODO : Equation selectionne
-        targetFactor.init(_("isisfish.metierSeasonInfoSpecies.targetFactor"), null, "TargetFactor", null, null, fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class);
      }
      else{
         DefaultComboBoxModel seasonModel = new DefaultComboBoxModel();
@@ -242,7 +239,11 @@
                     </row>
                     <row>
                         <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
-                            <InputOneEquationUI id='targetFactor' constructorParams='this'/>
+                            <InputOneEquationUI id='targetFactor' constructorParams='this'
+                                lblText='{_("isisfish.metierSeasonInfoSpecies.targetFactor")}'
+                                bean='{null}'  nameEquation='TargetFactor'
+                                clazz='{fr.ifremer.isisfish.equation.TargetSpeciesTargetFactorEquation.class}'
+                                decorator='boxed' _bean='{MetierImpl.class}' _method='""'/>
                         </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-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -60,8 +60,6 @@
             fieldPopulationBasicsComment.setText("");
             fieldPopulationBasicsMatureClass.setSelectedItem(null);
             tableAgeLength.setModel(new DefaultTableModel());
-            growthEquation.init(_("isisfish.populationBasics.growth"), null, "Growth", "Growth", "EquationGrowth", fr.ifremer.isisfish.equation.PopulationGrowth.class);
-            growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), null, "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -76,12 +74,9 @@
     getVerifier().setNewButton(create, "Population", false);
     getVerifier().setDeleteButton(remove);
     Population population = getVerifier().getEntity(Population.class);
-    getVerifier().addCurrentPanel(growthEquation, growthReverseEquation);
     setBean((PopulationImpl) population);
     if (getBean() != null){
 // TODO : Selection equation
-        growthEquation.init(_("isisfish.populationBasics.growth"), getBean(), "Growth", "Growth", "EquationGrowth", fr.ifremer.isisfish.equation.PopulationGrowth.class);
-        growthReverseEquation.init(_("isisfish.populationBasics.growthReverse"), getBean(), "GrowthReverse", "GrowthReverse", "EquationGrowthReverse", fr.ifremer.isisfish.equation.PopulationGrowthReverse.class);
         if (getBean() != null){
             if (getBean().getPopulationGroup() != null){
                 jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationBasicsMatureClass, getBean().getPopulationGroup(), getBean().getMaturityGroup(), true);
@@ -89,6 +84,7 @@
             setTableAgeLengthModel();
        }
     }
+    getVerifier().addCurrentPanel(growthEquation, growthReverseEquation);
 }
 protected void createClasses(){
     JFrame wizardFrame = new JFrame();
@@ -193,12 +189,20 @@
                                 </row>
                                 <row>
                                     <cell columns='3' fill='both' weightx='1.0' weighty='1.0'>
-                                        <InputOneEquationUI id='growthEquation' constructorParams='this'/>
+                                        <InputOneEquationUI id='growthEquation' constructorParams='this'
+                                        lblText='{_("isisfish.populationBasics.growth")}'
+                                        bean='{getBean()}'  nameEquation='Growth' methodGet='Growth' methodSet='EquationGrowth'
+                                        clazz='{fr.ifremer.isisfish.equation.PopulationGrowth.class}'
+                                        decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
                                     </cell>
                                 </row>
                                 <row>
                                     <cell columns='3' fill='both' weightx='1.0' weighty='1.0'>
-                                        <InputOneEquationUI id='growthReverseEquation' constructorParams='this'/>
+                                        <InputOneEquationUI id='growthReverseEquation' constructorParams='this'
+                                        lblText='{_("isisfish.populationBasics.growthReverse")}'
+                                        bean='{getBean()}'  nameEquation='GrowthReverse' methodGet='GrowthReverse' methodSet='EquationGrowthReverse'
+                                        clazz='{fr.ifremer.isisfish.equation.PopulationGrowthReverse.class}'
+                                        decorator='boxed' _bean='{PopulationImpl.class}' _method='"GrowthReverse"'/>
                                     </cell>
                                 </row>
                                 <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -48,9 +48,6 @@
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
             // remove previous binding on getBean()
             //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
-            naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"), null, "NaturalDeathRate", "NaturalDeathRate", "EquationNaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class);
-            meanWeight.init(_("isisfish.populationEquation.meanWeight"), null, "MeanWeight", "MeanWeight", "EquationMeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class);
-            price.init(_("isisfish.populationEquation.price"), null, "Price", "Price", "EquationPrice", fr.ifremer.isisfish.equation.PopulationPrice.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -63,9 +60,6 @@
     getVerifier().setCancelButton(cancel);
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    naturalDeathRate.init(_("isisfish.populationEquation.naturalDeathRate"), getBean(), "NaturalDeathRate", "NaturalDeathRate", "EquationNaturalDeathRate", fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class);
-    meanWeight.init(_("isisfish.populationEquation.meanWeight"), getBean(), "MeanWeight", "MeanWeight", "EquationMeanWeight", fr.ifremer.isisfish.equation.PopulationMeanWeight.class);
-    price.init(_("isisfish.populationEquation.price"), getBean(), "Price", "Price", "EquationPrice", fr.ifremer.isisfish.equation.PopulationPrice.class);
     getVerifier().addCurrentPanel(naturalDeathRate, meanWeight, price);
 }
     ]]>
@@ -73,17 +67,29 @@
     <Table id='body'>
         <row>
             <cell columns='2' fill='both' weightx='0.5'  weighty='0.3'>
-                <InputOneEquationUI id='naturalDeathRate' constructorParams='this'/>
+                <InputOneEquationUI id='naturalDeathRate' constructorParams='this'
+                    lblText='{_("isisfish.populationEquation.naturalDeathRate")}'
+                    bean='{getBean()}'  nameEquation='NaturalDeathRate' methodGet='NaturalDeathRate' methodSet='EquationNaturalDeathRate'
+                    clazz='{fr.ifremer.isisfish.equation.PopulationNaturalDeathRate.class}'
+                    decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRate"'/>
             </cell>
         </row>
         <row>
             <cell columns='2' fill='both' weightx='1.0'  weighty='0.3'>
-                <InputOneEquationUI id='meanWeight' constructorParams='this'/>
+                <InputOneEquationUI id='meanWeight' constructorParams='this'
+                    lblText='{_("isisfish.populationEquation.meanWeight")}'
+                    bean='{getBean()}'  nameEquation='MeanWeight' methodGet='MeanWeight' methodSet='EquationMeanWeight'
+                    clazz='{fr.ifremer.isisfish.equation.PopulationMeanWeight.class}'
+                    decorator='boxed' _bean='{PopulationImpl.class}' _method='"MeanWeight"'/>
             </cell>
         </row>
         <row>
             <cell columns='2' fill='both' weightx='1.0'  weighty='0.3'>
-                <InputOneEquationUI id='price' constructorParams='this'/>
+                <InputOneEquationUI id='price' constructorParams='this'
+                    lblText='{_("isisfish.populationEquation.price")}'
+                    bean='{getBean()}'  nameEquation='Price' methodGet='Price' methodSet='EquationPrice'
+                    clazz='{fr.ifremer.isisfish.equation.PopulationPrice.class}'
+                    decorator='boxed' _bean='{PopulationImpl.class}' _method='"Price"'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -51,9 +51,6 @@
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
             // remove previous binding on getBean()
             //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
-            migrationEquation.init(_("isisfish.common.migration"), null, "Migration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfish.equation.MigrationEquation.class);
-            emigrationEquation.init(_("isisfish.common.emigration"), null, "Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.isisfish.equation.EmigrationEquation.class);
-            immigrationEquation.init(_("isisfish.common.immigration"), null, "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifremer.isisfish.equation.ImmigrationEquation.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -67,9 +64,6 @@
 public void refresh(){
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    migrationEquation.init(_("isisfish.common.migration"), getPopInfo(), "Migration", "MigrationEquation", "MigrationEquationAsString", fr.ifremer.isisfish.equation.MigrationEquation.class);
-    emigrationEquation.init(_("isisfish.common.emigration"), getPopInfo(), "Emigration", "EmigrationEquation", "EmigrationEquationAsString", fr.ifremer.isisfish.equation.EmigrationEquation.class);
-    immigrationEquation.init(_("isisfish.common.immigration"), getPopInfo(), "Immigration", "ImmigrationEquation", "ImmigrationEquationAsString", fr.ifremer.isisfish.equation.ImmigrationEquation.class);
     getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation);
 }
     ]]>
@@ -77,17 +71,29 @@
     <Table id='body'>
         <row>
             <cell fill='both' weightx='1.0'  weighty='0.3'>
-                <InputOneEquationUI id='migrationEquation' constructorParams='this'/>
+                <InputOneEquationUI id='migrationEquation' constructorParams='this'
+                    lblText='{_("isisfish.common.migration")}'
+                    bean='{getPopInfo()}'  name='Migration' methodGet='MigrationEquation' methodSet='MigrationEquationAsString'
+                    clazz='{fr.ifremer.isisfish.equation.MigrationEquation.class}'
+                    decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
             </cell>
         </row>
         <row>
             <cell fill='both' weightx='1.0'  weighty='0.3'>
-                <InputOneEquationUI id='emigrationEquation' constructorParams='this'/>
+                <InputOneEquationUI id='emigrationEquation' constructorParams='this'
+                    lblText='{_("isisfish.common.emigration")}'
+                    bean='{getPopInfo()}'  nameEquation='Emigration' methodGet='EmigrationEquation' methodSet='EmigrationEquationAsString'
+                    clazz='{fr.ifremer.isisfish.equation.EmigrationEquation.class}'
+                    decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
             </cell>
         </row>
         <row>
             <cell fill='both' weightx='1.0'  weighty='0.3'>
-                <InputOneEquationUI id='immigrationEquation' constructorParams='this'/>
+                <InputOneEquationUI id='immigrationEquation' constructorParams='this'
+                    lblText='{_("isisfish.common.immigration")}'
+                    bean='{getPopInfo()}'  name='Immigration' methodGet='ImmigrationEquation' methodSet='ImmigrationEquationAsString'
+                    clazz='{fr.ifremer.isisfish.equation.ImmigrationEquation.class}'
+                    decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
             </cell>
         </row>
     </Table>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -53,7 +53,6 @@
             //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
             fieldPopulationMonthGapBetweenReproRecrutement.setText("");
             fieldPopulationRecruitmentComment.setText("");
-            reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationGrowth.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -79,7 +78,6 @@
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
 
-    reproductionEquation.init(_("isisfish.populationRecruitment.reproductionEquation"), getBean(), "Reproduction", "ReproductionEquation", "EquationReproductionEquation", fr.ifremer.isisfish.equation.PopulationReproductionEquation.class);
     getVerifier().addCurrentPanel(reproductionEquation);
 
     if(getBean() != null && getBean().getRecruitmentDistribution() != null){
@@ -95,7 +93,11 @@
                 <Table>
                     <row>
                         <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
-                            <InputOneEquationUI id='reproductionEquation' constructorParams='this'/>
+                            <InputOneEquationUI id='reproductionEquation' constructorParams='this'
+                                lblText='{_("isisfish.populationRecruitment.reproductionEquation")}'
+                                bean='{getBean()}'  nameEquation='Reproduction' methodGet='ReproductionEquation' methodSet='EquationReproductionEquation'
+                                clazz='{fr.ifremer.isisfish.equation.PopulationReproductionEquation.class}'
+                                decorator='boxed' _bean='{PopulationImpl.class}' _method='"ReproductionEquation"'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -199,7 +199,7 @@
         </row>
         <row>
             <cell columns='3'  fill='both' weightx='1.0' weighty='0.5'>
-                <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/>
+                <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MappingZoneReproZoneRecru"'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -63,7 +63,6 @@
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
             // remove previous binding on getBean()
             //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
-            selectivityEquation.init(_("isisfish.selectivity.equation"), null, "Selectivity", null, null, fr.ifremer.isisfish.equation.SelectivityEquation.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -105,9 +104,6 @@
         fieldSelectivityPopulation.setModel(getSelectivityPopulationModel());
         setSelectivityTableModel();
     }
-
-// TODO : Equation selection
-    selectivityEquation.init(_("isisfish.selectivity.equation"), null, "Selectivity", null, null, fr.ifremer.isisfish.equation.SelectivityEquation.class);
     
     getVerifier().addCurrentPanel(selectivityEquation);
 
@@ -187,7 +183,11 @@
                     </row>
                     <row>
                         <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
-                            <InputOneEquationUI id='selectivityEquation' constructorParams='this'/>
+                            <InputOneEquationUI id='selectivityEquation' constructorParams='this'
+                                lblText='{_("isisfish.selectivity.equation")}'
+                                bean='{null}'  nameEquation='Selectivity'
+                                clazz='{fr.ifremer.isisfish.equation.SelectivityEquation.class}'
+                                decorator='boxed' _bean='{GearImpl.class}' _method='""'/>
                         </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-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -54,7 +54,6 @@
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
             // remove previous binding on getBean()
             //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
-            technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), null, "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -75,7 +74,6 @@
         jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsPort,getRegion().getPort(), getBean().getPort(), true);
         jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true);
         init=false;
-        technicalEfficiency.init(_("isisfish.setOfVessels.technicalEfficiency"), getBean(), "TechnicalEfficiency", "TechnicalEfficiencyEquation", "EquationTechnicalEfficiency", fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class);
         getVerifier().addCurrentPanel(technicalEfficiency);
     }
 }
@@ -130,12 +128,18 @@
                             <JLabel text="isisfish.setOfVessels.fixedCosts" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}' onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/>
+                            <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}'
+                            onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))'
+                            enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/>
                         </cell>
                     </row>
                     <row>
                         <cell columns='2' fill='both' weightx='1.0' weighty='0.3'>
-                            <InputOneEquationUI id='technicalEfficiency' constructorParams='this'/>
+                            <InputOneEquationUI id='technicalEfficiency' constructorParams='this'
+                                lblText='{_("isisfish.setOfVessels.technicalEfficiency")}'
+                                bean='{getBean()}'  nameEquation='TechnicalEfficiency' methodGet='TechnicalEfficiencyEquation' methodSet='EquationTechnicalEfficiency'
+                                clazz='{fr.ifremer.isisfish.equation.SoVTechnicalEfficiencyEquation.class}'
+                                decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"TechnicalEfficiencyEquation"'/>
                         </cell>
                     </row>
                     <row>

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-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -56,7 +56,6 @@
             fieldStrategyName.setText("");
             fieldStrategyProportionSetOfVessels.setText("0.0");
             fieldStrategyComment.setText("");
-            strategyInactivity.init("isisfish.strategy.inactivity", null, "Inactivity", "InactivityEquation", "EquationInactivity", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class);
         }
         if (evt.getNewValue() != null) {
             // add binding on getBean()
@@ -73,7 +72,6 @@
     Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class);
     setBean((StrategyImpl) strategy);
     if (getBean() != null){
-        strategyInactivity.init("isisfish.strategy.inactivity", getBean(), "Inactivity", "InactivityEquation", "EquationInactivity", fr.ifremer.isisfish.equation.StrategyInactivityEquation.class);
         getVerifier().addCurrentPanel(strategyInactivity);
         setSetOfVesselsModel();
     }
@@ -114,7 +112,9 @@
                             <JLabel text="isisfish.strategy.proportionSetOfVessels" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <JTextField id="fieldStrategyProportionSetOfVessels"  text='{getBean().getProportionSetOfVessels()}' onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/>
+                            <JTextField id="fieldStrategyProportionSetOfVessels"  text='{getBean().getProportionSetOfVessels()}'
+                            onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))'
+                            enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/>
                         </cell>
                     </row>
                     <row>
@@ -127,7 +127,11 @@
                     </row>
                     <row>
                         <cell columns="2" fill='both' weightx='1.0'>
-                            <InputOneEquationUI id="strategyInactivity" constructorParams='this'/>
+                            <InputOneEquationUI id="strategyInactivity" constructorParams='this'
+                                lblText='{_("isisfish.strategy.inactivity")}'
+                                bean='{getBean()}'  nameEquation='Inactivity' methodGet='InactivityEquation' methodSet='EquationInactivity'
+                                clazz='{fr.ifremer.isisfish.equation.StrategyInactivityEquation.class}'
+                                decorator='boxed' _bean='{StrategyImpl.class}' _method='"Inactivity"'/>
                         </cell>
                     </row>
                     <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-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java	2009-03-05 23:48:46 UTC (rev 1915)
@@ -5,6 +5,7 @@
 
 package fr.ifremer.isisfish.ui.sensitivity;
 
+import fr.ifremer.isisfish.ui.input.InputAction;
 import fr.ifremer.isisfish.ui.input.InputOneEquationUI;
 import fr.ifremer.isisfish.ui.widget.IntervalPanel;
 import java.lang.reflect.Method;
@@ -18,6 +19,7 @@
 import javax.swing.JTable;
 import javax.swing.JTextField;
 import javax.swing.text.JTextComponent;
+import jaxx.runtime.JAXXInitialContext;
 import org.apache.commons.beanutils.BeanUtils;
 import org.codelutin.math.matrix.MatrixND;
 import org.codelutin.math.matrix.gui.MatrixPanelEditor;
@@ -55,8 +57,17 @@
                 ((JRadioButton) result).setSelected((Boolean)callMethod(e, fieldName));
 
             } else if (result instanceof InputOneEquationUI){
-//                ((InputOneEquationUI) result).init(setText(BeanUtils.getProperty(e, fieldName)));
-
+                InputOneEquationUI origine = (InputOneEquationUI) c;
+                InputOneEquationUI ui = new InputOneEquationUI(new JAXXInitialContext().add(new InputAction()));
+                ui.setLblText(origine.getLblText());
+                ui.setNameEquation(origine.getNameEquation());
+                ui.setClazz(origine.getClazz());
+                ui.setMethodGet(origine.getMethodGet());
+                ui.setMethodSet(origine.getMethodSet());
+                ui.setBean(e);
+                ui.setActif(true);
+                ui.refresh();
+                result = ui;
             } else if (result instanceof IntervalPanel){
 //                ((IntervalPanel) result).setModel((BeanUtils.getProperty(e, fieldName)));
 

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx	2009-03-05 23:48:46 UTC (rev 1915)
@@ -30,7 +30,7 @@
  * by : $Author: sletellier $
  */
  -->
-<JDialog id="FactorTypeChooser" title='isisfish.factor.title' resizable='false' modal='true' layout='{new BorderLayout()}'>
+<JDialog id="FactorTypeChooser" title='isisfish.factor.title' resizable='false' layout='{new BorderLayout()}'>
 
     <Boolean id='continuePossible' javaBean='true'/>
 

Modified: isis-fish/trunk/src/main/resources/sensitivity.properties
===================================================================
--- isis-fish/trunk/src/main/resources/sensitivity.properties	2009-03-05 16:53:02 UTC (rev 1914)
+++ isis-fish/trunk/src/main/resources/sensitivity.properties	2009-03-05 23:48:46 UTC (rev 1915)
@@ -28,6 +28,9 @@
 Population.Comment
 Population.Capturability
 Population.CapturabilityComment
+Population.MappingZoneReproZoneRecru
+Population.Growth
+Population.GrowthReverse
 PopulationGroup.MeanWeight
 PopulationGroup.Price
 Population.NaturalDeathRateMatrix

    

r1915 - 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)