Author: chatellier Date: 2010-04-30 12:09:05 +0000 (Fri, 30 Apr 2010) New Revision: 3039 Log: Fix duplicated preScript storage (just deprecated, still used when simulating from comand line) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2010-04-30 07:41:38 UTC (rev 3038) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2010-04-30 12:09:05 UTC (rev 3039) @@ -98,13 +98,15 @@ * Constructor. * * @param control le control pour la simulation. - * @param param les parametres de simulation. + * @param param les parametres de simulation (can be null) */ public SimulationItem(SimulationControl control, SimulationParameter param) { this.control = control; // use soft reference to improve minimum memory usage - this.parameter = new SimulationParameterCache(param); + if (param != null) { + this.parameter = new SimulationParameterCache(param); + } } /** @@ -171,7 +173,20 @@ * @deprecated use cached simulation parameter instead */ public String getSimulationPrescriptContent() { - return simulationPrescriptContent; + + String preScript = simulationPrescriptContent; + + // simulationPrescriptContent is not null when isis is lauched with + // simulation on comand line + // If preScript but params is not null, simulation has been launched by + // UI, use cached simulation parameters + if (preScript == null && parameter != null) { + if (parameter.getUsePreScript()) { + preScript = parameter.getPreScript(); + } + } + + return preScript; } /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2010-04-30 07:41:38 UTC (rev 3038) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2010-04-30 12:09:05 UTC (rev 3039) @@ -255,11 +255,12 @@ //File zip = item.getSimulationZip(); // get prescript content, only if UsePreScript is set to true - String simulationPrescript = null; + // FIXME EC-20100410 use prescriot already present in params + /*String simulationPrescript = null; if(param.getUsePreScript()) { simulationPrescript = param.getPreScript(); item.setSimulationPrescriptContent(simulationPrescript); - } + }*/ launcher.simulate(simulationService, item); }