[Isis-fish-commits] r3921 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish: simulator ui/config ui/input ui/input/variable ui/models ui/models/optimization ui/result ui/simulator ui/vcs ui/widget/filter

2 Apr 2014

Author: echatellier
Date: 2014-04-02 16:40:04 +0200 (Wed, 02 Apr 2014)
New Revision: 3921

Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3921

Log:
Fix compilation

Added:
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java
Modified:
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java
===================================================================

--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Optimization.java	2014-04-02 14:40:04 UTC (rev 3921)
@@ -24,11 +24,6 @@
  */
 package fr.ifremer.isisfish.simulator;
 
-import java.util.List;
-
-import fr.ifremer.isisfish.datastore.SimulationStorage;
-import fr.ifremer.isisfish.entities.FisheryRegion;
-
 /**
  * Script d'optimisation.
  * 

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -24,7 +24,9 @@
   -->
 <JDialog resizable="false" title="isisfish.simulator.ssh.configuration.title"
   layout="{new javax.swing.BoxLayout(this.getContentPane(), javax.swing.BoxLayout.PAGE_AXIS)}">
-  
+  <import>
+  static org.nuiton.i18n.I18n.t
+  </import>
   <SSHLauncherConfigAction id="action" javaBean="new SSHLauncherConfigAction(this)" />
   <Boolean id="connected" javaBean="false" />
 

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -29,6 +29,7 @@
 
     <import>
     static org.nuiton.i18n.I18n.n
+    static org.nuiton.i18n.I18n.t
     java.awt.event.MouseEvent;
     fr.ifremer.isisfish.entities.Cell;
     com.bbn.openmap.gui.Tool;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -30,6 +30,7 @@
     <fr.ifremer.isisfish.entities.EffortDescription id='effortDescription' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     java.util.ArrayList;
     fr.ifremer.isisfish.entities.EffortDescription;
     fr.ifremer.isisfish.entities.SetOfVessels;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -29,6 +29,7 @@
 
     <import>
     static org.nuiton.i18n.I18n.n
+    static org.nuiton.i18n.I18n.t
     fr.ifremer.isisfish.entities.FisheryRegion;
     fr.ifremer.isisfish.map.CopyMapToClipboardListener;
     com.bbn.openmap.gui.Tool;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -27,6 +27,7 @@
     <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     java.beans.PropertyChangeEvent;
     java.beans.PropertyChangeListener;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -43,6 +43,7 @@
     <Boolean id="autoSaveModification" javaBean="true" />
 
     <import>
+    static org.nuiton.i18n.I18n.t
     java.lang.reflect.Method;
     java.io.File;
     fr.ifremer.isisfish.entities.Formule;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -28,6 +28,7 @@
     <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     fr.ifremer.isisfish.entities.Species;
     fr.ifremer.isisfish.entities.PopulationGroup;
     fr.ifremer.isisfish.entities.Population;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -30,6 +30,7 @@
     <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/>
     
     <import>
+    static org.nuiton.i18n.I18n.t
     fr.ifremer.isisfish.entities.PopulationSeasonInfo;
     fr.ifremer.isisfish.entities.Population;
     fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -32,6 +32,7 @@
     <Boolean id='ageGroupType' javaBean='false'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     fr.ifremer.isisfish.entities.PopulationSeasonInfo;
     fr.ifremer.isisfish.ui.util.ErrorHelper;
     org.nuiton.math.matrix.MatrixND;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -28,6 +28,7 @@
     <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     </import>
 

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -28,6 +28,7 @@
     <fr.ifremer.isisfish.entities.Port id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.Port
     fr.ifremer.isisfish.entities.Cell

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -27,6 +27,7 @@
     <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     </import>
 

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -28,6 +28,7 @@
     <fr.ifremer.isisfish.entities.Species id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.Species;
     java.beans.PropertyChangeEvent;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -40,6 +40,7 @@
     <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo11' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     org.apache.commons.lang3.StringUtils
     java.beans.PropertyChangeEvent
     java.beans.PropertyChangeListener

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -28,6 +28,7 @@
     <fr.ifremer.isisfish.entities.TripType id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.TripType
     fr.ifremer.isisfish.types.TimeUnit

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -28,6 +28,7 @@
     <fr.ifremer.isisfish.entities.VesselType id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     fr.ifremer.isisfish.entities.VesselType
     fr.ifremer.isisfish.entities.TripType

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -27,6 +27,7 @@
     <fr.ifremer.isisfish.entities.Zone id='bean' javaBean='null'/>
 
     <import>
+    static org.nuiton.i18n.I18n.t
     static org.nuiton.i18n.I18n.n
     </import>
     <script><![CDATA[

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -23,7 +23,9 @@
   #L%
   -->
 <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='org.nuiton.topia.persistence.TopiaEntityContextable'>
-
+    <import>
+    static org.nuiton.i18n.I18n.t
+    </import>
     <EntityVariableHandler id="varHandler" />
 
     <!-- bean property -->

Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java	                        (rev 0)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java	2014-04-02 14:40:04 UTC (rev 3921)
@@ -0,0 +1,52 @@
+package fr.ifremer.isisfish.ui.models.optimization;
+
+import static org.nuiton.i18n.I18n.t;
+
+import javax.swing.table.AbstractTableModel;
+
+public class ExportObservationTableModel extends AbstractTableModel {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID = 7555677813473489539L;
+
+    /** Columns names. */
+    public final static String[] COLUMN_NAMES = {
+        t("isisfish.optimization.export"),
+        t("isisfish.optimization.observation")
+    };
+
+    /*
+     * @see javax.swing.table.TableModel#getColumnCount()
+     */
+    @Override
+    public int getColumnCount() {
+        int result = 2;
+        return result;
+    }
+    
+    /*
+     * @see javax.swing.table.TableModel#getRowCount()
+     */
+    @Override
+    public int getRowCount() {
+        int result = 4;
+        return result;
+    }
+    
+    /*
+     * @see javax.swing.table.TableModel#getColumnName(int)
+     */
+    @Override
+    public String getColumnName(int columnIndex) {
+        return COLUMN_NAMES[columnIndex];
+    }
+
+    @Override
+    public Object getValueAt(int rowIndex, int columnIndex) {
+        if (columnIndex == 0) {
+            return "Export " + rowIndex;
+        } else {
+            return "Observation " + rowIndex;
+        }
+    }
+}


Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ExportObservationTableModel.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java	                        (rev 0)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java	2014-04-02 14:40:04 UTC (rev 3921)
@@ -0,0 +1,96 @@
+/*
+ * #%L
+ * IsisFish
+ * 
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2009 - 2010 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 as
+ * published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.models.optimization;
+
+import java.awt.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import fr.ifremer.isisfish.simulator.Objective;
+
+/**
+ * Renderer pour la combo des script d'optimisation.
+ *
+ * @author chatellier
+ * @version $Revision$
+ * 
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class ObjectiveComboRenderer extends DefaultListCellRenderer {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID = -4070846632975105788L;
+
+    /** Objective cache. */
+    protected Map<String, Objective> objectiveCache;
+
+    /**
+     * Empty constructor.
+     */
+    public ObjectiveComboRenderer() {
+        objectiveCache = new HashMap<String, Objective>();
+    }
+
+    /*
+     * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
+     */
+    @Override
+    public Component getListCellRendererComponent(JList<?> list, Object value,
+            int index, boolean isSelected, boolean cellHasFocus) {
+
+        // this must be used to have alterned highlight rows and default
+        // selection color
+        JLabel c = (JLabel) super.getListCellRendererComponent(list, value,
+                index, isSelected, cellHasFocus);
+
+        String objectiveName = (String) value;
+        c.setText(objectiveName);
+
+        // c'est tres couteux d'avoir une instance
+        // on les met en cache
+        /*try {
+            Optimization optim = optimizationCache.get(optimizationName);
+            if (optim == null) {
+                SensitivityAnalysisStorage storage = SensitivityAnalysisStorage
+                        .getSensitivityAnalysis(optimizationName);
+                optim = storage.getNewInstance();
+                optimizationCache.put(optimizationName, optim);
+            }
+
+            c.setToolTipText(optim.getDescription());
+        } catch (Exception e) {
+            String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", sensitivityName));
+            c.setToolTipText(errorTooltip);
+        }*/
+
+        return c;
+    }
+}


Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/ObjectiveComboRenderer.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java	                        (rev 0)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java	2014-04-02 14:40:04 UTC (rev 3921)
@@ -0,0 +1,97 @@
+/*
+ * #%L
+ * IsisFish
+ * 
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2009 - 2010 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 as
+ * published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+package fr.ifremer.isisfish.ui.models.optimization;
+
+import java.awt.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.JLabel;
+import javax.swing.JList;
+
+import fr.ifremer.isisfish.simulator.Optimization;
+
+/**
+ * Renderer pour la combo des script d'optimisation.
+ *
+ * @author chatellier
+ * @version $Revision$
+ * 
+ * Last update : $Date$
+ * By : $Author$
+ */
+public class OptimizationComboRenderer extends DefaultListCellRenderer {
+
+    /** serialVersionUID. */
+    private static final long serialVersionUID = -4070846632975105788L;
+
+    /** Optimization cache. */
+    protected Map<String, Optimization> optimizationCache;
+
+    /**
+     * Empty constructor.
+     */
+    public OptimizationComboRenderer() {
+        optimizationCache = new HashMap<String, Optimization>();
+    }
+
+    /*
+     * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean)
+     */
+    @Override
+    public Component getListCellRendererComponent(JList<?> list, Object value,
+            int index, boolean isSelected, boolean cellHasFocus) {
+
+        // this must be used to have alterned highlight rows and default
+        // selection color
+        JLabel c = (JLabel) super.getListCellRendererComponent(list, value,
+                index, isSelected, cellHasFocus);
+
+        String optimizationName = (String) value;
+        c.setText(optimizationName);
+
+        // c'est tres couteux d'avoir une instance
+        // on les met en cache
+        /*try {
+            Optimization optim = optimizationCache.get(optimizationName);
+            if (optim == null) {
+                SensitivityAnalysisStorage storage = SensitivityAnalysisStorage
+                        .getSensitivityAnalysis(optimizationName);
+                optim = storage.getNewInstance();
+                optimizationCache.put(optimizationName, optim);
+            }
+
+            c.setToolTipText(optim.getDescription());
+        } catch (Exception e) {
+            String errorTooltip = TooltipHelper.getErrorTooltip(t("isisfish.error.compile.fileerror", sensitivityName));
+            c.setToolTipText(errorTooltip);
+        }*/
+
+        return c;
+    }
+    
+}


