August 2012 - Isis-fish-commits - mailman.cloud.codelutin.com

r3724 - trunk
by maven-release＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: maven-release Date: 2012-08-10 18:12:36 +0200 (Fri, 10 Aug 2012) New Revision: 3724 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3724 Log: [maven-release-plugin] prepare release isis-fish-4.1.0.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 16:05:29 UTC (rev 3723) +++ trunk/pom.xml 2012-08-10 16:12:36 UTC (rev 3724) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.0.3-SNAPSHOT</version> + <version>4.1.0.3</version>  <dependencies> @@ -730,9 +730,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.1.0.3</url> </scm> <repositories>

1 0

r3723 - trunk
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 18:05:29 +0200 (Fri, 10 Aug 2012) New Revision: 3723 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3723 Log: Udpate to mavenpom 3.3.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:52:27 UTC (rev 3722) +++ trunk/pom.xml 2012-08-10 16:05:29 UTC (rev 3723) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.5</version> + <version>3.3.6</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3722 - trunk
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 16:52:27 +0200 (Fri, 10 Aug 2012) New Revision: 3722 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3722 Log: Fix animal-sniffer signature (sun version) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:43:15 UTC (rev 3721) +++ trunk/pom.xml 2012-08-10 14:52:27 UTC (rev 3722) @@ -624,6 +624,18 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>1.10</version> + </signature> + </configuration> + </plugin> </plugins> </pluginManagement>

1 0

r3721 - trunk
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 16:43:15 +0200 (Fri, 10 Aug 2012) New Revision: 3721 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3721 Log: fixes #1400 : Update to nuiton-matrix 2.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 14:37:18 UTC (rev 3720) +++ trunk/pom.xml 2012-08-10 14:43:15 UTC (rev 3721) @@ -62,14 +62,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.3</version> <scope>compile</scope> </dependency>

1 0

