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

r2091 - tags
by hudson＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: hudson Date: 2010-09-16 11:24:13 +0200 (Thu, 16 Sep 2010) New Revision: 2091 Url: http://nuiton.org/repositories/revision/jaxx/2091 Log: [maven-release-plugin] copy for tag jaxx-2.2.1 Added: tags/jaxx-2.2.1/

1 0

r2090 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-widgets maven-jaxx-plugin
by hudson＠users.nuiton.org 16 Sep '10

16 Sep '10

Author: hudson Date: 2010-09-16 11:24:12 +0200 (Thu, 16 Sep 2010) New Revision: 2090 Url: http://nuiton.org/repositories/revision/jaxx/2090 Log: [maven-release-plugin] prepare release jaxx-2.2.1 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-compiler/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-demo/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-runtime/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-tutorial/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-tutorial-config/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-tutorial-css/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/jaxx-widgets/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/maven-jaxx-plugin/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-12 15:59:36 UTC (rev 2089) +++ trunk/pom.xml 2010-09-16 09:24:12 UTC (rev 2090) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.2.1-SNAPSHOT</version> + <version>2.2.1</version> <modules> <module>jaxx-runtime</module> @@ -505,9 +505,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.2.1</url> </scm> <profiles>

1 0

r2089 - trunk/jaxx-widgets/src/main/resources/i18n
by tchemit＠users.nuiton.org 12 Sep '10

12 Sep '10

Author: tchemit Date: 2010-09-12 17:59:36 +0200 (Sun, 12 Sep 2010) New Revision: 2089 Url: http://nuiton.org/repositories/revision/jaxx/2089 Log: i18n Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2010-09-12 15:55:29 UTC (rev 2088) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2010-09-12 15:59:36 UTC (rev 2089) @@ -1,69 +1,69 @@ -aboutframe.about=\u00c0 propos +aboutframe.about=\u00C0 propos aboutframe.license=Licence aboutframe.ok=OK aboutframe.thirdparty=Tierce partie bean.popup.label=Objet '%1$s' -bean.sort.down=Tri d\u00e9croissant -bean.sort.down.tip=Tri d\u00e9croissant actuellement utilis\u00e9 -bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre d\u00e9croissant +bean.sort.down=Tri d\u00E9croissant +bean.sort.down.tip=Tri d\u00E9croissant actuellement utilis\u00E9 +bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre d\u00E9croissant bean.sort.label=Ordre de tri -bean.sort.off=Cliquer pour activer le tri sur la propri\u00e9t\u00e9 '%1$s' -bean.sort.on=Le tri est effectu\u00e9 sur la propri\u00e9t\u00e9 '%1$s' +bean.sort.off=Cliquer pour activer le tri sur la propri\u00E9t\u00E9 '%1$s' +bean.sort.on=Le tri est effectu\u00E9 sur la propri\u00E9t\u00E9 '%1$s' bean.sort.up=Tri croissant -bean.sort.up.tip=Tri croissant actuellement utilis\u00e9 +bean.sort.up.tip=Tri croissant actuellement utilis\u00E9 bean.sort.up.toSelect.tip=Cliquer pour trier selon l'ordre croissant bean.unknown.type=Objet de type inconnu -beancombobox.action.reset.tip=R\u00e9initialiser la valeur de la liste d\u00e9roulante -beancombobox.action.sort.tip=Modifier le tri de la liste d\u00e9roulante +beancombobox.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante +beancombobox.action.sort.tip=Modifier le tri de la liste d\u00E9roulante beancombobox.popup.title=Modifier le tri -beanlist.action.reset.tip=Supprimer la s\u00e9lection -beanlist.action.sort.tip=Modifier le tri de la liste d\u00e9roulante +beanlist.action.reset.tip=Supprimer la s\u00E9lection +beanlist.action.sort.tip=Modifier le tri de la liste d\u00E9roulante beanlist.popup.title=Modifier le tri -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.action.save.tip=Sauver les modifications de cette cat\u00E9gorie config.choice.cancel=Annuler config.choice.continue=Continuer config.choice.doNotSave=Ne pas enregistrer 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.description=Description -config.detected.callBack=Actions d\u00e9tect\u00e9es pour les options modifi\u00e9es -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.detected.callBack=Actions d\u00E9tect\u00E9es pour les options modifi\u00E9es +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.launch.callBack=Lancer -config.launch.callBack.tip=Lancer les actions n\u00e9cessaires -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.launch.callBack.tip=Lancer les actions n\u00E9cessaires +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.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.unmodifiable=Ne peut pas \u00eatre modifi\u00e9 +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 errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... -fontsize.action.default.tip=Retour sur la taille par d\u00e9faut +fontsize.action.default.tip=Retour sur la taille par d\u00E9faut fontsize.action.down.tip=Diminuer la taille de la police fontsize.action.up.tip=Augmenter la taille de la police hidor.hideTip=Cacher hidor.showTip=Voir -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 @@ -79,8 +79,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

r2088 - in trunk/jaxx-widgets/src/main: java/jaxx/runtime/swing/editor/bean resources/i18n
by tchemit＠users.nuiton.org 12 Sep '10

12 Sep '10

Author: tchemit Date: 2010-09-12 17:55:29 +0200 (Sun, 12 Sep 2010) New Revision: 2088 Url: http://nuiton.org/repositories/revision/jaxx/2088 Log: Evolution #865: Improve BeanListHeader (can reset selection) Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2010-09-11 20:18:14 UTC (rev 2087) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx 2010-09-12 15:55:29 UTC (rev 2088) @@ -103,18 +103,6 @@ handler.init(decorator, data); } -protected void hidePopup() { - if (popup.isVisible()) { - popup.setVisible(false); - } -} - -protected Object updateSort(boolean reverseSort) { - if (reverseSort) { - return sortDown; - } - return sortUp; -} ]]> </script> @@ -125,13 +113,13 @@ constraints='BorderLayout.EAST'>  - - <JButton actionIcon='combobox-reset' + <JButton id='resetSelection' + actionIcon='combobox-reset' toolTipText='beanlist.action.reset.tip' focusable='false' focusPainted='false' visible='{isShowReset()}' - enabled='{isEnabled()}' + enabled='{isEnabled() && getList().getSelectedValue() != null}' onActionPerformed='getList().getSelectionModel().clearSelection()'/>  Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2010-09-11 20:18:14 UTC (rev 2087) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2010-09-12 15:55:29 UTC (rev 2088) @@ -62,6 +62,7 @@ /** the decorator of data */ protected MultiJXPathDecorator<O> decorator; + /** flag to mark when handler was init (it can be init only once). */ protected boolean init; private final BeanUIUtil.PopupHandler popupHandler = new BeanUIUtil.PopupHandler() { @@ -94,6 +95,10 @@ } init = true; + // list could have changed and the complex binding is not registred... + ui.removeDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); + ui.applyDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); + JAXXButtonGroup indexes = ui.getIndexes(); this.decorator = BeanUIUtil.createDecorator(decorator); @@ -190,7 +195,7 @@ ui.getList().setValueIsAdjusting(true); try { - + // reload the model ui.getList().setListData(datas.toArray(new Object[datas.size()])); @@ -219,7 +224,7 @@ } finally { ui.getList().setValueIsAdjusting(false); } - + ui.getList().requestFocus(); } @@ -253,5 +258,11 @@ setIndex(-1, ui.getIndex()); } + if (BeanListHeader.PROPERTY_LIST.equals(propertyName)) { + + // ui list has changed, replace binding + ui.removeDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); + ui.applyDataBinding(BeanListHeader.BINDING_RESET_SELECTION_ENABLED); + } } } Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2010-09-11 20:18:14 UTC (rev 2087) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java 2010-09-12 15:55:29 UTC (rev 2088) @@ -197,6 +197,14 @@ /** * Creation de l'ui pour modifier le décorateur. * + * @param selectedTip + * @param notSelectedTip + * @param i18nPrefix + * @param title + * @param indexes + * @param popupLabel + * @param sortUp + * @param sortDown * @param decorator le decorateur a utiliser */ protected void preparePopup(String selectedTip, Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2010-09-11 20:18:14 UTC (rev 2087) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2010-09-12 15:55:29 UTC (rev 2088) @@ -1,69 +1,69 @@ -aboutframe.about=\u00C0 propos +aboutframe.about=\u00c0 propos aboutframe.license=Licence aboutframe.ok=OK aboutframe.thirdparty=Tierce partie bean.popup.label=Objet '%1$s' -bean.sort.down=Tri d\u00E9croissant -bean.sort.down.tip=Tri d\u00E9croissant actuellement utilis\u00E9 -bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre d\u00E9croissant +bean.sort.down=Tri d\u00e9croissant +bean.sort.down.tip=Tri d\u00e9croissant actuellement utilis\u00e9 +bean.sort.down.toSelect.tip=Cliquer pour trier selon l'ordre d\u00e9croissant bean.sort.label=Ordre de tri -bean.sort.off=Cliquer pour activer le tri sur la propri\u00E9t\u00E9 '%1$s' -bean.sort.on=Le tri est effectu\u00E9 sur la propri\u00E9t\u00E9 '%1$s' +bean.sort.off=Cliquer pour activer le tri sur la propri\u00e9t\u00e9 '%1$s' +bean.sort.on=Le tri est effectu\u00e9 sur la propri\u00e9t\u00e9 '%1$s' bean.sort.up=Tri croissant -bean.sort.up.tip=Tri croissant actuellement utilis\u00E9 +bean.sort.up.tip=Tri croissant actuellement utilis\u00e9 bean.sort.up.toSelect.tip=Cliquer pour trier selon l'ordre croissant bean.unknown.type=Objet de type inconnu -beancombobox.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante -beancombobox.action.sort.tip=Modifier le tri de la liste d\u00E9roulante +beancombobox.action.reset.tip=R\u00e9initialiser la valeur de la liste d\u00e9roulante +beancombobox.action.sort.tip=Modifier le tri de la liste d\u00e9roulante beancombobox.popup.title=Modifier le tri -beanlist.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante -beanlist.action.sort.tip=Modifier le tri de la liste d\u00E9roulante +beanlist.action.reset.tip=Supprimer la s\u00e9lection +beanlist.action.sort.tip=Modifier le tri de la liste d\u00e9roulante beanlist.popup.title=Modifier le tri -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.action.save.tip=Sauver les modifications de cette cat\u00e9gorie config.choice.cancel=Annuler config.choice.continue=Continuer config.choice.doNotSave=Ne pas enregistrer 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.description=Description -config.detected.callBack=Actions d\u00E9tect\u00E9es pour les options modifi\u00E9es -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.detected.callBack=Actions d\u00e9tect\u00e9es pour les options modifi\u00e9es +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.launch.callBack=Lancer -config.launch.callBack.tip=Lancer les actions n\u00E9cessaires -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.launch.callBack.tip=Lancer les actions n\u00e9cessaires +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.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.unmodifiable=Ne peut pas \u00EAtre modifi\u00E9 +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 errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... -fontsize.action.default.tip=Retour sur la taille par d\u00E9faut +fontsize.action.default.tip=Retour sur la taille par d\u00e9faut fontsize.action.down.tip=Diminuer la taille de la police fontsize.action.up.tip=Augmenter la taille de la police hidor.hideTip=Cacher hidor.showTip=Voir -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 @@ -79,8 +79,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

r2087 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-runtime/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.nuiton.org 11 Sep '10

11 Sep '10

Author: tchemit Date: 2010-09-11 22:18:14 +0200 (Sat, 11 Sep 2010) New Revision: 2087 Url: http://nuiton.org/repositories/revision/jaxx/2087 Log: fix NPE due to inheritence + improve code Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2010-09-11 19:39:49 UTC (rev 2086) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2010-09-11 20:18:14 UTC (rev 2087) @@ -33,6 +33,7 @@ import jaxx.compiler.tags.TagHandler; import jaxx.compiler.tags.validator.BeanValidatorHandler.CompiledBeanValidator; import jaxx.runtime.validator.swing.SwingValidator; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.w3c.dom.Element; @@ -47,8 +48,6 @@ public static final String COMPONENT_ATTRIBUTE = "component"; - public static final String EXTERNAL_COMPONENT_ATTRIBUTE = "externalComponent"; - /** Logger */ static private Log log = LogFactory.getLog(FieldValidatorHandler.class); @@ -79,14 +78,15 @@ (CompiledBeanValidator) compiler.getOpenComponent(); String name = tag.getAttribute(NAME_ATTRIBUTE); - String component = tag.getAttribute(COMPONENT_ATTRIBUTE); - if (name == null || name.trim().isEmpty()) { + if (StringUtils.isEmpty(name)) { compiler.reportError(TAG + " tag requires a " + NAME_ATTRIBUTE + " attribute"); return; } name = name.trim(); - if (component == null || component.trim().isEmpty()) { + + String component = tag.getAttribute(COMPONENT_ATTRIBUTE); + if (StringUtils.isEmpty(component)) { // try to use the name as component if (!compiler.checkReference(tag, name, false, name)) { compiler.reportError( Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-09-11 19:39:49 UTC (rev 2086) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-09-11 20:18:14 UTC (rev 2087) @@ -206,8 +206,13 @@ super.setContextName(contextName); - // must reinstall ui - installUIs(); + // install uis only when fieldRepresentation is not null + // this case is possible since we come here from parent in constructor. + if (fieldRepresentation != null) { + + // must reinstall ui + installUIs(); + } } /** @@ -251,11 +256,11 @@ /** install ui on required components */ public void installUIs() { -// if (fieldRepresentation == null) { -// throw new NullPointerException( -// "fieldRepresentation is null, must init before " + -// "invoking installUIs method..."); -// } + if (fieldRepresentation == null) { + throw new NullPointerException( + "fieldRepresentation is null, must init before " + + "invoking installUIs method..."); + } SwingUtilities.invokeLater(new Runnable() { @Override

