r4275 - in branches/isis-fish-4.4.0-resultname/src: main/java/fr/ifremer/isisfish/datastore main/java/fr/ifremer/isisfish/simulator main/java/fr/ifremer/isisfish/simulator/launcher main/java/fr/ifremer/isisfish/ui main/java/fr/ifremer/isisfish/ui/sensitivity/wizard main/java/fr/ifremer/isisfish/ui/simulator test/java/fr/ifremer/isisfish/simulator/launcher test/resources - Isis-fish-commits

21 Jun 2015

Author: echatellier
Date: 2015-06-21 17:13:42 +0000 (Sun, 21 Jun 2015)
New Revision: 4275

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

Log:
Fix imports/useless files

Removed:
   branches/isis-fish-4.4.0-resultname/src/test/resources/.isis-config-3_cvs
Modified:
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx
   branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java
   branches/isis-fish-4.4.0-resultname/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java
===================================================================

--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageAbstract.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -28,9 +28,7 @@
 import static org.nuiton.i18n.I18n.t;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -27,8 +27,6 @@
 
 import static org.nuiton.i18n.I18n.t;
 
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -70,7 +70,6 @@
 import fr.ifremer.isisfish.simulator.SimulationParameter;
 import fr.ifremer.isisfish.simulator.SimulationPreScriptListener;
 import fr.ifremer.isisfish.simulator.Simulator;
-import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.types.TimeStep;
 import fr.ifremer.isisfish.util.CompileHelper;
 

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -83,7 +83,6 @@
 import fr.ifremer.isisfish.export.ExportInfo;
 import fr.ifremer.isisfish.export.SensitivityExport;
 import fr.ifremer.isisfish.mexico.MexicoHelper;
-import fr.ifremer.isisfish.result.ResultInfo;
 import fr.ifremer.isisfish.result.ResultInfoHelper;
 import fr.ifremer.isisfish.rule.Rule;
 import fr.ifremer.isisfish.simulator.Objective;

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/StatusBarHandler.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -32,7 +32,6 @@
 
 import javax.imageio.ImageIO;
 import javax.swing.JFileChooser;
-import javax.swing.SwingUtilities;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -46,7 +46,6 @@
 
 import fr.ifremer.isisfish.IsisConfig;
 import fr.ifremer.isisfish.IsisFish;
-import fr.ifremer.isisfish.ui.config.RConfigHandler;
 import fr.ifremer.isisfish.ui.config.RConfigUI;
 import fr.ifremer.isisfish.ui.config.SSHLauncherConfigUI;
 import fr.ifremer.isisfish.ui.input.InputContext;

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/FactorWizardUI.jaxx	2015-06-21 17:13:42 UTC (rev 4275)
@@ -25,8 +25,6 @@
 <JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'>
 
     <import>
-    java.beans.PropertyChangeEvent
-    java.beans.PropertyChangeListener
     java.awt.CardLayout
     </import>
 
@@ -45,6 +43,7 @@
         handler.afterInit();
     }
     ]]></script>
+
     <Table constraints='BorderLayout.CENTER'>
         <row>
             <cell columns='4' fill='horizontal'>

Modified: branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulatorContext.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -22,10 +22,6 @@
  */
 package fr.ifremer.isisfish.ui.simulator;
 
-import static org.nuiton.i18n.I18n.t;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,11 +32,9 @@
 import fr.ifremer.isisfish.IsisFish;
 import fr.ifremer.isisfish.datastore.RegionStorage;
 import fr.ifremer.isisfish.datastore.ResultInfoStorage;
-import fr.ifremer.isisfish.datastore.ScriptStorage;
 import fr.ifremer.isisfish.simulator.SimulationParameter;
 import fr.ifremer.isisfish.simulator.SimulationParameterImpl;
 import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup;
-import fr.ifremer.isisfish.ui.util.ErrorHelper;
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.context.DefaultJAXXContext;
 

Modified: branches/isis-fish-4.4.0-resultname/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java	2015-06-21 17:13:42 UTC (rev 4275)
@@ -28,10 +28,8 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Properties;
-import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 

Deleted: branches/isis-fish-4.4.0-resultname/src/test/resources/.isis-config-3_cvs
===================================================================
--- branches/isis-fish-4.4.0-resultname/src/test/resources/.isis-config-3_cvs	2015-06-21 17:13:09 UTC (rev 4274)
+++ branches/isis-fish-4.4.0-resultname/src/test/resources/.isis-config-3_cvs	2015-06-21 17:13:42 UTC (rev 4275)
@@ -1,21 +0,0 @@
-#IsisFish configuration version 3
-#Fri Dec 07 10:44:28 GMT 2007
-compileDirectory=/home/tony/isis-build
-cvsSsh2Connexion=false
-defaultExportDirectory=/home/tony/isis-export
-cvsUserName=anonymous
-simulatorServerPassword=guest
-simulatorServer=http\://simulateur.ifremer.fr\:9090
-javadocUrl=http\://isis-fish.labs.libre-entreprise.org/apidocs/
-smtpServer=smtp
-cvsHost=/home/tony/.isis-ssh-host.xml
-cvsHostName=cvs.labs.libre-entreprise.org
-userName=chemit tony
-cvsKeyFile=/home/tony/.isis-ssh-key
-cvsDataBase=isis-fish-data
-database=/home/tony/isis-database-3_cvs
-simulatorServerLogin=anonymous
-language=fr
-country=FR
-userMail=chemit@codelutin.com
-cvsRepository=/cvsroot/isis-fish

    

echatellier＠users.forge.codelutin.com

tags

participants (1)