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

r1643 - branches/jaxx-2.X
by tchemit＠users.nuiton.org 13 Nov '09

13 Nov '09

Author: tchemit Date: 2009-11-13 10:09:54 +0100 (Fri, 13 Nov 2009) New Revision: 1643 Modified: branches/jaxx-2.X/pom.xml Log: patch pom since can't use at the moment mavenpom 1.1.1 (not released... Modified: branches/jaxx-2.X/pom.xml =================================================================== --- branches/jaxx-2.X/pom.xml 2009-11-13 09:07:03 UTC (rev 1642) +++ branches/jaxx-2.X/pom.xml 2009-11-13 09:09:54 UTC (rev 1643) @@ -362,6 +362,10 @@ <javahelp.version>2.0.02</javahelp.version> +  +  + <redmine.includeAttached>false</redmine.includeAttached> + </properties> <build>

1 0

r1642 - branches/jaxx-2.X
by tchemit＠users.nuiton.org 13 Nov '09

13 Nov '09

Author: tchemit Date: 2009-11-13 10:07:03 +0100 (Fri, 13 Nov 2009) New Revision: 1642 Modified: branches/jaxx-2.X/pom.xml Log: stay for the moment on i18n 1.0.1 Modified: branches/jaxx-2.X/pom.xml =================================================================== --- branches/jaxx-2.X/pom.xml 2009-11-09 10:41:36 UTC (rev 1641) +++ branches/jaxx-2.X/pom.xml 2009-11-13 09:07:03 UTC (rev 1642) @@ -356,7 +356,7 @@ <projectId>jaxx</projectId> <lutinutil.version>1.1.0</lutinutil.version> - <i18n.version>1.0.2-SNAPSHOT</i18n.version> + <i18n.version>1.0.1</i18n.version> <jxlayer.version>3.0.3</jxlayer.version>

1 0

r1641 - branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n
by tchemit＠users.nuiton.org 09 Nov '09

09 Nov '09

