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

19 Apr 2011

Author: chatellier
Date: 2011-04-19 08:51:10 +0000 (Tue, 19 Apr 2011)
New Revision: 3270

Log:
Fix group creation wizard

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/PopulationGroupUI.jaxx
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================

--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2011-04-18 16:43:02 UTC (rev 3269)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2011-04-19 08:51:10 UTC (rev 3270)
@@ -111,7 +111,6 @@
         wizardFrame.pack();
         wizardFrame.setLocationRelativeTo(this);
         wizardFrame.setVisible(true);
-        //refresh();
     }
    
 }

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2011-04-18 16:43:02 UTC (rev 3269)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2011-04-19 08:51:10 UTC (rev 3270)
@@ -36,15 +36,12 @@
 
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
+
     <fr.ifremer.isisfish.entities.PopulationGroup id='populationGroup' javaBean='null'/>
 
-    <Boolean id='popGroupNotNull' javaBean='false'/>
-
     <import>
 	fr.ifremer.isisfish.entities.PopulationGroup;
-	fr.ifremer.isisfish.entities.PopulationGroupImpl;
 	fr.ifremer.isisfish.entities.Population;
-	fr.ifremer.isisfish.entities.PopulationImpl;
 	org.nuiton.math.matrix.MatrixND;
 	java.beans.PropertyChangeEvent;
 	java.beans.PropertyChangeListener;
@@ -81,7 +78,6 @@
                 fieldPopulationGroupMaxLength.setText("");
                 fieldPopulationGroupComment.setText("");
                 fieldPopulationGroupNaturalDeathRate.setMatrix(null);
-                setPopGroupNotNull(false);
             }
             if (evt.getNewValue() != null) {
                 
@@ -125,7 +121,7 @@
 protected void populationGroupChanged() {
     PopulationGroup selectedPopulationGroup = (PopulationGroup)populationGroupPopulationGroupComboBox.getSelectedItem();
     if (selectedPopulationGroup != null) {
-        setPopulationGroup((PopulationGroupImpl)selectedPopulationGroup);
+        setPopulationGroup(selectedPopulationGroup);
         getSaveVerifier().addCurrentEntity(selectedPopulationGroup);
         setNaturalDeathRateMatrix();
         
@@ -134,12 +130,7 @@
         fieldPopulationGroupAge.init();
         fieldPopulationGroupMinLength.init();
         fieldPopulationGroupMaxLength.init();*/
-        
-        setPopGroupNotNull(true);
     }
-    else {
-        setPopGroupNotNull(false);
-    }
 }
     ]]>
     </script>
@@ -155,87 +146,89 @@
             </row>
             <row>
                 <cell fill='horizontal' anchor='east'>
-                    <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{isPopGroupNotNull()}'/>
+                    <JLabel text="isisfish.populationGroup.meanWeigth" enabled='{getPopulationGroup() != null}'/>
                 </cell>
                 <cell columns='2' fill='horizontal' weightx='1.0'>
                     <JTextField id="fieldPopulationGroupMeanWeight" text='{String.valueOf(getPopulationGroup().getMeanWeight())}'
-                        enabled='false' decorator='boxed'/>
+                        editable="false"
+                        enabled='{getPopulationGroup() != null}' decorator='boxed'/>
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' anchor='east'>
-                    <JLabel text="isisfish.populationGroup.price" enabled='{isPopGroupNotNull()}'/>
+                    <JLabel text="isisfish.populationGroup.price" enabled='{getPopulationGroup() != null}'/>
                 </cell>
                 <cell columns='2' fill='horizontal' weightx='1.0'>
                     <JTextField id="fieldPopulationGroupPrice" text='{String.valueOf(getPopulationGroup().getPrice())}'
-                        enabled='false' decorator='boxed'/>
+                        editable="false"
+                        enabled='{getPopulationGroup() != null}' decorator='boxed'/>
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' anchor='east'>
-                    <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/>
+                    <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{getPopulationGroup() != null}'/>
                 </cell>
                 <cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
                     <org.nuiton.math.matrix.gui.MatrixPanelEditor id='fieldPopulationGroupNaturalDeathRate'
-                        enabled='false' decorator='boxed' _sensitivityBean='{PopulationImpl.class}' _sensitivityMethod='"NaturalDeathRateMatrix"' />
+                        enabled='false' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"NaturalDeathRateMatrix"' />
                     <!-- this bindings totally break UI
                     matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' -->
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' anchor='east'>
-                    <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isPopGroupNotNull()}'/>
+                    <JLabel text="isisfish.populationGroup.reproductionRate" enabled='{getPopulationGroup() != null}'/>
                 </cell>
                 <cell columns='2' fill='horizontal' weightx='1.0'>
                     <!--NumberEditor id='fieldPopulationGroupReproductionRate' constructorParams='this'
                                   bean='{getPopulationGroup()}' property='reproductionRate'
                                   useSign='true' enabled='{isPopGroupNotNull()}' decorator='boxed'
