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

9 Jun 2009

Author: chatellier
Date: 2009-06-09 17:48:44 +0000 (Tue, 09 Jun 2009)
New Revision: 2356

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.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/PopulationGroupUI.jaxx
Log:
Various minor fix (ident, comments...)

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2009-06-09 17:48:00 UTC (rev 2355)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2009-06-09 17:48:44 UTC (rev 2356)
@@ -42,8 +42,6 @@
 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");
             fieldCellName.setText("");
             fieldCellLatitude.setText("");
             fieldCellLongitude.setText("");
@@ -51,8 +49,7 @@
             fieldCellLand.setSelected(false);
         }
         if (evt.getNewValue() != null) {
-            // add binding on getBean()
-            //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
+
         }
     }
 });
@@ -108,6 +105,8 @@
             // avoid reentrant code
             return;
         }
+        
+        // FIXME this can't work on sensitivity
         getParentContainer(InputUI.class).setTreeSelection("$root/$cells/"+c.getTopiaId());
     }
 }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2009-06-09 17:48:00 UTC (rev 2355)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx	2009-06-09 17:48:44 UTC (rev 2356)
@@ -145,7 +145,7 @@
         <row>
             <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
                 <JScrollPane>
-                    <JList id="fieldEffortDescriptionMetierList" selectionMode="0" enabled='{isActif()}'/>
+                    <JList id="fieldEffortDescriptionMetierList" selectionMode="0" enabled='{isActif()}' decorator='boxed' />
                 </JScrollPane>
             </cell>
         </row>

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-09 17:48:00 UTC (rev 2355)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java	2009-06-09 17:48:44 UTC (rev 2356)
@@ -275,12 +275,11 @@
 
     protected void topiaCreate() {
 
-        if (log.isTraceEnabled()) {
-            log.trace("create called for " + type);
+        if (log.isDebugEnabled()) {
+            log.debug("Create called for " + type);
         }
+
         try {
-            //TODO use the IsisFishEntityEnum for this purpose :
-            //TopiaDAO<TopiaEntity> dao = IsisFishEntityEnum.getEntry(type).getDAO(isisContext);
             String name = type + "_new";
 
             Method method = MethodUtils.getAccessibleMethod(

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-06-09 17:48:00 UTC (rev 2355)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx	2009-06-09 17:48:44 UTC (rev 2356)
@@ -18,7 +18,7 @@
  *##%*/
 
  -->
-<JPanel id="input" layout='{new BorderLayout()}'>
+<JPanel layout='{new BorderLayout()}'>
 
     <javax.swing.tree.DefaultTreeSelectionModel id='navigationSelectionModel' selectionMode='{javax.swing.tree.TreeSelectionModel.SINGLE_TREE_SELECTION}'/>
 

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-06-09 17:48:00 UTC (rev 2355)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-06-09 17:48:44 UTC (rev 2356)
@@ -160,10 +160,10 @@
                                     <cell anchor='east'>
                                         <JLabel text="isisfish.populationBasics.numberGroup" enabled='{isActif()}'/>
                                     </cell>
-                                    <cell fill='horizontal' weightx='0.5'>
+                                    <cell fill='horizontal' weightx='1.0'>
                                         <JTextField id="fieldPopulationBasicsNbClasses" text='{getBean() == null ? "" : getBean().sizePopulationGroup()}' editable="false" enabled='{isActif()}' decorator='boxed'/>
                                     </cell>
-                                    <cell fill='horizontal' weightx='0.5'>
+                                    <cell fill='horizontal'>
                                         <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createClasses()' enabled='{isActif()}' decorator='boxed'/>
                                     </cell>
                                 </row>
@@ -171,10 +171,10 @@
                                     <cell anchor='east'>
                                         <JLabel text="isisfish.populationBasics.maturityGroup" enabled='{isActif()}'/>
                                     </cell>
-                                    <cell fill='horizontal' weightx='0.5'>
+                                    <cell fill='horizontal' weightx='1.0'>
                                         <JComboBox id="fieldPopulationBasicsMatureClass" onActionPerformed='matureClassChanged()' enabled='{isActif()}' decorator='boxed'/>
                                     </cell>
-                                    <cell fill='horizontal' weightx='0.5'>
+                                    <cell fill='horizontal'>
                                         <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" selected='{getBean().getPlusGroup()}' onActionPerformed='getBean().setPlusGroup(fieldPopulationBasicsPlusGroup.isSelected())' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"PlusGroup"'/>
                                     </cell>
                                 </row>
@@ -186,8 +186,8 @@
                                 <row>
                                     <cell columns='3' fill='both' weightx='1.0' weighty='1.0'>
                                         <InputOneEquationUI id='growthEquation' constructorParams='this'
-                                        lblText='{_("isisfish.populationBasics.growth")}'
-                                        bean='{getBean()}'  nameEquation='Growth' methodGet='Growth' methodSet='EquationGrowth'
+                                        lblText='{_("isisfish.populationBasics.growth")}' actif='{isActif()}'
+                                        bean='{getBean()}' nameEquation='Growth' methodGet='Growth' methodSet='EquationGrowth'
                                         clazz='{fr.ifremer.isisfish.equation.PopulationGrowth.class}'
                                         decorator='boxed' _bean='{PopulationImpl.class}' _method='"Growth"'/>
                                     </cell>
@@ -195,8 +195,8 @@
                                 <row>
                                     <cell columns='3' fill='both' weightx='1.0' weighty='1.0'>
                                         <InputOneEquationUI id='growthReverseEquation' constructorParams='this'
-                                        lblText='{_("isisfish.populationBasics.growthReverse")}'
-                                        bean='{getBean()}'  nameEquation='GrowthReverse' methodGet='GrowthReverse' methodSet='EquationGrowthReverse'
+                                        lblText='{_("isisfish.populationBasics.growthReverse")}' actif='{isActif()}'
+                                        bean='{getBean()}' nameEquation='GrowthReverse' methodGet='GrowthReverse' methodSet='EquationGrowthReverse'
                                         clazz='{fr.ifremer.isisfish.equation.PopulationGrowthReverse.class}'
                                         decorator='boxed' _bean='{PopulationImpl.class}' _method='"GrowthReverse"'/>
                                     </cell>
@@ -205,7 +205,7 @@
                                     <cell anchor='east'>
                                         <JLabel text="isisfish.population.comments" enabled='{isActif()}'/>
                                     </cell>
-                                    <cell columns='2' fill='both' weightx='1.0' weighty='0.2'>
+                                    <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
                                         <JScrollPane>
                                             <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldPopulationBasicsComment.getText())' enabled='{isActif()}' decorator='boxed'/>
                                         </JScrollPane>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-06-09 17:48:00 UTC (rev 2355)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx	2009-06-09 17:48:44 UTC (rev 2356)
@@ -112,7 +112,7 @@
 }
     ]]>
     </script>
-    <Table id='body'>
+    <Table>
         <row>
             <cell fill='horizontal' anchor='east'>
                 <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/>
@@ -143,7 +143,7 @@
             <cell fill='horizontal' anchor='east'>
                 <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/>
             </cell>
-            <cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
+            <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
                 <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate'
                 matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}'
                 enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/>

    

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

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)