Author: chatellier Date: 2009-04-30 15:35:37 +0000 (Thu, 30 Apr 2009) New Revision: 2160 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java Log: Fix hack cache problem (hack still not fixed) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-04-30 15:35:07 UTC (rev 2159) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2009-04-30 15:35:37 UTC (rev 2160) @@ -71,11 +71,20 @@ @SuppressWarnings("unchecked") static protected Map<String, RegionStorage> regions = (Map<String, RegionStorage>) new ReferenceMap(); - /** File to use to store next commit region comment */ protected File commentForNextCommitFile = null; - protected RegionStorage(File directory, String name) { + /** + * Constructor. + * + * @param directory region directory + * @param name region name + * + * FIXME constrcutor is publicc for hack in + * fr.ifremer.isisfish.simulator.SimulationParameter.fromProperties(File, Properties) + * set protected when fix hack + */ + public RegionStorage(File directory, String name) { super(directory, name); commentForNextCommitFile = new File(getDirectory(), "commentForNextCommit.txt"); } 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-04-30 15:35:07 UTC (rev 2159) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2009-04-30 15:35:37 UTC (rev 2160) @@ -349,7 +349,8 @@ // FIXME not good place and code if(this.region == null || !region.getName().equals(regionName)) { - this.region = RegionStorage.getRegion(directory, 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); } try {