From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:04 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2122 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Mon, 20 Apr 2009 10:49:23 +0200
Message-ID: <20090420084923.ECED4461CBE@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3839228434604943237=="

--===============3839228434604943237==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: chatellier
Date: 2009-04-20 08:49:22 +0000 (Mon, 20 Apr 2009)
New Revision: 2122

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdit=
orUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.j=
axx
Log:
Fix unused import, undocumented commented code...

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.j=
axx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	20=
09-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	20=
09-04-20 08:49:22 UTC (rev 2122)
@@ -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
@@ -16,47 +15,30 @@
  * 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, US=
A.
- *##%*/
-
-/* *
- * 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=C3=BB 2008) $
- * by : $Author: sletellier $
- */
- -->
-
-
-		    <!--
-		     + Gear
-		     +-->
+ *##%*/ -->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <script><![CDATA[
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.GearImpl;
 import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener;
=20
+// constructor code
 getVerifier().addCurrentPanel(this);
 setButtonTitle(_("isisfish.input.continueMetiers"));
 setNextPath("$root/$metiers");
+
+// refresh
 public void refresh() {
-    if (isSens()){
+    if (isSens()) {
         gearTab.addChangeListener(new SensitivityTabbedPaneListener());
     } else {
         gearTab.addChangeListener(new InputTabbedPaneListener());
     }
-    getVerifier().addCurrentPanel(selectivityUI ,gearTabUI);
+    getVerifier().addCurrentPanel(selectivityUI, gearTabUI);
 }
     ]]></script>
     <JPanel id=3D'body' layout=3D'{new BorderLayout()}'>
         <JTabbedPane constraints=3D'BorderLayout.CENTER' id=3D"gearTab" name=
=3D"Gear">
-            <tab  title=3D'{_("isisfish.gear.title")}'><GearTabUI id=3D"gear=
TabUI" constructorParams=3D'this'/></tab>
+            <tab title=3D'{_("isisfish.gear.title")}'><GearTabUI id=3D"gearT=
abUI" constructorParams=3D'this'/></tab>
             <tab title=3D'{_("isisfish.selectivity.title")}'><SelectivityUI =
id=3D"selectivityUI" constructorParams=3D'this'/></tab>
         </JTabbedPane>
     </JPanel>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationUI.jaxx	2009-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationUI.jaxx	2009-04-20 08:49:22 UTC (rev 2122)
@@ -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
@@ -16,21 +15,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, US=
A.
- *##%*/
+ *##%*/ -->
=20
-/* *
- * 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=C3=BB 2008) $
- * by : $Author: sletellier $
- */
- -->
-
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <!-- bean property -->
@@ -45,8 +31,6 @@
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
@@ -106,9 +90,10 @@
     }
     return result;
 }
