- Jaxx-commits - mailman.cloud.codelutin.com

r2634 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler jaxx-compiler/src/main/java/jaxx/compiler/tags jaxx-demo/src/main/java/jaxx/demo jaxx-demo/src/main/resources/i18n jaxx-runtime/src/main/java/jaxx/runtime
by tchemit＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: tchemit Date: 2013-03-18 09:34:23 +0100 (Mon, 18 Mar 2013) New Revision: 2634 Url: http://nuiton.org/projects/jaxx/repository/revisions/2634 Log: fixes #2499: Mnemonic should be able to be i18nAble (+ use it on jaxx-demo) Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/I18nHelper.java 2013-03-18 08:34:23 UTC (rev 2634) @@ -25,6 +25,7 @@ package jaxx.compiler; +import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; @@ -78,7 +79,8 @@ * @param attributeName the name of the attribute * @param attributeValueCode the value code of the attribute value * @param compiler the current used compile - * @return the surrender i18n call if attribute name is matchrf the attributeValueCode otherwise + * @return the surrender i18n call if attribute name is match the + * attributeValueCode otherwise */ public static String addI18nInvocation(String widgetId, String attributeName, String attributeValueCode, JAXXCompiler compiler) { @@ -94,4 +96,33 @@ return attributeValueCode; } + + /** + * Box a i18n key with code to be used as a i18n mnemonic. + * <p/> + * Note: <b>Be ware : </b> no test is done here to ensure we are on a + * i18neable attribute for an i18nable compiler. + * + * @param object the object to use + * @param attributeName the name of the attribute + * @param attributeValueCode the value code of the attribute value + * @param compiler the current used compile + * @return the surrender i18n call if attribute name is match the + * attributeValueCode otherwise + * @since 2.6.11 + */ + public static String addI18nMnemonicInvocation(CompiledObject object, + String attributeName, + String attributeValueCode, + JAXXCompiler compiler) { + String stringValue = I18nHelper.addI18nInvocation( + object.getId(), + attributeName, + attributeValueCode, + compiler); + compiler.addImport(SwingUtil.class.getName()); + String result = "{" + SwingUtil.class.getSimpleName() + + ".getFirstCharAt(" + stringValue + ",'Z')}"; + return result; + } } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultComponentHandler.java 2013-03-18 08:34:23 UTC (rev 2634) @@ -32,6 +32,7 @@ import jaxx.compiler.UnsupportedAttributeException; import jaxx.compiler.reflect.ClassDescriptor; import jaxx.compiler.reflect.ClassDescriptorHelper; +import jaxx.compiler.types.TypeManager; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,6 +60,8 @@ public static final String ACTION_ICON_ATTRIBUTE = "actionIcon"; + public static final String I18N_MNEMONIC_ATTRIBUTE = "i18nMnemonic"; + public static final String CONTAINER_DELEGATE_ATTRIBUTE = "containerDelegate"; public static final String FONT_FACE_ATTRIBUTE = "font-face"; @@ -320,8 +323,7 @@ if (!(stringValue.startsWith("{") || stringValue.endsWith("}"))) { // this is a customized icon, add the icon creation code // compiler.setNeedSwingUtil(true); - String type = - compiler.getImportedType(SwingUtil.class); + String type = compiler.getImportedType(SwingUtil.class); if (compiler.getConfiguration().isUseUIManagerForIcon()) { stringValue = "{" + type + ".getUIManagerIcon(\"" + stringValue + "\")}"; @@ -357,6 +359,13 @@ } else { stringValue = "{" + type + ".createActionIcon(\"" + stringValue + "\")}"; } + } else if (I18N_MNEMONIC_ATTRIBUTE.equals(propertyName)) { + propertyName = MNEMONIC_ATTRIBUTE; + stringValue = I18nHelper.addI18nMnemonicInvocation( + object, + I18N_MNEMONIC_ATTRIBUTE, + TypeManager.getJavaCode(stringValue), + compiler); } super.setAttribute(object, propertyName, stringValue, inline, compiler); } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.css 2013-03-18 08:34:23 UTC (rev 2634) @@ -47,7 +47,7 @@ #menuFile { text:"jaxxdemo.menu.file"; - mnemonic:F; + i18nMnemonic: "jaxxdemo.menu.file.mnemonic"; _help:{"ui.main.menu.file"}; } @@ -55,7 +55,7 @@ text:"jaxxdemo.action.configuration"; toolTipText:"jaxxdemo.action.configuration.tip"; actionIcon:"config"; - mnemonic:C; + i18nMnemonic: "jaxxdemo.action.configuration.mnemonic"; _help:{"ui.main.menu.file.configuration"}; } @@ -63,7 +63,7 @@ text:"jaxxdemo.menu.file.locale"; toolTipText:"jaxxdemo.menu.file.locale"; actionIcon:"translate"; - mnemonic:C; + i18nMnemonic: "jaxxdemo.menu.file.locale.mnemonic"; _help:{"ui.main.menu.file.locale"}; } @@ -73,7 +73,7 @@ toolTipText:"jaxxdemo.action.locale.fr.tip"; actionIcon:"i18n-fr"; enabled:{!acceptLocale(getConfig().getLocale(), "fr_FR")}; - mnemonic:F; + i18nMnemonic: "jaxxdemo.action.locale.fr.mnemonic"; _help:{"ui.main.menu.file.locale.fr"}; } @@ -82,7 +82,7 @@ toolTipText:"jaxxdemo.action.locale.uk.tip"; actionIcon:"i18n-uk"; enabled:{!acceptLocale(getConfig().getLocale(), "en_GB")}; - mnemonic:U; + i18nMnemonic: "jaxxdemo.action.locale.uk.mnemonic"; _help:{"ui.main.menu.file.locale.uk"}; } @@ -90,7 +90,7 @@ text:"jaxxdemo.action.fullscreen"; toolTipText:"jaxxdemo.action.fullscreen.tip"; actionIcon:"fullscreen"; - mnemonic:P; + i18nMnemonic: "jaxxdemo.action.fullscreen.mnemonic"; visible:{!isUndecorated()}; _help:{"ui.main.menu.file.fullscreen"}; } @@ -99,35 +99,36 @@ text:"jaxxdemo.action.normalscreen"; toolTipText:"jaxxdemo.action.normalscreen.tip"; actionIcon:"leave-fullscreen"; - mnemonic:N; + i18nMnemonic: "jaxxdemo.action.normalscreen.mnemonic"; visible:{isUndecorated()}; -_help:{"ui.main.menu.file.leave-fullscreen"}; + _help:{"ui.main.menu.file.leave-fullscreen"}; } #menuFileExit { text:"jaxxdemo.action.exit"; toolTipText:"jaxxdemo.action.exit.tip"; actionIcon:"exit"; - mnemonic:X; + i18nMnemonic: "jaxxdemo.action.exit.mnemonic"; _help:{"ui.main.menu.file.exit"}; } -#menuLogs { - text:"jaxxdemo.menu.showLogs"; - _help:{"ui.main.menu.showLogs"}; -} - #menuHelp { text:"jaxxdemo.menu.help"; - mnemonic:e; + i18nMnemonic: "jaxxdemo.menu.help.mnemonic"; _help:{"ui.main.menu.help"}; } +#menuHelpLogs { + text:"jaxxdemo.action.showLogs"; + i18nMnemonic: "jaxxdemo.action.showLogs.mnemonic"; + _help:{"ui.main.action.showLogs"}; +} + #menuHelpHelp { text:"jaxxdemo.action.help"; toolTipText:"jaxxdemo.action.help.tip"; actionIcon:"help"; - mnemonic:e; + i18nMnemonic: "jaxxdemo.action.help.mnemonic"; _help:{"ui.main.menu.help.help"}; } @@ -135,7 +136,7 @@ text:"jaxxdemo.action.site"; toolTipText:"jaxxdemo.action.site.tip"; actionIcon:"site"; - mnemonic:s; + i18nMnemonic: "jaxxdemo.action.site.mnemonic"; _help:{"ui.main.menu.help.site"}; } @@ -143,7 +144,7 @@ text:"jaxxdemo.action.about"; toolTipText:"jaxxdemo.action.about.tip"; actionIcon:"about"; - mnemonic:A; + i18nMnemonic: "jaxxdemo.action.about.mnemonic"; _help:{"ui.main.menu.help.about"}; } Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2013-03-18 08:34:23 UTC (rev 2634) @@ -85,7 +85,7 @@ </JMenu> <JMenu id='menuHelp'> - <JMenuItem id='menuLogs' + <JMenuItem id='menuHelpLogs' onActionPerformed="getHandler().showLogs(this)"/> <JMenuItem id='menuHelpHelp' onActionPerformed="getHandler().showHelp(this, null)"/> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2013-03-18 08:34:23 UTC (rev 2634) @@ -93,6 +93,7 @@ Yellow= You\ entered\:\ = Your\ name\:= +\\= \\u00f7= adjust\ the\ spacing= between\ these\ lines= @@ -148,25 +149,36 @@ jaxx.demo.label.lastName.tip=Last name jaxxdemo.about.message=<h3>JAXX Demo</h3><hr/>For more informations, visit the <a href\="http\://maven-site.nuiton.org/jaxx/jaxx-demo">website of the project</a>. jaxxdemo.action.about=About... +jaxxdemo.action.about.mnemonic=A jaxxdemo.action.about.tip=About JAXXDemo... jaxxdemo.action.add=Add jaxxdemo.action.configuration=Preferences +jaxxdemo.action.configuration.mnemonic=P jaxxdemo.action.configuration.tip=Change the preferences of the application jaxxdemo.action.exit=Quit +jaxxdemo.action.exit.mnemonic=Q jaxxdemo.action.exit.tip=Quit JAXXDemo jaxxdemo.action.fullscreen=Full screen +jaxxdemo.action.fullscreen.mnemonic=u jaxxdemo.action.fullscreen.tip=Change to full screen mode -jaxxdemo.action.help= +jaxxdemo.action.help=Help +jaxxdemo.action.help.mnemonic=e jaxxdemo.action.help.tip=Display help jaxxdemo.action.locale.fr=French +jaxxdemo.action.locale.fr.mnemonic=F jaxxdemo.action.locale.fr.tip=Change to french language jaxxdemo.action.locale.uk=English +jaxxdemo.action.locale.uk.mnemonic=E jaxxdemo.action.locale.uk.tip=Change to english language jaxxdemo.action.normalscreen=Normal screen +jaxxdemo.action.normalscreen.mnemonic=N jaxxdemo.action.normalscreen.tip=Change to normal screen mode jaxxdemo.action.remove=Remove jaxxdemo.action.show=show +jaxxdemo.action.showLogs=Show logs +jaxxdemo.action.showLogs.mnemonic=S jaxxdemo.action.site=Web site +jaxxdemo.action.site.mnemonic=W jaxxdemo.action.site.tip=Go to the web site jaxxdemo.beancomboboxdemo.autoComplete=AutoComplete jaxxdemo.beancomboboxdemo.configuration=Configuration @@ -254,8 +266,10 @@ jaxxdemo.listSelector.removeToolTipLbl=Remove button toolTip jaxxdemo.menu.file=File jaxxdemo.menu.file.locale=Languages -jaxxdemo.menu.help= -jaxxdemo.menu.showLogs=Show logs +jaxxdemo.menu.file.locale.mnemonic=L +jaxxdemo.menu.file.mnemonic=F +jaxxdemo.menu.help=Help +jaxxdemo.menu.help.mnemonic=h jaxxdemo.message.config.loaded=Configuration of JAXXDemo v. %1$s loaded. jaxxdemo.message.goto.site=Go to JAXXDemo Web site jaxxdemo.navigation.actor.title=Actor Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2013-03-18 08:34:23 UTC (rev 2634) @@ -93,6 +93,7 @@ Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: +\\= \\u00f7= adjust\ the\ spacing= between\ these\ lines= @@ -148,25 +149,37 @@ jaxx.demo.label.lastName.tip= jaxxdemo.about.message=<h3>JAXX Demo</h3><hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.nuiton.org/jaxx/jaxx-demo">site du projet</a>. jaxxdemo.action.about=A propos +jaxxdemo.action.about.mnemonic= jaxxdemo.action.about.tip=A propos de JAXX Demo... jaxxdemo.action.add=Ajouter jaxxdemo.action.configuration=Configuration +jaxxdemo.action.configuration.mnemonic= jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter +jaxxdemo.action.exit.mnemonic= jaxxdemo.action.exit.tip=Quitter JAXX Demo jaxxdemo.action.fullscreen=Plein écran +jaxxdemo.action.fullscreen.mnemonic= jaxxdemo.action.fullscreen.tip=Passer en mode pleine écran jaxxdemo.action.help=Aide +jaxxdemo.action.help.mnemonic= jaxxdemo.action.help.tip=Affichier l'aide jaxxdemo.action.locale.fr=Français +jaxxdemo.action.locale.fr.mnemonic= jaxxdemo.action.locale.fr.tip=Changer la langue en français +jaxxdemo.action.locale.mnemonic= jaxxdemo.action.locale.uk=Anglais +jaxxdemo.action.locale.uk.mnemonic= jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal +jaxxdemo.action.normalscreen.mnemonic= jaxxdemo.action.normalscreen.tip=Revenir en mode normal jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir +jaxxdemo.action.showLogs= +jaxxdemo.action.showLogs.mnemonic= jaxxdemo.action.site=Site internet +jaxxdemo.action.site.mnemonic= jaxxdemo.action.site.tip=Accéder au site de l'application sur internet jaxxdemo.beancomboboxdemo.autoComplete= jaxxdemo.beancomboboxdemo.configuration= @@ -254,8 +267,12 @@ jaxxdemo.listSelector.removeToolTipLbl=Remove button toolTip jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues +jaxxdemo.menu.file.locale.mnemonic= +jaxxdemo.menu.file.mnemonic= jaxxdemo.menu.help=Aide +jaxxdemo.menu.help.mnemonic= jaxxdemo.menu.showLogs=Afficher les logs +jaxxdemo.menu.showLogs.mnemonic= jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée. jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur @@ -302,5 +319,7 @@ t0.isSelected()\ &&\ t1.isSelected()= t0.isSelected()\ ||\ t1.isSelected()= t1.isSelected()= +tutti.menu.file.mnemonic= +tutti.menu.help.mnemonic= valid=valide x=x Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2013-03-18 08:34:23 UTC (rev 2634) @@ -93,6 +93,7 @@ Yellow=Jaune You\ entered\:\ = Your\ name\:=Votre nom \: +\\= \\u00f7= adjust\ the\ spacing= between\ these\ lines= @@ -148,25 +149,36 @@ jaxx.demo.label.lastName.tip=Nom jaxxdemo.about.message=<h3>JAXX Demo</h3><hr/>Pour plus d'informations, vous pouvez visiter le <a href\="http\://maven-site.nuiton.org/jaxx/jaxx-demo">site du projet</a>. jaxxdemo.action.about=A propos +jaxxdemo.action.about.mnemonic=A jaxxdemo.action.about.tip=A propos de JAXX Demo... jaxxdemo.action.add=Ajouter jaxxdemo.action.configuration=Configuration +jaxxdemo.action.configuration.mnemonic=C jaxxdemo.action.configuration.tip=Modifier la configuration jaxxdemo.action.exit=Quitter +jaxxdemo.action.exit.mnemonic=Q jaxxdemo.action.exit.tip=Quitter JAXX Demo jaxxdemo.action.fullscreen=Plein écran +jaxxdemo.action.fullscreen.mnemonic=P jaxxdemo.action.fullscreen.tip=Passer en mode pleine écran jaxxdemo.action.help=Aide +jaxxdemo.action.help.mnemonic=e jaxxdemo.action.help.tip=Affichier l'aide jaxxdemo.action.locale.fr=Français +jaxxdemo.action.locale.fr.mnemonic=F jaxxdemo.action.locale.fr.tip=Changer la langue en français jaxxdemo.action.locale.uk=Anglais +jaxxdemo.action.locale.uk.mnemonic=A jaxxdemo.action.locale.uk.tip=Changer la langue en anglais jaxxdemo.action.normalscreen=Ecran normal +jaxxdemo.action.normalscreen.mnemonic=N jaxxdemo.action.normalscreen.tip=Revenir en mode normal jaxxdemo.action.remove=Supprimer jaxxdemo.action.show=Voir +jaxxdemo.action.showLogs=Afficher les logs +jaxxdemo.action.showLogs.mnemonic=l jaxxdemo.action.site=Site internet +jaxxdemo.action.site.mnemonic=s jaxxdemo.action.site.tip=Accéder au site de l'application sur internet jaxxdemo.beancomboboxdemo.autoComplete=Auto complétion jaxxdemo.beancomboboxdemo.configuration=Configuration @@ -254,8 +266,10 @@ jaxxdemo.listSelector.removeToolTipLbl=Tooltip du boutton enlever jaxxdemo.menu.file=Fichier jaxxdemo.menu.file.locale=Langues +jaxxdemo.menu.file.locale.mnemonic=L +jaxxdemo.menu.file.mnemonic=F jaxxdemo.menu.help=Aide -jaxxdemo.menu.showLogs=Afficher les logs +jaxxdemo.menu.help.mnemonic=A jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s chargée. jaxxdemo.message.goto.site=Accéder au site de JAXX Demo (%1$s) jaxxdemo.navigation.actor.title=Acteur Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2013-03-18 06:31:44 UTC (rev 2633) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2013-03-18 08:34:23 UTC (rev 2634) @@ -1388,4 +1388,19 @@ } }); } + + /** + * Get the first char of a String, or return default value. + * <p/> + * Used for example by generated code (i18nMnemonic). + * + * @param text the text to cut + * @param defaultValue default char value if text is null, or empty + * @return the first char of the given text or the default value if text is null or empty. + * @since 2.6.14 + */ + public static char getFirstCharAt(String text, char defaultValue) { + return text == null || text.trim().length() == 0 ? + defaultValue : text.charAt(0); + } }

