[Isis-fish-commits] r2127 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

21 Apr 2009

Author: chatellier
Date: 2009-04-21 09:05:36 +0000 (Tue, 21 Apr 2009)
New Revision: 2127

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/MetierSeasonInfoSpeciesEditorUI.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/PopulationMigrationImmigrationUI.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/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/SetOfVesselsUI.jaxx
Log:
Doc/style improvments

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-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -44,16 +44,10 @@
     <fr.ifremer.isisfish.entities.Equation id='selectedEquation' javaBean='null'/>
 
     <script><![CDATA[
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
 import fr.ifremer.isisfish.entities.Formule;
 import fr.ifremer.isisfish.entities.Equation;
-import fr.ifremer.isisfish.entities.EquationImpl;
 import java.lang.reflect.Method;
-import org.apache.commons.beanutils.MethodUtils;
-import org.codelutin.topia.persistence.TopiaEntity;
 import org.codelutin.topia.TopiaContext;
-import fr.ifremer.isisfish.entities.EquationDAO;
-import fr.ifremer.isisfish.IsisFishDAOHelper;
 import jaxx.runtime.swing.Item;
 
 protected DocumentListener listener = null;
@@ -63,7 +57,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");
-            combo.setModel(new DefaultComboBoxModel());
+            formuleComboBox.setModel(new DefaultComboBoxModel());
             try {
                 editor.open(org.codelutin.util.FileUtil.getTempFile("", ".java"));
             } catch (IOException e) {
@@ -80,8 +74,8 @@
     }
 });
 start();
-protected void start(){
-   if (listener == null){
+protected void start() {
+   if (listener == null) {
         listener = new DocumentListener() {
 
             @Override
@@ -102,7 +96,7 @@
     setComboModel();
     editor.getCurrentEditor().addDocumentListener(listener);
 }
-protected Equation getEquation(){
+protected Equation getEquation() {
     Equation result = null;
     try {
         if (bean != null && methodGet != null){
@@ -139,7 +133,7 @@
     }
     if (nameEquation != null){
         setComboModel();
-        setFormule((Formule)combo.getSelectedItem());
+        setFormule((Formule)formuleComboBox.getSelectedItem());
         setEditorText();
         selectedEquation = getEquation();
     }
@@ -159,7 +153,7 @@
                 boolean selected = f.equals(selectedEquation);
                 items.add(new Item(f.getName(), f.getName(), f, selected));
             }
-            combo.setItems(items);
+            formuleComboBox.setItems(items);
         }
     }
 }
@@ -169,7 +163,7 @@
     setInfoText(_("isisfish.message.saveModel.finished"));
 }
 protected void openEditor() {
-    Formule e = (Formule)combo.getSelectedItem();
+    Formule e = (Formule)formuleComboBox.getSelectedItem();
     if (e != null) {
         getContextValue(InputAction.class).openEditor(e.getCategory(), e.getName(),  clazz, e.getContent(), editor);
     }
@@ -191,6 +185,12 @@
         }
     }
 }
+
+protected void formuleChanged() {
+    Formule selectedFormule = (Formule)formuleComboBox.getSelectedItem();
+    setFormule(selectedFormule);
+    setEditorText();
+}
     ]]>
     </script>
     <Table id='body'>
@@ -199,7 +199,7 @@
                 <JLabel id='lbl' text='{getLblText()}' enabled='{isActif()}'/>
             </cell>
             <cell fill='horizontal' weightx='1.0'>
