Author: chatellier Date: 2009-05-25 16:07:08 +0000 (Mon, 25 May 2009) New Revision: 2275 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 Log: Update javadoc about region root directory hack 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-25 16:02:49 UTC (rev 2274) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2009-05-25 16:07:08 UTC (rev 2275) @@ -321,10 +321,12 @@ * Get parameter property. * * This method open database. - * + * + * @param directory if not null, region will be forced to this directory + * * @return Parameter property. */ - public SimulationParameter getParameter(File dir) { + public SimulationParameter getParameter(File directory) { if (parameter == null) { Properties prop = new Properties(); File file = getSimulationParametersFile(); @@ -340,7 +342,7 @@ prop.load(in); in.close(); parameter = new SimulationParameter(); - parameter.fromProperties(dir, prop); + parameter.fromProperties(directory, 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-25 16:02:49 UTC (rev 2274) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-05-25 16:07:08 UTC (rev 2275) @@ -231,7 +231,7 @@ * Cela permet de le stocker facilement sur le disque. * * @return L'objet Properties representant les parametres - * @see #fromProperties(File,Properties) + * @see #fromProperties(File, Properties) */ public Properties toProperties() { Properties result = new Properties(); @@ -338,6 +338,12 @@ return result; } + /** + * Load properties from file. + * + * @param directory if not null, region will be forced to this directory + * @param props property to read + */ public void fromProperties(File directory, Properties props) { isisFishVersion = props.getProperty("isisFishVersion", ""); description = props.getProperty("description", ""); @@ -350,7 +356,7 @@ "useStatistic", "true")); // FIXME not good place and code - if(directory != null && (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); }