1 0

r2633 - trunk
by tchemit＠users.nuiton.org 18 Mar '13

18 Mar '13

Author: tchemit Date: 2013-03-18 07:31:44 +0100 (Mon, 18 Mar 2013) New Revision: 2633 Url: http://nuiton.org/projects/jaxx/repository/revisions/2633 Log: fixes #2605: Updates nuiton-utils to 2.6.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-17 23:51:39 UTC (rev 2632) +++ trunk/pom.xml 2013-03-18 06:31:44 UTC (rev 2633) @@ -112,7 +112,7 @@  <projectId>jaxx</projectId> - <nuitonUtilsVersion>2.6.10</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugeneVersion>2.6</eugeneVersion> <jxLayerVersion>3.0.4</jxLayerVersion>

1 0

r2632 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help
by tchemit＠users.nuiton.org 17 Mar '13

17 Mar '13

Author: tchemit Date: 2013-03-18 00:51:39 +0100 (Mon, 18 Mar 2013) New Revision: 2632 Url: http://nuiton.org/projects/jaxx/repository/revisions/2632 Log: fix build Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-17 18:38:49 UTC (rev 2631) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-17 23:51:39 UTC (rev 2632) @@ -290,7 +290,7 @@ } protected Component getDeppestComponent(Component mouseComponent, MouseEvent event) { - return SwingUtil.getDeepestObjectAt2(mouseComponent, event.getX(), event.getY()); + return SwingUtil.getDeepestObjectAt(mouseComponent, event.getX(), event.getY()); } public String findHelpId(Component comp) {

