- Buix-commits - mailman.cloud.codelutin.com

r1215 - in jaxx/trunk: . maven-jaxx-plugin
by tchemit＠users.labs.libre-entreprise.org Feb. 9, 2009

Feb. 9, 2009

Author: tchemit Date: 2009-02-09 02:16:56 +0000 (Mon, 09 Feb 2009) New Revision: 1215 Modified: jaxx/trunk/maven-jaxx-plugin/pom.xml jaxx/trunk/pom.xml Log: use absolute path for dependencies in system scope (NetBeans does not like it otherwise...) Modified: jaxx/trunk/maven-jaxx-plugin/pom.xml =================================================================== --- jaxx/trunk/maven-jaxx-plugin/pom.xml 2009-02-06 10:04:49 UTC (rev 1214) +++ jaxx/trunk/maven-jaxx-plugin/pom.xml 2009-02-09 02:16:56 UTC (rev 1215) @@ -67,6 +67,9 @@ <dependency> <groupId>com.sun</groupId> <artifactId>dt</artifactId> + <version>${java.version}</version> + <scope>system</scope> + <systemPath>/${java.home}/../lib/dt.jar</systemPath> </dependency>  Modified: jaxx/trunk/pom.xml =================================================================== --- jaxx/trunk/pom.xml 2009-02-06 10:04:49 UTC (rev 1214) +++ jaxx/trunk/pom.xml 2009-02-09 02:16:56 UTC (rev 1215) @@ -80,7 +80,7 @@ <artifactId>dt</artifactId> <version>${java.version}</version> <scope>system</scope> - <systemPath>${java.home}/../lib/dt.jar</systemPath> + <systemPath>/${java.home}/../lib/dt.jar</systemPath> </dependency> <dependency>

1 0

r1214 - /
by tchemit＠users.labs.libre-entreprise.org Feb. 6, 2009

Feb. 6, 2009

Author: tchemit Date: 2009-02-06 10:04:49 +0000 (Fri, 06 Feb 2009) New Revision: 1214 Added: lutinjaxx_trash/ Removed: lutinjaxx/ Log: un peu de menage Copied: lutinjaxx_trash (from rev 1213, lutinjaxx)

1 0

r1213 - jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 23:12:26 +0000 (Wed, 04 Feb 2009) New Revision: 1213 Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Utils.java Log: no! selectedItem can be null :) revert previous commit Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Utils.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Utils.java 2009-02-04 22:46:50 UTC (rev 1212) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Utils.java 2009-02-04 23:12:26 UTC (rev 1213) @@ -123,9 +123,7 @@ } // attach the model model.addListDataListener(combo); - if (select != null){ - model.setSelectedItem(select); - } + model.setSelectedItem(select); }

1 0

