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

6 Nov 2009

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/EquationEditorPaneUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.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/PopulationRecruitmentUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.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.jaxx
Log:
Divers import inutilis?\195?\169s

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -20,8 +20,8 @@
 <JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" width="400" height="400">
 
   <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;
 
 boolean ok = false;
 Class javaInterface = null;
@@ -113,16 +112,16 @@
   <Table weightx="1">
     <row>
 	  <cell columns='4' weighty="1" fill='both'>
-          <JScrollPane>
-	    <JEditorPane id="doc"/>
-	  </JScrollPane>
-          </cell>
+        <JScrollPane>
+	      <JEditorPane id="doc"/>
+	    </JScrollPane>
+      </cell>
 	</row>
 	
 	<row columns='4' weighty="5" fill='both'>
       <cell>
         <JSplitPane id='split' orientation='vertical' oneTouchExpandable='true' resizeWeight='0.8'>
-          <Editor id="editor"/>
+          <org.nuiton.widget.editor.Editor id="editor"/>
           <JScrollPane>
 	        <JEditorPane id="checkWindow"/>
 	      </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-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.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;
 
 addPropertyChangeListener("populationGroup", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.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;
 
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {

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-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.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;
 

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx	2009-11-06 17:00:00 UTC (rev 2745)
@@ -23,12 +23,9 @@
     <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/>
     
     <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;
 
 addPropertyChangeListener("bean", new PropertyChangeListener() {
     public void propertyChange(PropertyChangeEvent evt) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx	2009-11-06 16:59:01 UTC (rev 2744)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.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;
 
@@ -270,7 +269,7 @@
                             <JLabel text="isisfish.common.season" enabled='{isPopSeasonInfoNotNull()}'/>
                         </cell>
                         <cell  fill='horizontal' weightx='1.0'>
-                            <IntervalPanel id='seasonIntervalPanel' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/>
+                            <fr.ifremer.isisfish.ui.widget.IntervalPanel id='seasonIntervalPanel' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/>
                         </cell>
                     </row>
                     <row>

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

    

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

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)