1 0

r2631 - trunk/jaxx-runtime/src/main/java/jaxx/runtime
by tchemit＠users.nuiton.org 17 Mar '13

17 Mar '13

Author: tchemit Date: 2013-03-17 19:38:49 +0100 (Sun, 17 Mar 2013) New Revision: 2631 Url: http://nuiton.org/projects/jaxx/repository/revisions/2631 Log: fixes #2604: Add a new method to get a parent of a component of a certain type (using the Container#parent api) Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2013-03-17 18:33:49 UTC (rev 2630) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2013-03-17 18:38:49 UTC (rev 2631) @@ -319,6 +319,23 @@ @SuppressWarnings({"unchecked"}) public static <O extends Container> O getParentContainer(Object top, Class<O> clazz) { + + return getParent(top, clazz); + } + + + /** + * Find a parent of the given {@code top} object using the container api to get up. + * <p/> + * Stop on parent when it is of the given{@code clazz} type. + * + * @param <O> type of container to obtain from context + * @param top the top container + * @param clazz desired + * @return parent's container + * @since 2.5.14 + */ + public static <O> O getParent(Object top, Class<O> clazz) { if (top == null) { throw new IllegalArgumentException("top parameter can not be null"); } @@ -328,7 +345,7 @@ } Container parent = ((Container) top).getParent(); if (parent != null && !clazz.isAssignableFrom(parent.getClass())) { - parent = getParentContainer(parent, clazz); + parent = (Container) getParent(parent, clazz); } return (O) parent; }

