Author: chatellier Date: 2009-04-28 15:17:38 +0000 (Tue, 28 Apr 2009) New Revision: 2150 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java Log: Refactoring des @Step sur les actions. (ca marche pas avec les enum) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-04-28 10:26:19 UTC (rev 2149) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2009-04-28 15:17:38 UTC (rev 2150) @@ -68,6 +68,42 @@ private static Log log = LogFactory.getLog(IsisConfig.class); /** + * Config step after init. + * + * Refactored, can't be in enum + * + * @see org.codelutin.util.ApplicationConfig.Action.Step + */ + public static final int STEP_AFTER_INIT = 0; + + /** + * Config step after init vcs. + * + * Refactored, can't be in enum + * + * @see org.codelutin.util.ApplicationConfig.Action.Step + */ + public static final int STEP_AFTER_INIT_VCS = 1; + + /** + * Config step after ui. + * + * Refactored, can't be in enum + * + * @see org.codelutin.util.ApplicationConfig.Action.Step + */ + public static final int STEP_AFTER_UI = 2; + + /** + * Config step before exit. + * + * Refactored, can't be in enum + * + * @see org.codelutin.util.ApplicationConfig.Action.Step + */ + public static final int STEP_BEFORE_EXIT = 3; + + /** * La version du logiciel constitue de l.d.a.r * <li>l: le numero de version du logiciel * <li>d: le numero de version du schema de la base de donnees @@ -798,10 +834,6 @@ ////////////////////////////////////////////////// // Toutes les actions disponibles ////////////////////////////////////////////////// - - static public enum Step { - AfterInit, AfterInitVCS, AfterUI, BeforeExit - } public static enum Action { HELP(_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"), Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-04-28 10:26:19 UTC (rev 2149) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-04-28 15:17:38 UTC (rev 2150) @@ -128,29 +128,34 @@ // initialisation de l'application IsisFish.init(args); - log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); - + if (log.isDebugEnabled()) { + log.debug(_("isisfish.launch.init.done", config.getElapsedTimeAsString())); + } + // action after init - config.doAction(IsisConfig.Step.AfterInit.ordinal()); + config.doAction(IsisConfig.STEP_AFTER_INIT); - // initVCS ask for passphrase, ui must be set before - initLoookAndFeel(); - + // static vcs init (needed for some actions) try { initVCS(); } catch (Exception eee) { log.warn(_("Error during vcs initialisation"), eee); } - log.info(_("isisfish.launching", config.getElapsedTimeAsString())); + // initVCS ask for passphrase, ui must be set before + initLoookAndFeel(); + if (log.isInfoEnabled()) { + log.info(_("isisfish.launching", config.getElapsedTimeAsString())); + } + // after init vcs and local data - config.doAction(IsisConfig.Step.AfterInitVCS.ordinal()); - + config.doAction(IsisConfig.STEP_AFTER_INIT_VCS); + launchUI(); // action after ui launched - config.doAction(IsisConfig.Step.AfterUI.ordinal()); + config.doAction(IsisConfig.STEP_AFTER_UI); } catch (Exception e) { e.printStackTrace(); quit(); @@ -176,7 +181,7 @@ @Override public void run() { try { - config.doAction(IsisConfig.Step.BeforeExit.ordinal()); + config.doAction(IsisConfig.STEP_BEFORE_EXIT); } catch (Exception eee) { log.info("Error in quit daemon", eee); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-04-28 10:26:19 UTC (rev 2149) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2009-04-28 15:17:38 UTC (rev 2150) @@ -19,6 +19,19 @@ package fr.ifremer.isisfish.actions; +import static org.codelutin.i18n.I18n._; + +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.regex.Pattern; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.util.FileUtil; +import org.codelutin.util.ApplicationConfig.Action.Step; + import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.datastore.AnalysePlanStorage; import fr.ifremer.isisfish.datastore.DataStorage; @@ -29,24 +42,15 @@ import fr.ifremer.isisfish.datastore.ScriptStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Pattern; -import static org.codelutin.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.util.FileUtil; - /** - * + * Export actions. + * * @author poussin - * @version $Revision: 1862 $ + * @version $Revision$ * - * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ - * by : $Author: chatellier $ + * Last update: $Date$ + * by : $Author$ */ public class ExportAction { @@ -59,7 +63,7 @@ this.config = config; } - public void applyFilter(String filter, List<String> names) { + protected void applyFilter(String filter, List<String> names) { if (filter != null && !"*".equals(filter)) { Pattern p = Pattern.compile(filter); // apply filter on names found @@ -72,7 +76,7 @@ } } - public void display(String filter, List<String> names) { + protected void display(String filter, List<String> names) { StringBuilder sb = new StringBuilder(); sb.append(" found ").append(names.size()); sb.append(" with filter ").append(filter); @@ -156,8 +160,9 @@ } } + @Step(IsisConfig.STEP_AFTER_INIT_VCS) public void exportSimulation(File file, String name, boolean force) throws Exception { - log.info("file:" + file + ", name:" + name); + log.info("exportSimulation in file " + file + " ( " + name + ", force = " + force + ")"); if (!force && file.exists()) { throw new IllegalArgumentException(_("destination already exists %s use 'force' argument to force overwrite", file)); } Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java ___________________________________________________________________ Name: svn:keywords + Date Author Revision