August 2008 - Nuiton-utils-commits - mailman.cloud.codelutin.com

[Lutinutil-commits] r1006 - trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 14:23:28 +0000 (Tue, 12 Aug 2008) New Revision: 1006 Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java Log: propriete du projet transient (on ne les enregistre pas dans la config de l'utilisateur 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-08-12 14:22:54 UTC (rev 1005) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/def/MandatoryConfigProperty.java 2008-08-12 14:23:28 UTC (rev 1006) @@ -26,7 +26,7 @@ public enum MandatoryConfigProperty { /** le nom du fichier de configuration de l'application */ - configFileName("java.io.File", "mandatory,static,final"), + configFileName("java.io.File", "mandatory,static,final,transient"), /** l'encoding a utiliser sur le systeme */ encoding("java.lang.String", "mandatory,static,final"), @@ -35,22 +35,22 @@ locale("java.util.Locale", "mandatory,static"), /** le nom du projet */ - projectName("java.lang.String", "mandatory,static,final"), + projectName("java.lang.String", "mandatory,static,final,transient"), /** le website du projet */ - projectURL("java.net.URL", "mandatory,static,final"), + projectURL("java.net.URL", "mandatory,static,final,transient"), /** le nom de l'oganisation */ - organisationName("java.lang.String", "mandatory,static,final"), + organisationName("java.lang.String", "mandatory,static,final,transient"), /** le website de l'organisation */ - organisationURL("java.net.URL", "mandatory,static,final"), + organisationURL("java.net.URL", "mandatory,static,final,transient"), /** la version du projet */ - version("org.codelutin.util.VersionNumber", "mandatory,static,final"), + version("org.codelutin.util.VersionNumber", "mandatory,static,final,transient"), /** la version du projet */ - copyright("java.lang.String", "mandatory,static,final"); + copyright("java.lang.String", "mandatory,static,final,transient"); private final String type; private final String modifiers;

1 0

[Lutinutil-commits] r1005 - in trunk/commandline/commandline-demo/src/site: en/rst/user fr/rst/user
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 14:22:54 +0000 (Tue, 12 Aug 2008) New Revision: 1005 Modified: trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst Log: rst (mais pb encoding...) Modified: trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst =================================================================== --- trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst 2008-08-12 14:20:56 UTC (rev 1004) +++ trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst 2008-08-12 14:22:54 UTC (rev 1005) @@ -6,117 +6,117 @@ --------------- #. [--show-config]* <all|main|remote> [normal|complete|tec] - commandlinedemo.option.description.showConfig + show configurations #. --edit-config - commandlinedemo.option.description.editConfig + to edit the configuration via UI #. --config-file <configFile:FILE> - commandlinedemo.option.description.changeFileConfig + to change the configuration file to used #. [--config]* <key:STRING> <value:STRING> [main|remote] - commandlinedemo.option.description.changeConfig + to change a property in configuration #. --help|-h - commandlinedemo.option.description.help + show usage #. [--help-config]* <all|main|remote> - commandlinedemo.option.description.helpConfig + show usage of configuration #. --reset-config - commandlinedemo.option.description.resetConfig + reset configuration #. --ui <flag:BOOLEAN> - commandlinedemo.option.description.ui + flag to display or not UI Configurations of **CommandLineDemo** ------------------------------------- -commandlinedemo.config.main.description (main) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Main category of configuration (main) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. configFileName (File) <defaultValue:.commandlineDemo-1> - commandlinedemo.config.main.configFileName.description + Config file name absolute path #. copyright (String) <defaultValue:Copyright Codelutin 2008> - commandlinedemo.config.main.copyright.description + Copyright of the application #. debugMode (Boolean) <defaultValue:false> - commandlinedemo.config.main.debugMode.description + Flag to use or not the debug mode #. encoding (String) <defaultValue:UTF-8> - commandlinedemo.config.main.encoding.description + Encoding used by application #. locale (Locale) <defaultValue:en_GB> - commandlinedemo.config.main.locale.description + Locale used by application #. organisationName (String) <defaultValue:Codelutin> - commandlinedemo.config.main.organisationName.description + Name of organisation of the application #. organisationURL (URL) <defaultValue:http://codelutin.com> - commandlinedemo.config.main.organisationURL.description + website url of the organisation #. projectName (String) <defaultValue:CommandlineDemo> - commandlinedemo.config.main.projectName.description + name of the application #. projectURL (URL) <defaultValue:http://commandline.labs.libre-entreprise.org> - commandlinedemo.config.main.projectURL.description + website url of the application #. userFirstName (String) - commandlinedemo.config.main.userFirstName.description + first name of user #. userLastName (String) - commandlinedemo.config.main.userLastName.description + last name of user #. userMail (String) - commandlinedemo.config.main.userMail.description + email of user -#. version (VersionNumber) <defaultValue:0.8> - commandlinedemo.config.main.version.description +#. version (VersionNumber) <defaultValue:0.9> + version of application -commandlinedemo.config.remote.description (remote) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +remote category of configuration (remote) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. URI (URI) <defaultValue:jnp://localhost:1099> - commandlinedemo.config.remote.URI.description + remote uri ? #. login (String) - commandlinedemo.config.remote.login.description + remote login ? #. password (String) - commandlinedemo.config.remote.password.description + remote password ? #. proxyLogin (String) - commandlinedemo.config.remote.proxyLogin.description + remote proxy login ? #. proxyPassword (String) - commandlinedemo.config.remote.proxyPassword.description + remote proxy password ? #. useProxy (Boolean) <defaultValue:false> - commandlinedemo.config.remote.useProxy.description + falg to use or not remote proxy Modified: trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst =================================================================== --- trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-08-12 14:20:56 UTC (rev 1004) +++ trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-08-12 14:22:54 UTC (rev 1005) @@ -6,117 +6,117 @@ ------------------------------------------------- #. [--show-config]* <all|main|remote> [normal|complete|tec] - commandlinedemo.option.description.showConfig + Afficher la configuration #. --edit-config - commandlinedemo.option.description.editConfig + permet d'©diter la configuration #. --config-file <configFile:FILE> - commandlinedemo.option.description.changeFileConfig + permet de changer de fichier de configuration #. [--config]* <key:STRING> <value:STRING> [main|remote] - commandlinedemo.option.description.changeConfig + permet de changer une propri©t© de la configuration #. --help|-h - commandlinedemo.option.description.help + Affichage de l'aide #. [--help-config]* <all|main|remote> - commandlinedemo.option.description.helpConfig + Affichage de l'aide sur la configuration #. --reset-config - commandlinedemo.option.description.resetConfig + R©initialiser la configuration #. --ui <flag:BOOLEAN> - commandlinedemo.option.description.ui + Flag pour indiquer l'utilisation ou non de l'ui Les configurations de **CommandLineDemo** ----------------------------------------- -commandlinedemo.config.main.description (main) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cat©gorie principale de la configuration (main) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. configFileName (File) <defaultValue:.commandlineDemo-1> - commandlinedemo.config.main.configFileName.description + Le fichier de configuration utilis© #. copyright (String) <defaultValue:Copyright Codelutin 2008> - commandlinedemo.config.main.copyright.description + Le copyright de l'application #. debugMode (Boolean) <defaultValue:false> - commandlinedemo.config.main.debugMode.description + Flag pour activer ou non le mode debug #. encoding (String) <defaultValue:UTF-8> - commandlinedemo.config.main.encoding.description + L'encoding utilis© par l'application #. locale (Locale) <defaultValue:en_GB> - commandlinedemo.config.main.locale.description + La locale utilis©e par l'application #. organisationName (String) <defaultValue:Codelutin> - commandlinedemo.config.main.organisationName.description + Le nom de l'organisation #. organisationURL (URL) <defaultValue:http://codelutin.com> - commandlinedemo.config.main.organisationURL.description + L'url du site de l'organisation #. projectName (String) <defaultValue:CommandlineDemo> - commandlinedemo.config.main.projectName.description + Le nom du projet #. projectURL (URL) <defaultValue:http://commandline.labs.libre-entreprise.org> - commandlinedemo.config.main.projectURL.description + l'url du site de l'application #. userFirstName (String) - commandlinedemo.config.main.userFirstName.description + Le nom de famille de l'utilisateur #. userLastName (String) - commandlinedemo.config.main.userLastName.description + Le pr©nom de l'utilisateur #. userMail (String) - commandlinedemo.config.main.userMail.description + Le courriel de l'utilisateur -#. version (VersionNumber) <defaultValue:0.8> - commandlinedemo.config.main.version.description +#. version (VersionNumber) <defaultValue:0.9> + La version de l'aplication -commandlinedemo.config.remote.description (remote) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Cat©gorie remote de la configuration (remote) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #. URI (URI) <defaultValue:jnp://localhost:1099> - commandlinedemo.config.remote.URI.description + remote uri ? #. login (String) - commandlinedemo.config.remote.login.description + Login en remote ? #. password (String) - commandlinedemo.config.remote.password.description + Password en remote ? #. proxyLogin (String) - commandlinedemo.config.remote.proxyLogin.description + Login proxy ? #. proxyPassword (String) - commandlinedemo.config.remote.proxyPassword.description + Password proxy ? #. useProxy (Boolean) <defaultValue:false> - commandlinedemo.config.remote.useProxy.description + flag pour utiliser le mode proxy ?

1 0

[Lutinutil-commits] r1004 - in trunk/commandline: commandline-demo/src/main/resources/i18n commandline-ui-action/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 14:20:56 +0000 (Tue, 12 Aug 2008) New Revision: 1004 Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties Log: i18n Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-08-12 14:20:39 UTC (rev 1003) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-08-12 14:20:56 UTC (rev 1004) @@ -1,32 +1,32 @@ -commandlinedemo.config.main.configFileName.description= -commandlinedemo.config.main.copyright.description= -commandlinedemo.config.main.debugMode.description= -commandlinedemo.config.main.description= -commandlinedemo.config.main.encoding.description= -commandlinedemo.config.main.locale.description= -commandlinedemo.config.main.organisationName.description= -commandlinedemo.config.main.organisationURL.description= -commandlinedemo.config.main.projectName.description= -commandlinedemo.config.main.projectURL.description= -commandlinedemo.config.main.userFirstName.description= -commandlinedemo.config.main.userLastName.description= -commandlinedemo.config.main.userMail.description= -commandlinedemo.config.main.version.description= -commandlinedemo.config.remote.URI.description= -commandlinedemo.config.remote.description= -commandlinedemo.config.remote.login.description= -commandlinedemo.config.remote.password.description= -commandlinedemo.config.remote.proxyLogin.description= -commandlinedemo.config.remote.proxyPassword.description= -commandlinedemo.config.remote.useProxy.description= -commandlinedemo.option.description.changeConfig= -commandlinedemo.option.description.changeFileConfig= -commandlinedemo.option.description.editConfig= -commandlinedemo.option.description.help= -commandlinedemo.option.description.helpConfig= -commandlinedemo.option.description.resetConfig= -commandlinedemo.option.description.showConfig= -commandlinedemo.option.description.ui= +commandlinedemo.config.main.configFileName.description=Config file name absolute path +commandlinedemo.config.main.copyright.description=Copyright of the application +commandlinedemo.config.main.debugMode.description=Flag to use or not the debug mode +commandlinedemo.config.main.description=Main category of configuration +commandlinedemo.config.main.encoding.description=Encoding used by application +commandlinedemo.config.main.locale.description=Locale used by application +commandlinedemo.config.main.organisationName.description=Name of organisation of the application +commandlinedemo.config.main.organisationURL.description=website url of the organisation +commandlinedemo.config.main.projectName.description=name of the application +commandlinedemo.config.main.projectURL.description=website url of the application +commandlinedemo.config.main.userFirstName.description=first name of user +commandlinedemo.config.main.userLastName.description=last name of user +commandlinedemo.config.main.userMail.description=email of user +commandlinedemo.config.main.version.description=version of application +commandlinedemo.config.remote.URI.description=remote uri ? +commandlinedemo.config.remote.description=remote category of configuration +commandlinedemo.config.remote.login.description=remote login ? +commandlinedemo.config.remote.password.description=remote password ? +commandlinedemo.config.remote.proxyLogin.description=remote proxy login ? +commandlinedemo.config.remote.proxyPassword.description=remote proxy password ? +commandlinedemo.config.remote.useProxy.description=falg to use or not remote proxy +commandlinedemo.option.description.changeConfig=to change a property in configuration +commandlinedemo.option.description.changeFileConfig=to change the configuration file to used +commandlinedemo.option.description.editConfig=to edit the configuration via UI +commandlinedemo.option.description.help=show usage +commandlinedemo.option.description.helpConfig=show usage of configuration +commandlinedemo.option.description.resetConfig=reset configuration +commandlinedemo.option.description.showConfig=show configurations +commandlinedemo.option.description.ui=flag to display or not UI mainui.menu.edit=Edit mainui.menu.file=File mainui.menu.help=Help Modified: trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties =================================================================== --- trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-08-12 14:20:39 UTC (rev 1003) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-08-12 14:20:56 UTC (rev 1004) @@ -1,32 +1,32 @@ -commandlinedemo.config.main.configFileName.description= -commandlinedemo.config.main.copyright.description= -commandlinedemo.config.main.debugMode.description= -commandlinedemo.config.main.description= -commandlinedemo.config.main.encoding.description= -commandlinedemo.config.main.locale.description= -commandlinedemo.config.main.organisationName.description= -commandlinedemo.config.main.organisationURL.description= -commandlinedemo.config.main.projectName.description= -commandlinedemo.config.main.projectURL.description= -commandlinedemo.config.main.userFirstName.description= -commandlinedemo.config.main.userLastName.description= -commandlinedemo.config.main.userMail.description= -commandlinedemo.config.main.version.description= -commandlinedemo.config.remote.URI.description= -commandlinedemo.config.remote.description= -commandlinedemo.config.remote.login.description= -commandlinedemo.config.remote.password.description= -commandlinedemo.config.remote.proxyLogin.description= -commandlinedemo.config.remote.proxyPassword.description= -commandlinedemo.config.remote.useProxy.description= -commandlinedemo.option.description.changeConfig= -commandlinedemo.option.description.changeFileConfig= -commandlinedemo.option.description.editConfig= -commandlinedemo.option.description.help= -commandlinedemo.option.description.helpConfig= -commandlinedemo.option.description.resetConfig= -commandlinedemo.option.description.showConfig= -commandlinedemo.option.description.ui= +commandlinedemo.config.main.configFileName.description=Le fichier de configuration utilis\u00A9 +commandlinedemo.config.main.copyright.description=Le copyright de l'application +commandlinedemo.config.main.debugMode.description=Flag pour activer ou non le mode debug +commandlinedemo.config.main.description=Cat\u00A9gorie principale de la configuration +commandlinedemo.config.main.encoding.description=L'encoding utilis\u00A9 par l'application +commandlinedemo.config.main.locale.description=La locale utilis\u00A9e par l'application +commandlinedemo.config.main.organisationName.description=Le nom de l'organisation +commandlinedemo.config.main.organisationURL.description=L'url du site de l'organisation +commandlinedemo.config.main.projectName.description=Le nom du projet +commandlinedemo.config.main.projectURL.description=l'url du site de l'application +commandlinedemo.config.main.userFirstName.description=Le nom de famille de l'utilisateur +commandlinedemo.config.main.userLastName.description=Le pr\u00A9nom de l'utilisateur +commandlinedemo.config.main.userMail.description=Le courriel de l'utilisateur +commandlinedemo.config.main.version.description=La version de l'aplication +commandlinedemo.config.remote.URI.description=remote uri ? +commandlinedemo.config.remote.description=Cat\u00A9gorie remote de la configuration +commandlinedemo.config.remote.login.description=Login en remote ? +commandlinedemo.config.remote.password.description=Password en remote ? +commandlinedemo.config.remote.proxyLogin.description=Login proxy ? +commandlinedemo.config.remote.proxyPassword.description=Password proxy ? +commandlinedemo.config.remote.useProxy.description=flag pour utiliser le mode proxy ? +commandlinedemo.option.description.changeConfig=permet de changer une propri\u00A9t\u00A9 de la configuration +commandlinedemo.option.description.changeFileConfig=permet de changer de fichier de configuration +commandlinedemo.option.description.editConfig=permet d'\u00A9diter la configuration +commandlinedemo.option.description.help=Affichage de l'aide +commandlinedemo.option.description.helpConfig=Affichage de l'aide sur la configuration +commandlinedemo.option.description.resetConfig=R\u00A9initialiser la configuration +commandlinedemo.option.description.showConfig=Afficher la configuration +commandlinedemo.option.description.ui=Flag pour indiquer l'utilisation ou non de l'ui mainui.menu.edit=Edit mainui.menu.file=Fichier mainui.menu.help=Aide Modified: trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties =================================================================== --- trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-08-12 14:20:39 UTC (rev 1003) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-08-12 14:20:56 UTC (rev 1004) @@ -1,21 +1,21 @@ commandline= commandline.action.about=A propos commandline.action.about.help= -commandline.action.about.tooltip=Afficher les informations sur l''application +commandline.action.about.tooltip=Afficher les informations sur l'application commandline.action.changeLocale.help= -commandline.action.changeLocale.tooltip=Changer la langue de l''application +commandline.action.changeLocale.tooltip=Changer la langue de l'application commandline.action.config=Pr\u00E9f\u00E9rences commandline.action.config.help= commandline.action.config.tooltip=Changer la configuration commandline.action.help=Aide commandline.action.help.help= -commandline.action.help.tooltip=Voir l''aide +commandline.action.help.tooltip=Voir l'aide commandline.action.quit=Quitter commandline.action.quit.help= -commandline.action.quit.tooltip=Quitter l''application +commandline.action.quit.tooltip=Quitter l'application commandline.action.site=Site commandline.action.site.help= -commandline.action.site.tooltip=Ouvrir dans un navigateur le site de l''application +commandline.action.site.tooltip=Ouvrir dans un navigateur le site de l'application commandline.close_question=Voulez-vous quitter {0} ? commandline.confirm.changeLanguage= commandline.menu.i18n=Langue

1 0

[Lutinutil-commits] r1003 - trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 14:20:39 +0000 (Tue, 12 Aug 2008) New Revision: 1003 Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java Log: suppression annotation I18nAble Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java 2008-08-12 10:59:44 UTC (rev 1002) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/AbstractContextJavaGenerator.java 2008-08-12 14:20:39 UTC (rev 1003) @@ -20,7 +20,6 @@ import org.apache.commons.lang.StringUtils; import org.codelutin.i18n.I18n; -import org.codelutin.i18n.I18nable; import org.codelutin.option.AbstractContext; import org.codelutin.option.Config; import org.codelutin.option.ConfigKey; @@ -60,7 +59,7 @@ String simpleName, String superClass) { super(context, PUBLIC | ABSTRACT, pack, simpleName, superClass); - annotation = '@' + I18nable.class.getName(); + //annotation = '@' + I18nable.class.getName(); } protected void addContent() { Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java 2008-08-12 10:59:44 UTC (rev 1002) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/ConfigJavaGenerator.java 2008-08-12 14:20:39 UTC (rev 1003) @@ -21,7 +21,6 @@ import org.apache.commons.lang.StringUtils; import org.codelutin.i18n.I18n; -import org.codelutin.i18n.I18nable; import org.codelutin.option.ConfigPropertyKey; import org.codelutin.option.def.ConfigPropertyModifier; import org.codelutin.option.def.DefinitionParserContexts.ConfigContext; @@ -70,7 +69,7 @@ super(_context, concreteClass ? PUBLIC : ABSTRACT | PUBLIC, pack, simpleName, superClass); this.concreteClass = concreteClass; this.context = context; - annotation = '@' + I18nable.class.getName(); + //annotation = '@' + I18nable.class.getName(); } protected void addContent() { Modified: trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java =================================================================== --- trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java 2008-08-12 10:59:44 UTC (rev 1002) +++ trunk/commandline/maven-plugin/src/main/java/org/codelutin/option/generate/java/OptionParserJavaGenerator.java 2008-08-12 14:20:39 UTC (rev 1003) @@ -20,7 +20,6 @@ import org.apache.commons.lang.StringUtils; import org.codelutin.i18n.I18n; -import org.codelutin.i18n.I18nable; import org.codelutin.option.OptionParser; import org.codelutin.option.def.ArgumentType; import org.codelutin.option.def.ArgumentValueType; @@ -73,7 +72,7 @@ String simpleName, String superClass) { super(context, PUBLIC, pack, simpleName, superClass); - this.annotation = '@' + I18nable.class.getName(); + //this.annotation = '@' + I18nable.class.getName(); } protected void addContent() {

1 0

[Lutinutil-commits] r1002 - trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 10:59:44 +0000 (Tue, 12 Aug 2008) New Revision: 1002 Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java Log: accents Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-12 10:59:22 UTC (rev 1001) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-12 10:59:44 UTC (rev 1002) @@ -90,7 +90,7 @@ oldParser = new Properties(); oldLanguage = new Properties(); out.mkdirs(); - // �v�nements + // evenements if (keysModifier) { addParserEvent(KeysModifier.getInstance(getKeyModifierStart(), getKeyModifierEnd(), encoding)); } @@ -134,7 +134,7 @@ PluginHelper.copy(oldParserFile, saveFile); - // Anciennes cl�s disponnibles + // Anciennes cles disponnibles File oldLanguageFile = PluginHelper.getI18nFile(src, artifactId, bundles[0], true); //File oldLanguageFile = new File(src.getAbsolutePath() + File.separatorChar + artifactId + "-" + bundles[0] + ".properties"); /*if (!oldLanguageFile.exists()) { @@ -224,7 +224,7 @@ parseFile(file); } - // D�tection de nouvelles cl�s, sauvegarde du fichier pour pouvoir le restaurer en cas de plantage + // Detection de nouvelles cles, sauvegarde du fichier pour pouvoir le restaurer en cas de plantage if (size != result.size()) { saveProperties0(); }

1 0

[Lutinutil-commits] r1001 - trunk/maven-i18n-plugin
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 10:59:22 +0000 (Tue, 12 Aug 2008) New Revision: 1001 Modified: trunk/maven-i18n-plugin/pom.xml Log: clean pom Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2008-08-12 10:59:10 UTC (rev 1000) +++ trunk/maven-i18n-plugin/pom.xml 2008-08-12 10:59:22 UTC (rev 1001) @@ -31,13 +31,6 @@ <scope>compile</scope> </dependency> -  - <dependency> <groupId>lutinlib</groupId> <artifactId>lutinprocessor</artifactId>

1 0

[Lutinutil-commits] r1000 - in trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin: core extension
by tchemit＠users.labs.libre-entreprise.org 12 Aug '08

12 Aug '08

Author: tchemit Date: 2008-08-12 10:59:10 +0000 (Tue, 12 Aug 2008) New Revision: 1000 Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Generate.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Getter.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java Log: can not use maven-i18n-plugin goals after compile phase Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Generate.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Generate.java 2008-08-10 16:41:21 UTC (rev 999) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Generate.java 2008-08-12 10:59:10 UTC (rev 1000) @@ -34,7 +34,7 @@ * * @author julien * @goal gen - * @phase generate-resources + * @phase process-resources * @execute goal=get */ public class Generate extends AbstractI18nPlugin { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Getter.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Getter.java 2008-08-10 16:41:21 UTC (rev 999) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/Getter.java 2008-08-12 10:59:10 UTC (rev 1000) @@ -32,7 +32,7 @@ * * @author julien * @goal get - * @phase generate-resources + * @phase process-resources */ public class Getter extends AbstractI18nPlugin { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-08-10 16:41:21 UTC (rev 999) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-08-12 10:59:10 UTC (rev 1000) @@ -35,7 +35,7 @@ * * @author julien * @goal parserJava - * @phase process-classes + * @phase process-resources */ public class ParserJava extends AbstractI18nParser { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java 2008-08-10 16:41:21 UTC (rev 999) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaActionConfig.java 2008-08-12 10:59:10 UTC (rev 1000) @@ -29,7 +29,7 @@ * * @author chemit * @goal parserJavaActionConfig - * @phase generate-resources + * @phase process-resources */ public class ParserJavaActionConfig extends ParserJava { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java 2008-08-10 16:41:21 UTC (rev 999) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJavaTabConfig.java 2008-08-12 10:59:10 UTC (rev 1000) @@ -19,7 +19,7 @@ * * @author chemit * @goal parserJavaTabConfig - * @phase generate-resources + * @phase process-resources */ public class ParserJavaTabConfig extends ParserJavaActionConfig { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-10 16:41:21 UTC (rev 999) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-12 10:59:10 UTC (rev 1000) @@ -26,7 +26,7 @@ * * @author julien * @goal parserJaxx - * @phase generate-resources + * @phase process-resources */ public class ParserJaxx extends ParserXml { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-10 16:41:21 UTC (rev 999) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-12 10:59:10 UTC (rev 1000) @@ -26,7 +26,7 @@ * * @author julien * @goal parserSwixat - * @phase generate-resources + * @phase process-resources */ public class ParserSwixat extends ParserXml {

1 0

[Lutinutil-commits] r999 - in trunk/commandline: commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions commandline-ui-action/src/main/java/org/codelutin/option/ui/actions
by tchemit＠users.labs.libre-entreprise.org 10 Aug '08

10 Aug '08

Author: tchemit Date: 2008-08-10 16:41:21 +0000 (Sun, 10 Aug 2008) New Revision: 999 Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java Log: annotation with no config Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-08-10 14:35:24 UTC (rev 998) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-08-10 16:41:21 UTC (rev 999) @@ -20,10 +20,7 @@ import org.codelutin.jaxx.action.MyAbstractAction; /** @author chemit */ -@ActionProviderAnnotation( - name = "commandlinedemo", - fqn = "org.codelutin.commandline.demo.ui.CommandLineDemoActionProvider" -) +@ActionProviderAnnotation public class CommandLineDemoBaseAction extends MyAbstractAction { private static final long serialVersionUID = -810023044364620841L; Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java 2008-08-10 14:35:24 UTC (rev 998) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java 2008-08-10 16:41:21 UTC (rev 999) @@ -20,10 +20,7 @@ import org.codelutin.option.ContextProvider; /** @author chemit */ -@ActionProviderAnnotation( - name = "commandline", - fqn = "org.codelutin.option.ui.CommandlineActionProvider" -) +@ActionProviderAnnotation public class CommandLineBaseAction extends MyAbstractAction { private static final long serialVersionUID = -810023044364620841L;

1 0

[Lutinutil-commits] r998 - trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions
by tchemit＠users.labs.libre-entreprise.org 10 Aug '08

10 Aug '08

Author: tchemit Date: 2008-08-10 14:35:24 +0000 (Sun, 10 Aug 2008) New Revision: 998 Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java Log: make i18n locale libelle works Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-10 14:05:50 UTC (rev 997) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-10 14:35:24 UTC (rev 998) @@ -16,8 +16,6 @@ /** @author chemit */ -import static org.codelutin.i18n.I18n._; - import javax.swing.Action; import java.awt.event.ActionEvent; import java.util.Locale; @@ -52,12 +50,12 @@ super(name); Matcher matcher = PATTERN_NAME.matcher(name); if (!matcher.matches()) { - throw new IllegalArgumentException(_(getClass().getName() + " should have a name like this 'i18n_XX', but was {0}", name)); + throw new IllegalArgumentException(getClass().getName() + " should have a name like this 'i18n_XX', but was " + name); } locale = org.codelutin.i18n.I18n.newLocale(matcher.group(1)); - putValue(Action.NAME, _(locale.getDisplayName())); + putValue(Action.NAME, locale.getDisplayLanguage()); putValue(Action.SMALL_ICON, org.codelutin.jaxx.util.UIHelper.createImageIcon(getIcon())); } @@ -110,7 +108,6 @@ @Override public void disposeUI() { super.disposeUI(); - locale = org.codelutin.i18n.I18n.newLocale(locale.getLanguage()); - putValue(Action.NAME, _(locale.getDisplayName())); + putValue(Action.NAME, locale.getDisplayLanguage((Locale) getContext().getMainConfig().getProperty("locale"))); } }

1 0

[Lutinutil-commits] r997 - trunk/commandline
by tchemit＠users.labs.libre-entreprise.org 10 Aug '08

10 Aug '08

Author: tchemit Date: 2008-08-10 14:05:50 +0000 (Sun, 10 Aug 2008) New Revision: 997 Modified: trunk/commandline/pom.xml Log: remove phase Modified: trunk/commandline/pom.xml =================================================================== --- trunk/commandline/pom.xml 2008-08-10 13:57:08 UTC (rev 996) +++ trunk/commandline/pom.xml 2008-08-10 14:05:50 UTC (rev 997) @@ -70,14 +70,6 @@ <target>${maven.compile.target}</target> <encoding>${maven.compile.encoding}</encoding> </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> </plugin>  <plugin>

1 0