Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.13 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.14 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.13 Sun Mar 16 07:02:25 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java Sun Mar 16 21:24:10 2008 @@ -25,7 +25,7 @@ import org.codelutin.option.Option; import org.codelutin.option.OptionAction; import org.codelutin.option.OptionParser; -import org.codelutin.option.SimpleConfigImpl; +import org.codelutin.option.Config; import org.codelutin.option.def.DefinitionParser; import org.codelutin.option.def.DefinitionParserContexts.ConfigContext; import org.codelutin.option.def.DefinitionParserContexts.OptionContext; @@ -148,7 +148,7 @@ /** * @description fqn de la super classe des configs a generer - * @parameter expression="${commandline.configSuperClass}" default-value="org.codelutin.option.SimpleConfigImpl" + * @parameter expression="${commandline.configSuperClass}" default-value="org.codelutin.option.Config" */ protected String configSuperClass; @@ -170,39 +170,6 @@ */ protected boolean concreteConfig; - /** - * @description TODO - * @parameter expression="${commandline.abstractConfigOptionKey}" - * @required - */ - protected String abstractConfigOptionKey; - - /** - * @description TODO - * @parameter expression="${commandline.abstractConfigFileOptionKey}" - * @required - */ - protected String abstractConfigFileOptionKey; - - /** - * @description TODO - * @parameter expression="${commandline.abstractConfigFilenameConfigKey}" - * @required - */ - protected String abstractConfigFilenameConfigKey; - - /** - * @description fqn des classes contenant en inner-classes les implantations concretes des actions d'option - * @parameter expression="${commandline.actionImplementations}" - */ - protected String[] actionImplementations; - - /** - * @description fqn des implantations concretes des configs à enregister - * @parameter expression="${commandline.configImplementations}" - */ - protected String[] configImplementations; - protected DefinitionParser parser; //protected boolean needActionConstructor; @@ -255,13 +222,6 @@ contextSimpleName = prefix + "AbstractContext"; } - if (actionImplementations==null) { - actionImplementations = new String[0]; - } - - if (configImplementations==null) { - configImplementations=new String[0]; - } // make sure out exists if (!out.exists()) { out.mkdirs(); @@ -283,6 +243,8 @@ getLog().info(_("commandline.parser.result.info", parser, parser.getOptions().length, parser.getConfigs().length)); + //TODO Do same exception handling than the OptionPArser + // show errors if (showErrors) { if (parser.hasFailed()) { @@ -346,14 +308,13 @@ parserPackageName, contextPackageName, optionPackageName, + configPackageName, parserSimpleName, contextSimpleName, optionKeySimpleName + "", prefix + "AbstractConfig", - configSuperClass, - abstractConfigOptionKey, - abstractConfigFileOptionKey, - abstractConfigFilenameConfigKey + configSimpleName, + configSuperClass ); // the super classes of generatred configs is the one generated here configSuperClass = prefix + "AbstractConfig"; @@ -383,9 +344,7 @@ configSimpleName, actionPackageName, actionSimpleName, - parserSuperClass, - actionImplementations, - configImplementations + parserSuperClass ); @@ -445,6 +404,6 @@ } private boolean needSpecializedAbstractConfig() { - return configSuperClass.equals(SimpleConfigImpl.class.getName()); + return configSuperClass.equals(Config.class.getName()); } } \ No newline at end of file