Author: chatellier Date: 2009-10-30 10:51:04 +0000 (Fri, 30 Oct 2009) New Revision: 2720 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java Log: Update actions Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -36,7 +36,8 @@ import fr.ifremer.isisfish.datastore.SimulatorStorage; /** - * + * Import actions. + * * @author poussin * @version $Revision: 1862 $ * Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -1,5 +1,5 @@ /* *##% - * Copyright (C) 2002-2008 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002-2009 Ifremer, Code Lutin, Benjamin Poussin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,58 +19,38 @@ package fr.ifremer.isisfish.actions; -import static org.nuiton.i18n.I18n._; +import java.util.Arrays; -import java.io.File; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import fr.ifremer.isisfish.IsisConfig; -import fr.ifremer.isisfish.IsisFish; -import fr.ifremer.isisfish.vcs.VCS; -import java.util.Arrays; /** - * + * Other actions. + * * @author poussin * @version $Revision: 1862 $ - * + * * Last update: $Date: 2009-02-23 16:42:34 +0100 (lun. 23 févr. 2009) $ * by : $Author: chatellier $ */ public class OtherAction { - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(OtherAction.class); - protected IsisConfig config = null; - + public OtherAction(IsisConfig config) { this.config = config; } - + static public void help() { System.out.println("Usage: isis-fish [-h]"); - System.out.println("Options (set with --option <key> <value>:"); + System.out.println("Options (set with --option <key> <value>) :"); for (IsisConfig.Option o : IsisConfig.Option.values()) { - System.out.println("\t" + o.key + "(" + o.defaultValue + "):" + o.description); + System.out.println("\t" + o.key + "(" + o.defaultValue + ") : " + o.description); } System.out.println("Actions:"); for (IsisConfig.Action a : IsisConfig.Action.values()) { - System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + "):" + a.description); + System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + ") : " + a.description); } System.exit(0); } - - public void chekoutMavenFile() throws Exception { - VCS vcs = IsisFish.vcs; - File dest = config.getDatabaseDirectory(); - File file = new File(dest, "pom.xml"); - log.info(_("Checkout pom.xml to %s", file)); - vcs.update(file, false); - } - - } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -31,7 +31,8 @@ import fr.ifremer.isisfish.IsisConfig; /** - * + * VCS actions. + * * @author poussin * @version $Revision: 1862 $ * @@ -78,10 +79,11 @@ } public void vcsUpdate() throws Exception { - // ATTENTION: il est inutil de d'accepter cette option au premier + // ATTENTION: il est inutile de d'accepter cette option au premier // lancement! car on a effectue soit un checkout, soit - // une migration // !IsisContext.get().isFirstLaunch() -// Welcome.updateVCS(null); + // une migration + // !IsisContext.get().isFirstLaunch() + // Welcome.updateVCS(null); } public void vcsAdd(File ... file) throws Exception { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2009-10-30 10:26:13 UTC (rev 2719) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2009-10-30 10:51:04 UTC (rev 2720) @@ -1,5 +1,5 @@ /** - * Command line action classes implementation. + * Command line actions classes implementation. */ package fr.ifremer.isisfish.actions;