Author: sletellier Date: 2009-05-13 17:13:02 +0000 (Wed, 13 May 2009) New Revision: 2229 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Hacked : Rechargement de base ayant le meme nom en AS Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-13 15:58:31 UTC (rev 2228) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-13 17:13:02 UTC (rev 2229) @@ -314,6 +314,17 @@ * @return Parameter property. */ public SimulationParameter getParameter() { + return getParameter(null); + } + + /** + * Get parameter property. + * + * This method open database. + * + * @return Parameter property. + */ + public SimulationParameter getParameter(File dir) { if (parameter == null) { Properties prop = new Properties(); File file = getSimulationParametersFile(); @@ -329,7 +340,7 @@ prop.load(in); in.close(); parameter = new SimulationParameter(); - parameter.fromProperties(getDirectory(), prop); + parameter.fromProperties(dir, prop); } catch (IOException eee) { throw new IsisFishRuntimeException(_( "isisfish.error.read.simulation.parameters", file), eee); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-05-13 15:58:31 UTC (rev 2228) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-05-13 17:13:02 UTC (rev 2229) @@ -350,7 +350,7 @@ "useStatistic", "true")); // FIXME not good place and code - if(this.region == null || !region.getName().equals(regionName)) { + if(directory != null && (this.region == null || !region.getName().equals(regionName))) { // ATTENTION: directory pointe sur le repertoire de la simulation et non de la region this.region = new RegionStorage(directory, regionName); // RegionStorage.getRegion(directory, regionName); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-13 15:58:31 UTC (rev 2228) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-13 17:13:02 UTC (rev 2229) @@ -171,8 +171,7 @@ fos = new FileInputStream(f); Properties proper = new Properties(); proper.load(fos); - param.fromProperties(SimulationStorage.getSimulationDirectory(), - proper); + param.fromProperties(null, proper); } catch (Exception e) { if (log.isErrorEnabled()) { log.error("Can't import simulation", e);