1 0

r2630 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime: . awt awt/visitor
by tchemit＠users.nuiton.org 17 Mar '13

17 Mar '13

Author: tchemit Date: 2013-03-17 19:33:49 +0100 (Sun, 17 Mar 2013) New Revision: 2630 Url: http://nuiton.org/projects/jaxx/repository/revisions/2630 Log: fixes #2603: Add new API to scan components as a tree Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java 2013-03-17 18:33:49 UTC (rev 2630) @@ -0,0 +1,71 @@ +package jaxx.runtime.awt.visitor; + +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import org.jdesktop.jxlayer.JXLayer; + +import javax.swing.JRootPane; +import java.awt.Component; +import java.awt.Container; + +/** + * A visitor to build the tree from a given component. + * <p/> + * To obtain a tree from a compoent use the method {@link #buildTree(Component)}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.14 + */ +public class BuildTreeVisitor implements ComponentTreeNodeVisitor { + + public static ComponentTreeNode buildTree(Component component) { + BuildTreeVisitor v = new BuildTreeVisitor(); + ComponentTreeNode rootNode = new ComponentTreeNode(component); + rootNode.visit(v); + return rootNode; + } + + @Override + public void startNode(ComponentTreeNode node) { + Component component = node.getUserObject(); + if (component instanceof Container) { + Container container = (Container) component; + //TODO-TC-2013-03-17 Should use some rules to add this. + for (Component child : container.getComponents()) { + if (child instanceof JXLayer<?>) { + child = ((JXLayer<?>) child).getView(); + } else if (child instanceof JRootPane) { + child = ((JRootPane) child).getLayeredPane(); + } + ComponentTreeNode childNode = new ComponentTreeNode(child); + node.add(childNode); + } + } + } + + @Override + public void endNode(ComponentTreeNode componentTree) { + } +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/BuildTreeVisitor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java 2013-03-17 18:33:49 UTC (rev 2630) @@ -0,0 +1,113 @@ +package jaxx.runtime.awt.visitor; + +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import org.apache.commons.collections.iterators.EnumerationIterator; + +import javax.swing.tree.DefaultMutableTreeNode; +import java.awt.Component; +import java.awt.Container; +import java.util.Iterator; + +/** + * A node where userObject is a {@link Component}. + * <p/> + * If the compoent is a {@link Container}, then his children are the components + * of the container. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.14 + */ +public class ComponentTreeNode extends DefaultMutableTreeNode implements Iterable<ComponentTreeNode> { + + private static final long serialVersionUID = 1L; + + public ComponentTreeNode(Component userObject) { + super(userObject, true); + } + + /** + * To visit a node. + * + * @param visitor the visitor + */ + public void visit(ComponentTreeNodeVisitor visitor) { + visitor.startNode(this); + for (ComponentTreeNode child : this) { + child.visit(visitor); + } + visitor.endNode(this); + } + + @Override + public Component getUserObject() { + return (Component) super.getUserObject(); + } + + @Override + public ComponentTreeNode getParent() { + return (ComponentTreeNode) super.getParent(); + } + + @Override + public ComponentTreeNode getNextLeaf() { + return (ComponentTreeNode) super.getNextLeaf(); + } + + @Override + public ComponentTreeNode getNextNode() { + return (ComponentTreeNode) super.getNextNode(); + } + + @Override + public ComponentTreeNode getNextSibling() { + return (ComponentTreeNode) super.getNextSibling(); + } + + @Override + public ComponentTreeNode getPreviousLeaf() { + return (ComponentTreeNode) super.getPreviousLeaf(); + } + + @Override + public ComponentTreeNode getPreviousNode() { + return (ComponentTreeNode) super.getPreviousNode(); + } + + @Override + public ComponentTreeNode getPreviousSibling() { + return (ComponentTreeNode) super.getPreviousSibling(); + } + + @Override + public ComponentTreeNode getRoot() { + return (ComponentTreeNode) super.getRoot(); + } + + @Override + public Iterator<ComponentTreeNode> iterator() { + return new EnumerationIterator(children()); + } +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNode.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java 2013-03-17 18:33:49 UTC (rev 2630) @@ -0,0 +1,38 @@ +package jaxx.runtime.awt.visitor; + +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +/** + * To visit a {@link ComponentTreeNode}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.14 + */ +public interface ComponentTreeNodeVisitor { + + void startNode(ComponentTreeNode componentTree); + + void endNode(ComponentTreeNode componentTree); +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/ComponentTreeNodeVisitor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java 2013-03-17 18:33:49 UTC (rev 2630) @@ -0,0 +1,109 @@ +package jaxx.runtime.awt.visitor; + +/* + * #%L + * JAXX :: Runtime + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2013 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import com.google.common.collect.Lists; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.awt.Component; +import java.awt.Point; +import java.util.List; + +/** + * A visitor to get the deepest component given a point in a tree. + * <p/> + * To obtain the component use the method {@link #get(ComponentTreeNode, Point)}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5.14 + */ +public class GetCompopentAtPointVisitor implements ComponentTreeNodeVisitor { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(GetCompopentAtPointVisitor.class); + + int currentX; + + int currentY; + + final List<ComponentTreeNode> components = Lists.newArrayList(); + + public static Component get(ComponentTreeNode node, Point p) { + + GetCompopentAtPointVisitor v = new GetCompopentAtPointVisitor(p); + node.visit(v); + Component result = v.getLastComponent(); + v.components.clear(); + return result; + } + + public GetCompopentAtPointVisitor(Point p) { + currentX = (int) p.getX(); + currentY = (int) p.getY(); + } + + public Component getLastComponent() { + Component result = null; + if (!components.isEmpty()) { + ComponentTreeNode node = components.get(components.size() - 1); + result = node.getUserObject(); + } + return result; + } + + @Override + public void startNode(ComponentTreeNode node) { + Component component = node.getUserObject(); + + Point point = component.getLocation(); + currentX -= point.x; + currentY -= point.y; + + // check parent is ok + if (node.isRoot() || components.contains(node.getParent())) { + + boolean containsPoint = component.contains(currentX, currentY); + + if (containsPoint) { + + if (log.isDebugEnabled()) { + log.debug("Accept component: " + component); + } + + // keep this node + components.add(node); + } + } + } + + @Override + public void endNode(ComponentTreeNode componentTree) { + Point point = componentTree.getUserObject().getLocation(); + currentX += point.x; + currentY += point.y; + } +} Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/GetCompopentAtPointVisitor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html (rev 0) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html 2013-03-17 18:33:49 UTC (rev 2630) @@ -0,0 +1,36 @@ + +<html> +<body> +<h1>JAXX - awt tree node API</h1> + +This package contains a API to visit swing components. + +<h2>ComponentTreenode</h2> +The model of a node in the tree + +<h2>ComponentTreenodeVisitor</h2> +Object to load childs of Contract of a visitor on nodes. +</body> +</html> Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/awt/visitor/package.html ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2629 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help
by tchemit＠users.nuiton.org 17 Mar '13