Author: tchemit Date: 2009-11-09 11:41:36 +0100 (Mon, 09 Nov 2009) New Revision: 1641 Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties Log: fix i18n label Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-09 10:01:17 UTC (rev 1640) +++ branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-09 10:41:36 UTC (rev 1641) @@ -1,58 +1,56 @@ -aboutframe.about=\u00c0 propos +aboutframe.about=\u00C0 propos aboutframe.license=Licence aboutframe.ok=OK aboutframe.thirdparty=Tierce partie -columnselector.action.tip=S\u00e9lectionner les colonnes +columnselector.action.tip=S\u00E9lectionner les colonnes config.action.quit=Quitter -config.action.quit.tip=Quitter l'\u00e9diteur de configuration +config.action.quit.tip=Quitter l'\u00E9diteur de configuration config.action.reset=Annuler -config.action.reset.tip=Annuler les modifications de cette cat\u00e9gorie +config.action.reset.tip=Annuler les modifications de cette cat\u00E9gorie config.action.save=Enregistrer -config.action.save.tip=Sauver les modifications de cette cat\u00e9gorie -config.category.saved=La cat\u00e9gorie '%1$s' a \u00e9t\u00e9 modifi\u00e9e \: +config.action.save.tip=Sauver les modifications de cette cat\u00E9gorie +config.category.saved=La cat\u00E9gorie '%1$s' a \u00E9t\u00E9 modifi\u00E9e \: config.choice.cancel=Annuler config.choice.continue=Continuer config.choice.doNotSave=Ne pas enregistrer config.choice.ok=Ok config.choice.save=Enregistrer -config.defaultValue=Valeur par d\u00e9faut -config.defaultValue.tip=Valeur par d\u00e9faut de l'option +config.defaultValue=Valeur par d\u00E9faut +config.defaultValue.tip=Valeur par d\u00E9faut de l'option config.descrition=Description -config.error.category.already.exists=La cat\u00e9gorie de nom '%1$s' existe d\u00e9j\u00e0\! -config.error.category.not.found=La cat\u00e9gorie de nom '%1$s' n'existe pas\! +config.error.category.already.exists=La cat\u00E9gorie de nom '%1$s' existe d\u00E9j\u00E0\! +config.error.category.not.found=La cat\u00E9gorie de nom '%1$s' n'existe pas\! config.key=Clef config.key.tip=Clef de l'option -config.message.quit.invalid.category=La cat\u00e9gorie '%1$s' n'est pas valide\! -config.message.quit.valid.and.modified.category=La cat\u00e9gorie '%1$s' poss\u00e8dent des options modifi\u00e9es \: -config.modified=Option modifi\u00e9e (valeur originale \: %1$s) -config.no.option.selected=< Pas d'option s\u00e9lectionn\u00e9e > +config.message.quit.invalid.category=La cat\u00E9gorie '%1$s' n'est pas valide\! +config.message.quit.valid.and.modified.category=La cat\u00E9gorie '%1$s' poss\u00E8dent des options modifi\u00E9es \: +config.modified=Option modifi\u00E9e (valeur originale \: %1$s) +config.no.option.selected=< Pas d'option s\u00E9lectionn\u00E9e > config.option.final=Option non modifiable config.option.label=Option '%1$s' (%2$s) -config.option.modified=Valeur modifi\u00e9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > -config.option.valid=Valeur non valide -config.title=Pr\u00e9f\u00e9rences +config.option.modified=Valeur modifi\u00E9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > +config.title=Pr\u00E9f\u00E9rences config.title.need.confirm=Une confirmation de votre part est requise... -config.title.will.reload.application=L'application doit \u00eatre red\u00e9marrer... -config.unmodifiable=Ne peut pas \u00eatre modifi\u00e9 +config.title.will.reload.application=L'application doit \u00EAtre red\u00E9marrer... +config.unmodifiable=Ne peut pas \u00EAtre modifi\u00E9 config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) config.value=Valeur config.value.tip=Valeur de l'option -entitycombobox.action.reset.tip=R\u00e9initialiser la valeur de la liste d\u00e9roulante -entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00e9roulante +entitycombobox.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante +entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00E9roulante entitycombobox.popup.label=Objet '%1$s' entitycombobox.popup.title=Modifier le tri -entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00e9t\u00e9 '%1$s' -entitycombobox.sort.on=Le tri est effectu\u00e9 sur la propri\u00e9t\u00e9 '%1$s' +entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00E9t\u00E9 '%1$s' +entitycombobox.sort.on=Le tri est effectu\u00E9 sur la propri\u00E9t\u00E9 '%1$s' entitycombobox.unknown.type=Objet de type inconnu errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... -hidor.collapseTip=Voir -hidor.expandTip= -hidor.showTip=Cacher -i18neditor.empty.locales=< Aucune locale \u00e0 s\u00e9lectionner > +hidor.collapseTip=Cacher +hidor.expandTip=Voir +i18neditor.empty.locales=< Aucune locale \u00E0 s\u00E9lectionner > i18neditor.popup.title=Changer de langue -i18neditor.selected=Langue actuellement utilis\u00e9e \: %1$s +i18neditor.selected=Langue actuellement utilis\u00E9e \: %1$s i18neditor.unselected=Pour utiliser cette langue \: %1$s listSelector.hideList=Cacher la liste listSelector.showList=Afficher la liste @@ -68,8 +66,8 @@ numbereditor.7=7 numbereditor.8=8 numbereditor.9=9 -numbereditor.action.reset.tip=R\u00e9initialiser -numbereditor.action.show.tip=Afficher le pav\u00e9 num\u00e9rique +numbereditor.action.reset.tip=R\u00E9initialiser +numbereditor.action.show.tip=Afficher le pav\u00E9 num\u00E9rique numbereditor.clearAll=C numbereditor.clearOne=CE numbereditor.toggleSign=+/-

1 0

r1640 - branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n
by tchemit＠users.nuiton.org 09 Nov '09

09 Nov '09