r1212 - jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 22:46:50 +0000 (Wed, 04 Feb 2009) New Revision: 1212 Modified: jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java Log: when changing contextname, must after all reinject none ui listeners Modified: jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2009-02-04 22:45:36 UTC (rev 1211) +++ jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java 2009-02-04 22:46:50 UTC (rev 1212) @@ -1,6 +1,7 @@ package jaxx.runtime.validator.swing; import jaxx.runtime.validator.BeanValidator; +import jaxx.runtime.validator.ValidatorErrorListener; import jaxx.runtime.validator.ValidatorField; import jaxx.runtime.validator.swing.ui.AbstractBeanValidatorUI; import jaxx.runtime.validator.swing.ui.IconValidationUI; @@ -13,7 +14,9 @@ import java.awt.Container; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -151,9 +154,32 @@ @Override public void setContextName(String contextName) { + Map<ValidatorField, List<ValidatorErrorListener>> oldListeners = new HashMap<ValidatorField, List<ValidatorErrorListener>>(); + + + for (ValidatorField field : fields) { + ValidatorErrorListener[] listeners = field.getValidatorErrorListeners(); + List<ValidatorErrorListener> toReinject = new ArrayList<ValidatorErrorListener>(); + for (ValidatorErrorListener listener : listeners) { + if (listener instanceof AbstractBeanValidatorUI) { + // this listener will be reinject via installUIs method + continue; + } + toReinject.add(listener); + } + oldListeners.put(field, toReinject); + } super.setContextName(contextName); // must reinstall ui installUIs(); + // reinject none ui listeners + for (Entry<ValidatorField, List<ValidatorErrorListener>> entry : oldListeners.entrySet()) { + ValidatorField field = getField(entry.getKey().getName()); + for (ValidatorErrorListener listener : entry.getValue()) { + field.addValidatorErrorListener(listener); + } + } + oldListeners.clear(); } /**

1 0

r1211 - jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 22:45:36 +0000 (Wed, 04 Feb 2009) New Revision: 1211 Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/ValidatorField.java Log: can obtain the list of listeners on a field Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/ValidatorField.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/ValidatorField.java 2009-02-04 20:52:25 UTC (rev 1210) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/ValidatorField.java 2009-02-04 22:45:36 UTC (rev 1211) @@ -134,6 +134,10 @@ listenerList.remove(ValidatorErrorListener.class, listener); } + public ValidatorErrorListener[] getValidatorErrorListeners() { + return listenerList.getListeners(ValidatorErrorListener.class); + } + protected void fireNewError(BeanValidator validator) { ValidatorErrorEvent evt = new ValidatorErrorEvent(validator, this); for (ValidatorErrorListener listener : listenerList.getListeners(ValidatorErrorListener.class)) {

1 0

r1210 - jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 20:52:25 +0000 (Wed, 04 Feb 2009) New Revision: 1210 Modified: jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidatorErrorModel.java Log: ajout d'un test au cas ou l'erreur n'a pas d'editeur (mais c'est pas normal...) Modified: jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidatorErrorModel.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidatorErrorModel.java 2009-02-04 20:51:53 UTC (rev 1209) +++ jaxx/trunk/jaxx-runtime-validator-swing/src/main/java/jaxx/runtime/validator/swing/SwingValidatorErrorModel.java 2009-02-04 20:52:25 UTC (rev 1210) @@ -50,6 +50,9 @@ @Override public String toString() { + if (editor == null) { + return field.getI18nError(error); + } return editor.getName() + " : " + field.getI18nError(error); } }

1 0

r1209 - jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 20:51:53 +0000 (Wed, 04 Feb 2009) New Revision: 1209 Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java Log: ajout d'une methode containsField pour tester si le validateur valide une propriete donnee Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java 2009-02-04 20:20:03 UTC (rev 1208) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java 2009-02-04 20:51:53 UTC (rev 1209) @@ -272,6 +272,17 @@ return false; } + /** + * Test a the validator contains the field given his name + * + * @param fieldName the name of the searched field + * @return <code>true</code> if validator contaisn this field, <code>false</code> otherwise + */ + public boolean containsField(String fieldName) { + ValidatorField field = getField(fieldName); + return field != null; + } + public boolean isValid(String fieldName) { ValidatorField field = getField(fieldName); if (field == null) {

1 0

r1208 - in jaxx/trunk: jaxx-runtime-validator/src/main/resources jaxx-runtime-validator-swing/src/main/resources jaxx-runtime-validator-swing/src/main/resources/icons
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 20:20:03 +0000 (Wed, 04 Feb 2009) New Revision: 1208 Added: jaxx/trunk/jaxx-runtime-validator-swing/src/main/resources/icons/ jaxx/trunk/jaxx-runtime-validator-swing/src/main/resources/icons/error.png jaxx/trunk/jaxx-runtime-validator-swing/src/main/resources/icons/warning.png Removed: jaxx/trunk/jaxx-runtime-validator/src/main/resources/icons/ Log: move icons to swing validator module Copied: jaxx/trunk/jaxx-runtime-validator-swing/src/main/resources/icons/error.png (from rev 1195, jaxx/trunk/jaxx-runtime-validator/src/main/resources/icons/error.png) =================================================================== (Binary files differ) Property changes on: jaxx/trunk/jaxx-runtime-validator-swing/src/main/resources/icons/error.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: jaxx/trunk/jaxx-runtime-validator-swing/src/main/resources/icons/warning.png (from rev 1195, jaxx/trunk/jaxx-runtime-validator/src/main/resources/icons/warning.png) =================================================================== (Binary files differ) Property changes on: jaxx/trunk/jaxx-runtime-validator-swing/src/main/resources/icons/warning.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r1207 - in jaxx/trunk/jaxx-runtime-validator/src/test: java/jaxx/runtime/validator java/jaxx/runtime/validator/field resources resources/jaxx/runtime/validator
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 20:17:03 +0000 (Wed, 04 Feb 2009) New Revision: 1207 Added: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/AbstractValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/ValidatorBean-validation.xml jaxx/trunk/jaxx-runtime-validator/src/test/resources/validators.xml Removed: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingFileFieldValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingDirectoryFieldValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingFileFieldValidatorTest.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/RequiredFileFieldValidatorTest.java Log: refactor tests and should do more tests on BeanValidator... Added: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/AbstractValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/AbstractValidatorTest.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/AbstractValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -0,0 +1,49 @@ +package jaxx.runtime.validator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.BeforeClass; + +import java.io.File; + +/** + * Abstract class of this module. + * + * @author chemit + */ +public abstract class AbstractValidatorTest extends Assert { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(AbstractValidatorTest.class); + + static protected BeanValidator<ValidatorBean> validator; + + static protected File basedir; + + protected ValidatorBean bean; + + @BeforeClass + public static void initValidator() throws Exception { + + String b = System.getenv("basedir"); + if (b == null) { + b = new File("").getAbsolutePath(); + } + basedir = new File(b); + validator = new BeanValidator<ValidatorBean>(ValidatorBean.class, null); + } + + protected void assertFieldInError(String fieldName, String error, boolean required) { + ValidatorField<ValidatorBean> field = validator.getField(fieldName); + + for (String o : field.getErrors()) { + if (o.equals(error)) { + assertTrue(required); + return; + } + } + // error was not found + assertFalse(required); + } +} \ No newline at end of file Added: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/BeanValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -0,0 +1,33 @@ +package jaxx.runtime.validator; + +import org.junit.Test; + +/** + * Une classe pour tester {@link BeanValidator} + * + * @author chemit + */ +public class BeanValidatorTest extends AbstractValidatorTest { + + //TODO do other tests :) + + @Test + public void testSetBean() { + bean = new ValidatorBean(); + + assertNull(bean.getStringValue()); + + // no bean on validator + assertNull(validator.getBean()); + assertTrue(validator.isValid()); + + // add bean to validator + validator.setBean(bean); + assertFieldInError("stringValue", "stringValue.required", true); + + validator.setBean(null); + // validator is valid, no more errors should be in validator + assertTrue(validator.isValid()); + } + +} Copied: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java (from rev 1198, jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java) =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -0,0 +1,145 @@ +package jaxx.runtime.validator; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.File; +import java.util.Collection; + +public class ValidatorBean { + + public static class ValidatorBeanEntry { + + protected int intValue; + protected String stringValue; + protected String stringValue2; + + public ValidatorBeanEntry(int intValue, String stringValue) { + this.intValue = intValue; + this.stringValue = stringValue; + } + + public ValidatorBeanEntry(int intValue, String stringValue, String stringValue2) { + this.intValue = intValue; + this.stringValue = stringValue; + this.stringValue2 = stringValue2; + } + + public int getIntValue() { + return intValue; + } + + public void setIntValue(int intValue) { + this.intValue = intValue; + } + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(String stringValue) { + this.stringValue = stringValue; + } + + public String getStringValue2() { + return stringValue2; + } + + public void setStringValue2(String stringValue2) { + this.stringValue2 = stringValue2; + } + } + + protected File existingFile; + protected File notExistingFile; + + protected File existingDirectory; + protected File notExistingDirectory; + + protected Collection<ValidatorBeanEntry> entries; + + protected String stringValue; + + PropertyChangeSupport p; + + public ValidatorBean() { + p = new PropertyChangeSupport(this); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + p.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + p.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.removePropertyChangeListener(propertyName, listener); + } + + public String getStringValue() { + return stringValue; + } + + public File getExistingFile() { + return existingFile; + } + + public File getNotExistingFile() { + return notExistingFile; + } + + public File getExistingDirectory() { + return existingDirectory; + } + + public File getNotExistingDirectory() { + return notExistingDirectory; + } + + public Collection<ValidatorBeanEntry> getEntries() { + return entries; + } + + public void setStringValue(String stringValue) { + String old = this.stringValue; + this.stringValue = stringValue; + p.firePropertyChange("stringValue", old, existingFile); + } + + public void setExistingFile(File existingFile) { + File old = this.existingFile; + this.existingFile = existingFile; + p.firePropertyChange("existingFile", old, existingFile); + } + + public void setNotExistingFile(File notExistingFile) { + File old = this.notExistingFile; + this.notExistingFile = notExistingFile; + p.firePropertyChange("notExistingFile", old, notExistingFile); + } + + public void setExistingDirectory(File existingDirectory) { + File old = this.existingDirectory; + this.existingDirectory = existingDirectory; + p.firePropertyChange("existingDirectory", old, existingDirectory); + } + + public void setNotExistingDirectory(File notExistingDirectory) { + File old = this.notExistingDirectory; + this.notExistingDirectory = notExistingDirectory; + p.firePropertyChange("notExistingDirectory", old, notExistingDirectory); + } + + public void setEntries(Collection<ValidatorBeanEntry> entries) { + this.entries = entries; + // set null oldValue to always fire event + // otherwise it could been not sent... + p.firePropertyChange("entries", null, entries); + } + +} \ No newline at end of file Property changes on: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ValidatorBean.java ___________________________________________________________________ Name: svn:mergeinfo + Copied: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java (from rev 1198, jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractValidatorTest.java) =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractFieldValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -0,0 +1,41 @@ +package jaxx.runtime.validator.field; + +import jaxx.runtime.validator.AbstractValidatorTest; +import jaxx.runtime.validator.ValidatorBean; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.After; +import org.junit.Before; + +/** + * 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 chemit + */ +public abstract class AbstractFieldValidatorTest extends AbstractValidatorTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private final Log log = LogFactory.getLog(AbstractFieldValidatorTest.class); + + /** + * the moethod to implements testing the given validator on the given bean. + * + * @throws Exception if any error ? + */ + public abstract void testValidator() throws Exception; + + @Before + public void setUp() throws Exception { + log.info("start test " + getClass().getSimpleName()); + validator.setBean(bean = new ValidatorBean()); + } + + @After + public void tearDown() { + validator.setBean(null); + } + +} \ No newline at end of file Deleted: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -1,74 +0,0 @@ -package jaxx.runtime.validator.field; - -import jaxx.runtime.validator.BeanValidator; -import jaxx.runtime.validator.ValidatorField; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.After; -import org.junit.Assert; -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 chemit - */ -public abstract class AbstractValidatorTest extends Assert { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private final Log log = LogFactory.getLog(AbstractValidatorTest.class); - - static protected BeanValidator<ValidatorBean> validator; - - static protected File basedir; - - protected ValidatorBean bean; - - /** - * the moethod to implements testing the given validator on the given bean. - * - * @throws Exception if any error ? - */ - public abstract void testValidator() throws Exception; - - @BeforeClass - public static void initValidator() throws Exception { - - String b = System.getenv("basedir"); - if (b == null) { - b = new File("").getAbsolutePath(); - } - basedir = new File(b); - validator = new BeanValidator<ValidatorBean>(ValidatorBean.class, null); - } - - @Before - public void setUp() throws Exception { - log.info("start test " + getClass().getSimpleName()); - validator.setBean(bean = new ValidatorBean()); - } - - @After - public void tearDown() { - validator.setBean(null); - } - - protected void assertFieldInError(String fieldName, String error, boolean required) { - ValidatorField<ValidatorBean> field = validator.getField(fieldName); - - for (String o : field.getErrors()) { - if (o.equals(error)) { - assertTrue(required); - return; - } - } - // error was not found - assertFalse(required); - } -} \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -1,11 +1,11 @@ package jaxx.runtime.validator.field; -import jaxx.runtime.validator.field.ValidatorBean.ValidatorBeanEntry; +import jaxx.runtime.validator.ValidatorBean.ValidatorBeanEntry; import java.util.Arrays; /** @author chemit */ -public class CollectionFieldExpressionValidatorTest extends AbstractValidatorTest { +public class CollectionFieldExpressionValidatorTest extends AbstractFieldValidatorTest { static protected ValidatorBeanEntry beanEntry = new ValidatorBeanEntry(0, "stringValue"); static protected ValidatorBeanEntry beanEntry2 = new ValidatorBeanEntry(0, "fake"); Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -1,11 +1,11 @@ package jaxx.runtime.validator.field; -import jaxx.runtime.validator.field.ValidatorBean.ValidatorBeanEntry; +import jaxx.runtime.validator.ValidatorBean.ValidatorBeanEntry; import java.util.Arrays; /** @author chemit */ -public class CollectionUniqueKeyValidatorTest extends AbstractValidatorTest { +public class CollectionUniqueKeyValidatorTest extends AbstractFieldValidatorTest { static protected ValidatorBeanEntry beanEntry = new ValidatorBeanEntry(0, "stringValue"); static protected ValidatorBeanEntry beanEntry2 = new ValidatorBeanEntry(0, "fake"); Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -3,7 +3,7 @@ import java.io.File; /** @author chemit */ -public class ExistingDirectoryFieldValidatorTest extends AbstractValidatorTest { +public class ExistingDirectoryFieldValidatorTest extends AbstractFieldValidatorTest { @org.junit.Test @Override Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingFileFieldValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingFileFieldValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingFileFieldValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -3,7 +3,7 @@ import java.io.File; /** @author chemit */ -public class ExistingFileFieldValidatorTest extends AbstractValidatorTest { +public class ExistingFileFieldValidatorTest extends AbstractFieldValidatorTest { @org.junit.Test @Override Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingDirectoryFieldValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingDirectoryFieldValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingDirectoryFieldValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -3,7 +3,7 @@ import java.io.File; /** @author chemit */ -public class NotExistingDirectoryFieldValidatorTest extends AbstractValidatorTest { +public class NotExistingDirectoryFieldValidatorTest extends AbstractFieldValidatorTest { @org.junit.Test @Override Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingFileFieldValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingFileFieldValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingFileFieldValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -3,7 +3,7 @@ import java.io.File; /** @author chemit */ -public class NotExistingFileFieldValidatorTest extends AbstractValidatorTest { +public class NotExistingFileFieldValidatorTest extends AbstractFieldValidatorTest { @org.junit.Test Modified: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/RequiredFileFieldValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/RequiredFileFieldValidatorTest.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/RequiredFileFieldValidatorTest.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -3,7 +3,7 @@ import java.io.File; /** @author chemit */ -public class RequiredFileFieldValidatorTest extends AbstractValidatorTest { +public class RequiredFileFieldValidatorTest extends AbstractFieldValidatorTest { @org.junit.Test @Override Deleted: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2009-02-04 20:16:34 UTC (rev 1206) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2009-02-04 20:17:03 UTC (rev 1207) @@ -1,134 +0,0 @@ -package jaxx.runtime.validator.field; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.File; -import java.util.Collection; - -public class ValidatorBean { - - public static class ValidatorBeanEntry { - - protected int intValue; - protected String stringValue; - protected String stringValue2; - - public ValidatorBeanEntry(int intValue, String stringValue) { - this.intValue = intValue; - this.stringValue = stringValue; - } - - public ValidatorBeanEntry(int intValue, String stringValue, String stringValue2) { - this.intValue = intValue; - this.stringValue = stringValue; - this.stringValue2 = stringValue2; - } - - public int getIntValue() { - return intValue; - } - - public void setIntValue(int intValue) { - this.intValue = intValue; - } - - public String getStringValue() { - return stringValue; - } - - public void setStringValue(String stringValue) { - this.stringValue = stringValue; - } - - public String getStringValue2() { - return stringValue2; - } - - public void setStringValue2(String stringValue2) { - this.stringValue2 = stringValue2; - } - } - - protected File existingFile; - protected File notExistingFile; - - protected File existingDirectory; - protected File notExistingDirectory; - - protected Collection<ValidatorBeanEntry> entries; - - PropertyChangeSupport p; - - public ValidatorBean() { - p = new PropertyChangeSupport(this); - } - - public void addPropertyChangeListener(PropertyChangeListener listener) { - p.addPropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - p.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - p.removePropertyChangeListener(propertyName, listener); - } - - - public File getExistingFile() { - return existingFile; - } - - public File getNotExistingFile() { - return notExistingFile; - } - - public File getExistingDirectory() { - return existingDirectory; - } - - public File getNotExistingDirectory() { - return notExistingDirectory; - } - - public Collection<ValidatorBeanEntry> getEntries() { - return entries; - } - - public void setExistingFile(File existingFile) { - File old = this.existingFile; - this.existingFile = existingFile; - p.firePropertyChange("existingFile", old, existingFile); - } - - public void setNotExistingFile(File notExistingFile) { - File old = this.notExistingFile; - this.notExistingFile = notExistingFile; - p.firePropertyChange("notExistingFile", old, notExistingFile); - } - - public void setExistingDirectory(File existingDirectory) { - File old = this.existingDirectory; - this.existingDirectory = existingDirectory; - p.firePropertyChange("existingDirectory", old, existingDirectory); - } - - public void setNotExistingDirectory(File notExistingDirectory) { - File old = this.notExistingDirectory; - this.notExistingDirectory = notExistingDirectory; - p.firePropertyChange("notExistingDirectory", old, notExistingDirectory); - } - - public void setEntries(Collection<ValidatorBeanEntry> entries) { - this.entries = entries; - // set null oldValue to always fire event - // otherwise it could been not sent... - p.firePropertyChange("entries", null, entries); - } - -} \ No newline at end of file Copied: jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/ValidatorBean-validation.xml (from rev 1198, jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml) =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/ValidatorBean-validation.xml (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/ValidatorBean-validation.xml 2009-02-04 20:17:03 UTC (rev 1207) @@ -0,0 +1,90 @@ +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="stringValue"> + <field-validator type="requiredstring" short-circuit="true"> + <message>stringValue.required</message> + </field-validator> + </field> + + <field name="existingFile"> + <field-validator type="requiredFile" short-circuit="true" validatorScope="ERROR"> + <message>existingFile.required</message> + </field-validator> + <field-validator type="existingFile" short-circuit="true"> + <message>existingFile.not.exist</message> + </field-validator> + </field> + + <field name="notExistingFile"> + <field-validator type="requiredFile" short-circuit="true"> + <message>notExistingFile.required</message> + </field-validator> + <field-validator type="notExistingFile" short-circuit="true"> + <message>notExistingFile.exist</message> + </field-validator> + </field> + + <field name="existingDirectory"> + <field-validator type="requiredFile" short-circuit="true"> + <message>existingDirectory.required</message> + </field-validator> + + <field-validator type="existingDirectory" short-circuit="true"> + <message>existingDirectory.not.exist</message> + </field-validator> + </field> + + <field name="notExistingDirectory"> + <field-validator type="requiredFile" short-circuit="true"> + <message>notExistingDirectory.required</message> + </field-validator> + + <field-validator type="notExistingDirectory" short-circuit="true"> + <message>notExistingDirectory.exist</message> + </field-validator> + </field> + + <field name="entries"> + <field-validator type="collectionFieldExpression"> + <param name="mode">AT_LEAST_ONE</param> + <param name="expression"><![CDATA[ intValue == 0 && stringValue == "stringValue" ]]></param> + <message>collectionFieldExpression.atLeastOne</message> + </field-validator> + <field-validator type="collectionFieldExpression"> + <param name="mode">EXACTLY_ONE</param> + <param name="expression"><![CDATA[ intValue == 0 && stringValue == "stringValue" ]]></param> + <message>collectionFieldExpression.exactlyOne</message> + </field-validator> + <field-validator type="collectionFieldExpression"> + <param name="mode">ALL</param> + <param name="expression"><![CDATA[ intValue == 0 && stringValue == "stringValue" ]]></param> + <message>collectionFieldExpression.all</message> + </field-validator> + <field-validator type="collectionFieldExpression"> + <param name="mode">NONE</param> + <param name="expression"><![CDATA[ intValue == 0 && stringValue == "stringValue" ]]></param> + <message>collectionFieldExpression.none</message> + </field-validator> + + <field-validator type="collectionUniqueKey"> + <param name="keys">intValue</param> + <message>collectionUniqueKey.one.failed</message> + </field-validator> + <field-validator type="collectionUniqueKey"> + <param name="keys">stringValue</param> + <message>collectionUniqueKey.two.failed</message> + </field-validator> + <field-validator type="collectionUniqueKey"> + <param name="keys">intValue,stringValue</param> + <message>collectionUniqueKey.three.failed</message> + </field-validator> + <field-validator type="collectionUniqueKey"> + <param name="keys">intValue,stringValue,stringValue2</param> + <message>collectionUniqueKey.four.failed</message> + </field-validator> + </field> + +</validators> \ No newline at end of file Property changes on: jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/ValidatorBean-validation.xml ___________________________________________________________________ Name: svn:mergeinfo + Added: jaxx/trunk/jaxx-runtime-validator/src/test/resources/validators.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/validators.xml (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/validators.xml 2009-02-04 20:17:03 UTC (rev 1207) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator Config 1.0//EN" + "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"> +<validators> +  + <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/> + <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/> + <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/> + <validator name="long" class="com.opensymphony.xwork2.validator.validators.LongRangeFieldValidator"/> + <validator name="short" class="com.opensymphony.xwork2.validator.validators.ShortRangeFieldValidator"/> + <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/> + <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/> + <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/> + <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/> + <validator name="email" class="com.opensymphony.xwork2.validator.validators.EmailValidator"/> + <validator name="url" class="com.opensymphony.xwork2.validator.validators.URLValidator"/> + <validator name="visitor" class="com.opensymphony.xwork2.validator.validators.VisitorFieldValidator"/> + <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/> + <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> + <validator name="regex" class="com.opensymphony.xwork2.validator.validators.RegexFieldValidator"/> + <validator name="conditionalvisitor" + class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/> + +  + <validator name="collectionFieldExpression" + class="jaxx.runtime.validator.field.CollectionFieldExpressionValidator"/> + <validator name="collectionUniqueKey" class="jaxx.runtime.validator.field.CollectionUniqueKeyValidator"/> + <validator name="requiredFile" class="jaxx.runtime.validator.field.RequiredFileFieldValidator"/> + <validator name="existingFile" class="jaxx.runtime.validator.field.ExistingFileFieldValidator"/> + <validator name="notExistingFile" class="jaxx.runtime.validator.field.NotExistingFileFieldValidator"/> + <validator name="existingDirectory" class="jaxx.runtime.validator.field.ExistingDirectoryFieldValidator"/> + <validator name="notExistingDirectory" class="jaxx.runtime.validator.field.NotExistingDirectoryFieldValidator"/> + +</validators> \ No newline at end of file

1 0

r1206 - jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator
by tchemit＠users.labs.libre-entreprise.org Feb. 4, 2009

Feb. 4, 2009

Author: tchemit Date: 2009-02-04 20:16:34 +0000 (Wed, 04 Feb 2009) New Revision: 1206 Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java Log: when remove bean from validator when transfert errors to fields Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java 2009-02-04 20:16:04 UTC (rev 1205) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/BeanValidator.java 2009-02-04 20:16:34 UTC (rev 1206) @@ -25,6 +25,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; +import java.util.EnumMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -33,23 +34,6 @@ /** @author chemit */ public class BeanValidator { - /** - * Pour definir le niveau de validation. - * - * Par défaut, le validateur est supposé géré des erreurs, mais on peut aussi l'utiliser - * pour consigner des warnings sur le bean surveiller. - */ - public enum Scope { - ERROR, - WARNING - } - - public enum State { - VALID, - CONVERSION_ERROR, - FAILED - } - /** la nom de la propriété bean */ static public final String BEAN_PROERTY = "bean"; @@ -78,11 +62,17 @@ protected boolean changed = false; /** state of the validator (is true if no errors of error scope is found) */ - protected boolean valid; + protected boolean valid = true; /** bean to be watched */ protected B bean = null; + /** + * map of fields by scope + * TODO use this and remove fields property and xworks patch :) + */ + protected EnumMap<ValidatorScope, List<ValidatorField>> fieldsByScope; + /** list of fields watched by this validator */ protected List<ValidatorField> fields; @@ -231,7 +221,9 @@ if (bean == null) { // must remove all errors from this validator on errorListModel validationSupport.clearErrorsAndMessages(); - //errors.clear(); + + // dispatch in each field the new errors + dispatchErrorsToFields(); } else { try { Method method = this.bean.getClass().getMethod("addPropertyChangeListener", PropertyChangeListener.class); @@ -254,7 +246,7 @@ // so dettach bean, must rebuild the fields setBean(null); initFields(); - //pcs.firePropertyChange(CONTEXT_NAME_PROPERTY, oldValidationContextName, contextName); + pcs.firePropertyChange(CONTEXT_NAME_PROPERTY, oldValidationContextName, contextName); } public void setParentValidator(BeanValidator<?> parentValidator) { @@ -298,6 +290,7 @@ * @param valueClass the type of converted value * @return the converted value, or null if conversion was not ok */ + @SuppressWarnings({"unchecked"}) public <T> T convert(String fieldName, String value, Class<T> valueClass) { if (fieldName == null) { throw new IllegalArgumentException("fieldName can not be null"); @@ -419,6 +412,7 @@ * * The previously filed errors of a given field where a conversion error occurs will be removed. */ + @SuppressWarnings({"unchecked"}) protected void transfertConversionErrorsToFieldErrors() { Map map = validationContext.getFieldErrors(); for (Entry<String, String> entry : conversionErrors.entrySet()) {

1 0