From chatellier@users.labs.libre-entreprise.org Mon Jun 15 00:26:26 2026
From: chatellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r2745 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Fri, 06 Nov 2009 18:00:01 +0100
Message-ID: <20091106170001.9226116C48A@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7850534481825616354=="

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

Author: chatellier
Date: 2009-11-06 17:00:00 +0000 (Fri, 06 Nov 2009)
New Revision: 2745

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorP=
aneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroup=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionEmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigra=
tionImmigrationUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecru=
itmentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.ja=
xx
Log:
Divers import inutilis?\195?\169s

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Equation=
EditorPaneUI.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/EquationEditor=
PaneUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditor=
PaneUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -20,8 +20,8 @@
 <JDialog id=3D"EquationEditorPane" modal=3D"true" title=3D"isisfish.equation=
.editor.title" width=3D"400" height=3D"400">
=20
   <script><![CDATA[
-import org.nuiton.widget.editor.Editor;
 import fr.ifremer.isisfish.util.CompileHelper;
+import fr.ifremer.isisfish.util.EvaluatorHelper;
 import org.nuiton.util.FileUtil;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.HTMLDocument;
@@ -30,7 +30,6 @@
 import javax.swing.event.HyperlinkEvent;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import fr.ifremer.isisfish.util.EvaluatorHelper;
=20
 boolean ok =3D false;
 Class javaInterface =3D null;
@@ -113,16 +112,16 @@
   <Table weightx=3D"1">
     <row>
 	  <cell columns=3D'4' weighty=3D"1" fill=3D'both'>
-          <JScrollPane>
-	    <JEditorPane id=3D"doc"/>
-	  </JScrollPane>
-          </cell>
+        <JScrollPane>
+	      <JEditorPane id=3D"doc"/>
+	    </JScrollPane>
+      </cell>
 	</row>
 =09
 	<row columns=3D'4' weighty=3D"5" fill=3D'both'>
       <cell>
         <JSplitPane id=3D'split' orientation=3D'vertical' oneTouchExpandable=
=3D'true' resizeWeight=3D'0.8'>
-          <Editor id=3D"editor"/>
+          <org.nuiton.widget.editor.Editor id=3D"editor"/>
           <JScrollPane>
 	        <JEditorPane id=3D"checkWindow"/>
 	      </JScrollPane>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onGroupUI.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/PopulationGrou=
pUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGrou=
pUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -42,7 +42,6 @@
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import org.nuiton.math.matrix.MatrixND;
-import org.nuiton.math.matrix.gui.MatrixPanelEvent;
=20
 addPropertyChangeListener("populationGroup", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationEmigrationUI.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=
ationEmigrationUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationEmigrationUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -30,14 +30,12 @@
     <script><![CDATA[
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
+import fr.ifremer.isisfish.entities.PopulationGroup;
 import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
 import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
+import fr.ifremer.isisfish.entities.Zone;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import fr.ifremer.isisfish.entities.Population;
-import fr.ifremer.isisfish.entities.PopulationGroup;
-import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
-import fr.ifremer.isisfish.entities.Zone;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onMigrationImmigrationUI.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=
ationImmigrationUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigr=
ationImmigrationUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -35,8 +35,6 @@
 import fr.ifremer.isisfish.entities.PopulationSeasonInfo;
 import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl;
 import fr.ifremer.isisfish.entities.Zone;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
=20

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onRecruitmentUI.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/PopulationRecr=
uitmentUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecr=
uitmentUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -23,12 +23,9 @@
     <fr.ifremer.isisfish.entities.PopulationImpl id=3D'bean' javaBean=3D'nul=
l'/>
    =20
     <script><![CDATA[
-import fr.ifremer.isisfish.entities.Equation;
-import fr.ifremer.isisfish.entities.Formule;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
-import jaxx.runtime.swing.editor.NumberEditor;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onSeasonsUI.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/PopulationSeas=
onsUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -34,7 +34,6 @@
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
 import fr.ifremer.isisfish.ui.widget.Interval;
-import fr.ifremer.isisfish.ui.widget.IntervalPanel;
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.math.matrix.gui.MatrixPanelEvent;
=20
@@ -270,7 +269,7 @@
                             <JLabel text=3D"isisfish.common.season" enabled=
=3D'{isPopSeasonInfoNotNull()}'/>
                         </cell>
                         <cell  fill=3D'horizontal' weightx=3D'1.0'>
-                            <IntervalPanel id=3D'seasonIntervalPanel' enable=
d=3D'{isPopSeasonInfoNotNull()}' decorator=3D'boxed'/>
+                            <fr.ifremer.isisfish.ui.widget.IntervalPanel id=
=3D'seasonIntervalPanel' enabled=3D'{isPopSeasonInfoNotNull()}' decorator=3D'=
boxed'/>
                         </cell>
                     </row>
                     <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.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/PortUI.jaxx	20=
09-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	20=
09-11-06 17:00:00 UTC (rev 2745)
@@ -23,7 +23,6 @@
     <fr.ifremer.isisfish.entities.PortImpl id=3D'bean' javaBean=3D'null'/>
=20
     <script><![CDATA[
-import fr.ifremer.isisfish.entities.Species;
 import fr.ifremer.isisfish.entities.Port;
 import fr.ifremer.isisfish.entities.PortImpl;
 import fr.ifremer.isisfish.entities.Cell;

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTy=
peUI.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/VesselTypeUI.j=
axx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.j=
axx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -84,24 +84,17 @@
 }
=20
 protected void setListModel() {
-
     java.util.List<TripType> tripTypes =3D getRegion().getTripType();
     TripTypeListModel tripTypeModel =3D new TripTypeListModel(tripTypes);
     vesselTypeTripType.setModel(tripTypeModel);
-
-    /*java.util.List<Item> items =3D new java.util.ArrayList<Item>();
-    for (TripType tt : getRegion().getTripType()){
-        items.add(new Item(tt.getTopiaId(), tt.getName(), tt, false));
-    }
-    vesselTypeTripType.setItems(items);*/
    =20
-    if (getBean() !=3D null && getBean().getTripType() !=3D null){
+    if (getBean() !=3D null && getBean().getTripType() !=3D null) {
         vesselTypeTripType.setSelectedValues(getBean().getTripType().toArray=
());
     }
 }
 protected void tripTypeChanged(){
     java.util.List<TripType> tripTypes =3D new java.util.ArrayList<TripType>=
();
-    for (Object o : vesselTypeTripType.getSelectedValues()){
+    for (Object o : vesselTypeTripType.getSelectedValues()) {
         tripTypes.add((TripType)o);
     }
     getBean().setTripType(tripTypes);


--===============7850534481825616354==--