Author: tchemit Date: 2009-11-09 11:01:17 +0100 (Mon, 09 Nov 2009) New Revision: 1640 Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties Log: fix i18n label Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-07 13:26:40 UTC (rev 1639) +++ branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-09 10:01:17 UTC (rev 1640) @@ -1,48 +1,48 @@ -aboutframe.about=\u00C0 propos +aboutframe.about=\u00c0 propos aboutframe.license=Licence aboutframe.ok=OK aboutframe.thirdparty=Tierce partie -columnselector.action.tip=S\u00E9lectionner les colonnes +columnselector.action.tip=S\u00e9lectionner les colonnes config.action.quit=Quitter -config.action.quit.tip=Quitter l'\u00E9diteur de configuration +config.action.quit.tip=Quitter l'\u00e9diteur de configuration config.action.reset=Annuler -config.action.reset.tip=Annuler les modifications de cette cat\u00E9gorie +config.action.reset.tip=Annuler les modifications de cette cat\u00e9gorie config.action.save=Enregistrer -config.action.save.tip=Sauver les modifications de cette cat\u00E9gorie -config.category.saved=La cat\u00E9gorie '%1$s' a \u00E9t\u00E9 modifi\u00E9e \: +config.action.save.tip=Sauver les modifications de cette cat\u00e9gorie +config.category.saved=La cat\u00e9gorie '%1$s' a \u00e9t\u00e9 modifi\u00e9e \: config.choice.cancel=Annuler config.choice.continue=Continuer config.choice.doNotSave=Ne pas enregistrer config.choice.ok=Ok config.choice.save=Enregistrer -config.defaultValue=Valeur par d\u00E9faut -config.defaultValue.tip=Valeur par d\u00E9faut de l'option +config.defaultValue=Valeur par d\u00e9faut +config.defaultValue.tip=Valeur par d\u00e9faut de l'option config.descrition=Description -config.error.category.already.exists=La cat\u00E9gorie de nom '%1$s' existe d\u00E9j\u00E0\! -config.error.category.not.found=La cat\u00E9gorie de nom '%1$s' n'existe pas\! +config.error.category.already.exists=La cat\u00e9gorie de nom '%1$s' existe d\u00e9j\u00e0\! +config.error.category.not.found=La cat\u00e9gorie de nom '%1$s' n'existe pas\! config.key=Clef config.key.tip=Clef de l'option -config.message.quit.invalid.category=La cat\u00E9gorie '%1$s' n'est pas valide\! -config.message.quit.valid.and.modified.category=La cat\u00E9gorie '%1$s' poss\u00E8dent des options modifi\u00E9es \: -config.modified=Option modifi\u00E9e (valeur originale \: %1$s) -config.no.option.selected=< Pas d'option s\u00E9lectionn\u00E9e > +config.message.quit.invalid.category=La cat\u00e9gorie '%1$s' n'est pas valide\! +config.message.quit.valid.and.modified.category=La cat\u00e9gorie '%1$s' poss\u00e8dent des options modifi\u00e9es \: +config.modified=Option modifi\u00e9e (valeur originale \: %1$s) +config.no.option.selected=< Pas d'option s\u00e9lectionn\u00e9e > config.option.final=Option non modifiable config.option.label=Option '%1$s' (%2$s) -config.option.modified=Valeur modifi\u00E9e < nouvelle valeur \: '%1$s' - ancienne valeur \: '%2$s' > +config.option.modified=Valeur modifi\u00e9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > config.option.valid=Valeur non valide -config.title=Pr\u00E9f\u00E9rences +config.title=Pr\u00e9f\u00e9rences config.title.need.confirm=Une confirmation de votre part est requise... -config.title.will.reload.application=L'application doit \u00EAtre red\u00E9marrer... -config.unmodifiable=Ne peut pas \u00EAtre modifi\u00E9 +config.title.will.reload.application=L'application doit \u00eatre red\u00e9marrer... +config.unmodifiable=Ne peut pas \u00eatre modifi\u00e9 config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) config.value=Valeur config.value.tip=Valeur de l'option -entitycombobox.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante -entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00E9roulante +entitycombobox.action.reset.tip=R\u00e9initialiser la valeur de la liste d\u00e9roulante +entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00e9roulante entitycombobox.popup.label=Objet '%1$s' entitycombobox.popup.title=Modifier le tri -entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00E9t\u00E9 '%1$s' -entitycombobox.sort.on=Le tri est effectu\u00E9 sur la propri\u00E9t\u00E9 '%1$s' +entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00e9t\u00e9 '%1$s' +entitycombobox.sort.on=Le tri est effectu\u00e9 sur la propri\u00e9t\u00e9 '%1$s' entitycombobox.unknown.type=Objet de type inconnu errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! @@ -50,9 +50,9 @@ hidor.collapseTip=Voir hidor.expandTip= hidor.showTip=Cacher -i18neditor.empty.locales=< Aucune locale \u00E0 s\u00E9lectionner > +i18neditor.empty.locales=< Aucune locale \u00e0 s\u00e9lectionner > i18neditor.popup.title=Changer de langue -i18neditor.selected=Langue actuellement utilis\u00E9e \: %1$s +i18neditor.selected=Langue actuellement utilis\u00e9e \: %1$s i18neditor.unselected=Pour utiliser cette langue \: %1$s listSelector.hideList=Cacher la liste listSelector.showList=Afficher la liste @@ -68,8 +68,8 @@ numbereditor.7=7 numbereditor.8=8 numbereditor.9=9 -numbereditor.action.reset.tip=R\u00E9initialiser -numbereditor.action.show.tip=Afficher le pav\u00E9 num\u00E9rique +numbereditor.action.reset.tip=R\u00e9initialiser +numbereditor.action.show.tip=Afficher le pav\u00e9 num\u00e9rique numbereditor.clearAll=C numbereditor.clearOne=CE numbereditor.toggleSign=+/-

