r2331 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input - Isis-fish-commits

5 Jun 2009

Author: chatellier
Date: 2009-06-05 14:59:30 +0000 (Fri, 05 Jun 2009)
New Revision: 2331

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.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/PopulationMigrationUI.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/PopulationSeasonSpacializedUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
Log:
Format comment, remove number editor, fix strange binding content.

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-06-05 14:58:03 UTC (rev 2330)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-06-05 14:59:30 UTC (rev 2331)
@@ -316,7 +316,7 @@
      * Save all non saved entities.
      * 
      * Change registred button states.
-     * Commi opened topia context.
+     * Commit opened topia context.
      */
     protected void topiaSave() {
         try {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx	2009-06-05 14:58:03 UTC (rev 2330)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx	2009-06-05 14:59:30 UTC (rev 2331)
@@ -56,8 +56,6 @@
 
 @Override
 public void refresh() {
-    getVerifier().setSaveButton(save);
-    getVerifier().setCancelButton(cancel);
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
     if (getBean() != null){

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-06-05 14:58:03 UTC (rev 2330)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx	2009-06-05 14:59:30 UTC (rev 2331)
@@ -30,20 +30,6 @@
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 
-// TODO why it's commented
-addPropertyChangeListener("bean", new PropertyChangeListener() {
-    public void propertyChange(PropertyChangeEvent evt) {
-        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("");
-        }
-        if (evt.getNewValue() != null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text")
-        }
-    }
-});
-
 public void init(PopulationSeasonInfo pi) {
     setPopInfo((PopulationSeasonInfoImpl)pi);
 }
@@ -66,7 +52,7 @@
             <cell fill='both' weightx='1.0'  weighty='0.3'>
                 <InputOneEquationUI id='migrationEquation' constructorParams='this'
                     lblText='{_("isisfish.common.migration")}'
-                    bean='{getPopInfo()}'  nameEquation='Migration' methodGet='MigrationEquation' methodSet='MigrationEquationAsString'
+                    bean='{getPopInfo()}' nameEquation='Migration' methodGet='MigrationEquation' methodSet='MigrationEquationAsString'
                     clazz='{fr.ifremer.isisfish.equation.MigrationEquation.class}'
                     decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
             </cell>
@@ -75,7 +61,7 @@
             <cell fill='both' weightx='1.0'  weighty='0.3'>
                 <InputOneEquationUI id='emigrationEquation' constructorParams='this'
                     lblText='{_("isisfish.common.emigration")}'
-                    bean='{getPopInfo()}'  nameEquation='Emigration' methodGet='EmigrationEquation' methodSet='EmigrationEquationAsString'
+                    bean='{getPopInfo()}' nameEquation='Emigration' methodGet='EmigrationEquation' methodSet='EmigrationEquationAsString'
                     clazz='{fr.ifremer.isisfish.equation.EmigrationEquation.class}'
                     decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
             </cell>
@@ -84,7 +70,7 @@
             <cell fill='both' weightx='1.0'  weighty='0.3'>
                 <InputOneEquationUI id='immigrationEquation' constructorParams='this'
                     lblText='{_("isisfish.common.immigration")}'
-                    bean='{getPopInfo()}'  nameEquation='Immigration' methodGet='ImmigrationEquation' methodSet='ImmigrationEquationAsString'
+                    bean='{getPopInfo()}' nameEquation='Immigration' methodGet='ImmigrationEquation' methodSet='ImmigrationEquationAsString'
                     clazz='{fr.ifremer.isisfish.equation.ImmigrationEquation.class}'
                     decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
             </cell>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-06-05 14:58:03 UTC (rev 2330)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-06-05 14:59:30 UTC (rev 2331)
@@ -119,7 +119,8 @@
         </row>
         <row>
             <cell columns='2' anchor='west'>
-                <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo() == null ? true : getPopInfo().getUseEquationMigration()}' text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed'/>
+                <JCheckBox id="fieldUseEquationMigration" selected='{getPopInfo().getUseEquationMigration()}'
+                text="isisfish.populationMigration.useEquation" onActionPerformed='useEquationChanged()' enabled='{isActif()}' decorator='boxed'/>
             </cell>
         </row>
         <row>
@@ -128,13 +129,16 @@
                     <PopulationMigrationEquationUI id='populationMigrationEquationUI' constraints='"fieldUseEquation"' constructorParams='this'/>
                     <JTabbedPane id="fieldUseMatrix" constraints='"fieldUseMatrix"'>
                         <tab title='{_("isisfish.populationMigrationMigration.title")}'>
-                          <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/>
+                          <PopulationMigrationMigrationUI id="populationMigrationMigrationUI" constructorParams='this' decorator='boxed'
+                          _bean='{PopulationSeasonInfoImpl.class}' _method='"MigrationMatrix"'/>
                         </tab>
                         <tab title='{_("isisfish.populationMigrationImmigration.title")}'>
-                          <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/>
+                          <PopulationMigrationImmigrationUI id="populationMigrationImmigrationUI" constructorParams='this' decorator='boxed'
+                          _bean='{PopulationSeasonInfoImpl.class}' _method='"ImmigrationMatrix"'/>
                         </tab>
                         <tab title='{_("isisfish.populationMigrationEmigration.title")}'>
-                          <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/>
+                          <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed'
+                          _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/>
                         </tab>
                     </JTabbedPane>
                 </JPanel>
@@ -146,7 +150,9 @@
             </cell>
             <cell fill='both' weightx='1.0' weighty='0.3'>
                 <JScrollPane>
-                    <JTextArea id="fieldPopulationMigrationComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getMigrationComment())}' onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+                    <JTextArea id="fieldPopulationMigrationComment" text='{getBean().getMigrationComment()}'
+                    onKeyReleased='getBean().setMigrationComment(fieldPopulationMigrationComment.getText())'
+                    enabled='{isActif()}' decorator='boxed'/>
                 </JScrollPane>
             </cell>
         </row>

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-06-05 14:58:03 UTC (rev 2330)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-06-05 14:59:30 UTC (rev 2331)
@@ -37,7 +37,7 @@
         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");
-            fieldPopulationMonthGapBetweenReproRecrutement.setModelText("");
+            fieldPopulationMonthGapBetweenReproRecrutement.setText("");
             fieldPopulationRecruitmentComment.setText("");
         }
         if (evt.getNewValue() != null) {
@@ -67,7 +67,9 @@
 
     if (getBean() != null && getBean().getRecruitmentDistribution() != null) {
         fieldPopulationRecruitmentDistribution.setMatrix(getBean().getRecruitmentDistribution().copy());
-        fieldPopulationMonthGapBetweenReproRecrutement.init();
+        
+        // chatellier : number editor is not working
+        //fieldPopulationMonthGapBetweenReproRecrutement.init();
     }
     fieldPopulationRecruitmentDistribution.addMatrixListener(listener);
 }
@@ -97,13 +99,13 @@
                             <JLabel text="isisfish.populationRecruitment.monthgapgetweenreprorecruitment" enabled='{isActif()}'/>
                         </cell>
                         <cell fill='horizontal' weightx='1.0'>
-                            <NumberEditor id='fieldPopulationMonthGapBetweenReproRecrutement' constructorParams='this'
+                            <!--NumberEditor id='fieldPopulationMonthGapBetweenReproRecrutement' constructorParams='this'
                                           bean='{getBean()}' property='monthGapBetweenReproRecrutement' useSign='true'
                                           enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}'