17 Mar '13

Author: tchemit Date: 2013-03-17 19:28:51 +0100 (Sun, 17 Mar 2013) New Revision: 2629 Url: http://nuiton.org/projects/jaxx/repository/revisions/2629 Log: fixes #2602: [JAXXHelper] Improve api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-15 11:55:51 UTC (rev 2628) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2013-03-17 18:28:51 UTC (rev 2629) @@ -262,7 +262,7 @@ if (log.isDebugEnabled()) { log.debug("component traking " + comp.getName() + " : " + comp.getClass().getName()); } - comp = SwingUtil.getDeepestObjectAt(comp, event.getX(), event.getY()); + comp = getDeppestComponent(comp, event); if (log.isDebugEnabled()) { log.debug("deepest component " + comp.getName() + " : " + comp.getClass().getName()); } @@ -279,47 +279,6 @@ String helpID = findHelpId(comp); showHelp(context, helpID); } - - public String findHelpId(Component comp) { - String helpID = CSH.getHelpIDString(comp); - if (defaultID.equals(helpID)) { - String id = cache.get(comp); - // on verifie qu'on est bien sur sur le bon id - if (helpID.equals(id)) { - // ok - return helpID; - } - if (log.isDebugEnabled()) { - log.debug("will try to find better id for comp : " + comp.getName()); - } - // on est pas sur le bon id - // on recherche parmis les parents - helpID = findExtactHelpId(comp); - } - if (log.isInfoEnabled()) { - log.info("helpID " + helpID + " for comp " + comp.getName() + " : " + comp.getClass().getName()); - } - return helpID; - } - - protected String findExtactHelpId(Component comp) { - Container parent = comp.getParent(); - while (parent != null) { - String id = cache.get(parent); - if (id == null) { - // ce container n'a pas d'id - // on va directement sur le parent - parent = parent.getParent(); - continue; - } - // le parent possède un id - // on utilise cet id - return id; - } - // on a pas trouve d'id - // on retourne l'id par defaut - return defaultID; - } } protected AbstractButton getShowHelpButton(JAXXObject c) { @@ -330,6 +289,51 @@ return new ShowHelpForTrackedComponentAction(); } + protected Component getDeppestComponent(Component mouseComponent, MouseEvent event) { + return SwingUtil.getDeepestObjectAt2(mouseComponent, event.getX(), event.getY()); + } + + public String findHelpId(Component comp) { + String helpID = CSH.getHelpIDString(comp); + if (defaultID.equals(helpID)) { + String id = cache.get(comp); + // on verifie qu'on est bien sur sur le bon id + if (helpID.equals(id)) { + // ok + return helpID; + } + if (log.isDebugEnabled()) { + log.debug("will try to find better id for comp : " + comp.getName()); + } + // on est pas sur le bon id + // on recherche parmis les parents + helpID = findExtactHelpId(comp); + } + if (log.isInfoEnabled()) { + log.info("helpID " + helpID + " for comp " + comp.getName() + " : " + comp.getClass().getName()); + } + return helpID; + } + + protected String findExtactHelpId(Component comp) { + Container parent = comp.getParent(); + while (parent != null) { + String id = cache.get(parent); + if (id == null) { + // ce container n'a pas d'id + // on va directement sur le parent + parent = parent.getParent(); + continue; + } + // le parent possède un id + // on utilise cet id + return id; + } + // on a pas trouve d'id + // on retourne l'id par defaut + return defaultID; + } + //------------------------------------------------------------------------- //--- Copy CSH code but with accessible modifiers and little improvments //------------------------------------------------------------------------- @@ -584,7 +588,7 @@ return null; } - private static void dispatchEvent(AWTEvent event) { + protected static void dispatchEvent(AWTEvent event) { Object src = event.getSource(); if (event instanceof ActiveEvent) { // This could become the sole method of dispatching in time.

