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

r2053 - trunk/src/site/rst
by tchemit＠users.nuiton.org 30 Aug '10

30 Aug '10

Author: tchemit Date: 2010-08-30 10:02:27 +0200 (Mon, 30 Aug 2010) New Revision: 2053 Url: http://nuiton.org/repositories/revision/jaxx/2053 Log: add begin of specification of validator 2 Added: trunk/src/site/rst/spec-validator2.rst Added: trunk/src/site/rst/spec-validator2.rst =================================================================== --- trunk/src/site/rst/spec-validator2.rst (rev 0) +++ trunk/src/site/rst/spec-validator2.rst 2010-08-30 08:02:27 UTC (rev 2053) @@ -0,0 +1,55 @@ +========================================================================= +Amélioration de la gestion des validateurs dans les interfaces graphiques +========================================================================= + +Abstract +~~~~~~~~ + +Fonctionnement actuel +--------------------- + +Dans la version 2.2 de JAXX, tout se fait à la génération : chaque composant à +valider est encapsulé dans un layer pour pouvoir ensuite afficher l'état de +validation de la propriété du bean qu'il représente. + +Cela nous force à toujours avoir un couplage fort entre ce qui est à valider +et les composants d'édition, on ne peut pas avoir actuellement un composant +d'édition portant sur plusieurs propriétés d'un bean. + +De même, on ne peut pas avoir des validateurs qui descendent et se greffe sur +des composants complexes (car à la génération des composants on ne sait pas qui +va les valider). + +Nouveau fonctionnement +---------------------- + +L'idée c'est d'utiliser un seul layer par formulaire. Cela a de multiple +avantages : + +- utilisation de moins de resources : un layer au lieu de n. + +- ne plus altérer les composants d'édition (le fait d'ajouter un layer perturbre + l'affichage, et par exemple si on valider sur des boutons ils sont plus petits + que les autres et c'est moche). + +- ne plus rien figé à la génération + +- permettre d'utiliser des composants d'édition portant sur plus d'une propriété + +Mise en place +~~~~~~~~~~~~~ + +- definir un nouveau tag dans JAXX BeanValidatorForm (ou un decorator) qui + correspond au layer unique du formulaire à valider + +- ecrire le layer qui va dessiner ce qu'il faut à l'écran : + + - il doit connaitre les validateurs qui lui sont attachés et il faut ainsi + retrouver tous les composants d'édition (en descendant si besoin dans des + sous interfaces graphiques, plus de problème car non lié à la génération). + - il faut une méthode computeUI pour calculer la position des notifications + pour chaque composant. + + - il écoute le modèle des messages de validation pour modifier la vue. + - il écoute le composant container pour recalculer la disposition (changement + de taille, changement de disposition,...). Property changes on: trunk/src/site/rst/spec-validator2.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2052 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 17:28:35 +0200 (Sun, 29 Aug 2010) New Revision: 2052 Url: http://nuiton.org/repositories/revision/jaxx/2052 Log: Update nuiton-utils to 1.4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:56:03 UTC (rev 2051) +++ trunk/pom.xml 2010-08-29 15:28:35 UTC (rev 2052) @@ -398,7 +398,7 @@  <projectId>jaxx</projectId> - <lutinutil.version>1.3.1</lutinutil.version> + <lutinutil.version>1.4.1</lutinutil.version> <i18n.version>1.2.2</i18n.version>

1 0

r2051 - in trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav: tree treetable
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:56:03 +0200 (Sun, 29 Aug 2010) New Revision: 2051 Url: http://nuiton.org/repositories/revision/jaxx/2051 Log: add svn keywords Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/tree/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/nav/treetable/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author

1 0

r2050 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 16:19:52 +0200 (Sun, 29 Aug 2010) New Revision: 2050 Url: http://nuiton.org/repositories/revision/jaxx/2050 Log: Utilisation de mavenpom4redmine 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 08:54:57 UTC (rev 2049) +++ trunk/pom.xml 2010-08-29 14:19:52 UTC (rev 2050) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.2.4</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2049 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 10:54:57 +0200 (Sun, 29 Aug 2010) New Revision: 2049 Url: http://nuiton.org/repositories/revision/jaxx/2049 Log: use mavenpom 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 08:52:44 UTC (rev 2048) +++ trunk/pom.xml 2010-08-29 08:54:57 UTC (rev 2049) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2048 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 10:52:44 +0200 (Sun, 29 Aug 2010) New Revision: 2048 Url: http://nuiton.org/repositories/revision/jaxx/2048 Log: use mavenpom 2.2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 07:07:23 UTC (rev 2047) +++ trunk/pom.xml 2010-08-29 08:52:44 UTC (rev 2048) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.3</version> + <version>2.2.4</version> </parent> <artifactId>jaxx</artifactId>

