Author: sletellier Date: 2008-10-08 13:29:36 +0000 (Wed, 08 Oct 2008) New Revision: 1537 Modified: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Interface JAXX Modified: isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2008-10-08 13:29:21 UTC (rev 1536) +++ isis-fish/branches/arbo-maven/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2008-10-08 13:29:36 UTC (rev 1537) @@ -40,14 +40,17 @@ */ package fr.ifremer.isisfish.ui.simulator; +import static org.codelutin.i18n.I18nf._; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.RegionStorage; import fr.ifremer.isisfish.datastore.RuleStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.simulator.SimulationHelper; import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.simulator.launcher.SimulationService; +import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -56,6 +59,7 @@ import java.util.logging.Logger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.codelutin.log.UserLog; public class SimulAction { @@ -67,6 +71,7 @@ protected SimulationStorage simulStorage = null; protected RuleStorage ruleStorage = null; protected Map<Rule, String> rules = new HashMap<Rule, String>(); + static private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-HH-mm"); public SimulAction(){ param = new SimulationParameter(); } @@ -153,8 +158,18 @@ public void clearRules() { param.clearRules(); } - public void simul(String name) { - SimulationHelper.simulate(name, param, true); + public void simul(String simulId, SimulatorLauncher launcher) { + simulId += " " + dateFormat.format(new java.util.Date()); + + if (simulId == null || "".equals(simulId) || + SimulationStorage.localyExists(simulId) || + SimulationService.getService().exists(simulId)) { + UserLog.error(_("Can't start simulation, bad id: %s", simulId)); + } else { + SimulationParameter p = param.copy(); + + SimulationService.getService().submit(simulId, p, launcher, 0); + } } public void addTagValue(String tag, String value){ param.getTagValue().put(tag, value); @@ -167,4 +182,7 @@ log.debug("call saveTagValue: " + tagValues); IsisFish.config.setDefaultTagValues(tagValues); } + public List<SimulatorLauncher> getSimulationLauncher(){ + return SimulationService.getService().getSimulationLaunchers(); + } }