Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java:1.8 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java:1.9 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java:1.8 Sun Mar 16 07:02:25 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java Sun Mar 16 11:15:48 2008 @@ -24,7 +24,6 @@ import org.codelutin.option.OptionParser; import org.codelutin.option.def.ArgumentType; import org.codelutin.option.def.ArgumentValueType; -import org.codelutin.option.def.DefaultOption; import org.codelutin.option.def.DefinitionParser; import org.codelutin.option.def.DefinitionParserContexts.ArgumentContext; import org.codelutin.option.def.DefinitionParserContexts.ConfigContext; @@ -33,6 +32,7 @@ import org.codelutin.option.def.DefinitionParserUtil; import org.codelutin.option.def.OptionDefinition; import org.codelutin.option.def.OptionDefinitionBuilder; +import org.codelutin.option.def.DefaultOptionAction; import org.codelutin.util.StringUtil; import java.io.File; @@ -189,9 +189,9 @@ for (int i = 0; i < ocontexts.length; i++) { OptionContext context = ocontexts[i]; String key = context.getKey(); - DefaultOption option; + DefaultOptionAction option; try { - option = DefaultOption.valueOf(key); + option = DefaultOptionAction.valueOf(key); } catch (Exception e) { // not a option = null; Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java:1.1 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java:1.2 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java:1.1 Sat Mar 15 01:22:22 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java Sun Mar 16 11:15:48 2008 @@ -19,18 +19,14 @@ package org.codelutin.option.generate.java; import org.apache.commons.lang.StringUtils; -import org.codelutin.option.ParserException; -import org.codelutin.option.def.ArgumentType; -import org.codelutin.option.def.ArgumentValueType; -import org.codelutin.option.def.DefinitionParserContexts.ArgumentContext; +import org.codelutin.option.ParserFailedException; import org.codelutin.option.def.DefinitionParserContexts.ConfigContext; -import org.codelutin.option.def.DefinitionParserContexts.GroupContext; -import org.codelutin.option.def.DefinitionParserContexts.OptionContext; -import org.codelutin.option.def.DefinitionParserUtil; import java.io.File; import java.io.IOException; -import static java.lang.reflect.Modifier.*; +import static java.lang.reflect.Modifier.ABSTRACT; +import static java.lang.reflect.Modifier.PROTECTED; +import static java.lang.reflect.Modifier.PUBLIC; import java.text.FieldPosition; import java.text.MessageFormat; @@ -87,10 +83,10 @@ protected void addContent() { registerImport(normalImports, IOException.class); - registerImport(normalImports, ParserException.class); + registerImport(normalImports, ParserFailedException.class); builder.append('\n'); - addConstructor(null, PROTECTED, "super(args);", new String[]{IOException.class.getSimpleName(), ParserException.class.getSimpleName()}, "String[] args"); + addConstructor(null, PROTECTED, "super(args);", new String[]{IOException.class.getSimpleName(), ParserFailedException.class.getSimpleName()}, "String[] args"); // add parser accessor generateParserAccessor(); @@ -154,12 +150,12 @@ } protected String generateMainConfigAccessorJavadoc(String abstractClass) { - StringBuilder sb = new StringBuilder(); - sb.append("Accesseur typ\u00E9 de l'instance partag\u00E9e de la configuration principale."); - sb.append("\n\n@return la configuration principale"); - sb.append("\n@see ").append(abstractClass).append('\n'); - return sb.toString(); - } + StringBuilder sb = new StringBuilder(); + sb.append("Accesseur typ\u00E9 de l'instance partag\u00E9e de la configuration principale."); + sb.append("\n\n@return la configuration principale"); + sb.append("\n@see ").append(abstractClass).append('\n'); + return sb.toString(); + } protected String generateParserAccessorJavadoc(String abstractClass) { StringBuilder sb = new StringBuilder(); @@ -169,65 +165,4 @@ return sb.toString(); } - private final static MessageFormat OPTION_BEGIN = new MessageFormat("// option {0}/{1} : {2}\n"); - - /** - * A walker to generate the content of buildDefinition(OptionDefinitionBuilder) - * method. - * - * @author chemit - */ - class ToInitMethodSourceWalker extends DefinitionParserUtil.DefinitionParserWalker { - - protected StringBuilder builder; - - public String doWalk(OptionContext[] ocontexts) { - this.builder = new StringBuilder(); - invokeBuilderMethod("beginBuilder", ocontexts.length); - walk(ocontexts); - invokeBuilderMethod("endBuilder"); - return builder.toString(); - } - - @Override - protected void enterOption(OptionContext option, int optionIndex) { - StringBuffer sb = new StringBuffer(); - OPTION_BEGIN.format(new Object[]{optionIndex + 1, option.getParent().getContexts().size(), option.getKey()}, sb, new FieldPosition(0)); - builder.append(sb.toString()); - invokeBuilderMethod("beginOption", option.getContexts().size()); - } - - @Override - protected void exitOption(OptionContext option, int optionIndex) { - invokeBuilderMethod("endOption", option.getKey(), option.getMin(), option.getMax(), option.getAlias()); - } - - - @Override - protected void enterGroup(GroupContext group, int groupIndex) { - invokeBuilderMethod("beginGroup", group.getContexts().size()); - } - - @Override - protected void exitGroup(GroupContext group, int groupIndex) { - invokeBuilderMethod("endGroup", group.getPos()); - } - - @Override - protected void enterArgument(ArgumentContext argument, int argumentIndex) { - ArgumentType type = argument.getType(); - if (type == ArgumentType.constant) { - invokeBuilderMethod("addConstantArgument", argument.getKey(), argument.getMin()); - } else { - ArgumentValueType valueType = argument.getValueType(); - registerStaticImport(staticImports, ArgumentType.class, type + ""); - registerStaticImport(staticImports, ArgumentValueType.class, valueType + ""); - invokeBuilderMethod("addArgument", type, valueType, argument.getKey(), argument.getMin(), argument.getMax()); - } - } - - private void invokeBuilderMethod(String methodName, Object... params) { - invokeMethod(builder, "builder", methodName, params); - } - } } \ No newline at end of file Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionActionJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionActionJavaGenerator.java:1.2 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionActionJavaGenerator.java:1.3 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionActionJavaGenerator.java:1.2 Sun Mar 16 07:02:25 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionActionJavaGenerator.java Sun Mar 16 11:15:48 2008 @@ -22,7 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.codelutin.option.def.ArgumentType; import org.codelutin.option.def.ArgumentValueType; -import org.codelutin.option.def.DefaultOption; +import org.codelutin.option.def.DefaultOptionAction; import org.codelutin.option.def.DefinitionParserContexts.ArgumentContext; import org.codelutin.option.def.DefinitionParserContexts.GroupContext; import org.codelutin.option.def.DefinitionParserContexts.OptionContext; @@ -59,9 +59,9 @@ String parserClass, String contextClass) throws IOException { String key = context.getKey(); - DefaultOption option; + DefaultOptionAction option; try { - option = DefaultOption.valueOf(key); + option = DefaultOptionAction.valueOf(key); } catch (Exception e) { // not a option = null; @@ -88,7 +88,7 @@ private static final MessageFormat CLASS_JAVADOC_MESSAGE = new MessageFormat("Implantation de l''action associ\u00E9e à l''option {0}\n" + "qui est implant\u00E9e dans la classe {1}.\n\n@author {2}\n@see {3}\n@see {4}"); - protected DefaultOption option; + protected DefaultOptionAction option; protected OptionContext context; protected String optionPack, parserPack; @@ -107,7 +107,7 @@ String parserPack, String parserClass, String contextClass, - DefaultOption option) { + DefaultOptionAction option) { super(out, timestamp, i18nPrefix, option == null ? PUBLIC | ABSTRACT : PUBLIC, pack, option == null ? simpleName : simpleName.replace("Abstract", ""), superClass); this.optionClass = optionClass; this.parserClass = parserClass; Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java:1.1 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java:1.2 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java:1.1 Sun Mar 16 07:02:25 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java Sun Mar 16 11:15:48 2008 @@ -1,6 +1,6 @@ package org.codelutin.option.generate.java; -import org.codelutin.option.def.DefaultOption; +import org.codelutin.option.def.DefaultOptionAction; import org.codelutin.option.def.DefinitionParserContexts.OptionContext; import java.io.File; @@ -13,7 +13,7 @@ public class DefaultOptionActionJavaGenerator extends OptionActionJavaGenerator { - protected DefaultOptionActionJavaGenerator(File out, long timestamp, String i18nPrefix, OptionContext context, String pack, String simpleName, String superClass, String optionPack, String optionClass, String parserPack, String parserClass, String contextClass, DefaultOption option) { + protected DefaultOptionActionJavaGenerator(File out, long timestamp, String i18nPrefix, OptionContext context, String pack, String simpleName, String superClass, String optionPack, String optionClass, String parserPack, String parserClass, String contextClass, DefaultOptionAction option) { super(out, timestamp, i18nPrefix, context, pack, simpleName, superClass, optionPack, optionClass, parserPack, parserClass, contextClass, option); }