1 0

r2047 - trunk
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 09:07:23 +0200 (Sun, 29 Aug 2010) New Revision: 2047 Url: http://nuiton.org/repositories/revision/jaxx/2047 Log: Evolution #828: Update swingx to 1.6.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) +++ trunk/pom.xml 2010-08-29 07:07:23 UTC (rev 2047) @@ -276,7 +276,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx</artifactId> - <version>1.6</version> + <version>1.6.1</version> <scope>compile</scope> </dependency>

1 0

r2046 - 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 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 09:01:37 +0200 (Sun, 29 Aug 2010) New Revision: 2046 Url: http://nuiton.org/repositories/revision/jaxx/2046 Log: pass in 2.2 version (deprecated api were removed 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-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-compiler/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-demo/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-runtime/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-tutorial/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-tutorial-config/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-tutorial-css/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/jaxx-widgets/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/maven-jaxx-plugin/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 07:00:07 UTC (rev 2045) +++ trunk/pom.xml 2010-08-29 07:01:37 UTC (rev 2046) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <modules> <module>jaxx-runtime</module>

1 0

r2045 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config: . model
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 09:00:07 +0200 (Sun, 29 Aug 2010) New Revision: 2045 Url: http://nuiton.org/repositories/revision/jaxx/2045 Log: Evolution #827: Add a closeAction in ConfigUI api + improve code Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java 2010-08-29 06:57:46 UTC (rev 2044) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHandler.java 2010-08-29 07:00:07 UTC (rev 2045) @@ -27,13 +27,29 @@ import jaxx.runtime.SwingUtil; import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.swing.editor.config.model.*; +import jaxx.runtime.swing.editor.config.model.CallBackEntry; +import jaxx.runtime.swing.editor.config.model.CallBackMap; +import jaxx.runtime.swing.editor.config.model.CategoryModel; +import jaxx.runtime.swing.editor.config.model.ConfigUIModel; +import jaxx.runtime.swing.editor.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.DefaultSingleSelectionModel; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRootPane; +import javax.swing.JTabbedPane; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; -import java.awt.*; +import java.awt.Frame; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -176,23 +192,16 @@ if (!model.isSaved() || model.isStandalone()) { // just quit, no callBack can be apply here - - ui.destroy(); - - // close the configu ui - parentWindow.dispose(); + closeUI(parentWindow, model); return; } CallBackMap forSaved = model.getCallBacksForSaved(); if (forSaved.isEmpty()) { + // just quit, no callBack to call - - ui.destroy(); - - // close the configu ui - parentWindow.dispose(); + closeUI(parentWindow, model); return; } @@ -207,7 +216,7 @@ add(CALLBACKS, new ArrayList<CallBackEntry>(forSaved.keySet())). add(new ConfigCallBackUIHandler()); - + ConfigCallBackUI lastUI = new ConfigCallBackUI(context); lastUI.init(); @@ -227,6 +236,20 @@ return quitAction; } + protected void closeUI(Window parentWindow, ConfigUIModel model) { + + ui.destroy(); + + // close the config ui + parentWindow.dispose(); + + Runnable runnable = model.getCloseAction(); + if (runnable != null) { + log.info("execute close action"); + runnable.run(); + } + } + protected boolean canQuitCategory() { boolean canContinue = true; ConfigUIModel model = ui.getModel(); Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java 2010-08-29 06:57:46 UTC (rev 2044) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigUIHelper.java 2010-08-29 07:00:07 UTC (rev 2045) @@ -27,14 +27,18 @@ import jaxx.runtime.JAXXContext; import jaxx.runtime.context.JAXXInitialContext; -import jaxx.runtime.swing.editor.config.model.*; +import jaxx.runtime.swing.editor.config.model.CallBackFinalizer; +import jaxx.runtime.swing.editor.config.model.CategoryModel; +import jaxx.runtime.swing.editor.config.model.ConfigUIModel; +import jaxx.runtime.swing.editor.config.model.ConfigUIModelBuilder; +import jaxx.runtime.swing.editor.config.model.OptionModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import javax.swing.*; +import javax.swing.Icon; import javax.swing.table.TableCellEditor; -import java.awt.*; +import java.awt.Frame; /** * A helper to build a config ui. @@ -122,6 +126,10 @@ modelBuilder.setFinalizer(finalizer); } + public void setCloseAction(Runnable runnable) { + modelBuilder.setCloseAction(runnable); + } + /** * Construire l'ui de configuration (sous forme de panel) * Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java 2010-08-29 06:57:46 UTC (rev 2044) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModel.java 2010-08-29 07:00:07 UTC (rev 2045) @@ -81,13 +81,20 @@ /** Callbacks manager */ protected CallBacksManager callBacksManager; - /** suport of modification */ - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + /** + * optional action to execute (if not null) if no call backs fits. + * @since 1.4.2 + */ + protected Runnable closeAction; + /** support of modification notifications */ + protected final PropertyChangeSupport pcs; + public ConfigUIModel(ApplicationConfig config) { this.config = config; categories = new LinkedHashMap<String, CategoryModel>(); callBacksManager = new CallBacksManager(); + pcs = new PropertyChangeSupport(this); } /** @@ -156,6 +163,14 @@ callBacksManager.setFinalizer(finalizer); } + public Runnable getCloseAction() { + return closeAction; + } + + public void setCloseAction(Runnable closeAction) { + this.closeAction=closeAction; + } + /** * Obtain the dictionnary of callback for all to saved modified options. * Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java 2010-08-29 06:57:46 UTC (rev 2044) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/model/ConfigUIModelBuilder.java 2010-08-29 07:00:07 UTC (rev 2045) @@ -28,7 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import javax.swing.*; +import javax.swing.Icon; import javax.swing.table.TableCellEditor; /** @@ -39,22 +39,16 @@ * @since 2.0.0 */ public class ConfigUIModelBuilder { - /** - * Logger - */ + /** Logger */ private static final Log log = LogFactory.getLog(ConfigUIModelBuilder.class); - /** - * current model used - */ + /** current model used */ ConfigUIModel model; - /** - * current category used - */ + + /** current category used */ CategoryModel category; - /** - * current option used - */ + + /** current option used */ OptionModel option; /** @@ -81,11 +75,11 @@ * the model. * * @param categoryName the name of the new category - * (can not to be {@code null}) + * (can not to be {@code null}) * @param categoryLabel the label of the new category - * (can not to be {@code null}) + * (can not to be {@code null}) * @throws IllegalStateException if there is not a current model, - * nor category + * nor category * @throws NullPointerException if any of parameter is {@code null} */ public void addCategory(String categoryName, String categoryLabel) @@ -288,6 +282,13 @@ } } + public void setCloseAction(Runnable runnable) { + checkNotNull(runnable, "setCloseAction", "runnable"); + checkCurrent(model, "model"); + model.setCloseAction(runnable); + + } + protected CategoryModel flushCategory() { CategoryModel result = category; if (category != null) { @@ -317,16 +318,16 @@ protected void checkNoCurrent(Object o, String type) { if (o != null) { - throw new IllegalStateException("there is already a current " + - type + "!"); + throw new IllegalStateException( + "there is already a current " + type + "!"); } } protected void checkNotNull(Object o, String method, String parameter) { if (o == null) { - throw new NullPointerException("method " + method + - " does not support null parameter " + parameter + "!"); + throw new NullPointerException( + "method " + method + " does not support null parameter " + + parameter + "!"); } } - }