Property changes on: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/optimization/OptimizationComboRenderer.java
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision HeadURL
Added: svn:eol-style
   + native

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -23,6 +23,9 @@
   #L%
   -->
 <Table>
+    <import>
+    static org.nuiton.i18n.I18n.t
+    </import>
     <row>
         <cell fill="horizontal">
             <com.bbn.openmap.gui.ToolPanel id="toolPanel" />

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -28,6 +28,7 @@
     <Boolean id='changed' javaBean='false'/>
     
     <import>
+    static org.nuiton.i18n.I18n.t
     javax.swing.table.DefaultTableModel;
     java.util.Map.Entry;
     javax.swing.event.ListSelectionListener

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -24,6 +24,7 @@
   -->
 <Table>
     <import>
+    static org.nuiton.i18n.I18n.t
     fr.ifremer.isisfish.ui.WelcomePanelUI;
     fr.ifremer.isisfish.ui.models.common.GenericListModel;
     javax.swing.event.ListSelectionEvent;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java	2014-04-02 14:40:04 UTC (rev 3921)
@@ -39,6 +39,8 @@
 import fr.ifremer.isisfish.ui.models.common.ScriptParametersTableCellRenderer;
 import fr.ifremer.isisfish.ui.models.common.ScriptParametersTableModel;
 import fr.ifremer.isisfish.ui.models.common.GenericComboModel;