1 0

r1639 - branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/binding
by tchemit＠users.nuiton.org 07 Nov '09

07 Nov '09

Author: tchemit Date: 2009-11-07 14:26:40 +0100 (Sat, 07 Nov 2009) New Revision: 1639 Modified: branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java Log: remove unused import and code Modified: branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java =================================================================== --- branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2009-11-07 12:39:42 UTC (rev 1638) +++ branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2009-11-07 13:26:40 UTC (rev 1639) @@ -43,8 +43,6 @@ import java.io.StringReader; import java.lang.reflect.Modifier; import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.util.List; import org.apache.commons.logging.Log; @@ -204,12 +202,12 @@ return dependencySymbols.size() > 0; } - /** - * @return a list of symbols on which this data source depends. - */ - public Collection<String> getDependencies() { - return Collections.unmodifiableList(dependencySymbols); - } +// /** +// * @return a list of symbols on which this data source depends. +// */ +// public Collection<String> getDependencies() { +// return Collections.unmodifiableList(dependencySymbols); +// } /** * Examines a node to identify any dependencies it contains.

1 0

r1638 - branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/decorators
by tchemit＠users.nuiton.org 07 Nov '09

07 Nov '09

Author: tchemit Date: 2009-11-07 13:39:42 +0100 (Sat, 07 Nov 2009) New Revision: 1638 Modified: branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java Log: fix NPE if object is root Modified: branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java =================================================================== --- branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java 2009-11-07 06:12:53 UTC (rev 1637) +++ branches/jaxx-2.X/jaxx-compiler/src/main/java/jaxx/compiler/decorators/BoxedCompiledObjectDecorator.java 2009-11-07 12:39:42 UTC (rev 1638) @@ -29,7 +29,7 @@ /** * A decorator to surround a compiled object (should be a component at least) * with a JXLayer. - * + * * @author tony * @since 1.2 */ @@ -43,6 +43,9 @@ @Override public void finalizeCompiler(JAXXCompiler compiler, CompiledObject root, CompiledObject object, JavaFile javaFile, String packageName, String className, String fullClassName) { CompiledObject parent = object.getParent(); + if (parent == null) { + parent = root; + } for (ChildRef child : parent.getChilds()) { if (child.getChild() == object) { String javaCode = child.getChildJavaCode();

1 0

r1637 - branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation
by tchemit＠users.nuiton.org 07 Nov '09

07 Nov '09

Author: tchemit Date: 2009-11-07 07:12:53 +0100 (Sat, 07 Nov 2009) New Revision: 1637 Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java Log: - remove selectUI from context, it is too messy (can not know exactly where it is stored...) - add getParentNode to obtain the first ancestor with a matching internalClass - open api Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java 2009-11-06 11:36:48 UTC (rev 1636) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeContextHelper.java 2009-11-07 06:12:53 UTC (rev 1637) @@ -69,7 +69,7 @@ protected JAXXContextEntryDef<NavigationTreeModel> treeModelContextEntry; protected JAXXContextEntryDef<NavigationTreeHandler> treeHandlerContextEntry; protected JAXXContextEntryDef<JTree> treeContextEntry; - protected JAXXContextEntryDef<Component> selectedUIContextEntry; +// protected JAXXContextEntryDef<Component> selectedUIContextEntry; public NavigationTreeContextHelper(String prefix) { this.prefix = prefix; @@ -79,7 +79,7 @@ selectedBeanContextEntry = Util.newContextEntryDef(prefix + "-selected-bean", Object.class); selectedNodeContextEntry = Util.newContextEntryDef(prefix + "-selected-node", NavigationTreeNode.class); selectedPathContextEntry = Util.newContextEntryDef(prefix + "-selected-path", String.class); - selectedUIContextEntry = Util.newContextEntryDef(prefix + "-selected-ui", Component.class); +// selectedUIContextEntry = Util.newContextEntryDef(prefix + "-selected-ui", Component.class); } public String getPrefix() { @@ -116,10 +116,10 @@ return r; } - public Component getSelectedUI(JAXXContext context) { - Component r = getSelectedUIContextEntry().getContextValue(context); - return r; - } +// public Component getSelectedUI(JAXXContext context) { +// Component r = getSelectedUIContextEntry().getContextValue(context); +// return r; +// } public void setTreeModel(JAXXContext context, NavigationTreeModel model) { getTreeModelContextEntry().setContextValue(context, model); @@ -157,13 +157,13 @@ } } - public void setSelectedUI(JAXXContext context, Component ui) { - if (ui == null) { - getSelectedUIContextEntry().removeContextValue(context); - } else { - getSelectedUIContextEntry().setContextValue(context, ui); - } - } +// public void setSelectedUI(JAXXContext context, Component ui) { +// if (ui == null) { +// getSelectedUIContextEntry().removeContextValue(context); +// } else { +// getSelectedUIContextEntry().setContextValue(context, ui); +// } +// } protected JAXXContextEntryDef<NavigationTreeModel> getTreeModelContextEntry() { return treeModelContextEntry; @@ -189,7 +189,7 @@ return treeContextEntry; } - public JAXXContextEntryDef<Component> getSelectedUIContextEntry() { - return selectedUIContextEntry; - } +// public JAXXContextEntryDef<Component> getSelectedUIContextEntry() { +// return selectedUIContextEntry; +// } } Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java 2009-11-06 11:36:48 UTC (rev 1636) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHandler.java 2009-11-07 06:12:53 UTC (rev 1637) @@ -240,7 +240,7 @@ helper.setSelectedNode(ctxt, node); // save in context current ui - helper.setSelectedUI(ctxt, newUI); +// helper.setSelectedUI(ctxt, newUI); // really open the ui associated with the selected node // init ui before to be visible Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java 2009-11-06 11:36:48 UTC (rev 1636) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeHelper.java 2009-11-07 06:12:53 UTC (rev 1637) @@ -163,6 +163,26 @@ } /** + * Obtain the first ancestor with the matching internalClass + * + * @param current the node to test + * @param beanClass the type of the internal class to seek of + * @return the first ancestor node with the matching class or {@code null} if not found + */ + public NavigationTreeNode getParentNode(NavigationTreeNode current, Class<?> beanClass) { + if (current == null) { + // ancestor not found + return null; + } + if (beanClass.isAssignableFrom(current.getInternalClass())) { + // matching node + return current; + } + // try in the parent of node + return getParentNode(current.getParent(), beanClass); + } + + /** * Sélection d'un fils du noeud selectionne dans l'arbre de navigation. * * @param context le contexte applicatif Modified: branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java =================================================================== --- branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java 2009-11-06 11:36:48 UTC (rev 1636) +++ branches/jaxx-2.X/jaxx-runtime/src/main/java/jaxx/runtime/swing/navigation/NavigationTreeModel.java 2009-11-07 06:12:53 UTC (rev 1637) @@ -50,7 +50,7 @@ * The path separator used to build the {@link NavigationTreeNode#fullPath}. * * @see NavigationTreeNode#getNodePath() - * @see NavigationTreeNode#getFullPath() + * @see NavigationTreeNode#getFullPath() */ protected final String pathSeparator; /** @@ -206,7 +206,7 @@ /** * Obtain the associated bean value from context corresponding to node * - * @param node the current node + * @param node the current node * @return the value associated in context with the given node. */ public Object getBean(NavigationTreeNode node) { @@ -263,4 +263,8 @@ } } } + + public String getPathSeparator() { + return pathSeparator; + } }

1 0

r1636 - branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing
by tchemit＠users.nuiton.org 06 Nov '09

06 Nov '09

Author: tchemit Date: 2009-11-06 12:36:48 +0100 (Fri, 06 Nov 2009) New Revision: 1636 Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx Log: multi-selection + double click pour supprimer des elements sur un ListSelector Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2009-11-06 01:00:03 UTC (rev 1635) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2009-11-06 11:36:48 UTC (rev 1636) @@ -88,11 +88,13 @@ /** * Transfert the {@code b} data from list to combo box. * - * @param b the data to transfert + * @param bs the data to transfert */ -protected void transfertToCombo(B b) { - ((DefaultListModel) list.getModel()).removeElement(b); - ((DefaultComboBoxModel) combo.getModel()).addElement(b); +protected void transfertToCombo(B[] bs) { + for (B b : bs) { + ((DefaultListModel) list.getModel()).removeElement(b); + ((DefaultComboBoxModel) combo.getModel()).addElement(b); + } setModified(true); } @@ -146,6 +148,7 @@ enabled='{isEnabled()}' model='{new DefaultListModel()}' font-size='11' + onMouseClicked='if (event.getClickCount()==2) { transfertToCombo((B[]) list.getSelectedValues()); }' cellRenderer='{getRenderer()}'/> </JPanel> @@ -170,7 +173,7 @@ toolTipText='{getAddToComboTip()}' actionIcon='remove' enabled='{updateRemoveEnabled(list.isEnabled() && list.getSelectedIndex() > -1)}' - onActionPerformed='transfertToCombo((B) list.getSelectedValue());'/> + onActionPerformed='transfertToCombo((B[]) list.getSelectedValues())'/> <HidorButton id="hidor" target='{list}'

1 0

r1635 - in branches/jaxx-2.X/jaxx-widgets/src/main: java/jaxx/runtime/swing resources/i18n
by tchemit＠users.nuiton.org 06 Nov '09

06 Nov '09

Author: tchemit Date: 2009-11-06 02:00:03 +0100 (Fri, 06 Nov 2009) New Revision: 1635 Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties Log: add hidor on ListSelector (must finish the ui refresh, still problems) Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2009-11-06 01:00:03 UTC (rev 1635) @@ -22,7 +22,7 @@ boolean newValue = (Boolean) evt.getNewValue(); if (target != null) { target.setVisible(newValue); - }; + } } }); Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2009-11-06 01:00:03 UTC (rev 1635) @@ -1,5 +1,8 @@ <JPanel layout='{new BorderLayout()}' genericType='B'> +  + <Boolean id='showHidor' javaBean='false'/> + <Boolean id='modified' javaBean='false'/> <String id='addToListTip' javaBean='"+"'/> @@ -7,9 +10,30 @@ <String id='addToComboTip' javaBean='"-"'/> <ListCellRenderer id='renderer' javaBean='null'/> - + <script><![CDATA[ +hidor.addPropertyChangeListener("targetVisible", new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isDebugEnabled()) { + log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); + } + if (!showHidor || !isEnabled()) { + return; + } + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + log.info("invalidate " + getParent().getName()); + listPane.invalidate(); + } + }); + } +}); + /** * @return the datas from the combo box. */ @@ -112,17 +136,19 @@ ]]> </script> - <JScrollPane constraints='BorderLayout.CENTER' - columnHeaderView='{header}' - verticalScrollBarPolicy='vertical_scrollbar_always' - minimumSize='{SwingUtil.newMinDimension()}'> - <JList id='list' - enabled='{isEnabled()}' - model='{new DefaultListModel()}' - minimumSize='{SwingUtil.newMinDimension()}' - maximumSize='{new Dimension(100,200)}' - font-size='11' - cellRenderer='{getRenderer()}'/> + <JScrollPane id='listPane' constraints='BorderLayout.CENTER' + columnHeaderView='{header}'> +  +  + <JPanel layout="{new BorderLayout()}" minimumSize='{getMinimumSize()}'> + <JList id='list' + constraints='BorderLayout.CENTER' + enabled='{isEnabled()}' + model='{new DefaultListModel()}' + font-size='11' + cellRenderer='{getRenderer()}'/> + </JPanel> + </JScrollPane> <Table id="header" insets='0' constraints='BorderLayout.SOUTH'> @@ -133,7 +159,7 @@ renderer='{getRenderer()}'/> </cell> <cell anchor='east'> - <JToolBar floatable='false'> + <JToolBar id='actions' floatable='false'> <JButton id="add" toolTipText='{getAddToListTip()}' actionIcon='add' @@ -145,6 +171,14 @@ actionIcon='remove' enabled='{updateRemoveEnabled(list.isEnabled() && list.getSelectedIndex() > -1)}' onActionPerformed='transfertToCombo((B) list.getSelectedValue());'/> + + <HidorButton id="hidor" + target='{list}' + visible='{isShowHidor()}' + enabled='{isEnabled()}' + collapseTip='{_("listSelector.hideList")}' + expandTip='{_("listSelector.showList")}' + targetVisible='{true}'/> </JToolBar> </cell> </row> Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties 2009-11-06 01:00:03 UTC (rev 1635) @@ -52,6 +52,8 @@ i18neditor.popup.title=Change language i18neditor.selected=Selected language \: %1$s i18neditor.unselected=Select this langage \: %1$s +listSelector.hideList=Hide the list +listSelector.showList=Show the list memorywidget.memory=%d/%dMb numbereditor..=. numbereditor.0=0 Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-06 01:00:03 UTC (rev 1635) @@ -54,6 +54,8 @@ i18neditor.popup.title=Changer de langue i18neditor.selected=Langue actuellement utilis\u00E9e \: %1$s i18neditor.unselected=Pour utiliser cette langue \: %1$s +listSelector.hideList=Cacher la liste +listSelector.showList=Afficher la liste memorywidget.memory=%d/%dMo numbereditor..=. numbereditor.0=0

