Author: tchemit Date: 2008-07-28 12:22:21 +0000 (Mon, 28 Jul 2008) New Revision: 934 Modified: trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorContext.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java Log: mise en place action About ajout de proprietes obligatoires supplementaires fix bug sur l'action Quit Modified: trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java =================================================================== --- trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java 2008-07-28 12:22:08 UTC (rev 933) +++ trunk/commandline/commandline-ui/src/test/java/org/codelutin/option/ui/UITest.java 2008-07-28 12:22:21 UTC (rev 934) @@ -40,6 +40,7 @@ public static void main(String[] args) throws Exception { I18n.init(); + new JLoginUI().setVisible(true); new ConfigUI().init(null, new MyConfig(), new MyConfigLocal(), Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java 2008-07-28 12:22:08 UTC (rev 933) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java 2008-07-28 12:22:21 UTC (rev 934) @@ -37,9 +37,21 @@ /** le nom du projet */ projectName("java.lang.String", "mandatory,static,final"), + /** le website du projet */ + projectURL("java.net.URL", "mandatory,static,final"), + + /** le nom de l'oganisation */ + organisationName("java.lang.String", "mandatory,static,final"), + + /** le website de l'organisation */ + organisationURL("java.net.URL", "mandatory,static,final"), + /** la version du projet */ - version("org.codelutin.util.VersionNumber", "mandatory,static,final"); + version("org.codelutin.util.VersionNumber", "mandatory,static,final"), + /** la version du projet */ + copyright("java.lang.String", "mandatory,static,final"); + private final String type; private final String modifiers; Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorContext.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorContext.java 2008-07-28 12:22:08 UTC (rev 933) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorContext.java 2008-07-28 12:22:21 UTC (rev 934) @@ -256,6 +256,11 @@ injects.put(MandatoryConfigProperty.configFileName.name(), goal._configFileName); injects.put(MandatoryConfigProperty.projectName.name(), goal._projectName); + injects.put(MandatoryConfigProperty.projectURL.name(), goal._projectURL); + injects.put(MandatoryConfigProperty.organisationName.name(), goal._organisationName); + injects.put(MandatoryConfigProperty.organisationURL.name(), goal._organisationURL); + injects.put(MandatoryConfigProperty.copyright.name(), goal._copyright); + injects.put(MandatoryConfigProperty.encoding.name(), goal._encoding); injects.put(MandatoryConfigProperty.locale.name(), goal._locale); injects.put(MandatoryConfigProperty.version.name(), goal._version.endsWith("-SNAPSHOT") ? goal._version.substring(0, goal._version.indexOf("-SNAPSHOT")) : goal._version); Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java 2008-07-28 12:22:08 UTC (rev 933) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/JavaGeneratorGoal.java 2008-07-28 12:22:21 UTC (rev 934) @@ -145,12 +145,34 @@ protected String _configFileName; /** - * @description le nom du fichier de configuration dans la configuration genere + * @description le nom du projet * @parameter expression="${commandline._projectName}" default-value="${project.artifactId}" * @required */ protected String _projectName; + /** + * @description l'url de l'application + * @parameter expression="${commandline._projectURL}" + * @required + */ + protected String _projectURL; + + /** + * @description le nom du projet + * @parameter expression="${commandline.__organisationName}" + * @required + */ + protected String _organisationName; + + /** + * @description l'url de l'application + * @parameter expression="${commandline._organisationURL}" + * @required + */ + protected String _organisationURL; + + /** * @description l'encoding par default dans la configuration genere * @parameter expression="${commandline._encoding}" default-value="UTF-8" * @required @@ -168,7 +190,14 @@ * @required */ protected String _version; + /** + * @description la version dans la configuration genere + * @parameter expression="${commandline._copyright}" + * @required + */ + protected String _copyright; + public JavaGeneratorGoal() { super(JavaGeneratorContext.class); }