1 0

r2628 - trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config
by tchemit＠users.nuiton.org 15 Mar '13

15 Mar '13

Author: tchemit Date: 2013-03-15 12:55:51 +0100 (Fri, 15 Mar 2013) New Revision: 2628 Url: http://nuiton.org/projects/jaxx/repository/revisions/2628 Log: fixes #2599: [ConfigUI] Can not edit an option of type *char* Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java 2013-03-15 06:53:40 UTC (rev 2627) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableEditor.java 2013-03-15 11:55:51 UTC (rev 2628) @@ -26,13 +26,13 @@ import com.google.common.io.Files; import jaxx.runtime.swing.JAXXWidgetUtil; +import jaxx.runtime.swing.config.model.ConfigTableModel; +import jaxx.runtime.swing.config.model.OptionModel; import jaxx.runtime.swing.editor.ClassCellEditor; import jaxx.runtime.swing.editor.ColorCellEditor; import jaxx.runtime.swing.editor.EnumEditor; import jaxx.runtime.swing.editor.LocaleEditor; import jaxx.runtime.swing.editor.cell.FileCellEditor; -import jaxx.runtime.swing.config.model.ConfigTableModel; -import jaxx.runtime.swing.config.model.OptionModel; import org.apache.commons.lang3.StringUtils; import javax.swing.DefaultCellEditor; @@ -50,11 +50,12 @@ * L'éditeur des valeurs des propriétés d'une configuration * * @author tchemit <chemit(a)codelutin.com> - * @since 2.5.11 + * @since 2.5.11 */ public class ConfigTableEditor implements TableCellEditor { protected TableCellEditor delegate; + protected ConfigTableModel model; public ConfigTableEditor(ConfigTableModel model) { @@ -110,6 +111,9 @@ protected TableCellEditor findDelegate(JTable table, OptionModel option) { Class<?> type = option.getType(); + if (char.class.equals(type)) { + type = String.class; + } TableCellEditor editor = table.getDefaultEditor(type); TableCellEditor defaultEditor = table.getDefaultEditor(Object.class); // always Search from option.getEditor() and store editor as cache @@ -126,16 +130,16 @@ } else if (type.equals(Class.class)) { editor = new ClassCellEditor(); - } else if (type.equals(File.class)){ + } else if (type.equals(File.class)) { editor = new FileCellEditorWithExtDetector(); - } else if (type.equals(KeyStroke.class)){ + } else if (type.equals(KeyStroke.class)) { editor = JAXXWidgetUtil.newKeyStrokeTableCellEditor(); } else if (type.equals(Locale.class)) { editor = new DefaultCellEditor(LocaleEditor.newEditor()); - } else if (type.equals(Color.class)) { + } else if (type.equals(Color.class)) { editor = new ColorCellEditor(); } else {