1 0

r2086 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/reflect jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-demo/src/main/java/jaxx/demo jaxx-runtime/src/main/java/jaxx/runtime jaxx-runtime/src/main/java/jaxx/runtime/binding jaxx-runtime/src/main/java/jaxx/runtime/context jaxx-runtime/src/main/java/jaxx/runtime/css jaxx-runtime/src/main/java/jaxx/runtime/decorator jaxx-runtime/src/main/java/jaxx/runtime/swing ja
by tchemit＠users.nuiton.org 11 Sep '10

11 Sep '10

Author: tchemit Date: 2010-09-11 21:39:49 +0200 (Sat, 11 Sep 2010) New Revision: 2086 Url: http://nuiton.org/repositories/revision/jaxx/2086 Log: change javadoc + reformat Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/JavaFileParser.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/Base64Coder.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/ComponentDescriptor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingUpdateListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXBinding.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObjectDescriptor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/binding/DefaultJAXXBinding.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Pseudoclasses.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Rule.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Selector.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Stylesheet.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/GBC.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBox.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxBeanInfo.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxLayout.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Item.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXList.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTree.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfo.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Table.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBox.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxBeanInfo.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxLayout.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/LocaleEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUIHandler.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/ValidatorsMap.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/NotExistingFileFieldValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultApplicationContextTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/AbstractBeanValidatorDetectorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorDetectorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/SimpleBean.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/XWorkBeanValidatorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractValidatorBeanFieldValidatorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionBean.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidatorTest.java trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java trunk/jaxx-swing-action/src/main/java/org/nuiton/jaxx/tab/TabFactory.java trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/DemoConfig.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/JavaFileParser.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/JavaFileParser.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/JavaFileParser.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -54,7 +54,7 @@ @Deprecated public class JavaFileParser { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private final Log log = LogFactory.getLog(JavaFileParser.class); /** Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -148,7 +148,7 @@ public static class JavaFileParser { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private final Log log = LogFactory.getLog(JavaFileParser.class); /** Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -90,7 +90,7 @@ public static final String PARENT_VALIDATOR_ATTRIBUTE = "parentValidator"; - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static Log log = LogFactory.getLog(BeanValidatorHandler.class); protected static Map<JAXXCompiler, List<CompiledBeanValidator>> validators = Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/ExcludeFieldValidatorHandler.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -42,7 +42,7 @@ public static final String TAG = "excludeField"; public static final String NAME_ATTRIBUTE = "name"; public static final String COMPONENT_ATTRIBUTE = "component"; - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(ExcludeFieldValidatorHandler.class); @Override Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/FieldValidatorHandler.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -47,7 +47,9 @@ public static final String COMPONENT_ATTRIBUTE = "component"; - /** to use log facility, just put in your code: log.info(\"...\"); */ + public static final String EXTERNAL_COMPONENT_ATTRIBUTE = "externalComponent"; + + /** Logger */ static private Log log = LogFactory.getLog(FieldValidatorHandler.class); public void compileFirstPass(Element tag, JAXXCompiler compiler) throws CompilerException, IOException { Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoConfig.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -51,7 +51,7 @@ */ public class DemoConfig extends ApplicationConfig { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(DemoConfig.class); /** Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUIHandler.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -85,7 +85,7 @@ */ public class DemoUIHandler { //implements JAXXHelp { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(DemoUIHandler.class); static final JAXXContextEntryDef<DemoUI> MAIN_UI_ENTRY_DEF = JAXXUtil.newContextEntryDef("mainui", DemoUI.class); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/Base64Coder.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/Base64Coder.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/Base64Coder.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -59,6 +59,7 @@ public class Base64Coder { // Mapping table from 6-bit nibbles to Base64 characters. + private static char[] map1 = new char[64]; static { @@ -77,6 +78,7 @@ } // Mapping table from Base64 characters to 6-bit nibbles. + private static byte[] map2 = new byte[128]; static { @@ -257,6 +259,7 @@ } // Dummy constructor. + private Base64Coder() { } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/ComponentDescriptor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/ComponentDescriptor.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/ComponentDescriptor.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -28,9 +28,13 @@ public class ComponentDescriptor implements Serializable { String id; + String javaClassName; + String styleClass; + ComponentDescriptor parent; + private static final long serialVersionUID = 1L; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingListener.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingListener.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -34,6 +34,7 @@ */ public class DataBindingListener implements PropertyChangeListener { private JAXXObject object; + private String dest; /** Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingUpdateListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingUpdateListener.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/DataBindingUpdateListener.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -34,6 +34,7 @@ */ public class DataBindingUpdateListener implements PropertyChangeListener { private JAXXObject object; + private String dest; /** Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXBinding.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXBinding.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXBinding.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -36,14 +36,10 @@ * $Author$ */ public interface JAXXBinding extends PropertyChangeListener { - /** - * @return the unique id of a binding - */ + /** @return the unique id of a binding */ String getId(); - /** - * @return the {@link JAXXObject} which owns the binding - */ + /** @return the {@link JAXXObject} which owns the binding */ JAXXObject getSource(); /** @@ -53,18 +49,12 @@ */ boolean isDefaultBinding(); - /** - * Apply the binding without processing it (say just install listeners). - */ + /** Apply the binding without processing it (say just install listeners). */ void applyDataBinding(); - /** - * Processes the binding. - */ + /** Processes the binding. */ void processDataBinding(); - /** - * Remove the binding. - */ + /** Remove the binding. */ void removeDataBinding(); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,7 +24,7 @@ */ package jaxx.runtime; -import java.awt.*; +import java.awt.Container; import java.io.Serializable; import java.util.Map; @@ -49,14 +49,10 @@ */ Map<String, Object> get$objectMap(); - /** - * @return the {@link JAXXContext} attached to the object - */ + /** @return the {@link JAXXContext} attached to the object */ JAXXContext getDelegateContext(); - /** - * @return all the databinding registred on the jaxx object - */ + /** @return all the databinding registred on the jaxx object */ JAXXBinding[] getDataBindings(); /** Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObjectDescriptor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObjectDescriptor.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObjectDescriptor.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -30,7 +30,9 @@ public class JAXXObjectDescriptor implements Serializable { private ComponentDescriptor[] descriptors; + private Stylesheet stylesheet; + private static final long serialVersionUID = 1L; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -562,8 +562,8 @@ */ @SuppressWarnings({"unchecked"}) public static <O> O invokeConstructor(Class<O> type, - Class<?>[] prototype, - Object... parms) throws Exception { + Class<?>[] prototype, + Object... parms) throws Exception { O o = (O) ConstructorUtils.invokeConstructor(type, parms, prototype Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/SwingUtil.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -104,7 +104,7 @@ */ public class SwingUtil extends JAXXUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private final Log log = LogFactory.getLog(SwingUtil.class); public static final String DEFAULT_ICON_PATH = "/icons/"; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/binding/DefaultJAXXBinding.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/binding/DefaultJAXXBinding.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/binding/DefaultJAXXBinding.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -38,30 +38,22 @@ */ public abstract class DefaultJAXXBinding implements JAXXBinding { - /** - * Logger - */ + /** Logger */ private static final Log log = LogFactory.getLog(DefaultJAXXBinding.class); - /** - * Counter of all bindings hits - */ + + /** Counter of all bindings hits */ private static long NB = 0; - /** - * Counter of current binding hits - */ + + /** Counter of current binding hits */ private long nb = 0; - /** - * Id of the binding - */ + /** Id of the binding */ private final String id; - /** - * The source of the binding. - */ + + /** The source of the binding. */ protected final JAXXObject source; - /** - * flag to know {@code true} : if the binding was init from a generated jaxx object, {@code false} otherwise. - */ + + /** flag to know {@code true} : if the binding was init from a generated jaxx object, {@code false} otherwise. */ protected final boolean defaultBinding; /** @@ -99,6 +91,7 @@ } private static final String LOG_START_PATTERN = ">> (hits:%1$5d, total:%2$5d) on %3$s"; + private static final String LOG_END_PATTERN = "<< %4$3d (hits:%1$5d, total:%2$5d) on %3$s"; /** Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -44,7 +44,7 @@ */ public abstract class DataContext { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(DataContext.class); public static final DataContextEntry<?>[] EMPTY_DATA_CONTEXT_ENTRY_ARRAY = @@ -173,7 +173,6 @@ } /** - * * @param entry * @param klass * @param key @@ -182,7 +181,7 @@ Class<?> klass, String key) { String contextKey = getKey(entry, key); - delegate.removeContextValue(klass,key); + delegate.removeContextValue(klass, key); } public void removeContextValue(DataContextEntry<?> entry, @@ -313,8 +312,11 @@ public static abstract class DataContextEntry<E> implements Iterable<DataContextEntry<?>> { private final int level; + private final DataContextEntry<?> previous; + private final DataContextEntry<?>[] parents; + private Class<E> klass; public DataContextEntry(Class<E> klass, DataContextEntry<?> previous) { @@ -385,8 +387,11 @@ public static class DataContextEntryIterator implements Iterator<DataContextEntry<?>> { protected final DataContextEntry<?>[] datas; + protected final boolean reverse; + protected final int level; + protected int index; public DataContextEntryIterator(DataContextEntry<?>[] datas) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultApplicationContext.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -117,7 +117,7 @@ pcs = new PropertyChangeSupport(this); } - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private final Log log = LogFactory.getLog(DefaultApplicationContext.class); @@ -397,7 +397,7 @@ } protected Object newInstance(Class<?> clazz) throws - IllegalArgumentException { + IllegalArgumentException { Object value; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DefaultJAXXContext.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -189,7 +189,7 @@ if (JAXXContext.class.equals(klass)) { return null; } - + // try on parent JAXXContext parent = getParentContext(); @@ -202,7 +202,7 @@ // try now on the parent return ((DefaultJAXXContext) parent).remove0(klass, name); } - + // can not find the entry anywhere, so says that nothing was removed return null; } @@ -217,7 +217,7 @@ } return entry; } - + protected JAXXContext getParentContext() { return parentContext; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXContextEntryDef.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,20 +24,20 @@ */ package jaxx.runtime.context; +import jaxx.runtime.JAXXContext; + import java.io.Serializable; import java.util.List; import java.util.Map; -import jaxx.runtime.JAXXContext; - /** * To qualify an entry in a {@link JAXXContext}. * * Use the factory methods <code>newContextEntryDef</code> and * <code>newListContextEntryDef</code< to obtain new instances. * + * @author tchemit <chemit(a)codelutin.com> * @param <O> type of the entry associated to the definition - * @author tchemit <chemit(a)codelutin.com> */ public class JAXXContextEntryDef<O> implements Serializable { @@ -82,11 +82,11 @@ * Special constructor for map, otherwise it is not possible to cast to O * * @param mapClass map class - * @param name name of content + * @param name name of content * @since 2.0.2 */ @SuppressWarnings({"unchecked"}) - public JAXXContextEntryDef(Class<Map> mapClass,String name) { + public JAXXContextEntryDef(Class<Map> mapClass, String name) { this(name, (Class<O>) mapClass); } @@ -127,15 +127,15 @@ return this.name != null && name != null && this.name.equals(name); } return klass.isAssignableFrom(this.klass) && (this.name == null && name == null - || (this.name != null && name != null && this.name.equals(name))); + || (this.name != null && name != null && this.name.equals(name))); } public boolean accept2(Class<?> klass, String name) { return !(Object.class.equals(klass) && !Object.class.equals(this.klass)) && - this.klass.isAssignableFrom(klass) && - (this.name == null && name == null || - (this.name != null && name != null && this.name.equals(name)) - ); + this.klass.isAssignableFrom(klass) && + (this.name == null && name == null || + (this.name != null && name != null && this.name.equals(name)) + ); } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/JAXXInitialContext.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -76,8 +76,8 @@ /** * Register a named (or not) value in the context. * - * @param <O> type of data to add - * @param def definition of entry + * @param <O> type of data to add + * @param def definition of entry * @param value the value to registred * @return the instance of the context */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Pseudoclasses.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Pseudoclasses.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Pseudoclasses.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -36,11 +36,13 @@ public class Pseudoclasses { public static final String NO_PSEUDOCLASS = "no pseudoclass"; + private static Map<Object, Map<String, List<PropertyValue>>> properties = new WeakHashMap<Object, Map<String, List<PropertyValue>>>(); private static class PropertyValue implements Comparable<PropertyValue> { private Object value; + private int id; public PropertyValue(Object value, int id) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Rule.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Rule.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Rule.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -29,9 +29,13 @@ public class Rule implements java.io.Serializable, Comparable<Rule> { public static final String INLINE_ATTRIBUTE = "<inline attribute>"; + public static final String DATA_BINDING = "<data binding>"; + private Selector[] selectors; + private Map<String, String> properties; + private static final long serialVersionUID = 1L; public Rule(Selector[] selectors, Map<String, String> properties) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Selector.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Selector.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Selector.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,15 +27,25 @@ public class Selector implements java.io.Serializable, Comparable<Selector> { public static final int NEVER_APPLIES = 0; + public static final int PSEUDOCLASS_APPLIES_INHERIT_ONLY = 1; + public static final int PSEUDOCLASS_APPLIES = 2; + public static final int ALWAYS_APPLIES_INHERIT_ONLY = 3; + public static final int ALWAYS_APPLIES = 4; + private String javaClassName; + private String styleClass; + private String pseudoClass; + private String id; + private boolean inline; + private static final long serialVersionUID = 1L; public Selector(String javaClassName, String styleClass, String pseudoClass, String id) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Stylesheet.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Stylesheet.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/css/Stylesheet.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,6 +27,7 @@ public class Stylesheet implements java.io.Serializable { private Rule[] rules; + private static final long serialVersionUID = 1L; public Stylesheet() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/Decorator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -29,16 +29,15 @@ /** * A simple contract to define a String decorator on any java object. * - * @param <O> the type of data to decorate * @author tchemit <chemit(a)codelutin.com> + * @param <O> the type of data to decorate * @since 1.7.2 (was previously {@code jaxx.runtime.Decorator}) */ public abstract class Decorator<O> implements Serializable { private static final long serialVersionUID = -1L; - /** - * Type of the data to decorate - */ + + /** Type of the data to decorate */ protected final Class<O> internalClass; public Decorator(Class<O> internalClass) throws NullPointerException { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/decorator/DecoratorProvider.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -38,27 +38,23 @@ * * Then can obtain decorator via the methods {@code getDecorator(...)} * + * * @author tchemit <chemit(a)codelutin.com> * @since 1.7 */ public abstract class DecoratorProvider { - /** - * Logger - */ + /** Logger */ private static final Log log = LogFactory.getLog(JXPathDecorator.class); - /** - * Registred decorators. - */ + + /** Registred decorators. */ protected List<DecoratorContext<?>> decorators; public DecoratorProvider() { loadDecorators(); } - /** - * Load all decorators of the provider - */ + /** Load all decorators of the provider */ protected abstract void loadDecorators(); /** @@ -230,13 +226,10 @@ public static class DecoratorContext<T> { - /** - * the context name of the decorator - */ + /** the context name of the decorator */ final String context; - /** - * the decorator - */ + + /** the decorator */ final Decorator<T> decorator; public DecoratorContext(String context, Decorator<T> decorator) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/CardLayout2.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -81,7 +81,7 @@ * * @param constraints l'identifiant a tester * @return {@code true} si l'identifiant est deja present dans le - * layout, {@code false} otherwise. + * layout, {@code false} otherwise. */ public boolean contains(Serializable constraints) { return contexts.contains(constraints); @@ -202,8 +202,8 @@ //dimension = comp.getMinimumSize(); Insets insets = parent.getInsets(); comp.setBounds(getHgap() + insets.left, getVgap() + insets.top, - parent.getWidth() - (getHgap() * 2 + insets.left + insets.right), - parent.getHeight() - (getVgap() * 2 + insets.top + insets.bottom)); + parent.getWidth() - (getHgap() * 2 + insets.left + insets.right), + parent.getHeight() - (getVgap() * 2 + insets.top + insets.bottom)); } else { super.layoutContainer(parent); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/GBC.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/GBC.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/GBC.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -1,4 +1,3 @@ - /* %%Ignore-License GBC - A convenience class to tame the GridBagLayout @@ -17,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ +*/ package jaxx.runtime.swing; import java.awt.GridBagConstraints; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBox.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBox.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBox.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -35,10 +35,15 @@ public class HBox extends JPanel { private static final long serialVersionUID = 1L; + public static final String SPACING_PROPERTY = "spacing"; + public static final String MARGIN_PROPERTY = "margin"; + public static final String HORIZONTAL_ALIGNMENT_PROPERTY = "horizontalAlignment"; + public static final String VERTICAL_ALIGNMENT_PROPERTY = "verticalAlignment"; + private Insets margin; public HBox() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxBeanInfo.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxBeanInfo.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxBeanInfo.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -55,18 +55,18 @@ PropertyDescriptor horizontalAlignment = new PropertyDescriptor("horizontalAlignment", HBox.class); horizontalAlignment.setBound(true); horizontalAlignment.setValue("enumerationValues", new Object[]{ - "left", SwingConstants.LEFT, "SwingConstants.LEFT", - "center", SwingConstants.CENTER, "SwingConstants.CENTER", - "right", SwingConstants.RIGHT, "SwingConstants.RIGHT" - }); + "left", SwingConstants.LEFT, "SwingConstants.LEFT", + "center", SwingConstants.CENTER, "SwingConstants.CENTER", + "right", SwingConstants.RIGHT, "SwingConstants.RIGHT" + }); PropertyDescriptor verticalAlignment = new PropertyDescriptor("verticalAlignment", HBox.class); verticalAlignment.setBound(true); verticalAlignment.setValue("enumerationValues", new Object[]{ - "top", SwingConstants.TOP, "SwingConstants.TOP", - "middle", SwingConstants.CENTER, "SwingConstants.CENTER", - "bottom", SwingConstants.BOTTOM, "SwingConstants.BOTTOM" - }); + "top", SwingConstants.TOP, "SwingConstants.TOP", + "middle", SwingConstants.CENTER, "SwingConstants.CENTER", + "bottom", SwingConstants.BOTTOM, "SwingConstants.BOTTOM" + }); return new PropertyDescriptor[]{spacing, margin, horizontalAlignment, verticalAlignment}; } catch (IntrospectionException e) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxLayout.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxLayout.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/HBoxLayout.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -40,7 +40,9 @@ public class HBoxLayout implements LayoutManager { private int spacing = 6; + private int horizontalAlignment = SwingConstants.LEFT; + private int verticalAlignment = SwingConstants.TOP; public int getSpacing() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Item.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Item.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Item.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -31,6 +31,7 @@ import java.util.List; // This needs to be split into two classes, Item and TreeItem + /** * An item in a component such as <code>JComboBox</code> or <code>JTree</code>. The <code>Item</code> * class corresponds to the <code><item></code> tag in JAXX source files. @@ -38,14 +39,23 @@ public class Item { public static final String LABEL_PROPERTY = "label"; + public static final String VALUE_PROPERTY = "value"; + public static final String SELECTED_PROPERTY = "selected"; + private String id; + private String label; + private Object value; + private boolean selected; + private List<Item> children; + private Item parent; + private PropertyChangeSupport propertyChangeSupport; /** Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXButtonGroup.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -36,15 +36,25 @@ public class JAXXButtonGroup extends ButtonGroup { public static final String SELECTED_VALUE_PROPERTY = "selectedValue"; + public static final String BUTTON8GROUP_CLIENT_PROPERTY = "$buttonGroup"; + public static final String VALUE_CLIENT_PROPERTY = "$value"; + public static final String SELECTED_TIP_CLIENT_PROPERTY = "$selected.toolTipText"; + public static final String NOT_SELECTED_TIP_CLIENT_PROPERTY = "$not.selected.toolTipText"; + protected EventListenerList listenerList = new EventListenerList(); + private PropertyChangeSupport propertyChangeSupport; + private transient Object selectedValue; + protected boolean useToolTipText; + protected transient ChangeEvent changeEvent = new ChangeEvent(this); + private transient ChangeListener changeListener = new ChangeListener() { @Override @@ -55,6 +65,7 @@ } } }; + private static final long serialVersionUID = 1L; @Override @@ -182,7 +193,7 @@ private void firePropertyChange(Object oldValue) { if (propertyChangeSupport != null) { getPropertyChangeSupport().firePropertyChange(SELECTED_VALUE_PROPERTY, - oldValue, getSelectedValue()); + oldValue, getSelectedValue()); } fireStateChanged(); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,7 +24,12 @@ */ package jaxx.runtime.swing; -import javax.swing.*; +import javax.swing.AbstractListModel; +import javax.swing.ComboBoxModel; +import javax.swing.DefaultListCellRenderer; +import javax.swing.JComboBox; +import javax.swing.JList; +import javax.swing.ListModel; import java.awt.Component; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -43,7 +48,9 @@ public class JAXXComboBoxModel extends AbstractListModel implements ComboBoxModel { private List<Item> items; + private Object selectedItem; + private static final long serialVersionUID = -8940733376638766414L; public JAXXComboBoxModel(List<Item> items) { @@ -127,7 +134,7 @@ @Override public void setSelectedItem(Object selectedItem) { if (this.selectedItem != null && !this.selectedItem.equals(selectedItem) || - this.selectedItem == null && selectedItem != null) { + this.selectedItem == null && selectedItem != null) { this.selectedItem = selectedItem; fireContentsChanged(this, -1, -1); } @@ -219,8 +226,9 @@ } setItems(items); } - + // this way we can keep it marked protected and still allow code in this file to call it + @Override protected void fireItemStateChanged(ItemEvent e) { super.fireItemStateChanged(e); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXList.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXList.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXList.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -46,6 +46,7 @@ public class JAXXListModel extends AbstractListModel { private List<Item> items; + private static final long serialVersionUID = -1598924187490122036L; public JAXXListModel(List<Item> items) { @@ -103,7 +104,7 @@ } } - public List<Item> getItems(){ + public List<Item> getItems() { return items; } @@ -157,6 +158,7 @@ } // this way we can keep it marked protected and still allow code in this file to call it + @Override protected void fireSelectionValueChanged(int firstIndex, int lastIndex, boolean isAdjusting) { super.fireSelectionValueChanged(firstIndex, lastIndex, isAdjusting); @@ -177,9 +179,9 @@ setSelectedIndices(selectedIndices); } - public List<Item> getItems(){ - if (getModel() instanceof JAXXListModel){ - return ((JAXXListModel)getModel()).getItems(); + public List<Item> getItems() { + if (getModel() instanceof JAXXListModel) { + return ((JAXXListModel) getModel()).getItems(); } return null; } @@ -191,10 +193,10 @@ /** * Set the selected Objects * - * @param values Objects must be selected in the list + * @param values Objects must be selected in the list */ public void setSelectedValues(Object[] values) { - if (values != null){ + if (values != null) { List<Integer> selectedIndices = new ArrayList<Integer>(); ListModel model = getModel(); for (int i = 0; i < model.getSize(); i++) { @@ -211,8 +213,7 @@ ints[i] = selectedIndices.get(i).intValue(); } setSelectedIndices(ints); - } - else{ + } else { // No selection if values is null setSelectedIndex(-1); } @@ -223,11 +224,11 @@ } public void setSelectedItems(List<Item> itemsToSelect) { - if (itemsToSelect != null){ + if (itemsToSelect != null) { List<Item> items = getItems(); int[] indices = new int[itemsToSelect.size()]; int i = 0; - for (Item item : itemsToSelect){ + for (Item item : itemsToSelect) { indices[i] = items.indexOf(item); i++; } @@ -235,25 +236,25 @@ } } - public Item getSelectedItem(){ + public Item getSelectedItem() { Object selected = super.getSelectedValue(); return findItem(selected); } - public List<Item> getSelectedItems(){ + public List<Item> getSelectedItems() { Object[] selected = super.getSelectedValues(); java.util.List<Item> itemsSelected = new ArrayList<Item>(); - for (Object s : selected){ + for (Object s : selected) { itemsSelected.add(findItem(s)); } return itemsSelected; } - public Item findItem(Object value){ + public Item findItem(Object value) { List<Item> items = getItems(); - if (items != null){ - for (Item i : items){ - if (i.getValue().equals(value)){ + if (items != null) { + for (Item i : items) { + if (i.getValue().equals(value)) { return i; } } @@ -261,33 +262,33 @@ return null; } - public void addItem(Item item){ + public void addItem(Item item) { List<Item> items = getItems(); - if (items != null){ + if (items != null) { items.add(item); setItems(items); } } - public void addAllItems(Collection<Item> itemsToAdd){ + public void addAllItems(Collection<Item> itemsToAdd) { List<Item> items = getItems(); - if (items != null){ + if (items != null) { items.addAll(itemsToAdd); setItems(items); } } - public void removeItem(Item item){ + public void removeItem(Item item) { List<Item> items = getItems(); - if (items != null){ + if (items != null) { items.remove(item); setItems(items); } } - public void removeAllItems(Collection<Item> itemsToRemove){ + public void removeAllItems(Collection<Item> itemsToRemove) { List<Item> items = getItems(); - if (items != null){ + if (items != null) { items.removeAll(itemsToRemove); setItems(items); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXToggleButton.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -29,12 +29,19 @@ public class JAXXToggleButton extends JToggleButton { private static final long serialVersionUID = 1L; + protected String glueText; + protected String normalText; + protected String glueTooltipText; + protected String normalTooltipText; + protected int normalMnemonic; + protected int glueMnemonic; + protected boolean _init; public String getGlueText() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTree.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTree.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/JAXXTree.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -41,11 +41,13 @@ public class JAXXTree extends JTree { private static final long serialVersionUID = 1L; + private static final String SYNTHETIC = "<synthetic root node>"; public class JAXXTreeModel implements TreeModel { private Item root; + private List<TreeModelListener> listeners = new ArrayList<TreeModelListener>(); public JAXXTreeModel(List<Item> items) { @@ -74,8 +76,8 @@ boolean root = item.getParent() == null; TreePath path = !root ? getTreePath(item.getParent()) : null; fireTreeNodesChanged(new TreeModelEvent(JAXXTreeModel.this, path, - !root ? new int[]{item.getParent().getChildren().indexOf(item)} : null, - new Object[]{item.getValue()})); + !root ? new int[]{item.getParent().getChildren().indexOf(item)} : null, + new Object[]{item.getValue()})); } } }; @@ -135,7 +137,7 @@ @Override public int getChildCount(Object parent) { Item node = findItem(parent); - if (node == null){ + if (node == null) { return 0; } return node.getChildren().size(); @@ -237,7 +239,7 @@ newItems.add(items); setItems(newItems); } - + public void setItems(List<Item> items) { // Create model JAXXTreeModel model = new JAXXTreeModel(items); @@ -248,10 +250,10 @@ setModel(model); // Appli selected items - if (items != null){ + if (items != null) { List<TreePath> treePathSelected = new ArrayList<TreePath>(); - for (Item i : items){ - if (i.isSelected()){ + for (Item i : items) { + if (i.isSelected()) { treePathSelected.add(model.getTreePath(i)); } } @@ -263,15 +265,15 @@ TreePath selectionPath = getSelectionPath(); return selectionPath != null ? selectionPath.getLastPathComponent() : null; } - - public Item getRootItem(){ - if (getModel() instanceof JAXXTreeModel){ - return ((JAXXTreeModel)getModel()).getRootItem(); + + public Item getRootItem() { + if (getModel() instanceof JAXXTreeModel) { + return ((JAXXTreeModel) getModel()).getRootItem(); } return null; } - protected TreePath[] convertToTreePathArray(Object[] datas){ + protected TreePath[] convertToTreePathArray(Object[] datas) { TreePath[] params = new TreePath[datas.length]; System.arraycopy(datas, 0, params, 0, datas.length); return params; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/OneClicListSelectionModel.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -40,8 +40,11 @@ /** Logger */ static private Log log = LogFactory.getLog(OneClicListSelectionModel.class); + protected ListSelectionModel delegate; + protected final ListModel model; + private boolean[] _states; public OneClicListSelectionModel(ListSelectionModel delegate, ListModel model) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfo.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfo.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfo.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,7 +24,8 @@ */ package jaxx.runtime.swing; -import javax.swing.*; +import javax.swing.Icon; +import javax.swing.JComponent; import javax.swing.event.SwingPropertyChangeSupport; import java.awt.Color; import java.beans.PropertyChangeListener; @@ -33,28 +34,51 @@ public class TabInfo { public static String BACKGROUND_PROPERTY = "background"; + public static String TAB_COMPONENT_PROPERTY = "tabComponent"; + public static String TAB_COMPONENT_STR_PROPERTY = "tabComponentStr"; + public static String DISABLED_ICON_PROPERTY = "disabledIcon"; + public static String DISPLAYED_MNEMONIC_INDEX_PROPERTY = "displayedMnemonicIndex"; + public static String ENABLED_PROPERTY = "enabled"; + public static String FOREGROUND_PROPERTY = "foreground"; + public static String ICON_PROPERTY = "icon"; + public static String MNEMONIC_PROPERTY = "mnemonic"; + public static String TITLE_PROPERTY = "title"; + public static String TOOL_TIP_TEXT_PROPERTY = "toolTipText"; + private String id; + private Color background; + private Icon disabledIcon; + private int displayedMnemonicIndex = -1; + private boolean enabled = true; + private Color foreground; + private Icon icon; + private int mnemonic = -1; + private String title; + private String toolTipText; + private JComponent tabComponent; + private String tabComponentStr; + private PropertyChangeSupport propertyChangeSupport; public TabInfo() { @@ -163,7 +187,7 @@ } public void setTabComponent(JComponent tabComponent) { - JComponent oldValue = this.tabComponent; + JComponent oldValue = this.tabComponent; this.tabComponent = tabComponent; firePropertyChange(TAB_COMPONENT_PROPERTY, oldValue, tabComponent); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/TabInfoPropertyChangeListener.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -26,13 +26,15 @@ import javax.swing.Icon; import javax.swing.JTabbedPane; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; public class TabInfoPropertyChangeListener implements PropertyChangeListener { private JTabbedPane tabs; + private int tabIndex; public TabInfoPropertyChangeListener(JTabbedPane tabs, int tabIndex) { @@ -59,7 +61,7 @@ tabs.setIconAt(tabIndex, (Icon) e.getNewValue()); } else if (name.equals(TabInfo.DISABLED_ICON_PROPERTY)) { tabs.setDisabledIconAt(tabIndex, (Icon) e.getNewValue()); - }else if (name.equals(TabInfo.TAB_COMPONENT_PROPERTY)) { + } else if (name.equals(TabInfo.TAB_COMPONENT_PROPERTY)) { tabs.setTabComponentAt(tabIndex, (Component) e.getNewValue()); } } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Table.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Table.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/Table.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -38,9 +38,13 @@ public class Table extends JPanel { private static final long serialVersionUID = 1L; + public static final Insets DEFAULT_INSETS = new Insets(3, 3, 3, 3); + private GridBagConstraints tableConstraints = new GridBagConstraints(); + private GridBagConstraints rowConstraints; + private GridBagConstraints cellConstraints; public Table() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBox.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBox.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBox.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -35,10 +35,15 @@ public class VBox extends JPanel { private static final long serialVersionUID = 1L; + public static final String SPACING_PROPERTY = "spacing"; + public static final String MARGIN_PROPERTY = "margin"; + public static final String HORIZONTAL_ALIGNMENT_PROPERTY = "horizontalAlignment"; + public static final String VERTICAL_ALIGNMENT_PROPERTY = "verticalAlignment"; + private Insets margin; public VBox() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxBeanInfo.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxBeanInfo.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxBeanInfo.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -55,18 +55,18 @@ PropertyDescriptor horizontalAlignment = new PropertyDescriptor("horizontalAlignment", VBox.class); horizontalAlignment.setBound(true); horizontalAlignment.setValue("enumerationValues", new Object[]{ - "left", SwingConstants.LEFT, "SwingConstants.LEFT", - "center", SwingConstants.CENTER, "SwingConstants.CENTER", - "right", SwingConstants.RIGHT, "SwingConstants.RIGHT" - }); + "left", SwingConstants.LEFT, "SwingConstants.LEFT", + "center", SwingConstants.CENTER, "SwingConstants.CENTER", + "right", SwingConstants.RIGHT, "SwingConstants.RIGHT" + }); PropertyDescriptor verticalAlignment = new PropertyDescriptor("verticalAlignment", VBox.class); verticalAlignment.setBound(true); verticalAlignment.setValue("enumerationValues", new Object[]{ - "top", SwingConstants.TOP, "SwingConstants.TOP", - "middle", SwingConstants.CENTER, "SwingConstants.CENTER", - "bottom", SwingConstants.BOTTOM, "SwingConstants.BOTTOM" - }); + "top", SwingConstants.TOP, "SwingConstants.TOP", + "middle", SwingConstants.CENTER, "SwingConstants.CENTER", + "bottom", SwingConstants.BOTTOM, "SwingConstants.BOTTOM" + }); return new PropertyDescriptor[]{spacing, margin, horizontalAlignment, verticalAlignment}; } catch (IntrospectionException e) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxLayout.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxLayout.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/VBoxLayout.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -40,7 +40,9 @@ public class VBoxLayout implements LayoutManager { private int spacing = 6; + private int horizontalAlignment = SwingConstants.LEFT; + private int verticalAlignment = SwingConstants.TOP; public int getSpacing() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionExecutor.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -226,10 +226,10 @@ // find method Class<?> klass = methodContainer.getClass(); - final Method targetMethod= ReflectUtil.getDeclaredMethod(klass, - methodName, - true, - arguments + final Method targetMethod = ReflectUtil.getDeclaredMethod(klass, + methodName, + true, + arguments ); targetMethod.setAccessible(true); Runnable result; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/application/ActionWorker.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -36,7 +36,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 2.1 */ -public class ActionWorker<R,P> extends SwingWorker<R, P> { +public class ActionWorker<R, P> extends SwingWorker<R, P> { /** Logger */ private static final Log log = LogFactory.getLog(ActionWorker.class); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/ClassCellEditor.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -37,7 +37,7 @@ /** * A class cell editor (fork from comandline project). - * + * * @author tchemit <chemit(a)codelutin.com> */ public class ClassCellEditor implements TableCellEditor { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/EnumEditor.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -40,29 +40,27 @@ * 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>. - * ##%* */package jaxx.runtime.swing.editor; + * ##%* */ +package jaxx.runtime.swing.editor; +import org.nuiton.util.ReflectUtil; + import javax.swing.JComboBox; import java.util.EnumSet; import java.util.Iterator; -import org.nuiton.util.ReflectUtil; - /** * Une éditeur d'enum. * - * @param <E> le type d'enumeration a editer. - * * @author tchemit <chemit(a)codelutin.com> - * + * @param <E> le type d'enumeration a editer. * @since 1.6.0 */ public class EnumEditor<E extends Enum<E>> extends JComboBox { private static final long serialVersionUID = 2L; - /** - * Type of enumeration - */ + + /** Type of enumeration */ protected Class<E> type; /** @@ -70,7 +68,7 @@ * all values of enumeration. * * @param type type of enumeration - * @param <E> generci type of enumeration + * @param <E> generci type of enumeration * @return the instanciated editor */ public static <E extends Enum<E>> EnumEditor<E> newEditor(Class<E> type) { @@ -83,9 +81,9 @@ * all values of enumeration which {@code ordinal} is strictly lower than * the given {@code maxOrdinal}. * - * @param type type of enumeration + * @param type type of enumeration * @param maxOrdinal the upper (strict) bound of ordinal values allowed - * @param <E> generic type of enumeration + * @param <E> generic type of enumeration * @return the instanciated editor */ public static <E extends Enum<E>> EnumEditor<E> newEditor(Class<E> type, @@ -98,7 +96,7 @@ * all given {@code universe} values of enumeration. * * @param universe enumerations to put in editor - * @param <E> generci type of enumeration + * @param <E> generci type of enumeration * @return the instanciated editor */ public static <E extends Enum<E>> EnumEditor<E> newEditor(E... universe) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/LocaleEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/LocaleEditor.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/LocaleEditor.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,11 +24,12 @@ */ package jaxx.runtime.swing.editor; -import javax.swing.JComboBox; -import java.util.Locale; import org.nuiton.i18n.I18n; import org.nuiton.i18n.I18nStore; +import javax.swing.JComboBox; +import java.util.Locale; + /** * A {@link Locale} editor. * @@ -45,7 +46,7 @@ /** serialVersionUID */ private static final long serialVersionUID = -6777873426011538807L; - + protected Locale[] type; public static LocaleEditor newEditor(Locale... type) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/editor/MyDefaultCellEditor.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -90,6 +90,7 @@ ((MyDefaultCellEditor) cellEditor).setRequireSelect(requireSelect); return cellEditor; } + protected boolean requireSelect = true; @Override 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 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpBroker.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,8 +24,29 @@ */ package jaxx.runtime.swing.help; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.help.CSH; +import javax.help.HelpBroker; +import javax.help.HelpSet; +import javax.swing.AbstractButton; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; import java.applet.Applet; -import java.awt.*; +import java.awt.AWTEvent; +import java.awt.ActiveEvent; +import java.awt.Component; +import java.awt.Container; +import java.awt.Cursor; +import java.awt.EventQueue; +import java.awt.Frame; +import java.awt.MenuComponent; +import java.awt.Toolkit; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.InputEvent; @@ -38,17 +59,6 @@ import java.util.Locale; import java.util.Map; import java.util.Vector; -import javax.help.CSH; -import javax.help.HelpBroker; -import javax.help.HelpSet; -import javax.swing.AbstractButton; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import jaxx.runtime.JAXXContext; -import jaxx.runtime.JAXXObject; -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * La classe pour encapsuler l'aide de l'application. @@ -59,49 +69,38 @@ public class JAXXHelpBroker { public static final String JAXX_CONTEXT_ENTRY = "jaxxcontext"; - /** - * Logger - */ + + /** Logger */ static private Log log = LogFactory.getLog(JAXXHelpBroker.class); - /** - * name of helpset - */ + + /** name of helpset */ protected final String helpsetName; - /** - * default id to use if none given - */ + + /** default id to use if none given */ protected final String defaultID; - /** - * help key - */ + + /** help key */ protected final String helpKey; - /** - * helpset to use - */ + + /** helpset to use */ protected HelpSet helpset; - /** - * help broker - */ + + /** help broker */ protected HelpBroker helpBroker; - /** - * current locale used - */ + + /** current locale used */ protected Locale locale; - /** - * cache of cursors modified when in context-sensitive mode - */ + + /** cache of cursors modified when in context-sensitive mode */ protected Hashtable<Component, Cursor> cursors; - /** - * cursor to use in context-sensitive mode - */ + + /** cursor to use in context-sensitive mode */ protected Cursor onItemCursor; - /** - * cache of component which cursor have been modified - */ + + /** cache of component which cursor have been modified */ protected final Map<Component, String> cache; - /** - * help ui handler - */ + + /** help ui handler */ protected JAXXHelpUIHandler handler; public JAXXHelpBroker(String helpsetName, String helpKey, String defaultID, JAXXHelpUIHandler handler) { @@ -330,6 +329,7 @@ /* * Get all top level containers to change it's cursors */ + protected Vector<?> getTopContainers(Object source) { // This method is used to obtain all top level components of application // for which the changing of cursor to question mark is wanted. @@ -396,6 +396,7 @@ * Set the cursor for a component and its children. * Store the old cursors for future resetting */ + protected void setAndStoreCursors(Component comp, Cursor cursor) { if (comp == null) { return; @@ -417,6 +418,7 @@ /* * Actually restore the cursor for a component and its children */ + protected void resetAndRestoreCursors(Component comp) { if (comp == null) { return; @@ -436,12 +438,12 @@ /** * Context Sensitive Event Tracking - * + * * Creates a new EventDispatchThread from which to dispatch events. This * method returns when stopModal is invoked. * * @return MouseEvent The mouse event occurred. Null if - * cancelled on an undetermined object. + * cancelled on an undetermined object. */ public static MouseEvent getMouseEvent() { // Should the cursor change to a quesiton mark here or @@ -511,7 +513,7 @@ // if this is the cancel key then exit // otherwise pass all other keys up if (e.getKeyCode() == KeyEvent.VK_CANCEL || - e.getKeyCode() == KeyEvent.VK_ESCAPE) { + e.getKeyCode() == KeyEvent.VK_ESCAPE) { e.consume(); return null; } else { @@ -523,9 +525,9 @@ int eID = e.getID(); if ((eID == MouseEvent.MOUSE_CLICKED || - eID == MouseEvent.MOUSE_PRESSED || - eID == MouseEvent.MOUSE_RELEASED) && - SwingUtilities.isRightMouseButton(e)) { + eID == MouseEvent.MOUSE_PRESSED || + eID == MouseEvent.MOUSE_RELEASED) && + SwingUtilities.isRightMouseButton(e)) { // cancel tracking e.consume(); if (log.isDebugEnabled()) { @@ -535,9 +537,9 @@ } if ((eID == MouseEvent.MOUSE_CLICKED || - eID == MouseEvent.MOUSE_PRESSED || - eID == MouseEvent.MOUSE_RELEASED) && - SwingUtilities.isLeftMouseButton(e)) { + eID == MouseEvent.MOUSE_PRESSED || + eID == MouseEvent.MOUSE_RELEASED) && + SwingUtilities.isLeftMouseButton(e)) { if (eID == MouseEvent.MOUSE_CLICKED) { if (eventNumber == 0) { dispatchEvent(event); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUI.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,14 +27,12 @@ import java.awt.Component; /** - * * Contract to be added on JAXXObject which wants to use javax help. - * - * @param type of broker. - * + * * @author tchemit <chemit(a)codelutin.com> - * @since 1.3 + * @param type of broker. * @see JAXXHelpBroker + * @since 1.3 */ public interface JAXXHelpUI { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUIHandler.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUIHandler.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/help/JAXXHelpUIHandler.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -26,10 +26,7 @@ import jaxx.runtime.JAXXContext; -/** - * - * @author tchemit <chemit(a)codelutin.com> - */ +/** @author tchemit <chemit(a)codelutin.com> */ public interface JAXXHelpUIHandler { void showHelp(JAXXContext context, JAXXHelpBroker broker, String helpID); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavBridge.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -156,5 +156,5 @@ // * selection empty. // */ // N getSelectedNode(); - + } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNode.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -134,12 +134,12 @@ * on direct childs of the node. * * @param id the id of the researched node - * @param bridge model owner of nodes + * @param bridge model owner of nodes * @param provider data provider * @return the found node or {@code null} if not found */ N findNodeById(String id, - NavBridge<M,N> bridge, + NavBridge<M, N> bridge, NavDataProvider provider); /** @@ -175,7 +175,7 @@ * @param provider le provider de données * @param populateChilds un drapeau pour charger aussi les fils du noeud courant */ - void populateNode(NavBridge<M,N> bridge, + void populateNode(NavBridge<M, N> bridge, NavDataProvider provider, boolean populateChilds); @@ -188,7 +188,7 @@ * @param bridge model owner of the node * @param provider data provider */ - void populateChilds(NavBridge<M,N> bridge, NavDataProvider provider); + void populateChilds(NavBridge<M, N> bridge, NavDataProvider provider); //-------------------------------------------------------------------------- //-- Overrides to use generic type as return Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/NavNodeChildLoador.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -100,7 +100,7 @@ /** * Load childs of the given {@code parentnode}. * - * @param bridge the model owner of nodes + * @param bridge the model owner of nodes * @param parentNode the parent node where to insert nodes * @param dataProvider data provider * @throws Exception pour tout probleme de recuperation de donnees Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/NavTreeNode.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.nav.tree; +import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -75,9 +75,9 @@ } public NavTreeNode(Class<?> internalClass, - String id, - String context, - NavTreeNodeChildLoador<?, ?, N> childLoador) { + String id, + String context, + NavTreeNodeChildLoador<?, ?, N> childLoador) { this.internalClass = internalClass; this.id = id; this.context = context; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html 2010-09-11 19:39:49 UTC (rev 2086) @@ -1,4 +1,5 @@ -package.html<html> +package.html +<html> <body> <h1>JAXX - nav tree implementation</h1> Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableBridge.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -43,7 +43,7 @@ * @author sletellier <letellier(a)codelutin.com> * @since 2.1 */ -public class NavTreeTableBridge<N extends NavTreeTableNode<N>> implements NavBridge<NavTreeTableModel, N> { +public class NavTreeTableBridge<N extends NavTreeTableNode<N>> implements NavBridge<NavTreeTableModel, N> { /** Logger */ static private final Log log = LogFactory.getLog(NavTreeTableBridge.class); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableModel.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -43,9 +43,7 @@ */ public class NavTreeTableModel implements TreeTableModel { - /** - * Logger - */ + /** Logger */ static private final Log log = LogFactory.getLog(NavTreeTableModel.class); /** @@ -64,9 +62,7 @@ } - /** - * the delegate model - */ + /** the delegate model */ protected MyDefaultTreeTableModel delegate; public NavTreeTableModel(MyDefaultTreeTableModel delegate) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/NavTreeTableNode.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,8 +24,8 @@ */ package jaxx.runtime.swing.nav.treetable; +import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavDataProvider; -import jaxx.runtime.swing.nav.NavBridge; import jaxx.runtime.swing.nav.NavNode; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -75,9 +75,9 @@ } public NavTreeTableNode(Class<?> internalClass, - String id, - String context, - NavTreeTableNodeChildLoador<?, ?, N> childLoador) { + String id, + String context, + NavTreeTableNodeChildLoador<?, ?, N> childLoador) { this.internalClass = internalClass; this.id = id; this.context = context; @@ -282,7 +282,7 @@ public Enumeration<N> children() { return (Enumeration<N>) super.children(); } - + public void removeAllChildren() { super.children.clear(); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/BooleanCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -35,13 +35,16 @@ import java.awt.Color; import java.awt.Component; -/** @author tchemit <chemit(a)codelutin.com> +/** + * @author tchemit <chemit(a)codelutin.com> * @since 1.5 */ public class BooleanCellRenderer extends JPanel implements TableCellRenderer { private static final long serialVersionUID = 1L; + protected TableCellRenderer defaultDelegate; + protected JCheckBox checkBox; public BooleanCellRenderer(TableCellRenderer delegate) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderListCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,31 +27,30 @@ import jaxx.runtime.decorator.Decorator; import jaxx.runtime.decorator.DecoratorProvider; -import javax.swing.*; -import java.awt.*; +import javax.swing.DefaultListCellRenderer; +import javax.swing.JList; +import javax.swing.ListCellRenderer; +import java.awt.Component; /** * A {@link ListCellRenderer} which use decorators from the {@link #provider} to obtain the text to display. - * + * * The interest of this renderer is to define a unique renderer for your application (put it in JAXXContext) * and then use it simply :) - * + * * User: chemit * Date: 29 oct. 2009 * Time: 03:00:53 - * @since 2.0.0 + * * @see DecoratorProvider + * @since 2.0.0 */ public class DecoratorProviderListCellRenderer implements ListCellRenderer { - /** - * Delegate cell renderer - */ + /** Delegate cell renderer */ protected ListCellRenderer delegate; - /** - * provider of decorators - */ + /** provider of decorators */ protected DecoratorProvider provider; public DecoratorProviderListCellRenderer(DecoratorProvider provider) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorProviderTableCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,10 +27,10 @@ import jaxx.runtime.decorator.Decorator; import jaxx.runtime.decorator.DecoratorProvider; -import javax.swing.*; +import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import java.awt.*; +import java.awt.Component; /** * A {@link TableCellRenderer} which use decorators from the {@link #provider} to obtain the text to display. @@ -47,14 +47,10 @@ */ public class DecoratorProviderTableCellRenderer implements TableCellRenderer { - /** - * Delegate cell renderer - */ + /** Delegate cell renderer */ protected TableCellRenderer delegate; - /** - * provider of decorators - */ + /** provider of decorators */ protected DecoratorProvider provider; public DecoratorProviderTableCellRenderer(DecoratorProvider provider) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/DecoratorTableCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,28 +24,26 @@ */ package jaxx.runtime.swing.renderer; -import jaxx.runtime.decorator.*; +import jaxx.runtime.decorator.Decorator; + import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; import java.awt.Component; -import javax.swing.table.DefaultTableCellRenderer; /** * A {@link TableCellRenderer} which compute text with the given {@link #decorator} * and leave the hand to the {@link #delegate} to perform the visual renderer. - * + * * @author tchemit <chemit(a)codelutin.com> * @since 1.7.2 (was previously {@code jaxx.runtime.swing.DecoratorTableCellRenderer}). */ public class DecoratorTableCellRenderer implements TableCellRenderer { - /** - * Delegate cell renderer - */ + /** Delegate cell renderer */ protected TableCellRenderer delegate; - /** - * Decorator to produce text to render - */ + + /** Decorator to produce text to render */ protected Decorator<?> decorator; public DecoratorTableCellRenderer(Decorator<?> decorator) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EmptyNumberTableCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -25,9 +25,9 @@ package jaxx.runtime.swing.renderer; import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; import java.awt.Component; -import javax.swing.table.DefaultTableCellRenderer; /** * A {@link TableCellRenderer} which does not display numbers when they are @@ -39,8 +39,11 @@ public class EmptyNumberTableCellRenderer implements TableCellRenderer { protected final Integer ZERO = 0; + protected final Float ZEROF = 0F; + protected final Double ZEROD = 0D; + private TableCellRenderer delegate; public EmptyNumberTableCellRenderer() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/EnumTableCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -30,18 +30,16 @@ import java.util.EnumSet; /** - * - * * A {@link TableCellRenderer} which displays enum values from their ordinal value. * - * @param <E> le type de l'énumération. - * * @author tchemit <chemit(a)codelutin.com> + * @param <E> le type de l'énumération. * @since 1.5 */ public class EnumTableCellRenderer<E extends Enum<E>> implements TableCellRenderer { private TableCellRenderer delegate; + private EnumSet<E> enumValues; public EnumTableCellRenderer(TableCellRenderer delegate, Class<E> enumClass) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/I18nTableCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,14 +24,14 @@ */ package jaxx.runtime.swing.renderer; -import static org.nuiton.i18n.I18n._; - import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import java.awt.Component; +import static org.nuiton.i18n.I18n._; + /** * A simple TableCellRenderer using a delegate TableCellRenderer to render * everything elese thant the text : the text is I18nalize. @@ -105,5 +105,5 @@ public String[] getTips() { return tips; } - + } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/LocaleListCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,28 +24,30 @@ */ package jaxx.runtime.swing.renderer; +import jaxx.runtime.SwingUtil; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.Icon; +import javax.swing.JLabel; +import javax.swing.JList; import java.awt.Component; import java.util.HashMap; import java.util.Locale; import java.util.Map; -import javax.swing.DefaultListCellRenderer; -import javax.swing.Icon; -import javax.swing.JLabel; -import javax.swing.JList; -import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -/** - * - * @author tchemit <chemit(a)codelutin.com> - */ +/** @author tchemit <chemit(a)codelutin.com> */ public class LocaleListCellRenderer extends DefaultListCellRenderer { public static final Log log = LogFactory.getLog(LocaleListCellRenderer.class); + private static final long serialVersionUID = 1L; + protected final Map<Locale, Icon> cache = new HashMap<Locale, Icon>(); + protected boolean showIcon; + protected boolean showText; public LocaleListCellRenderer() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorListCellRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,36 +24,33 @@ */ package jaxx.runtime.swing.renderer; -import java.awt.Component; -import java.util.ArrayList; -import java.util.List; +import jaxx.runtime.decorator.Decorator; +import jaxx.runtime.decorator.JXPathDecorator; + import javax.swing.DefaultListCellRenderer; import javax.swing.JList; import javax.swing.ListCellRenderer; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.JXPathDecorator; +import java.awt.Component; +import java.util.ArrayList; +import java.util.List; /** * A {@link ListCellRenderer} which compute text with the matching decorator * from {@link #decorators} and leave the hand to the {@link #delegate} to * perform the visual renderer. - * + * * @author tchemit <chemit(a)codelutin.com> * @since 2.0.0 */ public class MultiDecoratorListCellRenderer implements ListCellRenderer { - /** - * Delegate cell renderer - */ + /** Delegate cell renderer */ protected ListCellRenderer delegate; - /** - * accepted types - */ + + /** accepted types */ protected List<Class<?>> types; - /** - * decorators for accepted types - */ + + /** decorators for accepted types */ protected Decorator<?>[] decorators; public MultiDecoratorListCellRenderer(ListCellRenderer delegate, JXPathDecorator<?>... decorator) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/renderer/MultiDecoratorTableCelleRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,14 +24,15 @@ */ package jaxx.runtime.swing.renderer; -import java.awt.Component; -import java.util.ArrayList; -import java.util.List; +import jaxx.runtime.decorator.Decorator; +import jaxx.runtime.decorator.JXPathDecorator; + import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; -import jaxx.runtime.decorator.Decorator; -import jaxx.runtime.decorator.JXPathDecorator; +import java.awt.Component; +import java.util.ArrayList; +import java.util.List; /** * A {@link TableCellRenderer} which compute text with the matching decorator @@ -43,17 +44,13 @@ */ public class MultiDecoratorTableCelleRenderer implements TableCellRenderer { - /** - * Delegate cell renderer - */ + /** Delegate cell renderer */ protected TableCellRenderer delegate; - /** - * accepted types - */ + + /** accepted types */ protected List<Class<?>> types; - /** - * decorators for accepted types - */ + + /** decorators for accepted types */ protected Decorator<?>[] decorators; public MultiDecoratorTableCelleRenderer(JXPathDecorator<?>... decorator) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardUtil.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -44,7 +44,7 @@ */ public class WizardUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(WizardUI.class); protected WizardUtil() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtModel.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -393,7 +393,7 @@ throw new IllegalStateException("There is some step no model : " + toAdd); } } - + setSteps(newSteps); // on met a jour les états des étapes @@ -409,7 +409,7 @@ log.info("Ending updateUniverse"); // setValueAdjusting(false); - } + } protected abstract E[] updateStepUniverse(); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/ext/WizardExtUtil.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -44,7 +44,7 @@ */ public class WizardExtUtil extends WizardUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(WizardUI.class); protected WizardExtUtil() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -71,7 +71,7 @@ /** la nom de l'état changed */ static public final String CHANGED_PROERTY = "changed"; - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static protected final Log log = LogFactory.getLog(BeanValidator.class); protected static final BeanValidatorScope[] FILTER_SCOPES_EMPTY = Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorDetector.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -31,7 +31,13 @@ import java.io.File; import java.io.FilenameFilter; import java.lang.reflect.Constructor; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -44,7 +50,7 @@ */ public class BeanValidatorDetector { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ private static final Log log = LogFactory.getLog(BeanValidatorDetector.class); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,7 +27,12 @@ import com.opensymphony.xwork2.validator.FieldValidator; import java.io.Serializable; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; import static org.nuiton.i18n.I18n._; @@ -46,7 +51,7 @@ * validation. * @since 1.3 */ -public class BeanValidatorField implements Serializable{ +public class BeanValidatorField implements Serializable { private static final long serialVersionUID = 1L; @@ -204,7 +209,7 @@ } public String getI18nError(String error) { - String text; + String text; if (!error.contains("##")) { text = _(error); } else { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -34,7 +34,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.beans.*; +import java.beans.BeanInfo; +import java.beans.EventSetDescriptor; +import java.beans.IntrospectionException; +import java.beans.Introspector; +import java.beans.PropertyDescriptor; import java.util.ArrayList; import java.util.EnumMap; import java.util.EnumSet; @@ -47,7 +51,7 @@ */ public class BeanValidatorUtil { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private final Log log = LogFactory.getLog(BeanValidatorUtil.class); /** Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/ValidatorsMap.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/ValidatorsMap.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/ValidatorsMap.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,7 +24,11 @@ */ package jaxx.runtime.validator; -import java.util.*; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; /** * Un dictionnaire de validateurs ordonnees par le type de leur bean. Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -31,11 +31,22 @@ import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.util.ValueStackFactory; -import com.opensymphony.xwork2.validator.*; +import com.opensymphony.xwork2.validator.ActionValidatorManager; +import com.opensymphony.xwork2.validator.DelegatingValidatorContext; +import com.opensymphony.xwork2.validator.FieldValidator; +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.Validator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * A customized validator for a given bean. @@ -49,7 +60,7 @@ */ public class XWorkBeanValidator { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ private static final Log log = LogFactory.getLog(XWorkBeanValidator.class); protected final static Map<String, List<String>> EMPTY_RESULT = Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,10 +27,10 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; +import org.apache.commons.lang.builder.HashCodeBuilder; import java.util.Collection; import java.util.Set; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Un validateur basé sur {@link FieldExpressionValidator} qui valide sur une @@ -53,47 +53,56 @@ /** detection de clef unique */ UNIQUE_KEY } + /** le mode de validation sur la liste */ protected Mode mode; + /** * pour indiquer la propriété qui contient la liste à valider. - * + * * Si cette prorpiété n'est pas renseignée alors on utilise la * {@link #getFieldName()} pour obtenir la collection. - * + * * Cela permet d'effectuer une validation si une collection mais portant * en fait sur un autre champs + * * @since 1.5 */ protected String collectionFieldName; + /** * drapeau pour utiliser le contexte de parcours pour valider * l'expression, on dispose donc alors des variables previous, current, * index, size et empty dans l'expression. - * + * * Sinon l'expression s'applique directement sur l'entrée courant dans le * parcours sans préfixe. */ protected boolean useSensitiveContext; + /** * expression a valider sur la premiètre entrée de la collection. - * + * * Note : Pour le moment, on autorise uniquement cela en mode ALL. */ protected String expressionForFirst; + /** * expression a valider sur la dernière entrée de la collection. - * + * * Note : Pour le moment, on autorise uniquement cela en mode ALL. */ protected String expressionForLast; + /** * la liste des propriétés d'une entrée de la collection qui définit la * clef unique (en mode UNIQUE_KEY). */ protected String[] keys; + /** le context de parcours */ protected WalkerContext c; + private boolean useFirst, useLast; public Mode getMode() { @@ -158,11 +167,11 @@ if (useFirst && mode != Mode.ALL) { throw new ValidationException("can only use expressionForFirst in " + - "mode ALL but was " + mode); + "mode ALL but was " + mode); } if (useLast && mode != Mode.ALL) { throw new ValidationException("can only use expressionForLast in " + - "mode ALL but was " + mode); + "mode ALL but was " + mode); } String fieldName = getFieldName(); @@ -214,6 +223,7 @@ stack.pop(); } } + protected ValueStack stack; @Override @@ -434,8 +444,11 @@ public WalkerContext(int size) { this.size = size; } + protected int index = -1; + protected Object current; + protected Object previous; public void addCurrent(Object current) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -69,7 +69,7 @@ public void validate(Object object) throws ValidationException { String fieldName = getFieldName(); Object value = getFieldValue(fieldName, object); - if (value==null) { + if (value == null) { // no value defined addFieldError(fieldName, object); return; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,11 +27,12 @@ import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; +import org.nuiton.util.converter.ConverterUtil; + import java.util.Map; import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.nuiton.util.converter.ConverterUtil; /** * Extends {@link FieldExpressionValidator} to add some extra parameters available @@ -43,23 +44,41 @@ public class FieldExpressionWithParamsValidator extends FieldExpressionValidator { protected static final Pattern EXTRA_BOOLEAN_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(false|true)"); + protected static final Pattern EXTRA_SHORT_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(\\d+)"); + protected static final Pattern EXTRA_INT_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(\\d+)"); + protected static final Pattern EXTRA_LONG_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(\\d+)"); + protected static final Pattern EXTRA_DOUBLE_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(\\d+\\.\\d+)"); + protected static final Pattern EXTRA_STRING_PARAM_ENTRY_PATTERN = Pattern.compile("(\\w+)\\:(.+)"); + protected ValueStack stack; + protected String booleanParams; + protected String shortParams; + protected String intParams; + protected String longParams; + protected String doubleParams; + protected String stringParams; + protected Map<String, Boolean> booleans; + protected Map<String, Short> shorts; + protected Map<String, Integer> ints; + protected Map<String, Long> longs; + protected Map<String, Double> doubles; + protected Map<String, String> strings; public String getBooleanParams() { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/NotExistingFileFieldValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/NotExistingFileFieldValidator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/field/NotExistingFileFieldValidator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -69,9 +69,9 @@ public void validate(Object object) throws ValidationException { String fieldName = getFieldName(); Object value = this.getFieldValue(fieldName, object); - if (value==null) { + if (value == null) { // no value defined - addFieldError(fieldName, object); + addFieldError(fieldName, object); return; } File f; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -125,7 +125,7 @@ */ public class SwingValidator extends BeanValidator { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private final Log log = LogFactory.getLog(SwingValidator.class); static private final Class<? extends AbstractBeanValidatorUI> @@ -205,7 +205,7 @@ public void setContextName(String contextName) { super.setContextName(contextName); - + // must reinstall ui installUIs(); } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -28,7 +28,7 @@ import jaxx.runtime.validator.BeanValidatorMessage; import jaxx.runtime.validator.BeanValidatorScope; -import javax.swing.*; +import javax.swing.JComponent; /** * The object to box a validation message within an u. Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListModel.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -31,7 +31,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.AbstractListModel; +import javax.swing.JComponent; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -48,7 +49,7 @@ private static final long serialVersionUID = 1L; - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ private static Log log = LogFactory.getLog(SwingValidatorMessageListModel.class); /** list of registred validators */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListMouseListener.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,7 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JList; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; @@ -42,7 +43,7 @@ */ public class SwingValidatorMessageListMouseListener extends MouseAdapter { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(SwingValidatorMessageListMouseListener.class); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageListRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -26,8 +26,11 @@ import jaxx.runtime.validator.BeanValidatorScope; -import javax.swing.*; -import java.awt.*; +import javax.swing.DefaultListCellRenderer; +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JList; +import java.awt.Component; import static org.nuiton.i18n.I18n._; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableModel.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JComponent; import javax.swing.table.AbstractTableModel; import java.util.ArrayList; import java.util.Arrays; @@ -52,7 +52,7 @@ private static final long serialVersionUID = 1L; - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ private static Log log = LogFactory.getLog(SwingValidatorMessageTableModel.class); @@ -114,7 +114,7 @@ public void removeMessages(JComponent editor, BeanValidatorScope scope) { - if (editor==null) { + if (editor == null) { // no editor, so nothing to do return; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableMouseListener.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,7 +27,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.JTable; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeListener; @@ -44,7 +46,7 @@ */ public class SwingValidatorMessageTableMouseListener extends MouseAdapter { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ private static Log log = LogFactory.getLog(SwingValidatorMessageTableMouseListener.class); Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessageTableRenderer.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,12 +24,14 @@ */ package jaxx.runtime.validator.swing; +import jaxx.runtime.validator.BeanValidatorScope; + import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; import java.awt.Component; -import jaxx.runtime.validator.BeanValidatorScope; + import static org.nuiton.i18n.I18n._; /** @@ -37,8 +39,8 @@ * a {@link SwingValidatorMessageTableModel} model. * * @author tchemit <chemit(a)codelutin.com> + * @see SwingValidatorMessageTableModel * @since 1.3 - * @see SwingValidatorMessageTableModel */ public class SwingValidatorMessageTableRenderer extends DefaultTableCellRenderer { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -57,7 +57,7 @@ static ImageIcon infoIcon; - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private final Log log = LogFactory.getLog(SwingValidatorUtil.class); public static ImageIcon getErrorIcon() { @@ -239,7 +239,7 @@ * reload fields of the ui. * * @param validator validator to listen - * @param ui ui to refresh when context name has changed + * @param ui ui to refresh when context name has changed * @since 2.2.1 */ public static void listenValidatorContextNameAndRefreshFields(SwingValidator<?> validator, final JAXXValidator ui) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/AbstractBeanValidatorUI.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.jxlayer.plaf.AbstractLayerUI; -import javax.swing.*; +import javax.swing.JComponent; /** * Abstract renderer @@ -40,7 +40,7 @@ */ public abstract class AbstractBeanValidatorUI extends AbstractLayerUI<JComponent> implements BeanValidatorListener { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ private static final Log log = LogFactory.getLog(AbstractBeanValidatorUI.class); /** the field to render */ Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/IconValidationUI.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -28,8 +28,11 @@ import jaxx.runtime.validator.BeanValidatorScope; import org.jdesktop.jxlayer.JXLayer; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.RenderingHints; import java.awt.image.BufferedImage; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/ImageValidationUI.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -29,8 +29,11 @@ import jaxx.runtime.validator.BeanValidatorScope; import org.jdesktop.jxlayer.JXLayer; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import java.awt.Graphics2D; +import java.awt.RenderingHints; import java.awt.image.BufferedImage; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/ui/TranslucentValidationUI.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -28,8 +28,12 @@ import jaxx.runtime.validator.BeanValidatorScope; import org.jdesktop.jxlayer.JXLayer; -import javax.swing.*; -import java.awt.*; +import javax.swing.JComponent; +import java.awt.AlphaComposite; +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Insets; +import java.awt.Rectangle; /** * An implementation of {@link AbstractBeanValidatorUI} which paints a Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultApplicationContextTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultApplicationContextTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultApplicationContextTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -29,14 +29,21 @@ import jaxx.runtime.context.DefaultApplicationContext.MethodAccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.*; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** @author tchemit <chemit(a)codelutin.com> */ public class DefaultApplicationContextTest { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/context/DefaultJAXXContextTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -29,9 +29,7 @@ import org.junit.Before; import org.junit.Test; -/** - * @author tchemit <chemit(a)codelutin.com> - */ +/** @author tchemit <chemit(a)codelutin.com> */ public class DefaultJAXXContextTest { DefaultJAXXContext ctxt; Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/Data.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -30,6 +30,7 @@ public class Data { int pos; + String name; protected static List<Data> generate(int nb) { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/decorator/JXPathDecoratorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -26,7 +26,6 @@ import jaxx.runtime.decorator.JXPathDecorator.Context; import org.junit.After; -import static org.junit.Assert.assertEquals; import org.junit.Test; import java.util.ArrayList; @@ -34,6 +33,8 @@ import java.util.Comparator; import java.util.List; +import static org.junit.Assert.assertEquals; + /** * @author tchemit <chemit(a)codelutin.com> * @since 1.7.2 (was previously {@code jaxx.runtime.JXPathDecoratorTest}). @@ -42,7 +43,9 @@ protected JXPathDecorator<?> decorator; + protected String expected; + protected String result; @After @@ -110,20 +113,21 @@ } @Test - public void testDecoratorEspcapeCharacters() throws Exception { + public void testDecoratorEspcapeCharacters() throws Exception { decorator = DecoratorUtils.newJXPathDecorator(JXPathDecorator.class, "(${expression}$s) - ${nbToken}$d"); assertEquals("(%1$s) - %2$d", decorator.getExpression()); String s = decorator.toString(decorator); - System.out.println("s="+s); + System.out.println("s=" + s); assertDecoratorInternal(); - + } + @Test public void testSort() throws Exception { List<Data> datas = Data.generate(10); - + JXPathDecorator<Data> d = DecoratorUtils.newJXPathDecorator(Data.class, "${pos}$d ${name}$s"); List<Data> sortData = new ArrayList<Data>(datas); Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/AbstractBeanValidatorDetectorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/AbstractBeanValidatorDetectorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/AbstractBeanValidatorDetectorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,6 +24,12 @@ */ package jaxx.runtime.validator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import java.io.File; import java.util.Arrays; import java.util.Collection; @@ -31,12 +37,7 @@ import java.util.SortedSet; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * An abstract test to detects validators for a given list of objets types and @@ -59,10 +60,15 @@ /** Logger */ private static final Log log = LogFactory.getLog(AbstractBeanValidatorDetectorTest.class); + protected static File basedir; + protected BeanValidatorDetector instance; + protected Class<?>[] classes; + protected Class<?> validatorClass; + protected File sourceRoot; protected AbstractBeanValidatorDetectorTest( @@ -109,9 +115,7 @@ instance = null; } - /** - * Test of detect method, of class BeanValidatorDetector. - */ + /** Test of detect method, of class BeanValidatorDetector. */ @Test public void testDetect() { SortedSet<BeanValidator<?>> result = detect(sourceRoot, classes, null); Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorDetectorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorDetectorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorDetectorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,21 +24,21 @@ */ package jaxx.runtime.validator; -import java.io.File; -import java.util.SortedSet; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; -/** - * - * @author tchemit <chemit(a)codelutin.com> - */ +import java.io.File; +import java.util.SortedSet; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +/** @author tchemit <chemit(a)codelutin.com> */ public class BeanValidatorDetectorTest extends AbstractBeanValidatorDetectorTest { @BeforeClass public static void setUpClass() throws Exception { - AbstractBeanValidatorDetectorTest.setUpClass(); + AbstractBeanValidatorDetectorTest.setUpClass(); } @@ -46,9 +46,7 @@ super(new File(basedir, "src" + File.separator + "test" + File.separator + "resources"), SimpleBean.class); } - /** - * Test of detect method, of class BeanValidatorDetector. - */ + /** Test of detect method, of class BeanValidatorDetector. */ @Test public void testDetectNothing() { @@ -64,9 +62,7 @@ assertNull(validator.getContextName()); } - /** - * Test of getValidator method, of class BeanValidatorDetector. - */ + /** Test of getValidator method, of class BeanValidatorDetector. */ @Test public void testGetValidator() { Class<?>[] types = {SimpleBean.class}; @@ -82,9 +78,7 @@ } - /** - * Test of getClassDir method, of class BeanValidatorDetector. - */ + /** Test of getClassDir method, of class BeanValidatorDetector. */ @Test public void testGetClassDir() { Class<?> clazz = classes[0]; @@ -94,22 +88,18 @@ assertEquals(expected, result); } - /** - * Test of getContexts method, of class BeanValidatorDetector. - */ + /** Test of getContexts method, of class BeanValidatorDetector. */ @Test public void testGetContexts() { - + String[] expResult = {"error", "info", "simple", "warning"}; Class<?> clazz = classes[0]; - File dir = instance.getClassDir(sourceRoot,clazz); + File dir = instance.getClassDir(sourceRoot, clazz); String[] result = instance.getContexts(clazz, dir); assertEquals(expResult.length, result.length); } - /** - * Test of getContextsWithoutScopes method, of class BeanValidatorDetector. - */ + /** Test of getContextsWithoutScopes method, of class BeanValidatorDetector. */ @Test public void testGetContextsWithoutScopes() { System.out.println("getContextsWithoutScopes"); Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,7 +24,6 @@ */ package jaxx.runtime.validator; -import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.After; @@ -32,18 +31,22 @@ import org.junit.Before; import org.junit.Test; -/** - * - * @author tchemit <chemit(a)codelutin.com> - */ +import java.util.List; + +/** @author tchemit <chemit(a)codelutin.com> */ public class BeanValidatorTest { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static protected final Log log = LogFactory.getLog(BeanValidator.class); + protected BeanValidator<SimpleBean> validator; + protected SimpleBean bean; + BeanValidatorListenerImpl errorListener; + BeanValidatorListenerImpl warningListener; + BeanValidatorListenerImpl infoListener; @Before @@ -63,9 +66,13 @@ validator = null; } } + private static final String STRING_VALUE_ERROR = "stringValue.error"; + private static final String STRING_VALUE_WARNING = "stringValue.warning"; + private static final String INT_VALUE_ERROR = "intValue.error"; + private static final String INT_VALUE_INFO = "intValue.info"; @Test @@ -192,6 +199,7 @@ public BeanValidatorListenerImpl(BeanValidatorScope scope) { this.scope = scope; } + java.util.List<String> messages = new java.util.ArrayList<String>(); public List<String> getMessages() { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/SimpleBean.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/SimpleBean.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/SimpleBean.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -30,7 +30,9 @@ public class SimpleBean { protected int intValue; + protected String stringValue; + final PropertyChangeSupport p; public SimpleBean() { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/XWorkBeanValidatorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/XWorkBeanValidatorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/XWorkBeanValidatorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,22 +24,24 @@ */ package jaxx.runtime.validator; -import java.util.List; -import java.util.Map; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import java.util.List; +import java.util.Map; + /** - * * @author tchemit <chemit(a)codelutin.com> * @since 1.3 */ public class XWorkBeanValidatorTest { protected XWorkBeanValidator<SimpleBean> validator; + protected SimpleBean bean; + protected Map<String, List<String>> messages; @Before Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -24,7 +24,6 @@ */ package jaxx.runtime.validator.field; -import java.io.File; import jaxx.runtime.validator.BeanValidator; import jaxx.runtime.validator.BeanValidatorField; import org.apache.commons.logging.Log; @@ -35,24 +34,31 @@ import org.junit.Before; import org.junit.BeforeClass; +import java.io.File; + /** * Abstract class to test a specific validator. * * To implements a test on a new validator, just extends this class * and implements the method {@link #testValidator()}. * + * @author tchemit <chemit(a)codelutin.com> * @param the type of bean to validate. - * - * @author tchemit <chemit(a)codelutin.com> */ public abstract class AbstractFieldValidatorTest extends Assert { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private final Log log = LogFactory.getLog(AbstractFieldValidatorTest.class); + /** Logger */ + static private final Log log = + LogFactory.getLog(AbstractFieldValidatorTest.class); + protected static BeanValidator<?> cacheValidator; + protected static File basedir; + protected final Class type; + protected BeanValidator validator; + protected B bean; public AbstractFieldValidatorTest(Class type) { @@ -61,7 +67,7 @@ /** * the method to test the given validator on the given bean. - * + * * When coming here a validator and bean were instanciated and the bean was * setted into validator via setBean method. * Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractValidatorBeanFieldValidatorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractValidatorBeanFieldValidatorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/AbstractValidatorBeanFieldValidatorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -26,7 +26,7 @@ /** * Abstract class to test a specific validator for the {@link ValidatorBean}. - * + * * @author tchemit <chemit(a)codelutin.com> * @since 1.3 */ Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -33,10 +33,15 @@ public class CollectionFieldExpressionValidatorTest extends AbstractValidatorBeanFieldValidatorTest { protected static final String PROPERTY = "entries"; + static protected ValidatorBeanEntry beanEntry0 = new ValidatorBeanEntry(0, "stringValue"); + static protected ValidatorBeanEntry beanEntry0Bis = new ValidatorBeanEntry(0, "fake"); + static protected ValidatorBeanEntry beanEntry1 = new ValidatorBeanEntry(1, "fake"); + static protected ValidatorBeanEntry beanEntry3 = new ValidatorBeanEntry(3, "fake"); + static protected ValidatorBeanEntry beanEntry5 = new ValidatorBeanEntry(5, "fake"); @Test Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -33,7 +33,9 @@ public class CollectionUniqueKeyValidatorTest extends AbstractValidatorBeanFieldValidatorTest { static protected ValidatorBeanEntry beanEntry = new ValidatorBeanEntry(0, "stringValue"); + static protected ValidatorBeanEntry beanEntry2 = new ValidatorBeanEntry(0, "fake"); + static protected ValidatorBeanEntry beanEntry3 = new ValidatorBeanEntry(0, "stringValue", "stringValue2"); @Test Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionBean.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionBean.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionBean.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -27,18 +27,21 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -/** - * - * @author tchemit <chemit(a)codelutin.com> - */ +/** @author tchemit <chemit(a)codelutin.com> */ public class FieldExpressionBean { protected final PropertyChangeSupport p; + protected boolean booleanValue; + protected short shortValue; + protected int intValue; + protected long longValue; + protected double doubleValue; + protected String stringValue; public FieldExpressionBean() { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidatorTest.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidatorTest.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/FieldExpressionWithParamsValidatorTest.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -30,6 +30,7 @@ public class FieldExpressionWithParamsValidatorTest extends AbstractFieldValidatorTest<FieldExpressionBean> { public static final String MESSAGE = "expression.too.big##100"; + public static final String MESSAGE2 = "expression.too.big##100##2000"; public FieldExpressionWithParamsValidatorTest() { Modified: trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java =================================================================== --- trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-runtime/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -34,7 +34,9 @@ public static class ValidatorBeanEntry { protected int intValue; + protected String stringValue; + protected String stringValue2; public ValidatorBeanEntry(int intValue, String stringValue) { @@ -72,13 +74,21 @@ this.stringValue2 = stringValue2; } } + protected File existingFile; + protected File notExistingFile; + protected File existingDirectory; + protected File notExistingDirectory; + protected Collection<ValidatorBeanEntry> entries; + protected String stringValue; + protected ValidatorBeanEntry entry; + PropertyChangeSupport p; public ValidatorBean() { Modified: trunk/jaxx-swing-action/src/main/java/org/nuiton/jaxx/tab/TabFactory.java =================================================================== --- trunk/jaxx-swing-action/src/main/java/org/nuiton/jaxx/tab/TabFactory.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-swing-action/src/main/java/org/nuiton/jaxx/tab/TabFactory.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -65,7 +65,7 @@ public abstract class TabFactory { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ protected static Log log = LogFactory.getLog(TabFactory.class); /** dictionary of configs */ Modified: trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/DemoConfig.java =================================================================== --- trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/DemoConfig.java 2010-09-11 12:46:36 UTC (rev 2085) +++ trunk/jaxx-tutorial-config/src/main/java/jaxx/demo/config/DemoConfig.java 2010-09-11 19:39:49 UTC (rev 2086) @@ -18,7 +18,7 @@ */ public class DemoConfig extends ApplicationConfig { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ static private Log log = LogFactory.getLog(DemoConfig.class); /**