-                                          _method='"MonthGapBetweenReproRecrutement"'/>
-                            <!--JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}'
+                                          _method='"MonthGapBetweenReproRecrutement"'/-->
+                            <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}'
                             onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))'
-                            enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/-->
+                            enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/>
                         </cell>
                     </row>
                     <row>
@@ -130,7 +132,9 @@
                         </cell>
                         <cell fill='both' weightx='1.0' weighty='0.5'>
                             <JScrollPane>
-                                <JTextArea id="fieldPopulationRecruitmentComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getRecruitmentComment())}' onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+                                <JTextArea id="fieldPopulationRecruitmentComment" text='{getBean().getRecruitmentComment()}'
+                                onKeyReleased='getBean().setRecruitmentComment(fieldPopulationRecruitmentComment.getText())'
+                                enabled='{isActif()}' decorator='boxed'/>
                             </JScrollPane>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2009-06-05 14:58:03 UTC (rev 2330)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2009-06-05 14:59:30 UTC (rev 2331)
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *##%*/
- -->
+-->
  
 <fr.ifremer.isisfish.ui.input.InputContentUI>
 

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-06-05 14:58:03 UTC (rev 2330)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-06-05 14:59:30 UTC (rev 2331)
@@ -287,7 +287,7 @@
                         </cell>
                         <cell fill='both' weightx='1.0' weighty='0.2'>
                             <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution'
-                            matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution()}'
+                            matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution().copy()}'
                             enabled='{isPopSeasonInfoNotNull()}'
                             visible='{getPopulationSeasonInfo().getReproduction()}'
                             decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ReproductionDistribution"'/>
@@ -299,7 +299,7 @@
                         </cell>
                         <cell fill='both' weightx='1.0' weighty='0.1'>
                             <JScrollPane>
-                                <JTextArea id="fieldPopulationSeasonComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getSeasonsComment())}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/>
+                                <JTextArea id="fieldPopulationSeasonComment" text='{getBean().getSeasonsComment()}' onKeyReleased='getBean().setSeasonsComment(fieldPopulationSeasonComment.getText())' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/>
                             </JScrollPane>
                         </cell>
                     </row>

    

r2331 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)