-                <JComboBox id="combo" onActionPerformed='setFormule((Formule)combo.getSelectedItem());setEditorText();' enabled='{isActif()}'/>
+                <JComboBox id="formuleComboBox" onActionPerformed='formuleChanged()' enabled='{isActif()}'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx	2009-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -158,7 +158,7 @@
 protected void add() {
     Object species = ((GenericCell)fieldTargetSpecies.getSelectedItem()).getValue();
     if (getMetierInfo() != null && species != null) {
-        Formule selectedFormule = (Formule)targetFactor.getCombo().getSelectedItem();
+        Formule selectedFormule = (Formule)targetFactor.getFormuleComboBox().getSelectedItem();
         getContextValue(InputAction.class).addTargetSpecies(
                 getBean(),
                 (MetierSeasonInfo)getMetierInfo(),

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-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,20 +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.
  *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
  -->
-
 <fr.ifremer.isisfish.ui.input.InputContentUI>
 
     <!-- bean property -->
@@ -39,13 +25,12 @@
     <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/>
 
     <script><![CDATA[
-    
 import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
 import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
-import fr.ifremer.isisfish.entities.Formule;
 
+// TODO why it's commented
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() != null || evt.getNewValue() == null) {
@@ -58,10 +43,12 @@
         }
     }
 });
-public void init(PopulationSeasonInfo pi){
+
+public void init(PopulationSeasonInfo pi) {
     setPopInfo((PopulationSeasonInfoImpl)pi);
 }
-public void refresh(){
+
+public void refresh() {
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
     getVerifier().addCurrentPanel(immigrationEquation, emigrationEquation, migrationEquation);

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx	2009-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -16,23 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
- -->
-<!-- Fixme : ContextDataSource
-    name="isisfish.populationMigrationImmigration.title"
--->
+ *##%*/ -->
+<!-- Fixme : ContextDataSource name="isisfish.populationMigrationImmigration.title" -->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
 
     <!-- bean property -->

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-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -47,20 +47,20 @@
     }
 });
 
-public void refresh(){
+public void refresh() {
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
     getVerifier().addCurrentPanel(populationMigrationEquationUI, populationMigrationMigrationUI, populationMigrationImmigrationUI, populationMigrationEmigrationUI);
     Population population = getVerifier().getEntity(Population.class);
     setBean((PopulationImpl) population);
-    if (getBean() != null){
+    if (getBean() != null) {
         setFieldPopulationMigrationSeasonChooserModel();
     }
     useEquationChanged();
 }
-protected void seasonChanged(){
+protected void seasonChanged() {
     setPopInfo((PopulationSeasonInfoImpl)getPopulationSeasonInfo());
-    if (getPopInfo() != null){
+    if (getPopInfo() != null) {
         getVerifier().addCurrentEntity(getPopInfo());
         populationMigrationEquationUI.init(getPopInfo());
         populationMigrationMigrationUI.init(getPopInfo());
@@ -69,22 +69,22 @@
     }
     useEquationChanged();
 }
-protected void setFieldPopulationMigrationSeasonChooserModel(){
+protected void setFieldPopulationMigrationSeasonChooserModel() {
     DefaultComboBoxModel model = new DefaultComboBoxModel();
-    if (getBean().getPopulationSeasonInfo() != null){
+    if (getBean().getPopulationSeasonInfo() != null) {
         model.addElement(new GenericCell(" ", null, PopulationSeasonInfo.class));
-        for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()){
+        for (PopulationSeasonInfo psi : getBean().getPopulationSeasonInfo()) {
             model.addElement(new GenericCell(psi.getFirstMonth() + " - " + psi.getLastMonth(), psi, PopulationSeasonInfo.class));
         }
     }
     fieldPopulationMigrationSeasonChooser.setModel(model);
 }
-protected PopulationSeasonInfo getPopulationSeasonInfo(){
+protected PopulationSeasonInfo getPopulationSeasonInfo() {
     PopulationSeasonInfo result = null;
     Object selected = fieldPopulationMigrationSeasonChooser.getSelectedItem();
-    if (selected != null){
+    if (selected != null) {
         GenericCell cell = (GenericCell)selected;
-        if (cell.getValue() != null){
+        if (cell.getValue() != null) {
             result = (PopulationSeasonInfo)cell.getValue();
         }
     }
@@ -94,10 +94,10 @@
     if (getPopInfo() != null) {
         getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSelected());
     }
-    if (fieldUseEquationMigration.isSelected()){
+    if (fieldUseEquationMigration.isSelected()) {
         ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseEquation");
     }
-    else{
+    else {
         ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUseMatrix");
     }
 }
@@ -122,9 +122,15 @@
                 <JPanel id="hidablePanel"  layout='{new CardLayout()}'>
                     <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"'/></tab>
-                        <tab title='{_("isisfish.populationMigrationImmigration.title")}'><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"'/></tab>
+                        <tab title='{_("isisfish.populationMigrationMigration.title")}'>
+                          <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"'/>
+                        </tab>
+                        <tab title='{_("isisfish.populationMigrationEmigration.title")}'>
+                          <PopulationMigrationEmigrationUI id="populationMigrationEmigrationUI" constructorParams='this' decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"EmigrationMatrix"'/>
+                        </tab>
                     </JTabbedPane>
                 </JPanel>
             </cell>

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-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEditorUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -100,7 +100,10 @@
     if (selectivity != null) {
         for (Selectivity s : selectivity) {
             populations.add(s.getPopulation());
-            equations.add(s.getEquation());
+            
+            Equation equation = s.getEquation();
+            getVerifier().addCurrentEntity(equation);
+            equations.add(equation);
         }
     }
     model.addColumn("Population", populations.toArray());

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-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,18 +16,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
  -->
 
 <fr.ifremer.isisfish.ui.input.InputContentUI>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2009-04-21 09:04:48 UTC (rev 2126)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2009-04-21 09:05:36 UTC (rev 2127)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,24 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *##%*/
-
-/* *
- * IsisFish.java
- *
- * Created: 1 aout 2005 18:37:25 CEST
- *
- * @author Benjamin POUSSIN <poussin at codelutin.com>
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
  -->
 
-
- 		    <!--
-		     + SetOfVessels
-		     +-->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
 
     <script><![CDATA[

    

[Isis-fish-commits] r2127 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input

chatellier＠users.labs.libre-entreprise.org