r3715 - in trunk/src/main/java/fr/ifremer/isisfish: datastore export logging mexico/export simulator types/hibernate ui/sensitivity ui/sensitivity/model util - Isis-fish-commits

8 Aug 2012

Author: echatellier
Date: 2012-08-08 18:30:02 +0200 (Wed, 08 Aug 2012)
New Revision: 3715

Url: http://forge.codelutin.com/repositories/revision/isis-fish/3715

Log:
Fix imports...

Modified:
   trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java
   trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java
   trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java
   trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java
   trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java
   trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java
   trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java
   trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java
   trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java
   trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java
   trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java

Modified: trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java
===================================================================

--- trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -697,12 +697,12 @@
         SimulationStorage result = new SimulationStorage(simDir, name, null);
 
         File data = result.getDataBackupFile();
-        // FIXME was file.exists() ?
         if (data.exists()) {
-            TopiaContext tx = result.getStorage().beginTransaction();
+            TopiaContext root = result.getStorage();
+            TopiaContext tx = root.beginTransaction();
             tx.restore(data);
             tx.commitTransaction();
-            tx.closeContext();
+            root.closeContext();
         }
 
         return result;

Modified: trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -32,18 +32,14 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.commons.beanutils.ConvertUtilsBean;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.topia.TopiaContext;
 
-import fr.ifremer.isisfish.IsisFishException;
 import fr.ifremer.isisfish.datastore.ExportStorage;
-import fr.ifremer.isisfish.datastore.SensitivityExportStorage;
 import fr.ifremer.isisfish.datastore.SimulationStorage;
 import fr.ifremer.isisfish.datastore.StorageHelper;
-import fr.ifremer.isisfish.util.ConverterUtil;
 
 /**
  * Helper for exports manipulation.

Modified: trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -25,7 +25,6 @@
 
 package fr.ifremer.isisfish.logging;
 
-import fr.ifremer.isisfish.IsisConfig;
 import fr.ifremer.isisfish.IsisFish;
 import fr.ifremer.isisfish.IsisFishException;
 import fr.ifremer.isisfish.datastore.SimulationStorage;

Modified: trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -26,7 +26,6 @@
 package fr.ifremer.isisfish.mexico.export;
 
 import org.nuiton.topia.TopiaException;
-import org.nuiton.topia.persistence.HorizontalEntityVisitor;
 
 import fr.ifremer.isisfish.entities.Cell;
 import fr.ifremer.isisfish.entities.FisheryRegion;

Modified: trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -36,7 +36,6 @@
 import fr.ifremer.isisfish.entities.EquationImpl;
 import fr.ifremer.isisfish.entities.Variable;
 import fr.ifremer.isisfish.equation.VariableEquation;
-import fr.ifremer.isisfish.types.TimeStep;
 import fr.ifremer.isisfish.util.EvaluatorHelper;
 
 /**

Modified: trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -41,7 +41,6 @@
 import org.nuiton.math.matrix.MatrixND;
 import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.util.StringUtil;
-import org.hibernate.Hibernate;
 import org.hibernate.HibernateException;
 import org.hibernate.engine.SessionImplementor;
 import org.hibernate.engine.jdbc.NonContextualLobCreator;

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -38,7 +38,6 @@
 import org.jdesktop.jxlayer.JXLayer;
 import org.jdesktop.jxlayer.plaf.AbstractLayerUI;
 import org.jdesktop.jxlayer.plaf.LayerUI;
-import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.topia.persistence.TopiaEntityContextable;
 
 import fr.ifremer.isisfish.ui.input.InputContentUI;

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -42,8 +42,6 @@
 import fr.ifremer.isisfish.simulator.sensitivity.Factor;
 import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup;
 import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
-import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
 
 /**
  * Factor tree cell renderer.

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -47,9 +47,6 @@
  */
 public class FactorTreeModel implements TreeModel {
 
-    /** serialVersionUID. */
-    private static final long serialVersionUID = 593284613450915826L;
-
     /** Tree model root. */
     protected Factor rootFactor;
     

Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -41,7 +41,6 @@
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
 
 import org.apache.commons.lang3.StringUtils;

Modified: trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java	2012-08-08 16:29:42 UTC (rev 3714)
+++ trunk/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java	2012-08-08 16:30:02 UTC (rev 3715)
@@ -56,5 +56,3 @@
     }
 
 }
-
-

    

r3715 - in trunk/src/main/java/fr/ifremer/isisfish: datastore export logging mexico/export simulator types/hibernate ui/sensitivity ui/sensitivity/model util

echatellier＠users.forge.codelutin.com

tags

participants (1)