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.6 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java:1.7 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java:1.6 Tue Mar 18 22:21:41 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java Wed Mar 19 20:21:42 2008 @@ -22,8 +22,8 @@ import org.codelutin.i18n.I18n; import org.codelutin.i18n.I18nable; import org.codelutin.option.AbstractContext; -import org.codelutin.option.ConfigKey; import org.codelutin.option.Config; +import org.codelutin.option.ConfigKey; import org.codelutin.option.def.DefinitionParserContexts.ConfigContext; import org.codelutin.util.StringUtil; @@ -84,7 +84,7 @@ this.parserSimpleName = parserSimpleName; this.configSimpleName = configSimpleName; this.ccontexts = ccontexts; - annotation = '@'+ I18nable.class.getName(); + annotation = '@' + I18nable.class.getName(); } protected void addContent() { @@ -103,7 +103,7 @@ addConstructor(null, PROTECTED, "super(" + parserSimpleName + ".class);", new String[]{Exception.class.getSimpleName()}); builder.append('\n'); - addConstructor(null, PROTECTED, "super(" + parserSimpleName + ".class, configs);", new String[]{Exception.class.getSimpleName()},"Class... configs"); + addConstructor(null, PROTECTED, "super(" + parserSimpleName + ".class, configs);", new String[]{Exception.class.getSimpleName()}, "Class... configs"); // add main config accessor //generateMainConfigAccessor(); Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractOptionActionJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractOptionActionJavaGenerator.java:1.2 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractOptionActionJavaGenerator.java:1.3 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractOptionActionJavaGenerator.java:1.2 Tue Mar 18 22:21:41 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractOptionActionJavaGenerator.java Wed Mar 19 20:21:42 2008 @@ -23,9 +23,9 @@ import java.io.File; import java.io.IOException; +import java.lang.reflect.Modifier; import static java.lang.reflect.Modifier.ABSTRACT; import static java.lang.reflect.Modifier.PUBLIC; -import java.lang.reflect.Modifier; import java.text.FieldPosition; import java.text.MessageFormat; @@ -50,7 +50,7 @@ String superClassWithType = superClass + "'; String simpleNameWithType = simpleName + getClassType(); AbstractOptionActionJavaGenerator gen; - gen = new AbstractOptionActionJavaGenerator(out, timestamp, i18nPrefix, parserPack,contextPack, simpleNameWithType, superClassWithType, parserSimpleName, contextSimpleName); + gen = new AbstractOptionActionJavaGenerator(out, timestamp, i18nPrefix, parserPack, contextPack, simpleNameWithType, superClassWithType, parserSimpleName, contextSimpleName); gen.generate(); } @@ -65,25 +65,25 @@ protected String contextPack; protected AbstractOptionActionJavaGenerator(File out, - long timestamp, - String i18nPrefix, - String pack, - String contextPack, - String simpleName, - String superClass, - String parserSimpleName, - String contextSimpleName) { + long timestamp, + String i18nPrefix, + String pack, + String contextPack, + String simpleName, + String superClass, + String parserSimpleName, + String contextSimpleName) { super(out, timestamp, i18nPrefix, ABSTRACT | PUBLIC, pack, simpleName, superClass); this.parserSimpleName = parserSimpleName; this.contextSimpleName = contextSimpleName; - this.contextPack=contextPack; + this.contextPack = contextPack; } protected void addContent() { // add a proptected constructor (this is an abstract class) registerImport(normalImports, Option.class); - registerImport(normalImports,pack,parserSimpleName); + registerImport(normalImports, pack, parserSimpleName); registerImport(normalImports, contextPack, contextSimpleName); builder.append('\n'); Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionKeyJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionKeyJavaGenerator.java:1.3 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionKeyJavaGenerator.java:1.4 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionKeyJavaGenerator.java:1.3 Sat Mar 15 01:22:22 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionKeyJavaGenerator.java Wed Mar 19 20:21:42 2008 @@ -53,7 +53,7 @@ String superClassWithType = OptionKey.class.getSimpleName() + ""; String simpleNameWithType = simpleName + getClassType(abstractActionSimpleName); OptionKeyJavaGenerator gen; - gen = new OptionKeyJavaGenerator(out, timestamp, i18nPrefix, parserPack, contextPack, optionPack,simpleNameWithType, superClassWithType, parserSimpleName, contextSimpleName, abstractActionSimpleName); + gen = new OptionKeyJavaGenerator(out, timestamp, i18nPrefix, parserPack, contextPack, optionPack, simpleNameWithType, superClassWithType, parserSimpleName, contextSimpleName, abstractActionSimpleName); gen.generate(); } @@ -88,7 +88,7 @@ this.parserSimpleName = parserSimpleName; this.abstractActionSimpleName = abstractActionSimpleName; this.contextSimpleName = contextSimpleName; - this.optionPack= optionPack; + this.optionPack = optionPack; this.contextPack = contextPack; } @@ -98,7 +98,7 @@ registerImport(normalImports, OptionKey.class); registerImport(normalImports, OptionDefinition.class); //registerImport(normalImports, parserPack,parserSimpleName); - registerImport(normalImports, contextPack,contextSimpleName); + registerImport(normalImports, contextPack, contextSimpleName); // add factory static method newXXX String methodName = "new" + simpleNameWithNoType; 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.5 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java:1.6 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java:1.5 Wed Mar 19 00:30:19 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/DefaultOptionActionJavaGenerator.java Wed Mar 19 20:21:42 2008 @@ -16,7 +16,6 @@ } - @Override protected void addFields() { @@ -25,7 +24,7 @@ registerImport(normalImports, type); builder.append('\n'); - addConstructor(null, Modifier.PUBLIC, "super(\"" + type +"\");", new String[]{Exception.class.getSimpleName()}); + addConstructor(null, Modifier.PUBLIC, "super(\"" + type + "\");", new String[]{Exception.class.getSimpleName()}); } } 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.12 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java:1.13 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java:1.12 Mon Mar 17 23:30:41 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java Wed Mar 19 20:21:42 2008 @@ -105,7 +105,7 @@ this.optionClassPrefix = optionClassPrefix; this.actionClassPrefix = actionClassPrefix; this.ocontexts = ocontexts; - this.annotation = '@'+ I18nable.class.getName(); + this.annotation = '@' + I18nable.class.getName(); } protected void addContent() { Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java:1.8 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java:1.9 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java:1.8 Wed Mar 19 17:23:20 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/AbstractJavaGenerator.java Wed Mar 19 20:21:42 2008 @@ -38,8 +38,8 @@ */ public abstract class AbstractJavaGenerator { - public static String encoding="UTF-8"; - + public static String encoding = "UTF-8"; + /** la méthode à implanter pour ajouter du code dans la classe */ protected abstract void addContent(); @@ -111,6 +111,7 @@ /** la liste des imports statiques à ajouter */ protected List staticImports; + /** annotation a placer sur la classe */ protected String annotation; /** internal builder of class's header */ @@ -249,9 +250,9 @@ return; } int index = fqn.indexOf('<'); - if (index>-1) { + if (index > -1) { // suppress generictype - fqn =fqn.substring(0,index); + fqn = fqn.substring(0, index); } imports.add(fqn); } @@ -289,7 +290,7 @@ } protected void addAnnotation() { - if (annotation!=null) { + if (annotation != null) { builder.append(annotation).append('\n'); } } @@ -394,7 +395,7 @@ String content = headerBuilder.toString() + builder.toString(); log.debug(getFQN()); log.trace(content); - FileUtil.writeString(f, content,encoding); + FileUtil.writeString(f, content, encoding); } protected void addModifiers(int modifiers) { Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java:1.13 maven-commandline-plugin/src/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java:1.14 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java:1.13 Mon Mar 17 23:30:41 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java Wed Mar 19 20:21:42 2008 @@ -23,10 +23,10 @@ import org.codelutin.i18n.I18n; import org.codelutin.i18n.I18nable; import org.codelutin.option.ConfigPropertyKey; -import static org.codelutin.option.generate.java.OptionParserJavaGenerator.SUFFIX_PROPERTY_FIELD; import org.codelutin.option.def.ConfigPropertyModifier; import org.codelutin.option.def.DefinitionParserContexts.ConfigContext; import org.codelutin.option.def.DefinitionParserContexts.ConfigPropertyContext; +import static org.codelutin.option.generate.java.OptionParserJavaGenerator.SUFFIX_PROPERTY_FIELD; import java.io.File; import java.io.IOException; @@ -57,7 +57,7 @@ String superClass, boolean concreteClass) throws IOException { ConfigJavaGenerator gen; - gen = new ConfigJavaGenerator(out, timestamp, i18nPrefix, context,parserPack, pack, simpleName, parserSimpleName, superClass,concreteClass); + gen = new ConfigJavaGenerator(out, timestamp, i18nPrefix, context, parserPack, pack, simpleName, parserSimpleName, superClass, concreteClass); gen.generate(); } @@ -79,18 +79,18 @@ String superClass, boolean concreteClass) { super(out, timestamp, i18nPrefix, concreteClass ? PUBLIC : ABSTRACT | PUBLIC, pack, simpleName, superClass); - this.concreteClass=concreteClass; + this.concreteClass = concreteClass; this.context = context; - this.parserPack=parserPack; - this.parserSimpleName=parserSimpleName; - annotation = '@'+ I18nable.class.getName(); + this.parserPack = parserPack; + this.parserSimpleName = parserSimpleName; + annotation = '@' + I18nable.class.getName(); } protected void addContent() { registerStaticImport(staticImports, ConfigPropertyKey.class, "newConfigPropertyKey"); registerImport(normalImports, ConfigPropertyKey.class); //registerImport(normalImports,parserPack, parserSimpleName); - registerImport(normalImports,parserPack, superClass); + registerImport(normalImports, parserPack, superClass); registerStaticImport(staticImports, I18n.class, "n_"); @@ -110,7 +110,7 @@ Object value = property.getDefaultValue(); if (value != null) { if (value.getClass().isEnum()) { - params += ", \"" + ((Enum)value).name() + "\""; + params += ", \"" + ((Enum) value).name() + "\""; } else { params += ", \"" + value + "\""; }