1 0

r2085 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.nuiton.org 11 Sep '10

11 Sep '10

Author: tchemit Date: 2010-09-11 14:46:36 +0200 (Sat, 11 Sep 2010) New Revision: 2085 Url: http://nuiton.org/repositories/revision/jaxx/2085 Log: Anomalie #864: Validator fields are not refresh when validation changes his context name Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2010-09-11 12:24:18 UTC (rev 2084) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java 2010-09-11 12:46:36 UTC (rev 2085) @@ -24,14 +24,22 @@ */ package jaxx.runtime.validator.swing; +import jaxx.runtime.JAXXValidator; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.BeanValidatorScope; import jaxx.runtime.validator.BeanValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.ImageIcon; +import javax.swing.JComponent; +import javax.swing.JList; +import javax.swing.JTable; +import javax.swing.RowSorter; +import javax.swing.SortOrder; import java.awt.event.MouseListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Arrays; import static org.nuiton.i18n.I18n.n_; @@ -225,4 +233,27 @@ } return icon; } + + /** + * Method to listen the modification of the context name and at each time + * reload fields of the ui. + * + * @param validator validator to listen + * @param ui ui to refresh when context name has changed + * @since 2.2.1 + */ + public static void listenValidatorContextNameAndRefreshFields(SwingValidator<?> validator, final JAXXValidator ui) { + PropertyChangeListener listener = new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + SwingValidator<?> validator = (SwingValidator<?>) evt.getSource(); + log.info("Context name changed to [" + evt.getNewValue() + "] for validator " + validator.getBeanClass()); + ui.registerValidatorFields(); + } + }; + validator.addPropertyChangeListener( + SwingValidator.CONTEXT_NAME_PROPERTY, + listener + ); + } }