1 0

r1634 - in branches/jaxx-2.X: jaxx-demo/src/main/java/jaxx/demo jaxx-demo/src/main/java/jaxx/demo/component/jaxx jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content jaxx-demo/src/main/java/jaxx/demo/feature/validation jaxx-widgets/src/main/java/jaxx/runtime/swing jaxx-widgets/src/main/java/jaxx/runtime/swing/editor jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config
by tchemit＠users.nuiton.org 05 Nov '09

05 Nov '09

Author: tchemit Date: 2009-11-05 23:25:07 +0100 (Thu, 05 Nov 2009) New Revision: 1634 Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx Log: remove import of SwingUtil in jaxx scripts (auto-import) Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -28,7 +28,6 @@ <jaxx.runtime.swing.CardLayout2 id='contentLayout'/> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.navigation.*; import java.util.Locale; Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -41,7 +41,6 @@ } }}' /> <script><![CDATA[ -import jaxx.runtime.SwingUtil; void $afterCompleteSetup() { for (JComponent boxed : SwingUtil.getLayeredComponents(this)) { Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/FullNavigationTreeDemo.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -25,7 +25,6 @@ useOnlyVisibleComponentDimension='true'/> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.content.*; import jaxx.runtime.decorator.DecoratorProvider; Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorContentUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -21,7 +21,6 @@ <ContentUI superGenericType='People'> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.navigation.NavigationTreeNode; import jaxx.demo.component.jaxx.navigation.*; Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ActorsContentUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -21,7 +21,6 @@ <ContentUI superGenericType='java.util.List<People>'> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.*; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeNode; Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/ContentUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -24,7 +24,6 @@ implements='NavigationContentUI'> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.*; import jaxx.runtime.swing.navigation.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationContentUI; Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MovieContentUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -21,7 +21,6 @@ <ContentUI superGenericType='Movie'> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.navigation.NavigationTreeNode; import jaxx.demo.component.jaxx.navigation.*; Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/navigation/content/MoviesContentUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -21,7 +21,6 @@ <ContentUI superGenericType='java.util.List<Movie>'> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.demo.component.jaxx.navigation.*; import jaxx.runtime.swing.renderer.DecoratorProviderListCellRenderer; import jaxx.runtime.swing.navigation.NavigationTreeNode; Modified: branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-demo/src/main/java/jaxx/demo/feature/validation/ValidationTableDemo.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -50,7 +50,6 @@ <script><![CDATA[ import static org.nuiton.i18n.I18n.n_; -import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidatorUtil; import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer; Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/AboutPanel.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -40,7 +40,6 @@ <script><![CDATA[ import org.nuiton.util.Resource; -import jaxx.runtime.SwingUtil; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -11,7 +11,6 @@ <String id='expandTip' javaBean='_("hidor.expandTip")'/> <script><![CDATA[ -import jaxx.runtime.SwingUtil; addPropertyChangeListener("targetVisible", new PropertyChangeListener() { Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/I18nEditor.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -70,7 +70,6 @@ <script><![CDATA[ import java.util.Locale; -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.renderer.LocaleListCellRenderer; import static org.nuiton.i18n.I18n.n_; Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2009-11-05 20:44:42 UTC (rev 1633) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigCategoryUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) @@ -26,7 +26,6 @@ <style source='ConfigCategoryUI.css'/> <script><![CDATA[ -import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.editor.config.model.*; import jaxx.runtime.swing.editor.ColumnSelector; import static org.nuiton.i18n.I18n.n_;

1 0