Author: echatellier Date: 2015-06-08 14:34:10 +0000 (Mon, 08 Jun 2015) New Revision: 4247 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4247 Log: Misc imports Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java 2015-06-08 13:47:32 UTC (rev 4246) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageCSV.java 2015-06-08 14:34:10 UTC (rev 4247) @@ -136,7 +136,7 @@ new LinkedHashMap<TimeStep, Map<String, MatrixND>>() { private static final long serialVersionUID = 1L; @Override - protected boolean removeEldestEntry(Map.Entry eldest) { + protected boolean removeEldestEntry(Map.Entry<TimeStep, Map<String, MatrixND>> eldest) { return size() > cacheStep; } }; Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2015-06-08 13:47:32 UTC (rev 4246) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/ResultStorageInMemory.java 2015-06-08 14:34:10 UTC (rev 4247) @@ -67,7 +67,7 @@ LinkedHashMap<TimeStep, Map<String, MatrixND>> data = new LinkedHashMap<TimeStep, Map<String, MatrixND>>() { private static final long serialVersionUID = 1L; @Override - protected boolean removeEldestEntry(Map.Entry eldest) { + protected boolean removeEldestEntry(Map.Entry<TimeStep, Map<String, MatrixND>> eldest) { return size() > maxTimeStep; } }; @@ -75,7 +75,7 @@ LinkedHashMap<TimeStep, List<String>> rules = new LinkedHashMap<TimeStep, List<String>>() { private static final long serialVersionUID = 1L; @Override - protected boolean removeEldestEntry(Map.Entry eldest) { + protected boolean removeEldestEntry(Map.Entry<TimeStep, List<String>> eldest) { return size() > maxTimeStep; } }; Modified: branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2015-06-08 13:47:32 UTC (rev 4246) +++ branches/isis-fish-4.4.0-ui-refactoring/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2015-06-08 14:34:10 UTC (rev 4247) @@ -36,9 +36,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; import java.util.Set; Modified: branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java 2015-06-08 13:47:32 UTC (rev 4246) +++ branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/equation/EquationTest.java 2015-06-08 14:34:10 UTC (rev 4247) @@ -24,14 +24,12 @@ */ package fr.ifremer.isisfish.equation; -import fr.ifremer.isisfish.AbstractIsisFishTest; -import fr.ifremer.isisfish.util.Args; -import fr.ifremer.isisfish.util.EvaluatorHelper; -import java.util.Arrays; -import org.apache.commons.lang3.reflect.MethodUtils; import org.junit.Assert; import org.junit.Test; +import fr.ifremer.isisfish.AbstractIsisFishTest; +import fr.ifremer.isisfish.util.EvaluatorHelper; + /** * Equation related tests. * Modified: branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java =================================================================== --- branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java 2015-06-08 13:47:32 UTC (rev 4246) +++ branches/isis-fish-4.4.0-ui-refactoring/src/test/java/fr/ifremer/isisfish/ui/input/InputIT.java 2015-06-08 14:34:10 UTC (rev 4247) @@ -27,7 +27,6 @@ import java.io.File; import java.io.IOException; -import org.apache.commons.lang3.SystemUtils; import org.assertj.swing.core.matcher.JButtonMatcher; import org.junit.Assert; import org.junit.Before;