Author: echatellier Date: 2014-03-21 10:29:21 +0100 (Fri, 21 Mar 2014) New Revision: 3901 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3901 Log: jaxx can't handle java 7 code Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -63,7 +63,7 @@ public static final String EXPORT_TEMPLATE = "templates/script/export.ftl"; /** Instance cache. */ - private static Map<String, ExportStorage> exportCache = new ReferenceMap<>(); + private static Map<String, ExportStorage> exportCache = new ReferenceMap<String, ExportStorage>(); /** * Constructeur. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ObjectiveStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -52,7 +52,7 @@ public static final String OBJECTIVE_TEMPLATE = "templates/script/objective.ftl"; /** Instance cache. */ - private static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<>(); + private static Map<String, ObjectiveStorage> objectiveCache = new ReferenceMap<String, ObjectiveStorage>(); /** * Contruit un nouveau storage Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/OptimizationStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -52,7 +52,7 @@ public static final String OPTIMIZATION_TEMPLATE = "templates/script/optimization.ftl"; /** Instance cache. */ - private static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<>(); + private static Map<String, OptimizationStorage> objectiveCache = new ReferenceMap<String, OptimizationStorage>(); /** * Contruit un nouveau storage Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -70,7 +70,7 @@ private static Log log = LogFactory.getLog(RegionStorage.class); /** Instance cache. */ - protected static Map<String, RegionStorage> regions = new ReferenceMap<>(); + protected static Map<String, RegionStorage> regions = new ReferenceMap<String, RegionStorage>(); /** File to use to store next commit region comment. */ protected File commentForNextCommitFile = null; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -68,7 +68,7 @@ public static final String RULE_TEMPLATE = "templates/script/rule.ftl"; /** Instance cache. */ - private static Map<String, RuleStorage> rulesCache = new ReferenceMap<>(); + private static Map<String, RuleStorage> rulesCache = new ReferenceMap<String, RuleStorage>(); /** * Contruit un nouveau rule storage Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -54,7 +54,7 @@ public static final String SCRIPT_TEMPLATE = "templates/script/script.ftl"; /** Instance cache. */ - static private Map<String, ScriptStorage> scriptsCache = new ReferenceMap<>(); + static private Map<String, ScriptStorage> scriptsCache = new ReferenceMap<String, ScriptStorage>(); /** * Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -56,7 +56,7 @@ public static final String SENSITIVITY_EXPORT_TEMPLATE = "templates/script/sensitivityexport.ftl"; /** Instance cache. */ - private static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<>(); + private static Map<String, SensitivityExportStorage> sensitivityExportsCache = new ReferenceMap<String, SensitivityExportStorage>(); /** * Constructeur. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -85,7 +85,7 @@ private static Log log = LogFactory.getLog(SimulationStorage.class); /** Cache des simulation storage. */ - protected static Map<String, SimulationStorage> simulations = new ReferenceMap<>(); + protected static Map<String, SimulationStorage> simulations = new ReferenceMap<String, SimulationStorage>(); /** some free information, that user can add during simulation */ protected SimulationInformation information = null; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-03-20 14:53:11 UTC (rev 3900) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2014-03-21 09:29:21 UTC (rev 3901) @@ -55,7 +55,7 @@ public static final String SIMULATOR_TEMPLATE = "templates/script/simulator.ftl"; /** Simulators cache. */ - static private Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<>(); + static private Map<String, SimulatorStorage> simulatorsCache = new ReferenceMap<String, SimulatorStorage>(); /** * Constructeur.