From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:12 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2364 - in
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . simulator
Date: Wed, 10 Jun 2009 17:23:25 +0200
Message-ID: <20090610152325.1D3FD461BF7@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5989350409156085697=="

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

Author: chatellier
Date: 2009-06-10 15:23:24 +0000 (Wed, 10 Jun 2009)
New Revision: 2364

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.ja=
xx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsU=
I.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoic=
eUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx
Log:
Fix comments and others minor bugfix

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java
=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/Common.java	2009-06-=
10 15:20:46 UTC (rev 2363)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/Common.java	2009-06-=
10 15:23:24 UTC (rev 2364)
@@ -1,6 +1,5 @@
 /* *##%
- * Copyright (C) 2006 - 2009
- *     Ifremer, Code Lutin, C=C3=A9dric Pineau, Benjamin Poussin
+ * Copyright (C) 2006 - 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

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Expo=
rtUI.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/simulator/ExportUI.j=
axx	2009-06-10 15:20:46 UTC (rev 2363)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.j=
axx	2009-06-10 15:23:24 UTC (rev 2364)
@@ -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,41 +16,31 @@
  * 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 $
- */
  -->
-
 <Table>
 <script><![CDATA[
     import jaxx.runtime.swing.Item;
     import fr.ifremer.isisfish.ui.WelcomePanelUI;
     import fr.ifremer.isisfish.ui.widget.renderer.SimpleToolTipComboBoxRende=
rer;
+   =20
     refresh();
+   =20
     public ExportUI (SimulAction action){
-        =20
         setContextValue(action);
     }
-    public void refresh(){
+
+    public void refresh() {
         fieldSimulExportFolder.setText(getContextValue(SimulAction.class).ge=
tSimulationParameter().getExportDirectory());
         setListSimulExportChooseModel();
     }
-    protected void setListSimulExportChooseModel(){
+
+    protected void setListSimulExportChooseModel() {
         java.util.List<String> values =3D getContextValue(SimulAction.class)=
.getExportNames();
         java.util.List<String> selectedValue =3D getContextValue(SimulAction=
.class).getSimulationParameter().getExportNames();
         java.util.List<Item> items =3D new ArrayList<Item>();
-        for (String s : values){
+        for (String s : values) {
             boolean selected =3D false;
-            for (String sv : selectedValue){
+            for (String sv : selectedValue) {
                 selected =3D (sv.equals(s) || selected);
             }
             items.add(new Item(s, s, s, selected));
@@ -59,21 +48,24 @@
         listSimulExportChoose.setItems(items);
         listSimulExportChoose.setCellRenderer(new SimpleToolTipComboBoxRende=
rer(ToolTipListModelFactory.createExportClassDocsModel(values)));
     }
+   =20
     protected void exportChanged(){
-        if (listSimulExportChoose.getSelectedIndex() > -1){
+        if (listSimulExportChoose.getSelectedIndex() > -1) {
             Object[] values =3D listSimulExportChoose.getSelectedValues();
             java.util.List<String> exportNames =3D new LinkedList<String>();
-            for (Object o : values){
+            for (Object o : values) {
                 exportNames.add((String) o);
             }
             getContextValue(SimulAction.class).getSimulationParameter().setE=
xportNames(exportNames);
         }
     }
+   =20
     protected void saveExport(){
         getContextValue(SimulAction.class).saveExport();
         setInfoText(_("isisfish.export.saved"));
     }
-    protected void setInfoText(String txt){
+   =20
+    protected void setInfoText(String txt) {
         WelcomePanelUI root =3D getParentContainer(WelcomePanelUI.class);
         root.setInfoText(txt);
     }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreS=
criptsUI.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/simulator/PreScripts=
UI.jaxx	2009-06-10 15:20:46 UTC (rev 2363)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScripts=
UI.jaxx	2009-06-10 15:23:24 UTC (rev 2364)
@@ -16,20 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
-
-/**
- * PreScriptUI.
- *
- * 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 $
- */
  -->
-<JPanel id=3D"simulPreScripts" layout=3D'{new BorderLayout()}'>
+<JPanel layout=3D'{new BorderLayout()}'>
     <script><![CDATA[
         public PreScriptsUI(SimulAction action) {
             setContextValue(action);
@@ -47,8 +35,7 @@
             SimulUI simul =3D getParentContainer(SimulUI.class);
             simul.selTab(0);
         }
-        ]]>
-     </script>
+    ]]></script>
     <JScrollPane constraints=3D'BorderLayout.CENTER'>
         <JTextArea id=3D"fieldSimulPreScript" onFocusLost=3D'save()'/>
     </JScrollPane>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Resu=
ltChoiceUI.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/simulator/ResultChoi=
ceUI.jaxx	2009-06-10 15:20:46 UTC (rev 2363)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoi=
ceUI.jaxx	2009-06-10 15:23:24 UTC (rev 2364)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005
- *     Ifremer, Code Lutin, Cedric Pineau, Benjamin Poussin
+ * Copyright (C) 2005 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,8 @@
  * 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 $
- */
  -->
-<JPanel id=3D"ResultChoice" name=3D"isisfish.resultChoice.title" layout=3D'{=
new BorderLayout()}'>
+<JPanel layout=3D'{new BorderLayout()}'>
     <script><![CDATA[
     import fr.ifremer.isisfish.ui.WelcomePanelUI;
     import jaxx.runtime.swing.Item;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Sens=
UI.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/simulator/SensUI.jax=
x	2009-06-10 15:20:46 UTC (rev 2363)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jax=
x	2009-06-10 15:23:24 UTC (rev 2364)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009
- *     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, US=
A.
  *##%*/
-
-/* *
- * SensUI.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 $
- */
  -->
-
 <Table>
 <script><![CDATA[
     import javax.swing.DefaultComboBoxModel;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Simu=
lUI.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/simulator/SimulUI.ja=
xx	2009-06-10 15:20:46 UTC (rev 2363)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.ja=
xx	2009-06-10 15:23:24 UTC (rev 2364)
@@ -1,7 +1,6 @@
 <!--
 /* *##%
- * Copyright (C) 2005 - 2009
- *     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,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, US=
A.
  *##%*/
-
-/**
- * SimulUI.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 $
- */
  -->
-<JPanel  size=3D'{new Dimension(800,600)}' id=3D"simul" layout=3D'{new Borde=
rLayout()}'>
+<JPanel layout=3D'{new BorderLayout()}'>
     <script><![CDATA[
     import org.dom4j.DocumentHelper;
     import org.dom4j.Element;


--===============5989350409156085697==--