1 0

r2044 - trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator
by tchemit＠users.nuiton.org 29 Aug '10

29 Aug '10

Author: tchemit Date: 2010-08-29 08:57:46 +0200 (Sun, 29 Aug 2010) New Revision: 2044 Url: http://nuiton.org/repositories/revision/jaxx/2044 Log: Anomalie #826: Validators does not translate error message for none trim message + reformat and clean api Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorMessage.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-08-29 06:54:32 UTC (rev 2043) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidator.java 2010-08-29 06:57:46 UTC (rev 2044) @@ -31,9 +31,21 @@ import org.nuiton.util.converter.ConverterUtil; import javax.swing.event.EventListenerList; -import java.beans.*; -import java.util.*; +import java.beans.EventSetDescriptor; +import java.beans.Introspector; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeMap; /** * A customized validator for a given bean. @@ -410,12 +422,12 @@ * programmation, ce qui est utile par exemple si le bean ne supporte pas * les {@link PropertyChangeListener} * - * TODO la methode devra repasser en protected et on utilise la methode - * {@link #doValidate()} car {@link #validate()} ne modifie pas les etats + * Note: la methode est protected et on utilise la methode + * {@link #doValidate()} car la méthode ne modifie pas les etats * internes et cela en rend son utilisation delicate (le validateur entre * dans un etat incoherent par rapport aux messages envoyés). */ - public void validate() { + protected void validate() { // on ne valide que si il y a un bean et que le resultat de la validation // pourra etre affiche quelque part @@ -441,7 +453,7 @@ errors.add(conversionError); } else { errors = Collections.singletonList(conversionError); - if (newMessages == XWorkBeanValidator.EMPTY_RESULT) { + if (XWorkBeanValidator.EMPTY_RESULT.equals(newMessages)) { newMessages = new HashMap<String, List<String>>(); } // add the concrete conversion error @@ -535,7 +547,7 @@ } } - protected synchronized void initFields() { + protected void initFields() { Set<String> detectedFieldNames = new HashSet<String>(); EnumMap<BeanValidatorScope, Set<String>> tmp; Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java 2010-08-29 06:54:32 UTC (rev 2043) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorEvent.java 2010-08-29 06:57:46 UTC (rev 2044) @@ -38,14 +38,14 @@ private static final long serialVersionUID = 1L; /** the field impacted by the validator */ - BeanValidatorField<?> field; + protected BeanValidatorField<?> field; /** the scope impacted by the event */ - BeanValidatorScope scope; + protected BeanValidatorScope scope; - String[] messagestoAdd; + protected String[] messagestoAdd; - String[] messagestoDelete; + protected String[] messagestoDelete; public BeanValidatorEvent(BeanValidator<?> source, BeanValidatorField<?> field, Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java 2010-08-29 06:54:32 UTC (rev 2043) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorField.java 2010-08-29 06:57:46 UTC (rev 2044) @@ -26,6 +26,7 @@ import com.opensymphony.xwork2.validator.FieldValidator; +import java.io.Serializable; import java.util.*; import static org.nuiton.i18n.I18n._; @@ -45,8 +46,10 @@ * validation. * @since 1.3 */ -public class BeanValidatorField { +public class BeanValidatorField implements Serializable{ + private static final long serialVersionUID = 1L; + /** the class of bean */ protected final Class beanClass; @@ -201,7 +204,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/BeanValidatorMessage.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorMessage.java 2010-08-29 06:54:32 UTC (rev 2043) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorMessage.java 2010-08-29 06:57:46 UTC (rev 2044) @@ -52,7 +52,7 @@ BeanValidatorScope scope) { this.field = field; this.validator = validator; - this.message = message; + this.message = message == null ? null : message.trim(); this.scope = scope; } Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java 2010-08-29 06:54:32 UTC (rev 2043) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/BeanValidatorUtil.java 2010-08-29 06:57:46 UTC (rev 2044) @@ -56,7 +56,7 @@ */ static private ValueStack sharedValueStack; - public static synchronized ValueStack getSharedValueStack() { + public static ValueStack getSharedValueStack() { if (sharedValueStack == null) { // init context Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java 2010-08-29 06:54:32 UTC (rev 2043) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/validator/XWorkBeanValidator.java 2010-08-29 06:57:46 UTC (rev 2044) @@ -232,6 +232,7 @@ validationContext.getFieldErrors()); } + // retreave errors by field if (validationContext.hasFieldErrors()) { Map<?, ?> messages = validationContext.getFieldErrors(); result = new HashMap<String, List<String>>(messages.size()); @@ -240,7 +241,10 @@ (Collection<?>) messages.get(fieldName); List<String> mm = new ArrayList<String>(c.size()); for (Object message : c) { - mm.add(message + ""); + // tchemit 2010-08-28 : trim the incoming message + // (I18n will not translate it otherwise) + String messageStr = message == null ? "" : message + ""; + mm.add(messageStr.trim()); } result.put(fieldName + "", mm); } @@ -266,7 +270,7 @@ } /** update the property {@link #fieldNames}, says search in XWorks */ - protected synchronized void initFields() { + protected void initFields() { if (fieldNames != null) { fieldNames = null;

1 0