Index: lutincommandline/src/java/org/codelutin/option/def/DefinitionParser.java diff -u lutincommandline/src/java/org/codelutin/option/def/DefinitionParser.java:1.2 lutincommandline/src/java/org/codelutin/option/def/DefinitionParser.java:1.3 --- lutincommandline/src/java/org/codelutin/option/def/DefinitionParser.java:1.2 Sun Mar 16 03:49:50 2008 +++ lutincommandline/src/java/org/codelutin/option/def/DefinitionParser.java Sun Mar 16 07:11:27 2008 @@ -19,20 +19,17 @@ package org.codelutin.option.def; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import static org.codelutin.i18n.I18n._; import static org.codelutin.option.def.DefinitionParserContexts.ConfigContext; import static org.codelutin.option.def.DefinitionParserContexts.OptionContext; import static org.codelutin.option.def.DefinitionParserContexts.ParserContext; import static org.codelutin.option.def.DefinitionParserUtil.TypeSource; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import java.io.IOException; import java.io.Writer; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; -import java.util.Collections; /** * Parseur de définitions. TODO Revoir javadoc non correcte @@ -52,51 +49,6 @@ public abstract class DefinitionParser { protected static final Log log = LogFactory.getLog(DefinitionParser.class); - - /** - * les options gérées par commandline (config, help, usage...). - *

- * Ces options seront générés par le plugin commandline car sont génériques. - * - * @author chemit - */ - public enum DefaultOption { - - showConfig("--show-config * [@categories@] [normal|all|tec]"), - editConfig("--edit-config"), - changeFileConfig("--config-file "), - changeConfig("--config * [@categories@] "), - help("--help|-h"), - resetConfig("--reset-config"), - ui("--ui "); - - private final String def; - - protected static boolean skipDefault=false; - - private DefaultOption(String def) { - this.def = def; - } - - public String def() { - return def; - } - - public String configKey() { - return name() + DefinitionParserUtil.ODEFINITION_KEY_SUFFIX; - } - - public static List getConfigKeys() { - List defaultOptions = new ArrayList(); - if (!skipDefault) { - for (DefaultOption option : DefaultOption.values()) { - defaultOptions.add(option.configKey()); - } - Collections.sort(defaultOptions); - } - return defaultOptions; - } - } /** * les propriétés de configuration obligatoires. Index: lutincommandline/src/java/org/codelutin/option/def/DefaultOption.java diff -u /dev/null lutincommandline/src/java/org/codelutin/option/def/DefaultOption.java:1.1 --- /dev/null Sun Mar 16 07:11:32 2008 +++ lutincommandline/src/java/org/codelutin/option/def/DefaultOption.java Sun Mar 16 07:11:27 2008 @@ -0,0 +1,67 @@ +package org.codelutin.option.def; + +import org.codelutin.option.OptionActionRunnable; +import org.codelutin.option.OptionActionRunnableChangeConfig; +import org.codelutin.option.OptionActionRunnableChangeFileConfig; +import org.codelutin.option.OptionActionRunnableEditConfig; +import org.codelutin.option.OptionActionRunnableHelp; +import org.codelutin.option.OptionActionRunnableResetConfig; +import org.codelutin.option.OptionActionRunnableShowConfig; +import org.codelutin.option.OptionActionRunnableUi; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * les options gérées par commandline (config, help, usage...). + *

+ * Ces options seront générés par le plugin commandline car sont génériques. + * + * @author chemit + */ +public enum DefaultOption { + + showConfig("--show-config * [@categories@] [normal|all|tec]", OptionActionRunnableShowConfig.class), + editConfig("--edit-config", OptionActionRunnableEditConfig.class), + changeFileConfig("--config-file ", OptionActionRunnableChangeFileConfig.class), + changeConfig("--config * [@categories@] ", OptionActionRunnableChangeConfig.class), + help("--help|-h", OptionActionRunnableHelp.class), + resetConfig("--reset-config", OptionActionRunnableResetConfig.class), + ui("--ui ", OptionActionRunnableUi.class); + + private final String def; + private final Class action; + + public static boolean skipDefault = false; + + private DefaultOption(String def, Class action) { + this.def = def; + this.action = action; + } + + public String def() { + return def; + } + + public String configKey() { + return name() + DefinitionParserUtil.ODEFINITION_KEY_SUFFIX; + } + + public Class action() { + return action; + } + + public static List getConfigKeys() { + List defaultOptions = new ArrayList(); + if (!skipDefault) { + for (DefaultOption option : DefaultOption.values()) { + defaultOptions.add(option.configKey()); + } + Collections.sort(defaultOptions); + } + return defaultOptions; + } + + +}