1 0

r2627 - in trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config: . model
by tchemit＠users.nuiton.org 15 Mar '13

15 Mar '13

Author: tchemit Date: 2013-03-15 07:53:40 +0100 (Fri, 15 Mar 2013) New Revision: 2627 Url: http://nuiton.org/projects/jaxx/repository/revisions/2627 Log: refs #2596: [ConfigUI] Deal with application config array type options (improve i18n) Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java 2013-03-15 00:18:32 UTC (rev 2626) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigCategoryUIHandler.java 2013-03-15 06:53:40 UTC (rev 2627) @@ -29,6 +29,7 @@ import jaxx.runtime.swing.config.model.OptionModel; import jaxx.runtime.swing.renderer.ClassTableCellRenderer; import jaxx.runtime.swing.renderer.ColorCellRenderer; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -107,7 +108,9 @@ } else { buffer.append(_("config.option.label", option.getKey(), _(option.getDescription()))).append('\n'); if (option.isModified()) { - buffer.append(_("config.option.modified", option.getOriginalValue(), option.getValue())).append('\n'); + String oValue = option.toString(option.getOriginalValue()); + String mValue = option.toString(option.getValue()); + buffer.append(_("config.option.modified", oValue, mValue)).append('\n'); } if (option.isFinal()) { buffer.append(_("config.option.final")).append('\n'); @@ -115,4 +118,5 @@ } description.setText(buffer.toString()); } + } Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2013-03-15 00:18:32 UTC (rev 2626) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigTableRenderer.java 2013-03-15 06:53:40 UTC (rev 2627) @@ -88,7 +88,7 @@ protected Component getKeyCellRenderer(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column, OptionModel key, boolean isValid, boolean isModified) { String tooltip = _(key.getDescription()); - Object originalValue = key.getOriginalValue(); + String originalValue = key.toString(key.getOriginalValue()); boolean isFinal = key.isFinal(); if (isFinal) { tooltip += " [" + _("config.unmodifiable") + ']'; Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-03-15 00:18:32 UTC (rev 2626) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-03-15 06:53:40 UTC (rev 2627) @@ -260,7 +260,7 @@ toSave = null; } else { - if (option.getType().isArray()) { + if (option.isArrayType()) { int length = Array.getLength(value); List<Object> values = Lists.newArrayListWithCapacity(length); for (int i = 0; i < length; i++) { Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-03-15 00:18:32 UTC (rev 2626) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-03-15 06:53:40 UTC (rev 2627) @@ -80,6 +80,10 @@ return def.getType(); } + public boolean isArrayType() { + return getType().isArray(); + } + @Override public String getDescription() { return def.getDescription(); @@ -129,7 +133,7 @@ public boolean isModified() { boolean result; - if (getType().isArray()) { + if (isArrayType()) { result = !ArrayUtils.isEquals(originalValue, value); } else { result = ObjectUtils.notEqual(originalValue, value); @@ -181,4 +185,27 @@ protected void setPropertyName(String propertyName) { this.propertyName = propertyName; } + + /** + * Get a string value of the given {@code value} considered as a value of + * this option, means if option is array type, then we will decorate the + * value as a array. + * + * @param value value to decorate + * @return decorated value + * @since 2.5.14 + */ + public String toString( Object value) { + String result; + if (value == null) { + result = null; + } else { + if (isArrayType()) { + result = ArrayUtils.toString(value); + } else { + result = String.valueOf(value); + } + } + return result; + } }

1 0

r2626 - trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config
by tchemit＠users.nuiton.org 15 Mar '13

15 Mar '13

