Author: chatellier Date: 2010-01-22 10:20:57 +0000 (Fri, 22 Jan 2010) New Revision: 2928 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java Log: Fix simulation monitoring stop condition. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-20 16:39:20 UTC (rev 2927) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2010-01-22 10:20:57 UTC (rev 2928) @@ -527,7 +527,7 @@ // FIXME check SimulationStorage.exists(control.getId()) condition if (control.getProgress() > 0 - && control.getProgress() >= control.getProgressMax() && simulationExists(control.getId())) { + && control.getProgress() >= control.getProgressMax() && SimulationStorage.exists(control.getId())) { simulationEnded = true; } } @@ -541,27 +541,6 @@ } /** - * Check if simulation exists by checking "parameters.properties" file - * existense. - * - * @return {@code true} if simulation exists - */ - protected boolean simulationExists(String simulationId) { - boolean result = false; - - // works better than checking simulationDirectory - // existence, because directory can exists event if - // simulations doesn't exists - File simulationDirectory = new File(SimulationStorage.getSimulationDirectory(), simulationId); - File parametersFile = SimulationStorage.getSimulationParametersFile(simulationDirectory); - if (parametersFile.exists()) { - result = true; - } - - return result; - } - - /** * Operation to do after simulation end. * * - get simulation result