-protected void useEquationChanged(){
-    if (getPopInfo() !=3D null)
+protected void useEquationChanged() {
+    if (getPopInfo() !=3D null) {
         getPopInfo().setUseEquationMigration(fieldUseEquationMigration.isSel=
ected());
+    }
     if (fieldUseEquationMigration.isSelected()){
         ((CardLayout) hidablePanel.getLayout()).show(hidablePanel, "fieldUse=
Equation");
     }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Selectiv=
ityEditorUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdi=
torUI.jaxx	2009-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityEdi=
torUI.jaxx	2009-04-20 08:49:22 UTC (rev 2122)
@@ -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
@@ -16,20 +15,7 @@
  * 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, US=
A.
- *##%*/
-
-/* *
- * 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=C3=BB 2008) $
- * by : $Author: sletellier $
- */
- -->
+ *##%*/ -->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <!-- bean property -->
@@ -39,29 +25,17 @@
=20
     <Boolean id=3D'selectivityPopulationSelected' javaBean=3D'false'/>
=20
-    <script>
-    <![CDATA[
-
+    <script><![CDATA[
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
-import fr.ifremer.isisfish.entities.Gear;
-import fr.ifremer.isisfish.entities.GearImpl;
 import fr.ifremer.isisfish.entities.Species;
-import fr.ifremer.isisfish.entities.Formule;
-import fr.ifremer.isisfish.ui.WelcomePanelUI;
 import fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor;
 import javax.swing.table.DefaultTableModel;
 import fr.ifremer.isisfish.entities.Selectivity;
-import fr.ifremer.isisfish.entities.GearImpl;
 import fr.ifremer.isisfish.entities.Equation;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.codelutin.topia.TopiaContext;
-import org.codelutin.topia.persistence.TopiaEntity;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.MetierImpl;
=20
+// TODO why it's commented ? to remove ?
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
@@ -98,8 +72,9 @@
     public void mouseExited(MouseEvent e) {
     }
 });
-public void refresh(){
-    if (getBean() !=3D null){
+
+public void refresh() {
+    if (getBean() !=3D null) {
         setSelectivityTableModel();
         fieldSelectivityPopulation.setModel(getSelectivityPopulationModel());
     }
@@ -107,16 +82,17 @@
=20
     remove.setEnabled(false);
 }
+
 protected void setSelectivityTableModel() {
     DefaultTableModel model =3D new DefaultTableModel() {
         @Override
-            public boolean isCellEditable(int row, int column) {
-                boolean result =3D false;
-                if (column > 0) {
-                    result =3Dtrue;
-                }
-                return result;
+        public boolean isCellEditable(int row, int column) {
+            boolean result =3D false;
+            if (column > 0) {
+                result =3Dtrue;
             }
+            return result;
+        }
     };
     Collection<Selectivity> selectivity =3D getBean().getPopulationSelectivi=
ty();
     java.util.List<Population> populations =3D new ArrayList<Population>();
@@ -134,15 +110,18 @@
     EquationTableEditor cellEditor =3D new EquationTableEditor();
     selectivityTable.getColumnModel().getColumn(1).setCellEditor(cellEditor);
 }
+
 protected void add() {
     getAction().addSelectivity((Population)getPopulation(), selectivityEquat=
ion.getEditor().getText(), getBean());
     setSelectivityTableModel();
 }
+
 protected void remove() {
     getAction().removeSelectivity(getBean(), (Selectivity) getBean().getPopu=
lationSelectivity((Population) selectivityTable.getValueAt(selectivityTable.g=
etSelectedRow(), 0)));
     setSelectivityTableModel();
 }
-protected DefaultComboBoxModel getSelectivityPopulationModel(){
+
+protected DefaultComboBoxModel getSelectivityPopulationModel() {
     java.util.List<Species> species =3D getRegion().getSpecies();
     DefaultComboBoxModel selectivityPopulationModel =3D new DefaultComboBoxM=
odel();
     if (species !=3D null) {
@@ -157,13 +136,13 @@
     }
     return selectivityPopulationModel;
 }
-protected void selectivityChanged(){
+
+protected void selectivityChanged() {
     setSelectivityPopulationSelected(fieldSelectivityPopulation.getSelectedI=
tem() !=3D null);
     setPopulation((PopulationImpl) ((GenericCell) fieldSelectivityPopulation=
.getSelectedItem()).getValue());
     add.setEnabled(isSelectivityPopulationSelected());
 }
-    ]]>
-    </script>
+    ]]></script>
     <Table id=3D'body'>
         <row>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Selectiv=
ityUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.=
jaxx	2009-04-20 07:54:12 UTC (rev 2121)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.=
jaxx	2009-04-20 08:49:22 UTC (rev 2122)
@@ -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
@@ -16,39 +15,17 @@
  * 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, US=
A.
- *##%*/
-
-/* *
- * 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=C3=BB 2008) $
- * by : $Author: sletellier $
- */
- -->
+ *##%*/ -->
 <fr.ifremer.isisfish.ui.input.InputContentUI>
=20
     <!-- bean property -->
     <fr.ifremer.isisfish.entities.GearImpl id=3D'bean' javaBean=3D'null'/>
=20
-    <script>
-    <![CDATA[
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import fr.ifremer.isisfish.entities.Metier;
-import fr.ifremer.isisfish.entities.MetierImpl;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.PopulationImpl;
+    <script><![CDATA[
 import fr.ifremer.isisfish.entities.Gear;
 import fr.ifremer.isisfish.entities.GearImpl;
-import fr.ifremer.isisfish.entities.Species;
=20
+// TODO why it's commented ? to remove ?
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getOldValue() !=3D null || evt.getNewValue() =3D=3D null) {
@@ -61,17 +38,17 @@
         }
     }
 });
+
+// refresh
 public void refresh(){
     getVerifier().setSaveButton(save);
     getVerifier().setCancelButton(cancel);
     setBean(null);
     Gear gear =3D (Gear)getVerifier().getEntity(Gear.class);
     setBean((GearImpl) gear);
-   =20
     getVerifier().addCurrentPanel(editor);
 }
-    ]]>
-    </script>
+    ]]></script>
     <Table id=3D'body'>
         <row>
             <cell fill=3D'both' weightx=3D'1.0' weighty=3D'1.0'>


--===============3839228434604943237==--