-                                  _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"ReproductionRate"'/-->
+                                  _sensitivityBean='{PopulationGroup.class}' _sensitivityMethod='"ReproductionRate"'/-->
                     <JTextField id="fieldPopulationGroupReproductionRate" text='{String.valueOf(getPopulationGroup().getReproductionRate())}'
                         onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))'
-                        enabled='{isPopGroupNotNull()}' decorator='boxed' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"ReproductionRate"'/>
+                        enabled='{getPopulationGroup() != null}' decorator='boxed' _sensitivityBean='{PopulationGroup.class}' _sensitivityMethod='"ReproductionRate"'/>
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' anchor='east'>
-                    <JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/>
+                    <JLabel text="isisfish.populationGroup.age" enabled='{getPopulationGroup() != null}'/>
                 </cell>
                 <cell columns='2' fill='horizontal' weightx='1.0'>
                     <!-- non editable age field -->
                     <JTextField id="fieldPopulationGroupAge" text='{String.valueOf(getPopulationGroup().getAge())}'
                         onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))'
                         enabled='{getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}'
-                        decorator='boxed' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"Age"'/>
+                        decorator='boxed' _sensitivityBean='{PopulationGroup.class}' _sensitivityMethod='"Age"'/>
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' anchor='east'>
-                    <JLabel text="isisfish.populationGroup.length" enabled='{isPopGroupNotNull()}'/>
+                    <JLabel text="isisfish.populationGroup.length" enabled='{getPopulationGroup() != null}'/>
                 </cell>
                 <cell fill='both' weightx='0.5'>
                     <!-- non editable min length field -->
                     <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' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"MinLength"'/>
+                        enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _sensitivityBean='{PopulationGroup.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' _sensitivityBean='{PopulationGroupImpl.class}' _sensitivityMethod='"MaxLength"'/>
+                        enabled='{!getPopulationGroup().getPopulation().getSpecies().getAgeGroupType()}' decorator='boxed' _sensitivityBean='{PopulationGroup.class}' _sensitivityMethod='"MaxLength"'/>
                 </cell>
             </row>
             <row>
                 <cell fill='horizontal' anchor='east'>
-                    <JLabel text="isisfish.populationGroup.comments" enabled='{isPopGroupNotNull()}'/>
+                    <JLabel text="isisfish.populationGroup.comments" enabled='{getPopulationGroup() != null}'/>
                 </cell>
                 <cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
                     <JScrollPane>
                         <!-- jaxx.runtime.SwingUtil.getStringValue() for null values -->
                         <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}'
-                        onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed'/>
+                        onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{getPopulationGroup() != null}' decorator='boxed'/>
                     </JScrollPane>
                 </cell>
             </row>

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx	2011-04-18 16:43:02 UTC (rev 3269)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx	2011-04-19 08:51:10 UTC (rev 3270)
@@ -28,7 +28,6 @@
 	fr.ifremer.isisfish.IsisFishDAOHelper
 	fr.ifremer.isisfish.entities.Equation
 	fr.ifremer.isisfish.entities.Population
-	fr.ifremer.isisfish.entities.PopulationImpl
  	fr.ifremer.isisfish.entities.PopulationGroup
 	fr.ifremer.isisfish.entities.PopulationGroupDAO
 	fr.ifremer.isisfish.entities.PopulationDAO
@@ -54,8 +53,8 @@
         protected double step = 1;
         protected PopulationBasicsUI popBasic;
         
-        public void init(PopulationBasicsUI p){
-            popBasic = p;
+        public void init(PopulationBasicsUI popBasic) {
+            this.popBasic = popBasic;
         }
 
         /**
@@ -232,14 +231,13 @@
             }
 
             try {
-                Population pop = (Population)getContextValue(InputSaveVerifier.class).getEntity(Population.class);
+                Population pop = popBasic.getBean();
                 // remove maturity group
                 pop.setMaturityGroup(null);
-
                 // remove all old group
-                TopiaContext isisContext = ((PopulationImpl)pop).getTopiaContext();
                 pop.clearPopulationGroup();
 
+                TopiaContext isisContext = pop.getTopiaContext();
                 PopulationGroupDAO populationGroupDAO = IsisFishDAOHelper.getPopulationGroupDAO(isisContext);
 
                 if (isAgeType()) {

    

r3270 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)