r3720 - trunk/src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 16:37:18 +0200 (Fri, 10 Aug 2012) New Revision: 3720 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3720 Log: Suppression du thread local (gros effet de bord sur les autres tests) Modified: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Modified: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 13:22:56 UTC (rev 3719) +++ trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 14:37:18 UTC (rev 3720) @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.List; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -64,6 +65,11 @@ SimulationContext.get().setSimulationStorage(simRef); } + @After + public void clearThreadLocal() { + SimulationContext.remove(); + } + /** * Test la conversion des entités. * @throws IOException

1 0

r3719 - in trunk: . src/main/java/fr/ifremer/isisfish/util src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 15:22:56 +0200 (Fri, 10 Aug 2012) New Revision: 3719 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3719 Log: Remove cpdetector (not used anymore) Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 13:15:37 UTC (rev 3718) +++ trunk/pom.xml 2012-08-10 13:22:56 UTC (rev 3719) @@ -385,13 +385,6 @@ <scope>compile</scope> </dependency> -  - <dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-10 13:15:37 UTC (rev 3718) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-10 13:22:56 UTC (rev 3719) @@ -386,96 +386,4 @@ } return result; } - - /*protected static CodepageDetectorProxy getCodepageDetector() { - - if (detector == null) { - detector = CodepageDetectorProxy.getInstance(); // A singleton. - - // Add the implementations of info.monitorenter.cpdetector.io.ICodepageDetector: - // This one is quick if we deal with unicode codepages: - detector.add(new ByteOrderMarkDetector()); - // The first instance delegated to tries to detect the meta charset attribut in html pages. - detector.add(new ParsingDetector(true)); // be verbose about parsing. - // This one does the tricks of exclusion and frequency detection, if first implementation is - // unsuccessful: - detector.add(JChardetFacade.getInstance()); // Another singleton. - detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. - } - return detector; - }*/ - - /* - * Convert all files to UTF-8. - * - * @param files fiels to convert - * @return converted file list - * - public static List<File> convertToUnicode(List<File> files) { - - CodepageDetectorProxy myDetector = getCodepageDetector(); - - for (File file : files) { - try { - Charset charset = myDetector.detectCodepage(file.toURI().toURL()); - - if (log.isDebugEnabled()) { - log.debug("Charset for " + file.getAbsolutePath() + " is " + charset); - } - - if (charset != null && !charset.name().equalsIgnoreCase("utf-8")) { - - if (log.isDebugEnabled()) { - log.debug("Convert " + file.getAbsolutePath() + " to unicode"); - } - - File tmpFile = File.createTempFile(file.getName(), ".copy"); - tmpFile.deleteOnExit(); - - // direct copy - InputStream is = new FileInputStream(file); - OutputStream os = new FileOutputStream(tmpFile); - try { - IOUtils.copy(is, os); - } - finally { - is.close(); - os.close(); - } - - // copy using cp transaltion - is = new FileInputStream(tmpFile); - os = new FileOutputStream(file); - Reader ir = new InputStreamReader(is, charset); - Writer ow = new OutputStreamWriter(new FileOutputStream(file), "utf-8"); - try { - IOUtils.copy(ir, ow); - } - finally { - ir.close(); - ow.close(); - is.close(); - os.close(); - } - - } - else { - if (log.isDebugEnabled()) { - log.debug("File " + file.getAbsolutePath() + " already in unicode : skip"); - } - } - } catch (MalformedURLException e) { - if (log.isErrorEnabled()) { - log.error("Can't convert file in unicode", e); - } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Can't convert file in unicode", e); - } - } - - } - - return files; - }*/ } Modified: trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-08-10 13:15:37 UTC (rev 3718) +++ trunk/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-08-10 13:22:56 UTC (rev 3719) @@ -27,19 +27,17 @@ import java.io.File; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.equation.PopulationReproductionEquation; @@ -183,64 +181,7 @@ fB.delete(); FileUtil.deleteRecursively(dest); } - - /* - * Save a file as non utf-8 encoded. - * Convert to uft-8. - * Assert that file has been converted. - * @throws IOException - * - @Test - public void convertToUnicodeTest() throws IOException { - String content = getFirstClassContent("ConvertToUnicode"); - // add un accent - content = content.replace("code", "cod\u00E9"); - - File nonUnicodeFile = File.createTempFile("ConvertToUnicode", ".java", getTestDirectory()); - FileUtil.writeString(nonUnicodeFile, content, "ISO-8859-15"); - - if (log.isDebugEnabled()) { - log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as ISO-8859-15"); - } - - CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); - - // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); - String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); - Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); - - nonUnicodeFile.delete(); - }*/ - - /* - * Try to convert file already in UTF-8. - * - * @throws IOException - * - @Test - public void convertToUnicodeUselessTest() throws IOException { - String content = getFirstClassContent("UselessConvertToUnicode"); - - // add un accent - content = content.replace("code", "cod\u00E9"); - - File nonUnicodeFile = File.createTempFile("UselessConvertToUnicode", ".java", getTestDirectory()); - FileUtil.writeString(nonUnicodeFile, content, "UTF-8"); - - if (log.isDebugEnabled()) { - log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as UTF-8"); - } - - CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); - - // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); - String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); - Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); - - nonUnicodeFile.delete(); - }*/ - /** * Test que le contenu du fichier java correspondant à l'equation est * corectement généré.

1 0

r3718 - in trunk: . src/test/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 15:15:37 +0200 (Fri, 10 Aug 2012) New Revision: 3718 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3718 Log: Update nuiton-matrix and fix tests. Modified: trunk/pom.xml trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-10 09:24:11 UTC (rev 3717) +++ trunk/pom.xml 2012-08-10 13:15:37 UTC (rev 3718) @@ -62,21 +62,15 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.3</version> + <version>2.3-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.3</version> + <version>2.3-SNAPSHOT</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> </dependency> <dependency> Modified: trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java =================================================================== --- trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 09:24:11 UTC (rev 3717) +++ trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-08-10 13:15:37 UTC (rev 3718) @@ -44,9 +44,6 @@ import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Zone; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.TimeStep; @@ -63,7 +60,7 @@ public void setUp() throws IOException, TopiaException { MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); URL zipURL = this.getClass().getResource("/simulations/test-nonregression-20090203.zip"); - SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-nonregression"); + SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-" + System.currentTimeMillis()); SimulationContext.get().setSimulationStorage(simRef); } @@ -75,9 +72,9 @@ @Test public void testImportEntityImportString() throws IOException, TopiaException { String data = "[1, 1, 1]\n" + - "String:testpopulation\n" + - "String:Testengin\n" + - "String:Zone test1\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "Zone:Zone test1\n" + "0;0;0;42.0"; TopiaContext tx = SimulationContext.get().getDB(); @@ -129,7 +126,7 @@ String data = "[1, 1, 2]\n" + "Population:test population\n" + "Gear:Testengin\n" + - "TimeStep:0,1\n" + + "TimeStep:1,0\n" + "0;0;0;1.0\n" + "0;0;1;2.0"; @@ -143,7 +140,7 @@ MatrixND m = MatrixFactory.getInstance().create(sems); m.importCSV(new StringReader(data), null); - Assert.assertEquals(1.0, m.getValue(0, 0, 0), 0.001); - Assert.assertEquals(2.0, m.getValue(0, 0, 1), 0.001); + Assert.assertEquals(2.0, m.getValue(0, 0, 0), 0.001); + Assert.assertEquals(1.0, m.getValue(0, 0, 1), 0.001); } }

1 0

r3717 - in trunk: . src/main/java/fr/ifremer/isisfish/util
by echatellier＠users.forge.codelutin.com 10 Aug '12

10 Aug '12

Author: echatellier Date: 2012-08-10 11:24:11 +0200 (Fri, 10 Aug 2012) New Revision: 3717 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3717 Log: fixes : #1395 Script are compiled using default encoding Modified: trunk/pom.xml trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/pom.xml 2012-08-10 09:24:11 UTC (rev 3717) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.2</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer</groupId> Modified: trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-08-10 09:24:11 UTC (rev 3717) @@ -239,6 +239,8 @@ args.add("-g"); // Show a description of each use or override of a deprecated member or class. args.add("-deprecation"); + args.add("-encoding"); + args.add("utf-8"); args.add("-classpath"); args.add(classpathAsString); args.add("-d"); Modified: trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-08-09 13:04:18 UTC (rev 3716) +++ trunk/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-08-10 09:24:11 UTC (rev 3717) @@ -36,6 +36,7 @@ import java.util.List; import java.util.Map; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -94,9 +95,9 @@ Method interfaceMethod = methods[0]; String content = generateContent(packageName, className, interfaceMethod, script); - - FileUtil.writeString(src, content); + FileUtils.writeStringToFile(src, content, "utf-8"); + int compileResult = CompileHelper.compile(src.getParentFile(), src, src.getParentFile(), out); File dest = new File(src.getParentFile(), className + ".class"); dest.deleteOnExit();

1 0

r3716 - trunk/src/main/java/fr/ifremer/isisfish/aspect
by echatellier＠users.forge.codelutin.com 09 Aug '12

09 Aug '12

Author: echatellier Date: 2012-08-09 15:04:18 +0200 (Thu, 09 Aug 2012) New Revision: 3716 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3716 Log: fixes #1393 : When using statistics, if an exception occurs, it's masked by another one Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java Modified: trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2012-08-08 16:30:02 UTC (rev 3715) +++ trunk/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2012-08-09 13:04:18 UTC (rev 3716) @@ -99,7 +99,7 @@ getTrace().traceBefore(); } - @AfterThrowing(type = "Exception", pointcut = "executeMethod") + @AfterThrowing(type = "java.lang.Exception", pointcut = "executeMethod") public void traceAfterThrowingExecute(JoinPoint jp) { // si une exeption est leve, il faut faire la meme chose traceAfterExecute(jp);

1 0

r3715 - in trunk/src/main/java/fr/ifremer/isisfish: datastore export logging mexico/export simulator types/hibernate ui/sensitivity ui/sensitivity/model util
by echatellier＠users.forge.codelutin.com 08 Aug '12

08 Aug '12

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 @@ } } - -

1 0