+import fr.ifremer.isisfish.ui.models.optimization.ExportObservationTableModel;
+
 import javax.swing.ListModel;
 import javax.swing.table.TableModel;
 

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -27,6 +27,7 @@
     java.awt.CardLayout
     javax.swing.ComboBoxModel
     javax.swing.table.DefaultTableModel
+    fr.ifremer.isisfish.ui.models.optimization.ExportObservationTableModel
   </import>
 
   <script><![CDATA[

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -29,6 +29,7 @@
     <Boolean id='sensitivity' javaBean='false' />
 
     <import>
+    static org.nuiton.i18n.I18n.t
     java.text.ParseException;
     fr.ifremer.isisfish.datastore.RegionStorage
     fr.ifremer.isisfish.datastore.StorageChangeEvent

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -24,6 +24,7 @@
   -->
 <JPanel layout='{new BorderLayout()}'>
     <import>
+    static org.nuiton.i18n.I18n.t
     fr.ifremer.isisfish.ui.WelcomePanelUI
     fr.ifremer.isisfish.ui.models.common.GenericListModel
     javax.swing.event.ListSelectionEvent

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java	2014-04-02 14:40:04 UTC (rev 3921)
@@ -1345,12 +1345,4 @@
     public void setOptimization(Optimization optimization) {
         param.setOptimization(optimization);
     }
-    
-    public Objective getObjective() {
-        return param.getObjective();
-    }
-    
-    public void setObjective(Objective objective) {
-        param.setObjective(objective);
-    }
 }

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -24,6 +24,7 @@
   -->
 <JDialog>
     <import>
+    static org.nuiton.i18n.I18n.t
     javax.swing.text.html.HTMLEditorKit;
     javax.swing.event.HyperlinkListener;
     javax.swing.event.HyperlinkEvent;

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -24,6 +24,7 @@
   -->
 <JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'>
     <import>
+    static org.nuiton.i18n.I18n.t
     java.io.BufferedReader
     java.io.InputStreamReader
     java.io.IOException

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx
===================================================================
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2014-04-02 14:06:11 UTC (rev 3920)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx	2014-04-02 14:40:04 UTC (rev 3921)
@@ -24,6 +24,7 @@
   -->
 <JDialog>
     <import>
+    static org.nuiton.i18n.I18n.t
     jaxx.runtime.JAXXObject
     javax.swing.text.html.HTMLEditorKit
     javax.swing.text.html.HTMLDocument

    

[Isis-fish-commits] r3921 - in branches/4.0.1/src/main/java/fr/ifremer/isisfish: simulator ui/config ui/input ui/input/variable ui/models ui/models/optimization ui/result ui/simulator ui/vcs ui/widget/filter

echatellier＠users.forge.codelutin.com