Author: chatellier Date: 2009-06-25 13:08:16 +0000 (Thu, 25 Jun 2009) New Revision: 2430 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java Log: Update doc, remove one fixme. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-06-25 08:59:41 UTC (rev 2429) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2009-06-25 13:08:16 UTC (rev 2430) @@ -33,7 +33,9 @@ import fr.ifremer.isisfish.export.ExportHelper; /** - * SimulationExportResultWrapper. + * Export simulation listener. + * + * Do export after simulation ends. * * Created: 14 nov. 07 00:22:51 * @@ -52,22 +54,16 @@ /* * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) */ + @Override public void afterSimulation(SimulationContext context) { SimulationStorage simulation = context.getSimulationStorage(); SimulationParameter parameters = simulation.getParameter(); File rootDirectory = simulation.getDirectory(); - // - // Export des résultats - // - /*if (parameters.getExportNames() != null - && parameters.getExportNames().size() > 0) { - File exportDir = SimulationStorage.getResultExportDirectory(rootDirectory); - exportDir.mkdirs(); - ExportHelper.doExport(simulation, exportDir, parameters.getExportNames(), rootDirectory); - }*/ - // FIXME changed since sensitivity export adding // Ici on contantene les 2 listes d'exports + + // first, make export instances based on export + // names List<Export> allExports = new ArrayList<Export>(); if (parameters.getExportNames() != null) { for (String exportName : parameters.getExportNames()) { @@ -82,9 +78,14 @@ } } } + + // second, add already instanciated sensitivity + // exports (with parameters) if (parameters.getSensitivityExport() != null) { allExports.addAll(parameters.getSensitivityExport()); } + + // make exports if (!allExports.isEmpty()) { File exportDir = SimulationStorage .getResultExportDirectory(rootDirectory); @@ -97,6 +98,7 @@ /* * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) */ + @Override public void beforeSimulation(SimulationContext context) { } }