Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.12 maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.13 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java:1.12 Thu Mar 20 01:30:55 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorGoal.java Sat Mar 22 01:36:20 2008 @@ -37,9 +37,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.Writer; -import java.lang.reflect.Field; import java.net.URL; -import java.util.ArrayList; import java.util.List; /** @@ -53,7 +51,7 @@ /** * @description le chemin où trouver les fichiers de traductions pour l'initialisation I18N, sinon le fichier du - * plugin est utilisé, alors qu'il faut que ce soit celui de l'application + * plugin est utilisé, alors qu'il faut que ce soit celui de l'application * @parameter expression="${commandline.i18nCP}" default-value="${basedir}/src/resources" */ protected File i18nCP; @@ -70,7 +68,7 @@ * @parameter expression="${commandline.rstFilePath}" * @required */ - protected File rstFilePath; + protected String rstFilePath; /** * @description Target rst file. @@ -94,10 +92,18 @@ LanguageManager.reset(); for (String bundle : getBundles()) { - File rstFilePath = new File(getContext().getRstFilePath(), getPrefix() + "Usage-" + bundle + ".rst"); - LocaleEnum langue = LocaleEnum.valueOf(bundle); + String pattern = getContext().getRstFilePath(); + String filename = getPrefix() + "Usage.rst"; + + File rstFilePath = new File(pattern.replace("@bundle@", bundle) + File.separator + filename); + if (!rstFilePath.getParentFile().exists()) { + rstFilePath.getParentFile().mkdirs(); + } + Writer w = null; try { + LocaleEnum langue = LocaleEnum.valueOf(bundle); + w = new BufferedWriter(new FileWriter(rstFilePath)); generateForBundle(w, rstFilePath, getPrefix(), optionKeys, configKeys, langue, urls); @@ -156,7 +162,7 @@ return i18nCP; } - public File getRstFilePath() { + public String getRstFilePath() { return rstFilePath; } @@ -176,34 +182,4 @@ this.bundles = bundles; } - @SuppressWarnings({"unchecked"}) - public List getConstants(Class klass, Class searchingClass) { - List result = new ArrayList(); - for (Field field : klass.getDeclaredFields()) { - if (!field.isAccessible()) { - field.setAccessible(true); - } - if (acceptClass(field.getType(), searchingClass) && ReflectUtil.isConstantField(field)) { - try { - result.add((T) field.get(null)); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } - } - } - Class superClass = klass.getSuperclass(); - if (superClass != null) { - result.addAll(getConstants(superClass, searchingClass)); - } - return result; - } - - public boolean acceptClass(Class klass, Class searchingClass) { - - boolean result = klass.getName().equals(searchingClass.getName()); - if (!result && klass.getSuperclass() != null) { - result = acceptClass(klass.getSuperclass(), searchingClass); - } - return result; - } } \ No newline at end of file Index: maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java diff -u maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java:1.2 maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java:1.3 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java:1.2 Thu Mar 20 01:30:55 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/RstGeneratorContext.java Sat Mar 22 01:36:20 2008 @@ -42,7 +42,7 @@ return goal.getI18nCP(); } - public File getRstFilePath() { + public String getRstFilePath() { return goal.getRstFilePath(); } @@ -80,9 +80,7 @@ contextClass = (Class) Class.forName(contextFQN, true, loader); - if (!getRstFilePath().getParentFile().exists()) { - getRstFilePath().getParentFile().mkdirs(); - } + if (goal.getBundles() == null) { goal.setBundles(new String[]{"fr", "en"}); 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.21 maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.22 --- maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java:1.21 Thu Mar 20 01:30:55 2008 +++ maven-commandline-plugin/src/java/org/codelutin/option/generate/JavaGeneratorGoal.java Sat Mar 22 01:36:21 2008 @@ -137,14 +137,17 @@ // generate specialized abstract OptionAction for this parser if (needSpecializedAction()) { - AbstractOptionActionJavaGenerator.doGenerate(getContext().getOut(), timestamp, getContext().getI18nPrefix(), + + AbstractOptionActionJavaGenerator.doGenerate(getContext()); + + /*AbstractOptionActionJavaGenerator.doGenerate(getContext().getOut(), getTimestamp(), getContext().getI18nPrefix(), getContext().getParserPackageName(), getContext().getContextPackageName(), getContext().getParserSimpleName(), getContext().getContextSimpleName(), getContext().getActionSimpleName(), getActionSuperClass() - ); + );*/ setActionSuperClass(getContext().getActionSimpleName()); }