1 0

r2084 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org 11 Sep '10

11 Sep '10

Author: tchemit Date: 2010-09-11 14:24:18 +0200 (Sat, 11 Sep 2010) New Revision: 2084 Url: http://nuiton.org/repositories/revision/jaxx/2084 Log: change version to 2.2.1 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-compiler/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-demo/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-runtime/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-tutorial/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-tutorial-config/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-tutorial-css/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/jaxx-widgets/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/maven-jaxx-plugin/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-11 12:24:05 UTC (rev 2083) +++ trunk/pom.xml 2010-09-11 12:24:18 UTC (rev 2084) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.3-SNAPSHOT</version> + <version>2.2.1-SNAPSHOT</version> <modules> <module>jaxx-runtime</module>

1 0

r2083 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/finalizers jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-runtime/src/main/java/jaxx/runtime jaxx-runtime/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.nuiton.org 11 Sep '10

11 Sep '10

Author: tchemit Date: 2010-09-11 14:24:05 +0200 (Sat, 11 Sep 2010) New Revision: 2083 Url: http://nuiton.org/repositories/revision/jaxx/2083 Log: Anomalie #864: Validator fields are not refresh when validation changes his context name Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2010-09-09 09:33:37 UTC (rev 2082) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/finalizers/ValidatorFinalizer.java 2010-09-11 12:24:05 UTC (rev 2083) @@ -103,6 +103,8 @@ builder.append(validators.size()); builder.append(" validator(s)"); builder.append(eol); + builder.append("registerValidatorFields();"); + StringBuilder registerValidatorFieldsMethod = new StringBuilder(); for (CompiledBeanValidator validator : validators) { String id = TypeManager.getJavaCode(validator.getId()); builder.append("validatorIds.add("); @@ -117,10 +119,19 @@ builder.append(id); builder.append(").reloadBean();"); builder.append(eol); + // init fields + validator.addFieldRepresentations(compiler, registerValidatorFieldsMethod); } builder.append("validatorIds = java.util.Collections.unmodifiableList(validatorIds);"); builder.append(eol); compiler.appendLateInitializer(builder.toString()); + compiler.getJavaFile().addMethod(JavaFileGenerator.newMethod( + Modifier.PUBLIC, + "void", + "registerValidatorFields", + registerValidatorFieldsMethod.toString(), + true) + ); } @Override Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2010-09-09 09:33:37 UTC (rev 2082) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2010-09-11 12:24:05 UTC (rev 2083) @@ -35,6 +35,7 @@ import jaxx.compiler.reflect.ClassDescriptorHelper; import jaxx.compiler.tags.DefaultObjectHandler; import jaxx.compiler.types.TypeManager; +import jaxx.runtime.JAXXValidator; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorUtil; import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; @@ -755,7 +756,7 @@ if (getBeanDescriptor(compiler) != null) { // add fieldrepresentation invocations - addFieldRepresentations(tag, compiler); +// addFieldRepresentations(tag, compiler); // register the validator in compiler registerValidator(compiler, this); @@ -782,6 +783,13 @@ ids.addAll(compiledBeanValidator.getFields().values()); } + /** + * + * @param tag + * @param compiler + * @deprecated since 2.2.1, prefer use the methdo {@link #addFieldRepresentations(JAXXCompiler, StringBuilder)} + */ + @Deprecated protected void addFieldRepresentations(Element tag, JAXXCompiler compiler) { for (Entry<String, String> entry : fields.entrySet()) { @@ -801,6 +809,35 @@ } } + /** + * Register in buffer all field representation to init (and to record in method {@link JAXXValidator#registerValidatorFields()} + * + * @param compiler the compiler used + * @param buffer the buffer where to add code + * @since 2.2.1 + */ + public void addFieldRepresentations(JAXXCompiler compiler, StringBuilder buffer) { + for (Entry<String, String> entry : fields.entrySet()) { + String propertyName = entry.getKey(); + String component = entry.getValue(); + if (!checkBeanProperty(compiler, propertyName)) { + // property not find on bean + continue; + } +// if (!compiler.checkReference(tag, component, true, null)) { +// // editor component not find on ui +// continue; +// } + String keyCode = TypeManager.getJavaCode(propertyName); + buffer.append(getJavaCode()); + buffer.append(".setFieldRepresentation("); + buffer.append(keyCode); + buffer.append(", "); + buffer.append(component); + buffer.append(");\n"); + } + } + protected void registerAutoFieldBean(Element tag, JAXXCompiler compiler, JAXXBeanInfo beanInfo) { Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXValidator.java 2010-09-09 09:33:37 UTC (rev 2082) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXValidator.java 2010-09-11 12:24:05 UTC (rev 2083) @@ -25,9 +25,12 @@ package jaxx.runtime; -import java.util.List; import jaxx.runtime.validator.BeanValidator; +import jaxx.runtime.validator.swing.SwingValidator; +import javax.swing.JComponent; +import java.util.List; + /** * The contract of a validator-able object. * @@ -46,4 +49,17 @@ /** @return the list of ids of all registred validator */ List<String> getValidatorIds(); + /** + * Init the fields representation. + * + * This method is generated and should be called each time the context name + * of a validator has changed, since when using method + * {@link SwingValidator#setFieldRepresentation(String, JComponent)} + * is invoked at init, if a field is not watched for the selected context, + * then after when changing context name, the field will not be notified of any changed... + * + * @since 2.2.1 + */ + void registerValidatorFields(); + } \ No newline at end of file Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-09-09 09:33:37 UTC (rev 2082) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2010-09-11 12:24:05 UTC (rev 2083) @@ -135,7 +135,7 @@ * permet de faire le lien en un champs du bean et l'objet qui permet de * l'editer */ - protected Map<String, JComponent> fieldRepresentation; + protected final Map<String, JComponent> fieldRepresentation; /** Object servant a contenir la liste des erreurs */ protected SwingValidatorMessageListModel errorListModel; @@ -205,12 +205,9 @@ public void setContextName(String contextName) { super.setContextName(contextName); + // must reinstall ui - if (fieldRepresentation != null) { - - // can not install uis while field are not still init... - installUIs(); - } + installUIs(); } /** @@ -228,9 +225,9 @@ "' is not defined in validator (no rules on it)"); return; } - if (log.isDebugEnabled()) { - log.debug("register field [" + fieldname + "] with component : " + - c.getName() + if (log.isInfoEnabled()) { + log.info("register field [" + fieldname + "] with component : " + + c.getName() ); } fieldRepresentation.put(fieldname, c); @@ -254,11 +251,11 @@ /** install ui on required components */ public void installUIs() { - if (fieldRepresentation == null) { - throw new NullPointerException( - "fieldRepresentation is null, must init before " + - "invoking installUIs method..."); - } +// if (fieldRepresentation == null) { +// throw new NullPointerException( +// "fieldRepresentation is null, must init before " + +// "invoking installUIs method..."); +// } SwingUtilities.invokeLater(new Runnable() { @Override

1 0

r2082 - trunk
by tchemit＠users.nuiton.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:33:37 +0200 (Thu, 09 Sep 2010) New Revision: 2082 Url: http://nuiton.org/repositories/revision/jaxx/2082 Log: Use mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) +++ trunk/pom.xml 2010-09-09 09:33:37 UTC (rev 2082) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <artifactId>jaxx</artifactId>

1 0