Author: tchemit Date: 2013-03-15 01:18:32 +0100 (Fri, 15 Mar 2013) New Revision: 2626 Url: http://nuiton.org/projects/jaxx/repository/revisions/2626 Log: fixes #2597: [ConfigUI] Make possible to use ui not in a frame Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java 2013-03-15 00:18:16 UTC (rev 2625) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/ConfigUIHandler.java 2013-03-15 00:18:32 UTC (rev 2626) @@ -48,6 +48,7 @@ import javax.swing.KeyStroke; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; +import java.awt.Container; import java.awt.Frame; import java.awt.Window; import java.awt.event.ActionEvent; @@ -75,6 +76,8 @@ private final ConfigUI ui; + private Container topContainer; + public ConfigUIHandler(ConfigUI ui) { this.ui = ui; } @@ -116,8 +119,8 @@ for (CategoryModel categoryModel : model) { String category = categoryModel.getCategory(); String categoryLabel = _(categoryModel.getCategoryLabel()); - ConfigCategoryUI p = new ConfigCategoryUI(new - JAXXInitialContext().add(ui).add(categoryModel)); + ConfigCategoryUI p = new ConfigCategoryUI( + new JAXXInitialContext().add(ui).add(categoryModel)); p.getCategoryLabel().setText(categoryLabel); p.setName(category); categories.addTab(_(category), null, p, categoryLabel); @@ -133,7 +136,7 @@ } public void destroy() { - if (log.isDebugEnabled() ) { + if (log.isDebugEnabled()) { log.debug("destroy ui " + ui.getName()); } JAXXUtil.destroy(ui); @@ -195,9 +198,24 @@ return; } - final Window parentWindow = ui.getParentContainer(Window.class); + Window parentWindow; + final Container parentContainer; + if (topContainer == null) { + + // no top container given, still use the parent frame + + parentWindow = ui.getParentContainer(Window.class); + parentContainer = parentWindow; + + } else { + + // use only given topContainer + parentWindow = null; + parentContainer = topContainer; + } + ConfigUIModel model = ui.getModel(); if (!model.isSaved() || model.isStandalone()) { @@ -220,25 +238,30 @@ // init callBackUI JAXXInitialContext context = new JAXXInitialContext(). - add("parent", parentWindow). add(ui). add(CALLBACKS_WITH_OPTIONS, forSaved). add(CALLBACKS, new ArrayList<CallBackEntry>(forSaved.keySet())). add(new ConfigCallBackUIHandler()); + if (topContainer == null) { + + // still add parent window (to close ui) + context.setContextValue(parentWindow, "parent"); + } + ConfigCallBackUI lastUI = new ConfigCallBackUI(context); lastUI.init(); ui.setVisible(false); - parentWindow.remove(ui); - parentWindow.add(lastUI); + parentContainer.remove(ui); + parentContainer.add(lastUI); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - parentWindow.validate(); + parentContainer.validate(); } }); } @@ -250,9 +273,12 @@ destroy(); - // close the config ui - parentWindow.dispose(); + if (parentWindow != null) { + // close the config ui + parentWindow.dispose(); + } + Runnable runnable = model.getCloseAction(); if (runnable != null) { log.info("execute close action"); @@ -356,4 +382,9 @@ return response; } + + public void setTopContainer(Container topContainer) { + this.topContainer = topContainer; + } + }

1 0

r2625 - trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model
by tchemit＠users.nuiton.org 15 Mar '13

15 Mar '13

Author: tchemit Date: 2013-03-15 01:18:16 +0100 (Fri, 15 Mar 2013) New Revision: 2625 Url: http://nuiton.org/projects/jaxx/repository/revisions/2625 Log: fixes #2596: [ConfigUI] Deal with application config array type options Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-03-15 00:17:27 UTC (rev 2624) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/ConfigUIModel.java 2013-03-15 00:18:16 UTC (rev 2625) @@ -24,7 +24,9 @@ * #L% */ +import com.google.common.base.Joiner; import com.google.common.base.Supplier; +import com.google.common.collect.Lists; import jaxx.runtime.JAXXUtil; import org.apache.commons.beanutils.PropertyUtils; import org.nuiton.util.config.ApplicationConfig; @@ -32,6 +34,7 @@ import javax.swing.Icon; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; +import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; @@ -46,7 +49,7 @@ * Ce modele contient les catégories des options. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.5.11 + * @since 2.5.11 */ public class ConfigUIModel implements Iterable<CategoryModel> { @@ -251,9 +254,25 @@ // simple option with no javabeans, just push the option // value - applicationConfig.setOption(option.getKey(), - value == null ? - null : value.toString()); + + String toSave; + if (value == null) { + toSave = null; + } else { + + if (option.getType().isArray()) { + int length = Array.getLength(value); + List<Object> values = Lists.newArrayListWithCapacity(length); + for (int i = 0; i < length; i++) { + values.add(Array.get(value, i)); + } + toSave = Joiner.on(",").join(values); + } else { + toSave = value.toString(); + } + } + applicationConfig.setOption(option.getKey(), toSave); + } // l'option a été sauvegardée, on la marque option.setSaved(true); Modified: trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java =================================================================== --- trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-03-15 00:17:27 UTC (rev 2624) +++ trunk/jaxx-config/src/main/java/jaxx/runtime/swing/config/model/OptionModel.java 2013-03-15 00:18:16 UTC (rev 2625) @@ -24,6 +24,7 @@ * #L% */ +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; import org.nuiton.util.config.ConfigOptionDef; @@ -127,7 +128,13 @@ } public boolean isModified() { - return ObjectUtils.notEqual(originalValue, value); + boolean result; + if (getType().isArray()) { + result = !ArrayUtils.isEquals(originalValue, value); + } else { + result = ObjectUtils.notEqual(originalValue, value); + } + return result; } public boolean isValid() {

1 0