Author: chatellier Date: 2011-03-29 13:00:54 +0000 (Tue, 29 Mar 2011) New Revision: 3212 Log: Misc improvments Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-03-29 10:12:18 UTC (rev 3211) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-03-29 13:00:54 UTC (rev 3212) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -138,7 +138,8 @@ log.info("Command line action : simulateWithSimulationAndScript (" + simulationId + ", " + simulationZip.getAbsolutePath() + ", " + simulationPrescript + ")"); } - String name = simulationId; // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); + // ne pas mettre la date, car le sub process la met deja + " " + new SimpleDateFormat("yyyy-MM-dd-HH-mm").format(new Date()); + String name = simulationId; //SimulationStorage simulation = launcher.simulate(null, control, simulationZip); //simulation.getStorage().closeContext(); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-03-29 10:12:18 UTC (rev 3211) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-03-29 13:00:54 UTC (rev 3212) @@ -36,6 +36,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -133,8 +134,7 @@ control.setStarted(true); // replace prescript if specified on method - if (simulationPrescript != null - && !simulationPrescript.trim().isEmpty()) { + if (StringUtils.isNotBlank(simulationPrescript)) { param.setUsePreScript(true); param.setPreScript(simulationPrescript); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-03-29 10:12:18 UTC (rev 3211) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-03-29 13:00:54 UTC (rev 3212) @@ -125,24 +125,12 @@ protected String simulName = null; protected SensitivityStorage sensitivityStorage = null; - /** List de facteur sous forme d'arbre (factor group). {@code null} name for compatibility with 3.3.0.0 */ + /** + * List de facteur sous forme d'arbre (factor group). + * {@code null} name for compatibility with 3.3.0.0. + */ protected FactorGroup factorGroup = new FactorGroup(null, true); - //protected SortedMap<String, Factor> factors = new TreeMap<String, Factor>(); - /* - * @deprecated this is not a good idea to store factor source component in - * case, and found a new component instance that can edit a factor (simulation reloading) - * - protected Map<String, JComponent> factorComponent = new HashMap<String, JComponent>();*/ - - //protected DesignPlan designPlan = new DesignPlan(); - - /* - ************ - * Init - ************ - */ - public SimulAction() { init(); } @@ -837,10 +825,6 @@ public FactorGroup getFactorGroup() { return factorGroup; } - - /*public SortedMap<String, Factor> getFactors() { - return factors; - }*/ /** * Search factor in factor group tree by path. @@ -904,9 +888,6 @@ log.debug("Add factor (" + f.getName() + ") : " +f.getPath()); } factorGroup.addFactor(f); - //factors.put(f.getPath() + f.getName(), f); - //factorComponent.put(f.getPath() + f.getName(), c); - //designPlan.setFactors(getFactorGroup().getFactors()); } public void addContinuousFactor(String name, String comment, String path, Double min, @@ -977,16 +958,6 @@ addFactor(f); } - /*public JComponent getFactorComponent(Factor f) { - return factorComponent.get(f.getPath() + f.getName()); - }*/ - - /*public void removeFactor(Factor f) { - factors.remove(f.getPath() + f.getName()); - factorComponent.remove(f.getPath() + f.getName()); - //designPlan.setFactors(getFactorGroup().getFactors()); - }*/ - /* ************ * General