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

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

10 Aug '08

Author: tchemit Date: 2008-08-10 13:57:08 +0000 (Sun, 10 Aug 2008) New Revision: 996 Modified: trunk/commandline/pom.xml Log: force compile ? Modified: trunk/commandline/pom.xml =================================================================== --- trunk/commandline/pom.xml 2008-08-10 13:54:23 UTC (rev 995) +++ trunk/commandline/pom.xml 2008-08-10 13:57:08 UTC (rev 996) @@ -62,6 +62,23 @@ <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${maven.compile.source}</source> + <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> <groupId>lutinplugin</groupId>

1 0

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

10 Aug '08

Author: tchemit Date: 2008-08-10 13:54:23 +0000 (Sun, 10 Aug 2008) New Revision: 995 Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 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-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties Log: utilisation i18n dynamic menus Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-08-10 13:33:36 UTC (rev 994) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/DemoMainUI.java 2008-08-10 13:54:23 UTC (rev 995) @@ -34,9 +34,13 @@ protected void finalizeInit(final DemoContext context) { - // chargement dans l'ui des actions + // create i18n entries in menu with id 'i18nMenu' + ActionHelper.createI18nMenu(this); + + // load actions in ui context.getActionFactory().loadActions(this); + // add quit action accelerator getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F4, InputEvent.ALT_MASK), "quit"); getRootPane().getActionMap().put("quit", context.getActionFactory().newAction("quit", null)); @@ -47,7 +51,7 @@ } }); // repaint i18n actions - ActionHelper.refreshI18nActions(context, context.getActionFactory(), get$JFrame0()); + ActionHelper.refreshI18nActions(context, context.getActionFactory(), this); } } 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-10 13:33:36 UTC (rev 994) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-en_GB.properties 2008-08-10 13:54:23 UTC (rev 995) @@ -30,5 +30,4 @@ mainui.menu.edit=Edit mainui.menu.file=File mainui.menu.help=Help -mainui.menu.help.i18n=Language mainui.title=Commandline demo 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-10 13:33:36 UTC (rev 994) +++ trunk/commandline/commandline-demo/src/main/resources/i18n/commandline-demo-fr_FR.properties 2008-08-10 13:54:23 UTC (rev 995) @@ -30,5 +30,4 @@ mainui.menu.edit=Edit mainui.menu.file=Fichier mainui.menu.help=Aide -mainui.menu.help.i18n=Langue mainui.title=Commandline D\u00E9mo Modified: trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx =================================================================== --- trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2008-08-10 13:33:36 UTC (rev 994) +++ trunk/commandline/commandline-demo/src/main/uimodel/org/codelutin/commandline/demo/ui/JDemoMainUI.jaxx 2008-08-10 13:54:23 UTC (rev 995) @@ -10,11 +10,8 @@ <JMenuItem id="help"/> <JMenuItem id="site"/> <JMenuItem id="about"/> - <JMenu text='mainui.menu.help.i18n' mnemonic="{'L'}" - icon='{createImageIcon("action/translate.png")}'> - <JMenuItem id="i18n_fr"/> - <JMenuItem id="i18n_en"/> - </JMenu> +  + <JMenu id="i18nMenu"/> </JMenu> </JMenuBar> <Table insets='0,0,0,0'> 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 13:33:36 UTC (rev 994) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-10 13:54:23 UTC (rev 995) @@ -57,7 +57,7 @@ locale = org.codelutin.i18n.I18n.newLocale(matcher.group(1)); - putValue(Action.NAME, _(locale.getDisplayLanguage())); + putValue(Action.NAME, _(locale.getDisplayName())); putValue(Action.SMALL_ICON, org.codelutin.jaxx.util.UIHelper.createImageIcon(getIcon())); } @@ -83,12 +83,13 @@ public void doAction(ActionEvent e) { getContext().getMainConfig().setProperty("locale", locale); + // save config + getContext().saveSafely(); // on doit initialiser la nouvelle locale avant de decharger les ui // au cas ou un appel à une ui surviendrait et dans quel cas la locale // serait toujours sur l'ancienne valeur ... getContext().initI18n(); - // save config - getContext().saveSafely(); + // dispose then reload application getContext().dispose(true); } @@ -106,4 +107,10 @@ return locale; } + @Override + public void disposeUI() { + super.disposeUI(); + locale = org.codelutin.i18n.I18n.newLocale(locale.getLanguage()); + putValue(Action.NAME, _(locale.getDisplayName())); + } } 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-10 13:33:36 UTC (rev 994) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-08-10 13:54:23 UTC (rev 995) @@ -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] r994 - in trunk/commandline: . commandline-ui-action
by tchemit＠users.labs.libre-entreprise.org 10 Aug '08

10 Aug '08

Author: tchemit Date: 2008-08-10 13:33:36 +0000 (Sun, 10 Aug 2008) New Revision: 994 Modified: trunk/commandline/commandline-ui-action/pom.xml trunk/commandline/pom.xml Log: add all jaxx libraries in dependenciesManager to fix versions no more target/generated-sources/resources to be used Modified: trunk/commandline/commandline-ui-action/pom.xml =================================================================== --- trunk/commandline/commandline-ui-action/pom.xml 2008-08-10 13:27:10 UTC (rev 993) +++ trunk/commandline/commandline-ui-action/pom.xml 2008-08-10 13:33:36 UTC (rev 994) @@ -46,15 +46,6 @@ <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${maven.gen.dir}/resources</directory> - </resource> - </resources> - <plugins>  @@ -84,8 +75,6 @@ <groupId>lutinplugin</groupId> <artifactId>maven-i18n-plugin</artifactId> <configuration> - <verbose>true</verbose> -  </configuration> <executions> <execution> Modified: trunk/commandline/pom.xml =================================================================== --- trunk/commandline/pom.xml 2008-08-10 13:27:10 UTC (rev 993) +++ trunk/commandline/pom.xml 2008-08-10 13:33:36 UTC (rev 994) @@ -247,6 +247,24 @@  <dependency> <groupId>org.codelutin.jaxx</groupId> + <artifactId>util</artifactId> + <version>${jaxx.version}</version> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>runtime</artifactId> + <version>${jaxx.version}</version> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> + <artifactId>core</artifactId> + <version>${jaxx.version}</version> + </dependency> + + <dependency> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing</artifactId> <version>${jaxx.version}</version> </dependency>

1 0

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

10 Aug '08

Author: tchemit Date: 2008-08-10 13:27:10 +0000 (Sun, 10 Aug 2008) New Revision: 993 Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java Log: unused import Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-10 13:26:39 UTC (rev 992) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-10 13:27:10 UTC (rev 993) @@ -14,7 +14,6 @@ */ package org.codelutin.option.ui; -import static org.codelutin.i18n.I18n._; import org.codelutin.util.VersionNumber; import javax.swing.JEditorPane;

1 0

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

10 Aug '08

Author: tchemit Date: 2008-08-10 13:26:39 +0000 (Sun, 10 Aug 2008) New Revision: 992 Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties Log: delete test of i18n add applicationName in QuitAction add dynamic i18n menu no i18n init in ChangeLocationActionNameProvider Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/AboutUI.java 2008-08-10 13:26:39 UTC (rev 992) @@ -32,7 +32,6 @@ public AboutUI() { super(); - String test = _("toto.tata"); getApplicationWebsite().setEditorKit(new HTMLEditorKit()); getApplicationWebsite().addHyperlinkListener(createHyperLinkListener(getApplicationWebsite())); Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-10 13:26:39 UTC (rev 992) @@ -18,6 +18,7 @@ import static org.codelutin.i18n.I18n._; import org.codelutin.jaxx.action.ActionFactory; import org.codelutin.jaxx.action.MyAbstractAction; +import org.codelutin.jaxx.util.UIHelper; import org.codelutin.option.Context; import javax.swing.AbstractButton; @@ -68,7 +69,7 @@ button.setToolTipText(null); } else { MyAbstractAction action = (MyAbstractAction) button.getAction(); - String t = org.codelutin.i18n.I18n._(action.getI18nToolTipText(), params); + String t = _(action.getI18nToolTipText(), params); button.setToolTipText(t); } } @@ -106,7 +107,25 @@ public static void refreshI18nActions(Context context, ActionFactory actionFactory, JAXXObject mainUI) { Locale locale = (Locale) context.getMainConfig().getProperty("locale"); - String[] actions = actionFactory.getActionNames(); + + for (String command : new ChangeLocationActionNameProvider().getActionCommands()) { + AbstractButton button = (AbstractButton) mainUI.getObjectById(command); + + MyAbstractAction myAbstractAction = (MyAbstractAction) button.getAction(); + ChangeLocaleAction action; + if (myAbstractAction.hasDelegate()) { + action = (ChangeLocaleAction) myAbstractAction.getDelegate(); + } else { + action = (ChangeLocaleAction) myAbstractAction; + } + action.disposeUI(); + boolean enable = !action.equalsLocale(locale); + UpdateButton(button, enable, enable ? action.getLocale() : null); + button.setEnabled(enable); + } + + /*String[] actions = actionFactory.getActionNames(); + for (String actionName : actions) { Matcher matcher = ChangeLocaleAction.PATTERN_NAME.matcher(actionName); if (!matcher.matches()) { @@ -123,9 +142,35 @@ boolean enable = !action.equalsLocale(locale); UpdateButton(button, enable, enable ? action.getLocale() : null); button.setEnabled(enable); + }*/ + } + + public static void createI18nMenu(JAXXObject ui) { + javax.swing.JMenu i18nParent = (javax.swing.JMenu) ui.getObjectById("i18nMenu"); + String libelle = _("commandline.menu.i18n"); + i18nParent.setText(libelle); + i18nParent.setIcon(UIHelper.createImageIcon("action/translate.png")); + String mnemonic = libelle; + if (mnemonic.isEmpty()) { + mnemonic = "L"; } + i18nParent.setMnemonic(mnemonic.charAt(0)); + if (i18nParent.getItemCount() == 0) { + i18nParent.removeAll(); + } + // create the entries in menu + for (String command : new ChangeLocationActionNameProvider().getActionCommands()) { + createI18nEntry(command, i18nParent, ui); + } } + protected static void createI18nEntry(String language, javax.swing.JMenu i18nParent, JAXXObject ui) { + javax.swing.JMenuItem entry = new javax.swing.JMenuItem(); + entry.setName(language); + ui.get$objectMap().put(language, entry); + i18nParent.add(entry); + } + protected ActionHelper() { // no instance } Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-10 13:26:39 UTC (rev 992) @@ -38,7 +38,7 @@ public String[] getActionCommands() { //TODO Il faudrait ajuter une méthode à I18n pour initialiser le système uniquement si nécessaire. - org.codelutin.i18n.I18n.init(); + //org.codelutin.i18n.I18n.init(); Locale[] locales = I18n.getBundleManager().getLocales(); java.util.List<String> tmpList = new java.util.ArrayList<String>(); Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ConfigAction.java 2008-08-10 13:26:39 UTC (rev 992) @@ -49,7 +49,6 @@ @Override public void disposeUI() { - String test = _("toto"); super.disposeUI(); if (ui != null) { ui.dispose(); Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/QuitAction.java 2008-08-10 13:26:39 UTC (rev 992) @@ -47,10 +47,12 @@ boolean result = super.beforeAction(e); if (result) { + org.codelutin.option.Config config = getContext().getMainConfig(); + String applicationName = (String) config.getProperty("projectName"); String[] response = {_("commandline.yes"), _("commandline.no")}; int n = JOptionPane.showOptionDialog(null, - _("commandline.close_question"), - _("commandline.question"), + _("commandline.close_question", applicationName), + _("commandline.question", applicationName), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, //do not use a custom Icon @@ -60,7 +62,6 @@ result = n == JOptionPane.YES_OPTION; } - log.info("to treate ? " + result); return result; } @@ -70,9 +71,4 @@ getContext().dispose(false); } - @Override - public void disposeUI() { - super.disposeUI(); - } - } \ No newline at end of file Modified: trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties =================================================================== --- trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-08-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-08-10 13:26:39 UTC (rev 992) @@ -1,25 +1,24 @@ commandline= commandline.action.about=About commandline.action.about.help= -commandline.action.about.tooltip= +commandline.action.about.tooltip=Show about ui commandline.action.changeLocale.help= -commandline.action.changeLocale.tooltip= +commandline.action.changeLocale.tooltip=Change language commandline.action.config=Preferences commandline.action.config.help= -commandline.action.config.tooltip= +commandline.action.config.tooltip=Show Preference ui commandline.action.help=Help commandline.action.help.help= -commandline.action.help.tooltip= +commandline.action.help.tooltip=Show help ui commandline.action.quit=Quit commandline.action.quit.help= -commandline.action.quit.tooltip= +commandline.action.quit.tooltip=Quit application commandline.action.site=Site commandline.action.site.help= -commandline.action.site.tooltip= -commandline.close_question=Really quit ? +commandline.action.site.tooltip=Open in a browser the website of the application +commandline.close_question=Really quit {0} ? commandline.confirm.changeLanguage= +commandline.menu.i18n=Language commandline.no=No -commandline.question=Quit +commandline.question=Quit {0} commandline.yes=Yes -toto= -toto.tata= 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-10 10:58:24 UTC (rev 991) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-08-10 13:26:39 UTC (rev 992) @@ -1,25 +1,24 @@ commandline= commandline.action.about=A propos commandline.action.about.help= -commandline.action.about.tooltip= +commandline.action.about.tooltip=Afficher les informations sur l'application commandline.action.changeLocale.help= -commandline.action.changeLocale.tooltip= +commandline.action.changeLocale.tooltip=Changer la langue de l'application commandline.action.config=Pr\u00E9f\u00E9rences commandline.action.config.help= -commandline.action.config.tooltip= +commandline.action.config.tooltip=Changer la configuration commandline.action.help=Aide commandline.action.help.help= -commandline.action.help.tooltip= +commandline.action.help.tooltip=Voir l'aide commandline.action.quit=Quitter commandline.action.quit.help= -commandline.action.quit.tooltip= +commandline.action.quit.tooltip=Quitter l'application commandline.action.site=Site commandline.action.site.help= -commandline.action.site.tooltip= -commandline.close_question=Voulez-vous quitter ? +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 commandline.no=Non -commandline.question=Quitter +commandline.question=Quitter {0} commandline.yes=Oui -toto= -toto.tata=

1 0

[Lutinutil-commits] r991 - 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 10:58:24 +0000 (Sun, 10 Aug 2008) New Revision: 991 Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java Log: test ?\195?\160 l'envers... Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-10 10:39:34 UTC (rev 990) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-10 10:58:24 UTC (rev 991) @@ -44,7 +44,7 @@ for (Locale locale : locales) { String actionKey = "i18n_" + locale.getLanguage(); - if (tmpList.contains(actionKey)) { + if (!tmpList.contains(actionKey)) { tmpList.add(actionKey); } }

1 0

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

10 Aug '08

Author: tchemit Date: 2008-08-10 10:39:34 +0000 (Sun, 10 Aug 2008) New Revision: 990 Modified: trunk/commandline/ Log: svn ignore Property changes on: trunk/commandline ___________________________________________________________________ Name: svn:ignore - *.iws *.ipr + *.iws *.ipr *.iml

1 0

[Lutinutil-commits] r989 - 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 10:36:31 +0000 (Sun, 10 Aug 2008) New Revision: 989 Added: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java Log: ne pas utiliser une inner classe pour un provider de name carle Class.forname ne fonctionne pas 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-09 10:20:46 UTC (rev 988) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-10 10:36:31 UTC (rev 989) @@ -16,10 +16,7 @@ /** @author chemit */ -import org.codelutin.i18n.I18n; import static org.codelutin.i18n.I18n._; -import org.codelutin.jaxx.action.ActionNameProvider; -import org.codelutin.option.ui.actions.ChangeLocaleAction.I18nActionNameProvider; import javax.swing.Action; import java.awt.event.ActionEvent; @@ -37,7 +34,7 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "changeLocale", - actionCommandProvider = I18nActionNameProvider.class, + actionCommandProvider = org.codelutin.option.ui.actions.ChangeLocationActionNameProvider.class, shortDescription = "commandline.action.changeLocale.tooltip", longDescription = "commandline.action.changeLocale.help", hideActionText = false @@ -109,38 +106,4 @@ return locale; } - /** - * Cette classe définit dynamiquement les clefs d'actions associées à cette action. - * - * La recherche de telles actions est faite au démarrage de l'application par une - * {@link org.codelutin.jaxx.action.ActionProvider}. - * - * Les clefs d'actions sont en faites toutes les locales trouvées par - * {@link org.codelutin.i18n.bundle.I18nBundleManager} dont on récupère le pays. - * - * Actuellement, on ne tient compte que du pays dans les locales trouvées. Il est de la responsabilité du système - * I18n de charger les bon bundles en faisant des promotions si nécessaire (par exemple si on trouve un bundle fr - * mais aussi des bundles fr_FR)... - * - * @author chemit - */ - public static class I18nActionNameProvider implements ActionNameProvider { - - public String[] getActionCommands() { - //TODO Il faudrait ajuter une méthode à I18n pour initialiser le système uniquement si nécessaire. - org.codelutin.i18n.I18n.init(); - Locale[] locales = I18n.getBundleManager().getLocales(); - java.util.List<String> tmpList = new java.util.ArrayList<String>(); - - for (Locale locale : locales) { - String actionKey = "i18n_" + locale.getLanguage(); - if (tmpList.contains(actionKey)) { - tmpList.add(actionKey); - } - } - - return tmpList.toArray(new String[tmpList.size()]); - } - - } } Added: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java (rev 0) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocationActionNameProvider.java 2008-08-10 10:36:31 UTC (rev 989) @@ -0,0 +1,55 @@ +/** + * # #% Copyright (C) 2008 Code Lutin, Tony Chemit + * This program is free software; you + * can redistribute it and/or modify it under the terms of the GNU General + * Public License as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. This program is + * distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. You + * should have received a copy of the GNU General Public License along with this + * program; if not, write to the Free Software Foundation, Inc., 59 Temple Place + * - Suite 330, Boston, MA 02111-1307, USA. + * # #% + */ +package org.codelutin.option.ui.actions; + +import org.codelutin.i18n.I18n; +import org.codelutin.jaxx.action.ActionNameProvider; + +import java.util.Locale; + +/** + * Cette classe définit dynamiquement les clefs d'actions associées à cette action. + * + * La recherche de telles actions est faite au démarrage de l'application par une + * {@link org.codelutin.jaxx.action.ActionProvider}. + * + * Les clefs d'actions sont en faites toutes les locales trouvées par + * {@link org.codelutin.i18n.bundle.I18nBundleManager} dont on récupère le pays. + * + * Actuellement, on ne tient compte que du pays dans les locales trouvées. Il est de la responsabilité du système + * I18n de charger les bon bundles en faisant des promotions si nécessaire (par exemple si on trouve un bundle fr + * mais aussi des bundles fr_FR)... + * + * @author chemit + */ +public class ChangeLocationActionNameProvider implements ActionNameProvider { + + public String[] getActionCommands() { + //TODO Il faudrait ajuter une méthode à I18n pour initialiser le système uniquement si nécessaire. + org.codelutin.i18n.I18n.init(); + Locale[] locales = I18n.getBundleManager().getLocales(); + java.util.List<String> tmpList = new java.util.ArrayList<String>(); + + for (Locale locale : locales) { + String actionKey = "i18n_" + locale.getLanguage(); + if (tmpList.contains(actionKey)) { + tmpList.add(actionKey); + } + } + + return tmpList.toArray(new String[tmpList.size()]); + } + +}

1 0

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

09 Aug '08

Author: tchemit Date: 2008-08-09 10:20:46 +0000 (Sat, 09 Aug 2008) New Revision: 988 Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java Log: simplification dans jaxx : suppression du paquetage factory et provider Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-08-06 13:14:05 UTC (rev 987) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/DemoContext.java 2008-08-09 10:20:46 UTC (rev 988) @@ -18,8 +18,8 @@ import org.codelutin.commandline.demo.ui.JDemoMainUI; import org.codelutin.commandline.demo.ui.actions.CommandLineDemoBaseAction; import org.codelutin.i18n.I18n; -import org.codelutin.jaxx.action.factory.ActionFactory; -import org.codelutin.jaxx.action.factory.ActionFactoryFromProvider; +import org.codelutin.jaxx.action.ActionFactory; +import org.codelutin.jaxx.action.ActionFactoryFromProvider; /** @author chemit */ public class DemoContext extends CommandLineDemoAbstractContext { Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-06 13:14:05 UTC (rev 987) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ActionHelper.java 2008-08-09 10:20:46 UTC (rev 988) @@ -16,8 +16,8 @@ import jaxx.runtime.JAXXObject; import static org.codelutin.i18n.I18n._; +import org.codelutin.jaxx.action.ActionFactory; import org.codelutin.jaxx.action.MyAbstractAction; -import org.codelutin.jaxx.action.factory.ActionFactory; import org.codelutin.option.Context; import javax.swing.AbstractButton; 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-06 13:14:05 UTC (rev 987) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/ChangeLocaleAction.java 2008-08-09 10:20:46 UTC (rev 988) @@ -37,18 +37,17 @@ */ @org.codelutin.jaxx.action.ActionConfig( actionCommand = "changeLocale", + actionCommandProvider = I18nActionNameProvider.class, shortDescription = "commandline.action.changeLocale.tooltip", longDescription = "commandline.action.changeLocale.help", - hideActionText = false, - //actionCommands = {"i18n_fr", "i18n_en"}, - actionCommandProvider = I18nActionNameProvider.class + hideActionText = false ) public class ChangeLocaleAction extends CommandLineBaseAction { public static final Pattern PATTERN_NAME = Pattern.compile("i18n_(\\w\\w)"); - protected Locale locale; + protected transient Locale locale; private static final long serialVersionUID = 4180668477670765253L; @@ -61,8 +60,6 @@ locale = org.codelutin.i18n.I18n.newLocale(matcher.group(1)); - //putValue(Action.NAME, _(locale.getLibelle())); - //TODO Make it works again :) putValue(Action.NAME, _(locale.getDisplayLanguage())); putValue(Action.SMALL_ICON, org.codelutin.jaxx.util.UIHelper.createImageIcon(getIcon())); } @@ -112,21 +109,38 @@ return locale; } - /** @author chemit */ + /** + * Cette classe définit dynamiquement les clefs d'actions associées à cette action. + * + * La recherche de telles actions est faite au démarrage de l'application par une + * {@link org.codelutin.jaxx.action.ActionProvider}. + * + * Les clefs d'actions sont en faites toutes les locales trouvées par + * {@link org.codelutin.i18n.bundle.I18nBundleManager} dont on récupère le pays. + * + * Actuellement, on ne tient compte que du pays dans les locales trouvées. Il est de la responsabilité du système + * I18n de charger les bon bundles en faisant des promotions si nécessaire (par exemple si on trouve un bundle fr + * mais aussi des bundles fr_FR)... + * + * @author chemit + */ public static class I18nActionNameProvider implements ActionNameProvider { public String[] getActionCommands() { + //TODO Il faudrait ajuter une méthode à I18n pour initialiser le système uniquement si nécessaire. org.codelutin.i18n.I18n.init(); Locale[] locales = I18n.getBundleManager().getLocales(); + java.util.List<String> tmpList = new java.util.ArrayList<String>(); - final String[] result = new String[locales.length]; - for (int i = 0; i < locales.length; i++) { - Locale locale = locales[i]; - result[i] = "i18n_" + locale.getLanguage(); + for (Locale locale : locales) { + String actionKey = "i18n_" + locale.getLanguage(); + if (tmpList.contains(actionKey)) { + tmpList.add(actionKey); + } } - return result; + return tmpList.toArray(new String[tmpList.size()]); } } -} \ No newline at end of file +}

1 0

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

06 Aug '08

Author: bpoussin Date: 2008-08-06 13:14:05 +0000 (Wed, 06 Aug 2008) New Revision: 987 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/SourceEntry.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/ParserJaxx.java trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java Log: Ajout de la possibilite d'exclure des fichiers. Util pour swixat ou context.xml n'a pas besoin d'etre parse 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-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/AbstractI18nParser.java 2008-08-06 13:14:05 UTC (rev 987) @@ -53,6 +53,9 @@ /** @return the default includes to add to directory scanner */ protected abstract String[] getDefaultIncludes(); + /** @return the default excludes to add to directory scanner */ + protected abstract String[] getDefaultExcludes(); + /** @return the default src directory to use in directory scanner */ protected abstract File getDefaultBasedir(); @@ -188,7 +191,7 @@ } protected String[] getFilesForEntry(SourceEntry entry) { - return entry.getIncludedFiles(getDefaultBasedir(), getDefaultIncludes()); + return entry.getIncludedFiles(getDefaultBasedir(), getDefaultIncludes(), getDefaultExcludes()); } protected void addDefaultEntry() { Modified: trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/SourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/SourceEntry.java 2008-08-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/core/SourceEntry.java 2008-08-06 13:14:05 UTC (rev 987) @@ -106,7 +106,7 @@ return excludes != null && excludes.length > 0; } - public String[] getIncludedFiles(File defaultBasedir, String[] defaultIncludes) { + public String[] getIncludedFiles(File defaultBasedir, String[] defaultIncludes, String[] defaultExcludes) { // normalized entry if (!hasSrc()) { setBasedir(defaultBasedir); @@ -114,6 +114,9 @@ if (!hasIncludes()) { setIncludes(defaultIncludes); } + if (!hasExcludes()) { + setExcludes(defaultExcludes); + } // init directory scanner DirectoryScanner ds = new DirectoryScanner(); ds.setBasedir(getBasedir()); @@ -140,10 +143,10 @@ return sb.toString(); } - public String[] getIncludedFiles(File basedir, String[] defaultIncludes, URLClassLoader loader, List<String> annotationClass, Log log) { + public String[] getIncludedFiles(File basedir, String[] defaultIncludes, String[] defaultExcludes, URLClassLoader loader, List<String> annotationClass, Log log) { List<String> result = new ArrayList<String>(); - for (String s : getIncludedFiles(basedir, defaultIncludes)) { + for (String s : getIncludedFiles(basedir, defaultIncludes, defaultExcludes)) { if (filterByAnnotation(s, loader, annotationClass, log)) { result.add(s); } 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-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJava.java 2008-08-06 13:14:05 UTC (rev 987) @@ -67,23 +67,32 @@ //protected List<String> annotationClass; + @Override protected String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } + @Override + protected String[] getDefaultExcludes() { + return new String[]{}; + } + @Override protected File getDefaultBasedir() { return defaultBasedir; } + @Override protected String getKeyModifierStart() { return "_\$\\s*\""; } + @Override protected String getKeyModifierEnd() { return "\"\\s*(\$|,|\\+|$)"; } + @Override protected String getOutGetter() { return "java.getter"; } @@ -99,6 +108,7 @@ filter = new I18nFilter(); } + @Override protected boolean isFileUptodate(File basedir, File file1, String file) { String clazzFile = file.substring(0, file.length() - 4) + "class"; File clazz = new File(cp + File.separator + clazzFile); @@ -111,6 +121,7 @@ * @see org.codelutin.i18n.plugin.core.Parser#parseFile(java.io.File) */ + @Override public void parseFile(File srcFile) { try { @@ -129,6 +140,7 @@ * (non-Javadoc) * @see org.codelutin.i18n.plugin.core.Parser#parseLine(java.io.File, java.lang.String) */ + @Override public void parseLine(File srcFile, String line) { String keysSet = filter.parse(line); 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-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserJaxx.java 2008-08-06 13:14:05 UTC (rev 987) @@ -42,30 +42,42 @@ */ protected String rulesJaxx; + @Override protected String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } + @Override + protected String[] getDefaultExcludes() { + return new String[]{}; + } + + @Override protected boolean isFileUptodate(File basedir, File file1, String file) { return false; } + @Override protected String getOutGetter() { return "jaxx.getter"; } + @Override protected String getKeyModifierStart() { return "=\\s*[\"\']"; } + @Override protected String getKeyModifierEnd() { return "[\"\']"; } + @Override protected String getFileRules() { return rulesJaxx; } + @Override protected String getCoreFileRules() { return "jaxx.rules"; } @@ -78,6 +90,7 @@ * (non-Javadoc) * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) */ + @Override public String extract(String i18nString) { return i18nString.length() == 0 ? null : i18nString; } 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-06 10:51:35 UTC (rev 986) +++ trunk/maven-i18n-plugin/src/main/java/org/codelutin/i18n/plugin/extension/ParserSwixat.java 2008-08-06 13:14:05 UTC (rev 987) @@ -31,42 +31,60 @@ public class ParserSwixat extends ParserXml { /** - * @description Source entries (src+includes+excludes) . + * @description Source entries (src+includes) . * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/*.xml" */ protected String defaultIncludes; /** + * @description Source entries (src+excludes) . + * @parameter expression="${i18n.defaultIncludes}" default-value="**\\/context.xml" + */ + protected String defaultExcludes; + + /** * @description R�gles xml. * @parameter expression="${i18n.rulesSwixat}" default-value="swixat.rules" */ protected String rulesSwixat; + @Override protected String[] getDefaultIncludes() { return new String[]{defaultIncludes}; } + @Override + protected String[] getDefaultExcludes() { + return new String[]{defaultExcludes}; + } + + @Override protected boolean isFileUptodate(File basedir, File file1, String file) { return false; } + @Override protected String getKeyModifierStart() { return "=\\s*[\"\']"; } + @Override protected String getKeyModifierEnd() { return "[\"\']"; } + @Override protected String getOutGetter() { return "swixat.getter"; } + @Override protected String getFileRules() { return rulesSwixat; } + @Override protected String getCoreFileRules() { return "swixat.rules"; } @@ -75,6 +93,7 @@ * (non-Javadoc) * @see org.codelutin.i18n.plugin.extension.XmlParser#extract(java.lang.String) */ + @Override public String extract(String i18nString) { return i18nString; }

1 0