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

[Buix-commits] r1181 - jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 21:45:08 +0000 (Fri, 23 Jan 2009) New Revision: 1181 Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java Log: ajout todo sur javadoc Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java 2009-01-23 21:37:28 UTC (rev 1180) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/Generator.java 2009-01-23 21:45:08 UTC (rev 1181) @@ -1,6 +1,10 @@ package jaxx.compiler; -/** @author chemit */ +/** + * TODO javadoc! + * + * @author chemit + */ public interface Generator { void finalizeCompiler(CompiledObject root, JAXXCompiler compiler, JavaFile javaFile, String packageName, String className);

1 0

[Buix-commits] r1180 - in jaxx/trunk/jaxx-compiler-api: . src/main/java/jaxx/compiler
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 21:37:28 +0000 (Fri, 23 Jan 2009) New Revision: 1180 Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java Log: cache the lineSeparator property in JAXXCompiler Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-23 14:12:00 UTC (rev 1179) +++ jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-23 21:37:28 UTC (rev 1180) @@ -1,4 +1,5 @@ 1.1 chemit 200901?? + * 20090123 [chemit] - cache the lineSeparator property in JAXXCompiler * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) 1.0 chemit 20090111 Modified: jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-01-23 14:12:00 UTC (rev 1179) +++ jaxx/trunk/jaxx-compiler-api/src/main/java/jaxx/compiler/JAXXCompiler.java 2009-01-23 21:37:28 UTC (rev 1180) @@ -1310,13 +1310,16 @@ } } + /** line separator cached value */ + protected static String lineSeparator = System.getProperty("line.separator", "\n"); + /** * Returns the system line separator string. * * @return the string used to separate lines */ public static String getLineSeparator() { - return System.getProperty("line.separator", "\n"); + return lineSeparator; } // 1.5 adds getCanonicalName; unfortunately we can't depend on 1.5 features yet

1 0

[Buix-commits] r1179 - in jaxx/trunk/jaxx-runtime-validator/src: main/java/jaxx/runtime/validator/field test/java/jaxx/runtime/validator/field test/resources/jaxx/runtime/validator/field
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 14:12:00 +0000 (Fri, 23 Jan 2009) New Revision: 1179 Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.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/ValidatorBean.java jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml Log: ajout d'un validateur pour tester l'unicit?\195?\169 d'une clef dans une collection Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-01-23 14:12:00 UTC (rev 1179) @@ -41,7 +41,11 @@ } public void setKeys(String[] keys) { - this.keys = keys; + if (keys != null && keys.length == 1 && keys[0].indexOf(",") != -1) { + this.keys = keys[0].split(","); + } else { + this.keys = keys; + } } @Override 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-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-01-23 14:12:00 UTC (rev 1179) @@ -9,6 +9,7 @@ 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"); @org.junit.Test @Override @@ -19,6 +20,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", false); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); // add a entry bean.setEntries(Arrays.asList(beanEntry)); @@ -26,6 +28,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", false); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); // two entries with same key bean.setEntries(Arrays.asList(beanEntry, beanEntry)); @@ -33,6 +36,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", true); assertFieldInError("entries", "collectionUniqueKey.two.failed", true); assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + assertFieldInError("entries", "collectionUniqueKey.four.failed", true); // add a entry bean.setEntries(Arrays.asList(beanEntry2)); @@ -40,6 +44,7 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", false); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); // add two entries (will violated unique key on intValue) bean.setEntries(Arrays.asList(beanEntry2, beanEntry)); @@ -47,6 +52,24 @@ assertFieldInError("entries", "collectionUniqueKey.one.failed", true); assertFieldInError("entries", "collectionUniqueKey.two.failed", false); assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); + + // two entries with same key (except validator four) + bean.setEntries(Arrays.asList(beanEntry, beanEntry3)); + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", true); + assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + assertFieldInError("entries", "collectionUniqueKey.four.failed", false); + + beanEntry.setStringValue2("stringValue2"); + // two entries with same key + bean.setEntries(Arrays.asList(beanEntry, beanEntry3)); + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", true); + assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + assertFieldInError("entries", "collectionUniqueKey.four.failed", true); + + } } \ No newline at end of file Modified: 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-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2009-01-23 14:12:00 UTC (rev 1179) @@ -11,12 +11,19 @@ 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; } @@ -32,6 +39,14 @@ public void setStringValue(String stringValue) { this.stringValue = stringValue; } + + public String getStringValue2() { + return stringValue2; + } + + public void setStringValue2(String stringValue2) { + this.stringValue2 = stringValue2; + } } protected File existingFile; @@ -110,8 +125,10 @@ } public void setEntries(Collection<ValidatorBeanEntry> entries) { - Collection<ValidatorBeanEntry> old = this.entries; this.entries = entries; - p.firePropertyChange("entries", old, 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 Modified: 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/field/ValidatorBean-validation.xml 2009-01-23 12:27:43 UTC (rev 1178) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml 2009-01-23 14:12:00 UTC (rev 1179) @@ -75,6 +75,10 @@ <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

1 0

[Buix-commits] r1178 - jaxx/trunk/jaxx-example/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 12:27:43 +0000 (Fri, 23 Jan 2009) New Revision: 1178 Modified: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties Log: update i18n Modified: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties 2009-01-23 12:12:53 UTC (rev 1177) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties 2009-01-23 12:27:43 UTC (rev 1178) @@ -45,6 +45,7 @@ Greet= Inc\ (+)= Italic= +JAXX\ Demo= JMenu\ demo= Last\ Name\:= LastName\:= Modified: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties 2009-01-23 12:12:53 UTC (rev 1177) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties 2009-01-23 12:27:43 UTC (rev 1178) @@ -45,6 +45,7 @@ Greet= Inc\ (+)= Italic= +JAXX\ Demo= JMenu\ demo= Last\ Name\:= LastName\:=

1 0

[Buix-commits] r1177 - in jaxx/trunk/jaxx-runtime-validator/src: main/java/jaxx/runtime/validator/field main/resources test/java/jaxx/runtime/validator/field test/resources test/resources/jaxx/runtime/validator/field
by tchemit＠users.labs.libre-entreprise.org 23 Jan '09

23 Jan '09

Author: tchemit Date: 2009-01-23 12:12:53 +0000 (Fri, 23 Jan 2009) New Revision: 1177 Added: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties Log: ajout d'un validateur pour tester l'unicit?\195?\169 d'une clef dans une collection Modified: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java 2009-01-23 12:12:53 UTC (rev 1177) @@ -42,7 +42,7 @@ @Override public void validate(Object object) throws ValidationException { if (mode == null) { - throw new ValidationException("no mode was setted"); + throw new ValidationException("no mode defined"); } String fieldName = getFieldName(); Copied: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java (from rev 1173, jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java) =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java 2009-01-23 12:12:53 UTC (rev 1177) @@ -0,0 +1,137 @@ +package jaxx.runtime.validator.field; + +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; +import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * Un validateur basé sur {@link FieldExpressionValidator} qui valide une clef + * unique sur une collection. + * <p/> + * Le {@link #fieldName} sert à récupérer la propriété de type de collection du bean. + * + * @author chemit + */ +public class CollectionUniqueKeyValidator extends FieldExpressionValidator { + + + public enum Mode { + /** au moins une entrée de la collection doit etre valide */ + AT_LEAST_ONE, + /** exactement une entrée dela collection doit être valide */ + EXACTLY_ONE, + /** toutes les valeurs de la collection doivent etre valides */ + ALL, + /** aucune valeur de la collection doivent etre valides */ + NONE + } + + /** + * la liste des propriétés d'une entrée de la collection qui définit la + * clef unique. + */ + protected String[] keys; + + public String[] getKeys() { + return keys; + } + + public void setKeys(String[] keys) { + this.keys = keys; + } + + @Override + public void validate(Object object) throws ValidationException { + + if (keys == null || keys.length == 0) { + throw new ValidationException("no unique keys defined"); + } + + String fieldName = getFieldName(); + + Collection<?> col = getCollection(object); + + if (col.size() < 2) { + // la liste ne contient pas deux entrées donc c'est valide + return; + } + + boolean answer = true; + + List<Integer> hashCodes = new ArrayList<Integer>(); + + for (Object o : col) { + Integer hash = getUniqueKeyHashCode(o); + if (hashCodes.contains(hash)) { + // on a deja rencontre cette clef unique, + // donc la validation a echouee + answer = false; + break; + } + + // nouveau hashcode enregistre + hashCodes.add(hash); + } + + if (!answer) { + addFieldError(fieldName, object); + } + } + + /** + * Calcule pour une entrée donné, le hash de la clef unique + * + * @param o l'entree de la collection dont on va calculer le hash de la clef unique + * @return le hashCode calclé de la clef unique sur l'entrée donné + * @throws ValidationException if any pb to retreave properties values + */ + protected Integer getUniqueKeyHashCode(Object o) throws ValidationException { + // calcul du hash à la volée + HashCodeBuilder builder = new HashCodeBuilder(); + for (String key : this.keys) { + Object property = getFieldValue(key, o); + builder.append(property); + } + return builder.toHashCode(); + } + + /** + * @param object the incoming object containing the collection to test + * @return the collection of the incoming object given by the fieldName property + * @throws ValidationException if any pb to retreave the collection + */ + protected Collection<?> getCollection(Object object) throws ValidationException { + String fieldName = getFieldName(); + + Object obj = null; + + // obtain the collection to test + try { + obj = getFieldValue(fieldName, object); + } catch (ValidationException e) { + throw e; + } catch (Exception e) { + // let this pass, but it will be logged right below + } + + if (obj == null) { + // la collection est nulle, donc on renvoie une collection vide + return java.util.Collections.EMPTY_LIST; + } + + if (!Collection.class.isInstance(obj)) { + throw new ValidationException("field " + fieldName + " is not a collection type! (" + obj.getClass() + ")"); + } + return (Collection<?>) obj; + } + + @Override + public String getValidatorType() { + return "collectionUniqueKey"; + } + +} \ No newline at end of file Property changes on: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidator.java ___________________________________________________________________ Name: svn:mergeinfo + Modified: jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml 2009-01-23 12:12:53 UTC (rev 1177) @@ -12,5 +12,7 @@ <validator name="notExistingDirectory" class="jaxx.runtime.validator.field.NotExistingDirectoryFieldValidator"/> <validator name="collectionFieldExpression" class="jaxx.runtime.validator.field.CollectionFieldExpressionValidator"/> + <validator name="collectionUniqueKey" + class="jaxx.runtime.validator.field.CollectionUniqueKeyValidator"/> </validators>  Added: 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 (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionUniqueKeyValidatorTest.java 2009-01-23 12:12:53 UTC (rev 1177) @@ -0,0 +1,52 @@ +package jaxx.runtime.validator.field; + +import jaxx.runtime.validator.field.ValidatorBean.ValidatorBeanEntry; + +import java.util.Arrays; + +/** @author chemit */ +public class CollectionUniqueKeyValidatorTest extends AbstractValidatorTest { + + static protected ValidatorBeanEntry beanEntry = new ValidatorBeanEntry(0, "stringValue"); + static protected ValidatorBeanEntry beanEntry2 = new ValidatorBeanEntry(0, "fake"); + + @org.junit.Test + @Override + public void testValidator() throws Exception { + assertNull(bean.getEntries()); + + // no entry + assertFieldInError("entries", "collectionUniqueKey.one.failed", false); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + // add a entry + bean.setEntries(Arrays.asList(beanEntry)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", false); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + // two entries with same key + bean.setEntries(Arrays.asList(beanEntry, beanEntry)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", true); + assertFieldInError("entries", "collectionUniqueKey.three.failed", true); + + // add a entry + bean.setEntries(Arrays.asList(beanEntry2)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", false); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + // add two entries (will violated unique key on intValue) + bean.setEntries(Arrays.asList(beanEntry2, beanEntry)); + + assertFieldInError("entries", "collectionUniqueKey.one.failed", true); + assertFieldInError("entries", "collectionUniqueKey.two.failed", false); + assertFieldInError("entries", "collectionUniqueKey.three.failed", false); + + } +} \ No newline at end of file Modified: 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/field/ValidatorBean-validation.xml 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml 2009-01-23 12:12:53 UTC (rev 1177) @@ -62,6 +62,19 @@ <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> </validators> \ No newline at end of file Modified: jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties 2009-01-22 15:28:17 UTC (rev 1176) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties 2009-01-23 12:12:53 UTC (rev 1177) @@ -1,5 +1,5 @@ # Global logging configuration -log4j.rootLogger=ERROR, stdout +log4j.rootLogger=INFO, stdout # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout

1 0

[Buix-commits] r1176 - jaxx/trunk/jaxx-example/src/main/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 22 Jan '09

22 Jan '09

Author: tchemit Date: 2009-01-22 15:28:17 +0000 (Thu, 22 Jan 2009) New Revision: 1176 Added: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties Removed: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties Log: refactor poms reformat changelog rename some bundles according to the artifactId Copied: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties (from rev 1175, jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties) =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties (rev 0) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-en_GB.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -0,0 +1,99 @@ +-= +.= +0= +1= +10= +12= +14= +18= +2= +24= +3= +4= +5= +6= +7= +8= +9= +Age\:= +Animal= +Blue= +Blue\:= +Bold= +Button\ label\:= +C= +CE= +Cancel= +Comments\:= +Component\ Demo= +Config\ file\ \:= +Config\ file\:= +Cyan= +Dec\ (-)= +Demo= +Directory\ file\:= +Editable= +Email\ Address\:= +Email\:= +Enabled= +Fancy\ Button= +First\ Name\:= +FirstName\:= +Font\ size= +Green= +Green\:= +Greet= +Inc\ (+)= +Italic= +JMenu\ demo= +Last\ Name\:= +LastName\:= +Message\ Box= +Mineral= +Normal\ text\:= +OK= +Orange= +Password\:= +Purple= +Ratio\:= +Red= +Red\:= +Reset= +Show\ Background= +Show\ password\ dialog= +Sign\ on= +Simple\ Button= +Size\:= +Source= +Spacing\:= +Start= +Stop= +Supported\ Swing\ components\:= +Text2\:= +Text\:= +Underline= +Upper\ case\ text\:= +Use\ the\ spinner\ to= +Username\:= +Vegetable= +View= +Welcome\ to\ the\ JAXX\ framework\!= +Working\ directory\:= +Yellow= +Your\ name\:= +\\u00f7= +adjust\ the\ spacing= +between\ these\ lines= +cancel= +close= +close2= +close3= +edit= +edit2= +edit3= +ttt= +valid= +validator.field=Champ +validator.message=Message +validator.scope=... +x= Copied: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties (from rev 1175, jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties) =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties (rev 0) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-example-fr_FR.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -0,0 +1,99 @@ +-= +.= +0= +1= +10= +12= +14= +18= +2= +24= +3= +4= +5= +6= +7= +8= +9= +Age\:= +Animal= +Blue= +Blue\:= +Bold= +Button\ label\:= +C= +CE= +Cancel= +Comments\:= +Component\ Demo= +Config\ file\ \:= +Config\ file\:= +Cyan= +Dec\ (-)= +Demo= +Directory\ file\:= +Editable= +Email\ Address\:= +Email\:= +Enabled= +Fancy\ Button= +First\ Name\:= +FirstName\:= +Font\ size= +Green= +Green\:= +Greet= +Inc\ (+)= +Italic= +JMenu\ demo= +Last\ Name\:= +LastName\:= +Message\ Box= +Mineral= +Normal\ text\:= +OK= +Orange= +Password\:= +Purple= +Ratio\:= +Red= +Red\:= +Reset= +Show\ Background= +Show\ password\ dialog= +Sign\ on= +Simple\ Button= +Size\:= +Source= +Spacing\:= +Start= +Stop= +Supported\ Swing\ components\:= +Text2\:= +Text\:= +Underline= +Upper\ case\ text\:= +Use\ the\ spinner\ to= +Username\:= +Vegetable= +View= +Welcome\ to\ the\ JAXX\ framework\!= +Working\ directory\:= +Yellow= +Your\ name\:= +\\u00f7= +adjust\ the\ spacing= +between\ these\ lines= +cancel= +close= +close2= +close3= +edit= +edit2= +edit3= +ttt= +valid= +validator.field=Champ +validator.message=Message +validator.scope=... +x= Deleted: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties 2009-01-22 15:27:03 UTC (rev 1175) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -1,99 +0,0 @@ --= -.= -0= -1= -10= -12= -14= -18= -2= -24= -3= -4= -5= -6= -7= -8= -9= -Age\:= -Animal= -Blue= -Blue\:= -Bold= -Button\ label\:= -C= -CE= -Cancel= -Comments\:= -Component\ Demo= -Config\ file\ \:= -Config\ file\:= -Cyan= -Dec\ (-)= -Demo= -Directory\ file\:= -Editable= -Email\ Address\:= -Email\:= -Enabled= -Fancy\ Button= -First\ Name\:= -FirstName\:= -Font\ size= -Green= -Green\:= -Greet= -Inc\ (+)= -Italic= -JMenu\ demo= -Last\ Name\:= -LastName\:= -Message\ Box= -Mineral= -Normal\ text\:= -OK= -Orange= -Password\:= -Purple= -Ratio\:= -Red= -Red\:= -Reset= -Show\ Background= -Show\ password\ dialog= -Sign\ on= -Simple\ Button= -Size\:= -Source= -Spacing\:= -Start= -Stop= -Supported\ Swing\ components\:= -Text2\:= -Text\:= -Underline= -Upper\ case\ text\:= -Use\ the\ spinner\ to= -Username\:= -Vegetable= -View= -Welcome\ to\ the\ JAXX\ framework\!= -Working\ directory\:= -Yellow= -Your\ name\:= -\\u00f7= -adjust\ the\ spacing= -between\ these\ lines= -cancel= -close= -close2= -close3= -edit= -edit2= -edit3= -ttt= -valid= -validator.field=Champ -validator.message=Message -validator.scope=... -x= Deleted: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties 2009-01-22 15:27:03 UTC (rev 1175) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties 2009-01-22 15:28:17 UTC (rev 1176) @@ -1,99 +0,0 @@ --= -.= -0= -1= -10= -12= -14= -18= -2= -24= -3= -4= -5= -6= -7= -8= -9= -Age\:= -Animal= -Blue= -Blue\:= -Bold= -Button\ label\:= -C= -CE= -Cancel= -Comments\:= -Component\ Demo= -Config\ file\ \:= -Config\ file\:= -Cyan= -Dec\ (-)= -Demo= -Directory\ file\:= -Editable= -Email\ Address\:= -Email\:= -Enabled= -Fancy\ Button= -First\ Name\:= -FirstName\:= -Font\ size= -Green= -Green\:= -Greet= -Inc\ (+)= -Italic= -JMenu\ demo= -Last\ Name\:= -LastName\:= -Message\ Box= -Mineral= -Normal\ text\:= -OK= -Orange= -Password\:= -Purple= -Ratio\:= -Red= -Red\:= -Reset= -Show\ Background= -Show\ password\ dialog= -Sign\ on= -Simple\ Button= -Size\:= -Source= -Spacing\:= -Start= -Stop= -Supported\ Swing\ components\:= -Text2\:= -Text\:= -Underline= -Upper\ case\ text\:= -Use\ the\ spinner\ to= -Username\:= -Vegetable= -View= -Welcome\ to\ the\ JAXX\ framework\!= -Working\ directory\:= -Yellow= -Your\ name\:= -\\u00f7= -adjust\ the\ spacing= -between\ these\ lines= -cancel= -close= -close2= -close3= -edit= -edit2= -edit3= -ttt= -valid= -validator.field=Champ -validator.message=Message -validator.scope=... -x=

1 0

[Buix-commits] r1175 - in jaxx/trunk: . jaxx-compiler-api jaxx-compiler-swing jaxx-compiler-validator jaxx-example jaxx-example/src/main/resources/i18n jaxx-runtime-api jaxx-runtime-swing jaxx-runtime-validator jaxx-swing-action jaxx-util jaxx-util/src/main/resources/i18n maven-jaxx-plugin src/site
by tchemit＠users.labs.libre-entreprise.org 22 Jan '09

22 Jan '09

Author: tchemit Date: 2009-01-22 15:27:03 +0000 (Thu, 22 Jan 2009) New Revision: 1175 Added: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-en_GB.properties jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-fr_FR.properties Removed: jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-en_GB.properties jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-fr_FR.properties jaxx/trunk/jaxx-util/src/main/resources/i18n/util-en_GB.properties jaxx/trunk/jaxx-util/src/main/resources/i18n/util-fr_FR.properties Modified: jaxx/trunk/changelog.txt jaxx/trunk/jaxx-compiler-api/changelog.txt jaxx/trunk/jaxx-compiler-api/pom.xml jaxx/trunk/jaxx-compiler-swing/changelog.txt jaxx/trunk/jaxx-compiler-swing/pom.xml jaxx/trunk/jaxx-compiler-validator/changelog.txt jaxx/trunk/jaxx-compiler-validator/pom.xml jaxx/trunk/jaxx-example/changelog.txt jaxx/trunk/jaxx-example/pom.xml jaxx/trunk/jaxx-runtime-api/changelog.txt jaxx/trunk/jaxx-runtime-api/pom.xml jaxx/trunk/jaxx-runtime-swing/pom.xml jaxx/trunk/jaxx-runtime-validator/changelog.txt jaxx/trunk/jaxx-runtime-validator/pom.xml jaxx/trunk/jaxx-swing-action/changelog.txt jaxx/trunk/jaxx-swing-action/pom.xml jaxx/trunk/jaxx-util/changelog.txt jaxx/trunk/jaxx-util/pom.xml jaxx/trunk/maven-jaxx-plugin/changelog.txt jaxx/trunk/maven-jaxx-plugin/pom.xml jaxx/trunk/pom.xml jaxx/trunk/src/site/site.xml Log: refactor poms reformat changelog rename some bundles according to the artifactId Modified: jaxx/trunk/changelog.txt =================================================================== --- jaxx/trunk/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,7 +1,10 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + 1.0 chemit 20090111 - * 20081210 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) - - use lutinproject 3.3 + * 20081210 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) + - use lutinproject 3.3 0.7 chemit 20081210 - * 20081210 [chemit] use lutinutil 1.0 and lutinproject 3.2 - * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file + * 20081210 [chemit] use lutinutil 1.0 and lutinproject 3.2 + * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file Modified: jaxx/trunk/jaxx-compiler-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-compiler-api/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,88 +1,93 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + 1.0 chemit 20090111 - * 20081228 [chemit] - generify ClassDescriptor - - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from - JAXXCompiler and make possible to extract compiler engine from runtime + * 20081228 [chemit] - generify ClassDescriptor + - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from + JAXXCompiler and make possible to extract compiler engine from runtime - * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation - * 20081218 [chemit] - improve generation of methods - * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) - - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection - - add addSourcesToClassPath property to add sources directories in class-path - - improve classloader managment - - keep in DataSource objetCode - - fix bug when processDataBinding on a null objectCode - - always clean node cached values when selected it - - add usefull databinding method in Util + * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation + * 20081218 [chemit] - improve generation of methods + * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) + - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) + - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection + - add addSourcesToClassPath property to add sources directories in class-path + - improve classloader managment + - keep in DataSource objetCode + - fix bug when processDataBinding on a null objectCode + - always clean node cached values when selected it + - add usefull databinding method in Util -* 20081213 [chemit] - improve navigation tree node rendering with some caches - - introduce a ChildBuilder to simplify building of child nodes from a collection or array + * 20081213 [chemit] - improve navigation tree node rendering with some caches + - introduce a ChildBuilder to simplify building of child nodes from a collection or array 0.7 chemit 20081210 -* 20081210 [chemit] - fix bug 1751 -* 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) -* 20081208 [chemit] - javabBean attribute use to initialize bean - - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) - - introduce MultiJXPathDecorator - - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers + * 20081210 [chemit] - fix bug 1751 + * 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) + * 20081208 [chemit] - javabBean attribute use to initialize bean + - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) + - introduce MultiJXPathDecorator + - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers - * 20081207 [chemit] use lutinproject 3.1 - - can exclude field from validator - * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter - - fix bug when searching for a inner class + * 20081207 [chemit] - use lutinproject 3.1 + - can exclude field from validator + * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter + - fix bug when searching for a inner class - * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator - - add setcontextValue and removeContextValue on JAXXContextEntryDef - - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff - - only enter once in $initialize method in generated code + * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator + - add setcontextValue and removeContextValue on JAXXContextEntryDef + - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff + - only enter once in $initialize method in generated code 0.6 chemit 20081117 - * 20081118 [chemit] introduce NavigationUtil, save in context selected node - * 20081107 [chemit] improve data binding and code generation : - - make possible inheritance in binding - - add an attribute javaBean to an object : will generate a full java bean support property - - make possible binding to the javaBean added properties - - clean generated code + * 20081118 [chemit] introduce NavigationUtil, save in context selected node + * 20081107 [chemit] improve data binding and code generation : + - make possible inheritance in binding + - add an attribute javaBean to an object : will generate a full java bean support property + - make possible binding to the javaBean added properties + - clean generated code - * 20081105 [chemit] introduce a CardLayout2 to extends awt CardLayout - introduce a NavigationTreeModel - introduce a Decorator to render Object - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation - begin of rst documentation + * 20081105 [chemit] - introduce a CardLayout2 to extends awt CardLayout + - introduce a NavigationTreeModel + - introduce a Decorator to render Object + - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation + - begin of rst documentation - * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer - * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. - * 20081102 [chemit] improve JAXXContext : - - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext - - do javadoc in JAXXContext - - add logic in DefaultJAXXContext : seek in parent context if entry not found - * 20081102 [chemit] improve tests : - - fix the last failed test from Jaxx original version :) - - dumps tests to JUnit4 :) - * 20081030 [chemit] improve BeanValidator : - - add full PropertyChangeEvent java-bean support and a property valid - - when remove bean from validator, must remove errors from model - - make possible to have a dynamic errorListModel in jaxx files - * 20081030 [chemit] improve JAXXContext : - - fix setContextValue bug when setting twice a same type for a same key - - implements a DefaultJAXXContext - - use this default implementation with delegate pattern in JAXXObject - * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext - * 20081027 [chemit] fix bug 1722 - * 20081027 [chemit] add conversion support in validator - * 20081025 [chemit] improve BeanValidator tag : - - add a errorList attribute for set a ErrorListMouseListener on the errorList - - add a beanInitializer attribute for set the validator's bean at runtime - - add a default errorListModel value 'errors' - * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method - * 20081024 [chemit] fix validator context lost if UI is launched from another thread - ver-0-5 chemit 20081002 - * 20081017 [chemit] add validator support - * 20081013 [chemit] can generate logger on jaxx files - * 20081011 [chemit] improve site - * 20081011 [chemit] fix bug on JavaFileParser : works again - * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin - * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) - * 20081002 [chemit] Introduce JAXXContext - * 20081002 [chemit] Fix bug on method creation via scripting - * 20081002 [chemit] Improve i18n integration (works now also for tabs) + * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer + * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. + * 20081102 [chemit] improve JAXXContext : + - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext + - do javadoc in JAXXContext + - add logic in DefaultJAXXContext : seek in parent context if entry not found + * 20081102 [chemit] improve tests : + - fix the last failed test from Jaxx original version :) + - dumps tests to JUnit4 :) + * 20081030 [chemit] improve BeanValidator : + - add full PropertyChangeEvent java-bean support and a property valid + - when remove bean from validator, must remove errors from model + - make possible to have a dynamic errorListModel in jaxx files + * 20081030 [chemit] improve JAXXContext : + - fix setContextValue bug when setting twice a same type for a same key + - implements a DefaultJAXXContext + - use this default implementation with delegate pattern in JAXXObject + * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext + * 20081027 [chemit] fix bug 1722 + * 20081027 [chemit] add conversion support in validator + * 20081025 [chemit] improve BeanValidator tag : + - add a errorList attribute for set a ErrorListMouseListener on the errorList + - add a beanInitializer attribute for set the validator's bean at runtime + - add a default errorListModel value 'errors' + * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method + * 20081024 [chemit] fix validator context lost if UI is launched from another thread + + 0.5 chemit 20081002 + * 20081017 [chemit] add validator support + * 20081013 [chemit] can generate logger on jaxx files + * 20081011 [chemit] improve site + * 20081011 [chemit] fix bug on JavaFileParser : works again + * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin + * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Introduce JAXXContext + * 20081002 [chemit] Fix bug on method creation via scripting + * 20081002 [chemit] Improve i18n integration (works now also for tabs) + * 20081002 [chemit] Improve i18n integration (works now also for tabs) Modified: jaxx/trunk/jaxx-compiler-api/pom.xml =================================================================== --- jaxx/trunk/jaxx-compiler-api/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-compiler-api/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -8,18 +9,22 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-compiler-api</artifactId> <dependencies> +  + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-api</artifactId> + <version>${project.version}</version> </dependency> </dependencies> @@ -27,7 +32,8 @@    - <name>jaxx-compiler-api</name> + + <name>${project.artifactId}</name> <description>Jaxx compiler api</description>  @@ -35,9 +41,6 @@  <packaging>jar</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build>    Modified: jaxx/trunk/jaxx-compiler-swing/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-swing/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-compiler-swing/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,89 +1,93 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + 1.0 chemit 20090111 - * 20081228 [chemit] - generify ClassDescriptor - - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from - JAXXCompiler and make possible to extract compiler engine from runtime + * 20081228 [chemit] - generify ClassDescriptor + - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from + JAXXCompiler and make possible to extract compiler engine from runtime - * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation - * 20081218 [chemit] - improve generation of methods - * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) - - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection - - add addSourcesToClassPath property to add sources directories in class-path - - improve classloader managment - - keep in DataSource objetCode - - fix bug when processDataBinding on a null objectCode - - always clean node cached values when selected it - - add usefull databinding method in Util + * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation + * 20081218 [chemit] - improve generation of methods + * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) + - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) + - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection + - add addSourcesToClassPath property to add sources directories in class-path + - improve classloader managment + - keep in DataSource objetCode + - fix bug when processDataBinding on a null objectCode + - always clean node cached values when selected it + - add usefull databinding method in Util -* 20081213 [chemit] - improve navigation tree node rendering with some caches - - introduce a ChildBuilder to simplify building of child nodes from a collection or array + * 20081213 [chemit] - improve navigation tree node rendering with some caches + - introduce a ChildBuilder to simplify building of child nodes from a collection or array 0.7 chemit 20081210 -* 20081210 [chemit] - fix bug 1751 -* 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) -* 20081208 [chemit] - javabBean attribute use to initialize bean - - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) - - introduce MultiJXPathDecorator - - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers + * 20081210 [chemit] - fix bug 1751 + * 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) + * 20081208 [chemit] - javabBean attribute use to initialize bean + - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) + - introduce MultiJXPathDecorator + - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers - * 20081207 [chemit] use lutinproject 3.1 - - can exclude field from validator - * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter - - fix bug when searching for a inner class + * 20081207 [chemit] use lutinproject 3.1 + - can exclude field from validator + * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter + - fix bug when searching for a inner class - * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator - - add setcontextValue and removeContextValue on JAXXContextEntryDef - - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff - - only enter once in $initialize method in generated code + * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator + - add setcontextValue and removeContextValue on JAXXContextEntryDef + - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff + - only enter once in $initialize method in generated code 0.6 chemit 20081117 - * 20081118 [chemit] introduce NavigationUtil, save in context selected node - * 20081107 [chemit] improve data binding and code generation : - - make possible inheritance in binding - - add an attribute javaBean to an object : will generate a full java bean support property - - make possible binding to the javaBean added properties - - clean generated code + * 20081118 [chemit] introduce NavigationUtil, save in context selected node + * 20081107 [chemit] improve data binding and code generation : + - make possible inheritance in binding + - add an attribute javaBean to an object : will generate a full java bean support property + - make possible binding to the javaBean added properties + - clean generated code - * 20081105 [chemit] introduce a CardLayout2 to extends awt CardLayout - introduce a NavigationTreeModel - introduce a Decorator to render Object - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation - begin of rst documentation + * 20081105 [chemit] - introduce a CardLayout2 to extends awt CardLayout + - introduce a NavigationTreeModel + - introduce a Decorator to render Object + - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation + - begin of rst documentation - * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer - * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. - * 20081102 [chemit] improve JAXXContext : - - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext - - do javadoc in JAXXContext - - add logic in DefaultJAXXContext : seek in parent context if entry not found - * 20081102 [chemit] improve tests : - - fix the last failed test from Jaxx original version :) - - dumps tests to JUnit4 :) - * 20081030 [chemit] improve BeanValidator : - - add full PropertyChangeEvent java-bean support and a property valid - - when remove bean from validator, must remove errors from model - - make possible to have a dynamic errorListModel in jaxx files - * 20081030 [chemit] improve JAXXContext : - - fix setContextValue bug when setting twice a same type for a same key - - implements a DefaultJAXXContext - - use this default implementation with delegate pattern in JAXXObject - * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext - * 20081027 [chemit] fix bug 1722 - * 20081027 [chemit] add conversion support in validator - * 20081025 [chemit] improve BeanValidator tag : - - add a errorList attribute for set a ErrorListMouseListener on the errorList - - add a beanInitializer attribute for set the validator's bean at runtime - - add a default errorListModel value 'errors' - * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method - * 20081024 [chemit] fix validator context lost if UI is launched from another thread - ver-0-5 chemit 20081002 - * 20081017 [chemit] add validator support - * 20081013 [chemit] can generate logger on jaxx files - * 20081011 [chemit] improve site - * 20081011 [chemit] fix bug on JavaFileParser : works again - * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin - * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) - * 20081002 [chemit] Introduce JAXXContext - * 20081002 [chemit] Fix bug on method creation via scripting - * 20081002 [chemit] Improve i18n integration (works now also for tabs) + * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer + * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. + * 20081102 [chemit] improve JAXXContext : + - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext + - do javadoc in JAXXContext + - add logic in DefaultJAXXContext : seek in parent context if entry not found + * 20081102 [chemit] improve tests : + - fix the last failed test from Jaxx original version :) + - dumps tests to JUnit4 :) + * 20081030 [chemit] improve BeanValidator : + - add full PropertyChangeEvent java-bean support and a property valid + - when remove bean from validator, must remove errors from model + - make possible to have a dynamic errorListModel in jaxx files + * 20081030 [chemit] improve JAXXContext : + - fix setContextValue bug when setting twice a same type for a same key + - implements a DefaultJAXXContext + - use this default implementation with delegate pattern in JAXXObject + * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext + * 20081027 [chemit] fix bug 1722 + * 20081027 [chemit] add conversion support in validator + * 20081025 [chemit] improve BeanValidator tag : + - add a errorList attribute for set a ErrorListMouseListener on the errorList + - add a beanInitializer attribute for set the validator's bean at runtime + - add a default errorListModel value 'errors' + * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method + * 20081024 [chemit] fix validator context lost if UI is launched from another thread + + 0.5 chemit 20081002 + * 20081017 [chemit] add validator support + * 20081013 [chemit] can generate logger on jaxx files + * 20081011 [chemit] improve site + * 20081011 [chemit] fix bug on JavaFileParser : works again + * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin + * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Introduce JAXXContext + * 20081002 [chemit] Fix bug on method creation via scripting + * 20081002 [chemit] Improve i18n integration (works now also for tabs) Modified: jaxx/trunk/jaxx-compiler-swing/pom.xml =================================================================== --- jaxx/trunk/jaxx-compiler-swing/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-compiler-swing/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -8,23 +9,28 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-compiler-swing</artifactId> <dependencies> +  + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-swing</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-compiler-api</artifactId> + <version>${project.version}</version> </dependency> </dependencies> @@ -32,7 +38,8 @@    - <name>jaxx-compiler-swing</name> + + <name>${project.artifactId}</name> <description>Jaxx compiler swing extension</description>  @@ -40,9 +47,6 @@  <packaging>jar</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build>    Modified: jaxx/trunk/jaxx-compiler-validator/changelog.txt =================================================================== --- jaxx/trunk/jaxx-compiler-validator/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-compiler-validator/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,34 +1,37 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + 1.0 chemit 20090111 - * 20090111 [chemit] - beanClass is now mandatory on BeanValidator (can be guest from bean attribute if present). - - add parent attribute on BeanValidator to chain validators + * 20090111 [chemit] - beanClass is now mandatory on BeanValidator (can be guest from bean attribute if present). + - add parent attribute on BeanValidator to chain validators 0.8 ??? 200812?? - * 20081228 [chemit] - generify ClassDescriptor - - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from - JAXXCompiler and make possible to extract compiler engine from runtime + * 20081228 [chemit] - generify ClassDescriptor + - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from + JAXXCompiler and make possible to extract compiler engine from runtime - * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation - * 20081218 [chemit] - improve generation of methods - * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) - - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection - - add addSourcesToClassPath property to add sources directories in class-path - - improve classloader managment - - keep in DataSource objetCode - - fix bug when processDataBinding on a null objectCode - - always clean node cached values when selected it - - add usefull databinding method in Util + * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation + * 20081218 [chemit] - improve generation of methods + * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) + - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) + - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection + - add addSourcesToClassPath property to add sources directories in class-path + - improve classloader managment + - keep in DataSource objetCode + - fix bug when processDataBinding on a null objectCode + - always clean node cached values when selected it + - add usefull databinding method in Util -* 20081213 [chemit] - improve navigation tree node rendering with some caches - - introduce a ChildBuilder to simplify building of child nodes from a collection or array + * 20081213 [chemit] - improve navigation tree node rendering with some caches + - introduce a ChildBuilder to simplify building of child nodes from a collection or array 0.7 chemit 20081210 -* 20081210 [chemit] - fix bug 1751 -* 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) -* 20081208 [chemit] - javabBean attribute use to initialize bean - - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) - - introduce MultiJXPathDecorator - - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers + * 20081210 [chemit] - fix bug 1751 + * 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) + * 20081208 [chemit] - javabBean attribute use to initialize bean + - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) + - introduce MultiJXPathDecorator + - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers * 20081207 [chemit] use lutinproject 3.1 - can exclude field from validator @@ -41,52 +44,53 @@ - only enter once in $initialize method in generated code 0.6 chemit 20081117 - * 20081118 [chemit] introduce NavigationUtil, save in context selected node - * 20081107 [chemit] improve data binding and code generation : - - make possible inheritance in binding - - add an attribute javaBean to an object : will generate a full java bean support property - - make possible binding to the javaBean added properties - - clean generated code + * 20081118 [chemit] introduce NavigationUtil, save in context selected node + * 20081107 [chemit] improve data binding and code generation : + - make possible inheritance in binding + - add an attribute javaBean to an object : will generate a full java bean support property + - make possible binding to the javaBean added properties + - clean generated code - * 20081105 [chemit] introduce a CardLayout2 to extends awt CardLayout - introduce a NavigationTreeModel - introduce a Decorator to render Object - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation - begin of rst documentation + * 20081105 [chemit] - introduce a CardLayout2 to extends awt CardLayout + - introduce a NavigationTreeModel + - introduce a Decorator to render Object + - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation + - begin of rst documentation - * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer - * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. - * 20081102 [chemit] improve JAXXContext : - - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext - - do javadoc in JAXXContext - - add logic in DefaultJAXXContext : seek in parent context if entry not found - * 20081102 [chemit] improve tests : - - fix the last failed test from Jaxx original version :) - - dumps tests to JUnit4 :) - * 20081030 [chemit] improve BeanValidator : - - add full PropertyChangeEvent java-bean support and a property valid - - when remove bean from validator, must remove errors from model - - make possible to have a dynamic errorListModel in jaxx files - * 20081030 [chemit] improve JAXXContext : - - fix setContextValue bug when setting twice a same type for a same key - - implements a DefaultJAXXContext - - use this default implementation with delegate pattern in JAXXObject - * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext - * 20081027 [chemit] fix bug 1722 - * 20081027 [chemit] add conversion support in validator - * 20081025 [chemit] improve BeanValidator tag : - - add a errorList attribute for set a ErrorListMouseListener on the errorList - - add a beanInitializer attribute for set the validator's bean at runtime - - add a default errorListModel value 'errors' - * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method - * 20081024 [chemit] fix validator context lost if UI is launched from another thread - ver-0-5 chemit 20081002 - * 20081017 [chemit] add validator support - * 20081013 [chemit] can generate logger on jaxx files - * 20081011 [chemit] improve site - * 20081011 [chemit] fix bug on JavaFileParser : works again - * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin - * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) - * 20081002 [chemit] Introduce JAXXContext - * 20081002 [chemit] Fix bug on method creation via scripting - * 20081002 [chemit] Improve i18n integration (works now also for tabs) + * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer + * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. + * 20081102 [chemit] improve JAXXContext : + - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext + - do javadoc in JAXXContext + - add logic in DefaultJAXXContext : seek in parent context if entry not found + * 20081102 [chemit] improve tests : + - fix the last failed test from Jaxx original version :) + - dumps tests to JUnit4 :) + * 20081030 [chemit] improve BeanValidator : + - add full PropertyChangeEvent java-bean support and a property valid + - when remove bean from validator, must remove errors from model + - make possible to have a dynamic errorListModel in jaxx files + * 20081030 [chemit] improve JAXXContext : + - fix setContextValue bug when setting twice a same type for a same key + - implements a DefaultJAXXContext + - use this default implementation with delegate pattern in JAXXObject + * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext + * 20081027 [chemit] fix bug 1722 + * 20081027 [chemit] add conversion support in validator + * 20081025 [chemit] improve BeanValidator tag : + - add a errorList attribute for set a ErrorListMouseListener on the errorList + - add a beanInitializer attribute for set the validator's bean at runtime + - add a default errorListModel value 'errors' + * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method + * 20081024 [chemit] fix validator context lost if UI is launched from another thread + + 0.5 chemit 20081002 + * 20081017 [chemit] add validator support + * 20081013 [chemit] can generate logger on jaxx files + * 20081011 [chemit] improve site + * 20081011 [chemit] fix bug on JavaFileParser : works again + * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin + * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Introduce JAXXContext + * 20081002 [chemit] Fix bug on method creation via scripting + * 20081002 [chemit] Improve i18n integration (works now also for tabs) Modified: jaxx/trunk/jaxx-compiler-validator/pom.xml =================================================================== --- jaxx/trunk/jaxx-compiler-validator/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-compiler-validator/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -8,23 +9,28 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-compiler-validator</artifactId> <dependencies> +  + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-validator</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-compiler-api</artifactId> + <version>${project.version}</version> </dependency> </dependencies> @@ -32,7 +38,8 @@    - <name>jaxx-compiler-validator</name> + + <name>${project.artifactId}</name> <description>Jaxx compiler validation extension</description>  @@ -40,9 +47,6 @@  <packaging>jar</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build>    Modified: jaxx/trunk/jaxx-example/changelog.txt =================================================================== --- jaxx/trunk/jaxx-example/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-example/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,9 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + - rename i18n bundles according artifactId + 1.0 chemit 20090111 - * 20090111 [chemit] - use lutinproject 3.3 - - refactor examples : now onyl one module, with one webstart demo (cost very less time to release) + * 20090111 [chemit] - use lutinproject 3.3 + - refactor examples : now onyl one module, with one webstart demo (cost very less time to release) 0.7 chemit 200812?? - * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file + * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file Modified: jaxx/trunk/jaxx-example/pom.xml =================================================================== --- jaxx/trunk/jaxx-example/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-example/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -7,24 +8,27 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-example</artifactId> <dependencies> +  + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-swing</artifactId> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-validator</artifactId> - <scope>compile</scope> + <version>${project.version}</version> </dependency> </dependencies> @@ -32,7 +36,8 @@    - <name>jaxx-example</name> + + <name>${project.artifactId}</name> <description>Jaxx Examples</description>  @@ -54,15 +59,6 @@ </properties> -  -  -  - <scm> - <url>${maven.scm.url.child}</url> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - </scm> - <build> <resources> @@ -84,53 +80,6 @@ <plugins> <plugin> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <src>${basedir}/src/main/java</src> - <force>true</force> - </configuration> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - <includes> - <param>**\/**.java</param> - </includes> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <configuration> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </plugin> - - <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -151,15 +100,51 @@ <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> +  + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> </plugin> <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + <includes> + <param>**\/**.java</param> + </includes> + </entry> + </entries> + </configuration> + </plugin> + + <plugin> <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> </plugin> </plugins> </build> +  +  +  + + <scm> + <url>${maven.scm.url.child}</url> + <connection>${maven.scm.connection.child}</connection> + <developerConnection>${maven.scm.developerConnection.child}</developerConnection> + </scm> + <profiles>  <profile> @@ -182,21 +167,29 @@ <phase>compile</phase> <configuration> <tasks> - <mkdir dir="${jnlp.build.directory}" /> - <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> + <mkdir dir="${jnlp.build.directory}"/> + <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" + verbose="${maven.verbose}" todir="${jnlp.build.directory}" + failonerror="false"> <filterset> - <filter token="lib" value="javahelp-2.0.02.jar" /> - <filter token="url" value="${project.url}" /> + <filter token="lib" value="javahelp-2.0.02.jar"/> + <filter token="url" value="${project.url}"/> </filterset> </copy> - <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false"> + <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" + verbose="${maven.verbose}" todir="${jnlp.build.directory}" + failonerror="false"> <filterset> - <filter token="lib" value="jxlayer-3.0.1.jar" /> - <filter token="url" value="${project.url}" /> + <filter token="lib" value="jxlayer-3.0.1.jar"/> + <filter token="url" value="${project.url}"/> </filterset> </copy> - <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> - <copy file="${project.build.directory}/lib/jxlayer-3.0.1.jar" verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false" /> + <copy file="${project.build.directory}/lib/javahelp-2.0.02.jar" + verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" + failonerror="false"/> + <copy file="${project.build.directory}/lib/jxlayer-3.0.1.jar" + verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" + failonerror="false"/> </tasks> </configuration> <goals> @@ -209,10 +202,11 @@ <phase>pre-site</phase> <configuration> <tasks> - <mkdir dir="${maven.site.gen.dir}/resources" /> - <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" failonerror="false" overwrite="false"> + <mkdir dir="${maven.site.gen.dir}/resources"/> + <copy todir="${maven.site.gen.dir}/resources" verbose="${maven.verbose}" + failonerror="false" overwrite="false"> <fileset dir="${jnlp.build.directory}"> - <include name="**" /> + <include name="**"/> </fileset> </copy> </tasks> @@ -257,17 +251,17 @@ <sign> <keystore>${keystorepath}</keystore> - <keypass /> + <keypass/> <storepass>${keystorepass}</storepass> - <storetype /> + <storetype/> <alias>${keystorealias}</alias> - <validity /> - <dnameCn /> - <dnameOu /> - <dnameO /> - <dnameL /> - <dnameSt /> - <dnameC /> + <validity/> + <dnameCn/> + <dnameOu/> + <dnameO/> + <dnameL/> + <dnameSt/> + <dnameC/> <verify>true</verify> <keystoreConfig> <delete>false</delete> @@ -275,7 +269,6 @@ </keystoreConfig> </sign> - <pack200>false</pack200> <gzip>true</gzip> <verbose>false</verbose> Deleted: jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-en_GB.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-en_GB.properties 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-en_GB.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,99 +0,0 @@ --= -.= -0= -1= -10= -12= -14= -18= -2= -24= -3= -4= -5= -6= -7= -8= -9= -Age\:= -Animal= -Blue= -Blue\:= -Bold= -Button\ label\:= -C= -CE= -Cancel= -Comments\:= -Component\ Demo= -Config\ file\ \:= -Config\ file\:= -Cyan= -Dec\ (-)= -Demo= -Directory\ file\:= -Editable= -Email\ Address\:= -Email\:= -Enabled= -Fancy\ Button= -First\ Name\:= -FirstName\:= -Font\ size= -Green= -Green\:= -Greet= -Inc\ (+)= -Italic= -JMenu\ demo= -Last\ Name\:= -LastName\:= -Message\ Box= -Mineral= -Normal\ text\:= -OK= -Orange= -Password\:= -Purple= -Ratio\:= -Red= -Red\:= -Reset= -Show\ Background= -Show\ password\ dialog= -Sign\ on= -Simple\ Button= -Size\:= -Source= -Spacing\:= -Start= -Stop= -Supported\ Swing\ components\:= -Text2\:= -Text\:= -Underline= -Upper\ case\ text\:= -Use\ the\ spinner\ to= -Username\:= -Vegetable= -View= -Welcome\ to\ the\ JAXX\ framework\!= -Working\ directory\:= -Yellow= -Your\ name\:= -\\u00f7= -adjust\ the\ spacing= -between\ these\ lines= -cancel= -close= -close2= -close3= -edit= -edit2= -edit3= -ttt= -valid= -validator.field=Champ -validator.message=Message -validator.scope=... -x= Deleted: jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-fr_FR.properties =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-fr_FR.properties 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-fr_FR.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,99 +0,0 @@ --= -.= -0= -1= -10= -12= -14= -18= -2= -24= -3= -4= -5= -6= -7= -8= -9= -Age\:= -Animal= -Blue= -Blue\:= -Bold= -Button\ label\:= -C= -CE= -Cancel= -Comments\:= -Component\ Demo= -Config\ file\ \:= -Config\ file\:= -Cyan= -Dec\ (-)= -Demo= -Directory\ file\:= -Editable= -Email\ Address\:= -Email\:= -Enabled= -Fancy\ Button= -First\ Name\:= -FirstName\:= -Font\ size= -Green= -Green\:= -Greet= -Inc\ (+)= -Italic= -JMenu\ demo= -Last\ Name\:= -LastName\:= -Message\ Box= -Mineral= -Normal\ text\:= -OK= -Orange= -Password\:= -Purple= -Ratio\:= -Red= -Red\:= -Reset= -Show\ Background= -Show\ password\ dialog= -Sign\ on= -Simple\ Button= -Size\:= -Source= -Spacing\:= -Start= -Stop= -Supported\ Swing\ components\:= -Text2\:= -Text\:= -Underline= -Upper\ case\ text\:= -Use\ the\ spinner\ to= -Username\:= -Vegetable= -View= -Welcome\ to\ the\ JAXX\ framework\!= -Working\ directory\:= -Yellow= -Your\ name\:= -\\u00f7= -adjust\ the\ spacing= -between\ these\ lines= -cancel= -close= -close2= -close3= -edit= -edit2= -edit3= -ttt= -valid= -validator.field=Champ -validator.message=Message -validator.scope=... -x= Copied: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties (from rev 1173, jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-en_GB.properties) =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties (rev 0) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-en_GB.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -0,0 +1,99 @@ +-= +.= +0= +1= +10= +12= +14= +18= +2= +24= +3= +4= +5= +6= +7= +8= +9= +Age\:= +Animal= +Blue= +Blue\:= +Bold= +Button\ label\:= +C= +CE= +Cancel= +Comments\:= +Component\ Demo= +Config\ file\ \:= +Config\ file\:= +Cyan= +Dec\ (-)= +Demo= +Directory\ file\:= +Editable= +Email\ Address\:= +Email\:= +Enabled= +Fancy\ Button= +First\ Name\:= +FirstName\:= +Font\ size= +Green= +Green\:= +Greet= +Inc\ (+)= +Italic= +JMenu\ demo= +Last\ Name\:= +LastName\:= +Message\ Box= +Mineral= +Normal\ text\:= +OK= +Orange= +Password\:= +Purple= +Ratio\:= +Red= +Red\:= +Reset= +Show\ Background= +Show\ password\ dialog= +Sign\ on= +Simple\ Button= +Size\:= +Source= +Spacing\:= +Start= +Stop= +Supported\ Swing\ components\:= +Text2\:= +Text\:= +Underline= +Upper\ case\ text\:= +Use\ the\ spinner\ to= +Username\:= +Vegetable= +View= +Welcome\ to\ the\ JAXX\ framework\!= +Working\ directory\:= +Yellow= +Your\ name\:= +\\u00f7= +adjust\ the\ spacing= +between\ these\ lines= +cancel= +close= +close2= +close3= +edit= +edit2= +edit3= +ttt= +valid= +validator.field=Champ +validator.message=Message +validator.scope=... +x= Copied: jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties (from rev 1173, jaxx/trunk/jaxx-example/src/main/resources/i18n/Components-fr_FR.properties) =================================================================== --- jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties (rev 0) +++ jaxx/trunk/jaxx-example/src/main/resources/i18n/jaxx-exemple-fr_FR.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -0,0 +1,99 @@ +-= +.= +0= +1= +10= +12= +14= +18= +2= +24= +3= +4= +5= +6= +7= +8= +9= +Age\:= +Animal= +Blue= +Blue\:= +Bold= +Button\ label\:= +C= +CE= +Cancel= +Comments\:= +Component\ Demo= +Config\ file\ \:= +Config\ file\:= +Cyan= +Dec\ (-)= +Demo= +Directory\ file\:= +Editable= +Email\ Address\:= +Email\:= +Enabled= +Fancy\ Button= +First\ Name\:= +FirstName\:= +Font\ size= +Green= +Green\:= +Greet= +Inc\ (+)= +Italic= +JMenu\ demo= +Last\ Name\:= +LastName\:= +Message\ Box= +Mineral= +Normal\ text\:= +OK= +Orange= +Password\:= +Purple= +Ratio\:= +Red= +Red\:= +Reset= +Show\ Background= +Show\ password\ dialog= +Sign\ on= +Simple\ Button= +Size\:= +Source= +Spacing\:= +Start= +Stop= +Supported\ Swing\ components\:= +Text2\:= +Text\:= +Underline= +Upper\ case\ text\:= +Use\ the\ spinner\ to= +Username\:= +Vegetable= +View= +Welcome\ to\ the\ JAXX\ framework\!= +Working\ directory\:= +Yellow= +Your\ name\:= +\\u00f7= +adjust\ the\ spacing= +between\ these\ lines= +cancel= +close= +close2= +close3= +edit= +edit2= +edit3= +ttt= +valid= +validator.field=Champ +validator.message=Message +validator.scope=... +x= Modified: jaxx/trunk/jaxx-runtime-api/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-runtime-api/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,91 +1,94 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + 1.0 chemit 20090111 - * 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) + * 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) 0.8 ??? 200812?? - * 20081228 [chemit] - generify ClassDescriptor - - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from - JAXXCompiler and make possible to extract compiler engine from runtime + * 20081228 [chemit] - generify ClassDescriptor + - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from + JAXXCompiler and make possible to extract compiler engine from runtime - * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation - * 20081218 [chemit] - improve generation of methods - * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) - - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection - - add addSourcesToClassPath property to add sources directories in class-path - - improve classloader managment - - keep in DataSource objetCode - - fix bug when processDataBinding on a null objectCode - - always clean node cached values when selected it - - add usefull databinding method in Util - -* 20081213 [chemit] - improve navigation tree node rendering with some caches - - introduce a ChildBuilder to simplify building of child nodes from a collection or array + * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation + * 20081218 [chemit] - improve generation of methods + * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) + - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) + - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection + - add addSourcesToClassPath property to add sources directories in class-path + - improve classloader managment + - keep in DataSource objetCode + - fix bug when processDataBinding on a null objectCode + - always clean node cached values when selected it + - add usefull databinding method in Util + + * 20081213 [chemit] - improve navigation tree node rendering with some caches + - introduce a ChildBuilder to simplify building of child nodes from a collection or array 0.7 chemit 20081210 -* 20081210 [chemit] - fix bug 1751 -* 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) -* 20081208 [chemit] - javabBean attribute use to initialize bean - - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) - - introduce MultiJXPathDecorator - - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers + * 20081210 [chemit] - fix bug 1751 + * 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) + * 20081208 [chemit] - javabBean attribute use to initialize bean + - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) + - introduce MultiJXPathDecorator + - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers - * 20081207 [chemit] use lutinproject 3.1 - - can exclude field from validator - * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter - - fix bug when searching for a inner class + * 20081207 [chemit] use lutinproject 3.1 + - can exclude field from validator + * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter + - fix bug when searching for a inner class - * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator - - add setcontextValue and removeContextValue on JAXXContextEntryDef - - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff - - only enter once in $initialize method in generated code + * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator + - add setcontextValue and removeContextValue on JAXXContextEntryDef + - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff + - only enter once in $initialize method in generated code 0.6 chemit 20081117 - * 20081118 [chemit] introduce NavigationUtil, save in context selected node - * 20081107 [chemit] improve data binding and code generation : - - make possible inheritance in binding - - add an attribute javaBean to an object : will generate a full java bean support property - - make possible binding to the javaBean added properties - - clean generated code + * 20081118 [chemit] introduce NavigationUtil, save in context selected node + * 20081107 [chemit] improve data binding and code generation : + - make possible inheritance in binding + - add an attribute javaBean to an object : will generate a full java bean support property + - make possible binding to the javaBean added properties + - clean generated code - * 20081105 [chemit] introduce a CardLayout2 to extends awt CardLayout - introduce a NavigationTreeModel - introduce a Decorator to render Object - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation - begin of rst documentation + * 20081105 [chemit] - introduce a CardLayout2 to extends awt CardLayout + - introduce a NavigationTreeModel + - introduce a Decorator to render Object + - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation + - begin of rst documentation - * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer - * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. - * 20081102 [chemit] improve JAXXContext : - - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext - - do javadoc in JAXXContext - - add logic in DefaultJAXXContext : seek in parent context if entry not found - * 20081102 [chemit] improve tests : - - fix the last failed test from Jaxx original version :) - - dumps tests to JUnit4 :) - * 20081030 [chemit] improve BeanValidator : - - add full PropertyChangeEvent java-bean support and a property valid - - when remove bean from validator, must remove errors from model - - make possible to have a dynamic errorListModel in jaxx files - * 20081030 [chemit] improve JAXXContext : - - fix setContextValue bug when setting twice a same type for a same key - - implements a DefaultJAXXContext - - use this default implementation with delegate pattern in JAXXObject - * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext - * 20081027 [chemit] fix bug 1722 - * 20081027 [chemit] add conversion support in validator - * 20081025 [chemit] improve BeanValidator tag : - - add a errorList attribute for set a ErrorListMouseListener on the errorList - - add a beanInitializer attribute for set the validator's bean at runtime - - add a default errorListModel value 'errors' - * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method - * 20081024 [chemit] fix validator context lost if UI is launched from another thread - ver-0-5 chemit 20081002 - * 20081017 [chemit] add validator support - * 20081013 [chemit] can generate logger on jaxx files - * 20081011 [chemit] improve site - * 20081011 [chemit] fix bug on JavaFileParser : works again - * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin - * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) - * 20081002 [chemit] Introduce JAXXContext - * 20081002 [chemit] Fix bug on method creation via scripting - * 20081002 [chemit] Improve i18n integration (works now also for tabs) + * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer + * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. + * 20081102 [chemit] improve JAXXContext : + - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext + - do javadoc in JAXXContext + - add logic in DefaultJAXXContext : seek in parent context if entry not found + * 20081102 [chemit] improve tests : + - fix the last failed test from Jaxx original version :) + - dumps tests to JUnit4 :) + * 20081030 [chemit] improve BeanValidator : + - add full PropertyChangeEvent java-bean support and a property valid + - when remove bean from validator, must remove errors from model + - make possible to have a dynamic errorListModel in jaxx files + * 20081030 [chemit] improve JAXXContext : + - fix setContextValue bug when setting twice a same type for a same key + - implements a DefaultJAXXContext + - use this default implementation with delegate pattern in JAXXObject + * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext + * 20081027 [chemit] fix bug 1722 + * 20081027 [chemit] add conversion support in validator + * 20081025 [chemit] improve BeanValidator tag : + - add a errorList attribute for set a ErrorListMouseListener on the errorList + - add a beanInitializer attribute for set the validator's bean at runtime + - add a default errorListModel value 'errors' + * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method + * 20081024 [chemit] fix validator context lost if UI is launched from another thread + 0.5 chemit 20081002 + * 20081017 [chemit] add validator support + * 20081013 [chemit] can generate logger on jaxx files + * 20081011 [chemit] improve site + * 20081011 [chemit] fix bug on JavaFileParser : works again + * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin + * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Introduce JAXXContext + * 20081002 [chemit] Fix bug on method creation via scripting + * 20081002 [chemit] Improve i18n integration (works now also for tabs) Modified: jaxx/trunk/jaxx-runtime-api/pom.xml =================================================================== --- jaxx/trunk/jaxx-runtime-api/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-runtime-api/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -8,11 +9,12 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-runtime-api</artifactId> <dependencies> @@ -43,7 +45,8 @@    - <name>jaxx-runtime-api</name> + + <name>${project.artifactId}</name> <description>Jaxx runtime api</description>  @@ -51,9 +54,6 @@  <packaging>jar</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build>    Modified: jaxx/trunk/jaxx-runtime-swing/pom.xml =================================================================== --- jaxx/trunk/jaxx-runtime-swing/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-runtime-swing/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -8,18 +9,22 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-runtime-swing</artifactId> <dependencies> +  + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-api</artifactId> + <version>${project.version}</version> </dependency> </dependencies> @@ -27,7 +32,8 @@    - <name>jaxx-runtime-swing</name> + + <name>${project.artifactId}</name> <description>Jaxx runtime swing extension</description>  @@ -35,9 +41,6 @@  <packaging>jar</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build>    Modified: jaxx/trunk/jaxx-runtime-validator/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-validator/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-runtime-validator/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,96 +1,97 @@ 1.1 chemit 200901?? -* 20090120 [chemit] - improve validators tests (one test by validator with a common AbstractValidatorTest super class) - - add a CollectionFieldExpressionValidator to validate a collection of a bean + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + * 20090120 [chemit] - improve validators tests (one test by validator with a common AbstractValidatorTest super class) + - add a CollectionFieldExpressionValidator to validate a collection of a bean 1.0 chemit 20090111 -* 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) -* 20090111 [chemit] - add parent attribute on BeanValidator to chain validators + * 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) + * 20090111 [chemit] - add parent attribute on BeanValidator to chain validators 0.8 ??? 200812?? - * 20081228 [chemit] - generify ClassDescriptor - - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from - JAXXCompiler and make possible to extract compiler engine from runtime + * 20081228 [chemit] - generify ClassDescriptor + - introduce StylesheetHelper helper class to detach Stylesheet, Rule and Selector classes from + JAXXCompiler and make possible to extract compiler engine from runtime - * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation - * 20081218 [chemit] - improve generation of methods - * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) - - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) - - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection - - add addSourcesToClassPath property to add sources directories in class-path - - improve classloader managment - - keep in DataSource objetCode - - fix bug when processDataBinding on a null objectCode - - always clean node cached values when selected it - - add usefull databinding method in Util + * 20081227 [chemit] - add PCS on ValidatorErrorTable to be used by table validation + * 20081218 [chemit] - improve generation of methods + * 20081214 [chemit] - can now in validation, put error with args (all args must be separated by a ##) + - improve event naming : replace the $evXXX by doMEthodName__on__field (except with optimize option) + - add jaww.runtime.swing.Utils.fillComboBox to fill a combobox model from a collection + - add addSourcesToClassPath property to add sources directories in class-path + - improve classloader managment + - keep in DataSource objetCode + - fix bug when processDataBinding on a null objectCode + - always clean node cached values when selected it + - add usefull databinding method in Util -* 20081213 [chemit] - improve navigation tree node rendering with some caches - - introduce a ChildBuilder to simplify building of child nodes from a collection or array + * 20081213 [chemit] - improve navigation tree node rendering with some caches + - introduce a ChildBuilder to simplify building of child nodes from a collection or array 0.7 chemit 20081210 -* 20081210 [chemit] - fix bug 1751 -* 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) -* 20081208 [chemit] - javabBean attribute use to initialize bean - - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) - - introduce MultiJXPathDecorator - - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers + * 20081210 [chemit] - fix bug 1751 + * 20081210 [chemit] - improve JAXXButtonGroup (add ActionChangeListener and toolTipText mecanism) + * 20081208 [chemit] - javabBean attribute use to initialize bean + - introduce Base64Coder to fix bug 1750 and control serailVersionUI (put them to 1L for the moment) + - introduce MultiJXPathDecorator + - add a resetAfterCompile parameter toCompilerOption to keep in test used compilers - * 20081207 [chemit] use lutinproject 3.1 - - can exclude field from validator - * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter - - fix bug when searching for a inner class + * 20081207 [chemit] - use lutinproject 3.1 + - can exclude field from validator + * 20081202 [chemit] - add strategy for loading ui in NavigationTreeSelectionAdapter + - fix bug when searching for a inner class - * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator - - add setcontextValue and removeContextValue on JAXXContextEntryDef - - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff - - only enter once in $initialize method in generated code + * 20081201 [chemit] - implements jaxx.runtime.JXPathDecorator + - add setcontextValue and removeContextValue on JAXXContextEntryDef + - introduce scope in BeanValidator (ERROR or WARNING) and related swing stuff + - only enter once in $initialize method in generated code 0.6 chemit 20081117 - * 20081118 [chemit] introduce NavigationUtil, save in context selected node - * 20081107 [chemit] improve data binding and code generation : - - make possible inheritance in binding - - add an attribute javaBean to an object : will generate a full java bean support property - - make possible binding to the javaBean added properties - - clean generated code + * 20081118 [chemit] introduce NavigationUtil, save in context selected node + * 20081107 [chemit] - improve data binding and code generation : + - make possible inheritance in binding + - add an attribute javaBean to an object : will generate a full java bean support property + - make possible binding to the javaBean added properties + - clean generated code - * 20081105 [chemit] introduce a CardLayout2 to extends awt CardLayout - introduce a NavigationTreeModel - introduce a Decorator to render Object - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation - begin of rst documentation + * 20081105 [chemit] - introduce a CardLayout2 to extends awt CardLayout + - introduce a NavigationTreeModel + - introduce a Decorator to render Object + - propagate constructor JAXXContext(JAXXContext) in JAXXObject generation + - begin of rst documentation - * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer - * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. - * 20081102 [chemit] improve JAXXContext : - - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext - - do javadoc in JAXXContext - - add logic in DefaultJAXXContext : seek in parent context if entry not found - * 20081102 [chemit] improve tests : - - fix the last failed test from Jaxx original version :) - - dumps tests to JUnit4 :) - * 20081030 [chemit] improve BeanValidator : - - add full PropertyChangeEvent java-bean support and a property valid - - when remove bean from validator, must remove errors from model - - make possible to have a dynamic errorListModel in jaxx files - * 20081030 [chemit] improve JAXXContext : - - fix setContextValue bug when setting twice a same type for a same key + * 20081104 [chemit] can add extra beanInfoSearchPath in SwingInitializer + * 20081104 [chemit] add jaxxContextImplementorClass in option to make possible use of other JAXXContext implementor. + * 20081102 [chemit] improve JAXXContext : + - introduce a JAXXContextEntryDef to qualify an entry of a JAXXContext + - do javadoc in JAXXContext + - add logic in DefaultJAXXContext : seek in parent context if entry not found + * 20081102 [chemit] improve tests : + - fix the last failed test from Jaxx original version :) + - dumps tests to JUnit4 :) + * 20081030 [chemit] improve BeanValidator : + - add full PropertyChangeEvent java-bean support and a property valid + - when remove bean from validator, must remove errors from model + - make possible to have a dynamic errorListModel in jaxx files + * 20081030 [chemit] improve JAXXContext : + - fix setContextValue bug when setting twice a same type for a same key - implements a DefaultJAXXContext - - use this default implementation with delegate pattern in JAXXObject - * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext - * 20081027 [chemit] fix bug 1722 - * 20081027 [chemit] add conversion support in validator - * 20081025 [chemit] improve BeanValidator tag : - - add a errorList attribute for set a ErrorListMouseListener on the errorList - - add a beanInitializer attribute for set the validator's bean at runtime - - add a default errorListModel value 'errors' - * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method - * 20081024 [chemit] fix validator context lost if UI is launched from another thread - ver-0-5 chemit 20081002 - * 20081017 [chemit] add validator support - * 20081013 [chemit] can generate logger on jaxx files - * 20081011 [chemit] improve site - * 20081011 [chemit] fix bug on JavaFileParser : works again - * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin - * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) - * 20081002 [chemit] Introduce JAXXContext - * 20081002 [chemit] Fix bug on method creation via scripting - * 20081002 [chemit] Improve i18n integration (works now also for tabs) + - use this default implementation with delegate pattern in JAXXObject + * 20081030 [chemit] add JAXXAction contract to simplify init of ui with JAXXInitialContext + * 20081027 [chemit] fix bug 1722 + * 20081027 [chemit] add conversion support in validator + * 20081025 [chemit] improve BeanValidator tag : + - add a errorList attribute for set a ErrorListMouseListener on the errorList + - add a beanInitializer attribute for set the validator's bean at runtime + - add a default errorListModel value 'errors' + * 20081025 [chemit] introduce JAXXInitialContext to fill JAXXContext at runtime before $initialize() method + * 20081024 [chemit] fix validator context lost if UI is launched from another thread + 0.5 chemit 20081002 + * 20081017 [chemit] add validator support + * 20081013 [chemit] can generate logger on jaxx files + * 20081011 [chemit] improve site + * 20081011 [chemit] fix bug on JavaFileParser : works again + * 20081002 [chemit] Using lutinproject 3.0, changing groupId to org.codelutin + * 20081002 [chemit] use a single module jaxx-core (no more core, runtime and jaxx-swing modules) + * 20081002 [chemit] Introduce JAXXContext + * 20081002 [chemit] Fix bug on method creation via scripting + * 20081002 [chemit] Improve i18n integration (works now also for tabs) Modified: jaxx/trunk/jaxx-runtime-validator/pom.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-runtime-validator/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -8,24 +9,25 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-runtime-validator</artifactId> <dependencies> +  + <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-api</artifactId> + <version>${project.version}</version> </dependency> -  +  <dependency> <groupId>com.opensymphony</groupId> @@ -37,7 +39,8 @@    - <name>jaxx-runtime-validator</name> + + <name>${project.artifactId}</name> <description>Jaxx runtime validation</description>  @@ -45,9 +48,6 @@  <packaging>jar</packaging> - <build> - <defaultGoal>install</defaultGoal> - </build>    Modified: jaxx/trunk/jaxx-swing-action/changelog.txt =================================================================== --- jaxx/trunk/jaxx-swing-action/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-swing-action/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,4 +1,8 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + - rename i18n bundles according artifactId + 1.0 chemit 20090111 0.7 chemit 200812?? - * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file + * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file Modified: jaxx/trunk/jaxx-swing-action/pom.xml =================================================================== --- jaxx/trunk/jaxx-swing-action/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-swing-action/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -9,31 +10,32 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-swing-action</artifactId> <dependencies> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-util</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-runtime-swing</artifactId> - <scope>compile</scope> + <version>${project.version}</version> </dependency> <dependency> <groupId>jboss</groupId> <artifactId>javassist</artifactId> <version>3.7.ga</version> - <scope>compile</scope> </dependency> </dependencies> @@ -41,7 +43,8 @@    - <name>jaxx-swing-action</name> + + <name>${project.artifactId}</name> <description>Jaxx lutin library swing extension (tabs and actions)</description>  @@ -50,13 +53,20 @@ <packaging>jar</packaging> <build> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +  + <compilerArgument>-proc:none</compilerArgument> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgument>-proc:none</compilerArgument> - </configuration> - </plugin> <plugin> <groupId>org.codelutin</groupId> Modified: jaxx/trunk/jaxx-util/changelog.txt =================================================================== --- jaxx/trunk/jaxx-util/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-util/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,4 +1,8 @@ +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + - rename i18n bundles according artifactId + 1.0 chemit 20090111 0.7 chemit 200812?? - * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file + * 20081207 [chemit] use lutinproject 3.1 \ No newline at end of file Modified: jaxx/trunk/jaxx-util/pom.xml =================================================================== --- jaxx/trunk/jaxx-util/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-util/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -7,17 +8,19 @@   <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>jaxx-util</artifactId>    - <name>jaxx-util</name> + + <name>${project.artifactId}</name> <description>Jaxx lutin library utility</description>  @@ -28,7 +31,7 @@ <build> <plugins> <plugin> - <groupId>org.codelutin.plugin</groupId> + <groupId>org.codelutin</groupId> <artifactId>maven-i18n-plugin</artifactId> </plugin> </plugins> @@ -37,7 +40,7 @@    - <scm> + <scm> <url>${maven.scm.url.child}</url> <connection>${maven.scm.connection.child}</connection> <developerConnection>${maven.scm.developerConnection.child}</developerConnection> Copied: jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-en_GB.properties (from rev 1173, jaxx/trunk/jaxx-util/src/main/resources/i18n/util-en_GB.properties) =================================================================== --- jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-en_GB.properties (rev 0) +++ jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-en_GB.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -0,0 +1,6 @@ +lutinui.config.cancel=Cancel +lutinui.config.cancel.tooltip=Cancel and quit +lutinui.config.reset=Reset +lutinui.config.reset.tooltip=Reset configuration +lutinui.config.save=Save +lutinui.config.save.tooltip=Save configuration and quit Copied: jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-fr_FR.properties (from rev 1173, jaxx/trunk/jaxx-util/src/main/resources/i18n/util-fr_FR.properties) =================================================================== --- jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-fr_FR.properties (rev 0) +++ jaxx/trunk/jaxx-util/src/main/resources/i18n/jaxx-util-fr_FR.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -0,0 +1,6 @@ +lutinui.config.cancel=Annuler +lutinui.config.cancel.tooltip=Annuler les modification et quitter +lutinui.config.reset=R\u00E9initialiser +lutinui.config.reset.tooltip=R\u00E9initialiser la configuration +lutinui.config.save=Sauver +lutinui.config.save.tooltip=Sauver la configuration et quitter Deleted: jaxx/trunk/jaxx-util/src/main/resources/i18n/util-en_GB.properties =================================================================== --- jaxx/trunk/jaxx-util/src/main/resources/i18n/util-en_GB.properties 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-util/src/main/resources/i18n/util-en_GB.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,6 +0,0 @@ -lutinui.config.cancel=Cancel -lutinui.config.cancel.tooltip=Cancel and quit -lutinui.config.reset=Reset -lutinui.config.reset.tooltip=Reset configuration -lutinui.config.save=Save -lutinui.config.save.tooltip=Save configuration and quit Deleted: jaxx/trunk/jaxx-util/src/main/resources/i18n/util-fr_FR.properties =================================================================== --- jaxx/trunk/jaxx-util/src/main/resources/i18n/util-fr_FR.properties 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/jaxx-util/src/main/resources/i18n/util-fr_FR.properties 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,6 +0,0 @@ -lutinui.config.cancel=Annuler -lutinui.config.cancel.tooltip=Annuler les modification et quitter -lutinui.config.reset=R\u00E9initialiser -lutinui.config.reset.tooltip=R\u00E9initialiser la configuration -lutinui.config.save=Sauver -lutinui.config.save.tooltip=Sauver la configuration et quitter Modified: jaxx/trunk/maven-jaxx-plugin/changelog.txt =================================================================== --- jaxx/trunk/maven-jaxx-plugin/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/maven-jaxx-plugin/changelog.txt 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,24 +1,26 @@ -1.1 chemit ??? +1.1 chemit 200901?? + * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) + - rename i18n bundles according artifactId + * 20090113 [chemit] - fix bug : when using addProjectClassPath property, sometimes does not retreave + dependancies, force it to work whatever is the phase :) -* 20090113 [chemit] - fix bug : when using addProjectClassPath property, sometimes does not retreave dependancies, force it to work whatever is the phase :) - 1.0 chemit 20090111 0.8 chemit 200812?? - * 20081219 [chemit] - add addProjectClassPath property to add project compile class-path in plugin class-path - * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path + * 20081219 [chemit] - add addProjectClassPath property to add project compile class-path in plugin class-path + * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path 0.7 chemit 20081210 -* 20081208 [chemit] - javabBean attribute use to initialize bean -* 20081207 [chemit] use lutinproject 3.1 + * 20081208 [chemit] - javabBean attribute use to initialize bean + * 20081207 [chemit] use lutinproject 3.1 0.6 chemit 200811?? - * 20081108 [chemit] can add extra imports in JaxxGeneratorMojo (will be added to all generated java files). - * 20081104 [chemit] can add extra beanInfoSearchPath in JaxxGeneratorMojo + * 20081108 [chemit] can add extra imports in JaxxGeneratorMojo (will be added to all generated java files). + * 20081104 [chemit] can add extra beanInfoSearchPath in JaxxGeneratorMojo -ver-0-5 chemit 20081002 - * 20081013 [chemit] can generate logger on jaxx files - * 20081011 [chemit] improve site - * 20081011 [chemit] refactor tests of the plugin using maven-plugin-testing-harness plugin - * 20081002 [chemit] Using lutinpluginproject 3.0, changing groupId to org.codelutin - * 20081002 [chemit] Make nearly all tests works again... +0.5 chemit 20081002 + * 20081013 [chemit] can generate logger on jaxx files + * 20081011 [chemit] improve site + * 20081011 [chemit] refactor tests of the plugin using maven-plugin-testing-harness plugin + * 20081002 [chemit] Using lutinpluginproject 3.0, changing groupId to org.codelutin + * 20081002 [chemit] Make nearly all tests works again... Modified: jaxx/trunk/maven-jaxx-plugin/pom.xml =================================================================== --- jaxx/trunk/maven-jaxx-plugin/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/maven-jaxx-plugin/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -1,4 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -7,56 +8,70 @@  <parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> <version>1.1-SNAPSHOT</version> </parent> + <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <scope>compile</scope> - </dependency> +  <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-compiler-api</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-compiler-validator</artifactId> + <version>${project.version}</version> </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-compiler-swing</artifactId> + <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.codelutin.jaxx</groupId> + <groupId>${project.groupId}</groupId> <artifactId>jaxx-swing-action</artifactId> + <version>${project.version}</version> </dependency>  + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> - <scope>compile</scope> </dependency> +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + </dependency> + +  + <dependency> + <groupId>com.sun</groupId> + <artifactId>dt</artifactId> + </dependency> + +  + + <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-plugin-testing-harness</artifactId> <version>1.1</version> @@ -70,27 +85,14 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <scope>compile</scope> - </dependency> -  - <dependency> - <groupId>com.sun</groupId> - <artifactId>dt</artifactId> -  - </dependency> - </dependencies>    - <name>maven-jaxx-plugin</name> - + <name>${project.artifactId}</name> <description> Maven 2 plugin to generate java source from ui interface definitions in jaxx format. @@ -106,10 +108,8 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> <executions> <execution> - <id>helpmojo</id> <goals> <goal>helpmojo</goal> </goals> @@ -124,7 +124,6 @@ <plugins> <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.3</version> </plugin> </plugins> </reporting> Modified: jaxx/trunk/pom.xml =================================================================== --- jaxx/trunk/pom.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/pom.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -13,8 +13,9 @@ <version>3.3</version> </parent> - <groupId>org.codelutin.jaxx</groupId> + <groupId>org.codelutin</groupId> <artifactId>jaxx</artifactId> + <version>1.1-SNAPSHOT</version> <modules> <module>jaxx-util</module> @@ -28,6 +29,8 @@ <module>jaxx-swing-action</module> <module>maven-jaxx-plugin</module> + + <module>jaxx-example</module> </modules> <dependencies> @@ -37,56 +40,11 @@ </dependency> </dependencies> -  -  -  - <name>jaxx-parent</name> - <version>1.1-SNAPSHOT</version> - <description>Jaxx lutin library parent pom</description> - <inceptionYear>2008</inceptionYear> - -  -  -  - - <packaging>pom</packaging> - - <properties> - -  - <labs.id>38</labs.id> - - <labs.project>buix</labs.project> - -  - <lutinutil.version>1.0</lutinutil.version> - - <jaxx.version>${project.version}</jaxx.version> - </properties> - - <build> - - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - - </build> - <dependencyManagement> <dependencies> + +  + <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> @@ -94,57 +52,27 @@ </dependency> <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-util</artifactId> - <version>${project.version}</version> + <groupId>org.codelutin</groupId> + <artifactId>lutinpluginutil</artifactId> + <version>0.2</version> + <scope>compile</scope> </dependency> -  - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-compiler-api</artifactId> - <version>${project.version}</version> - </dependency> +  -  <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-swing</artifactId> - <version>${project.version}</version> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + <version>1.3</version> </dependency> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-compiler-swing</artifactId> - <version>${project.version}</version> - </dependency> -  <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-runtime-validator</artifactId> - <version>${project.version}</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> </dependency> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-compiler-validator</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-swing-action</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.codelutin.jaxx</groupId> - <artifactId>jaxx-example</artifactId> - <version>${project.version}</version> - </dependency> +  <dependency> <groupId>com.sun</groupId> @@ -160,6 +88,8 @@ <version>2.0.02</version> </dependency> +  + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> @@ -174,12 +104,7 @@ <scope>compile</scope> </dependency> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinpluginutil</artifactId> - <version>0.2</version> - <scope>compile</scope> - </dependency> +  <dependency> <groupId>com.opensymphony</groupId> @@ -188,28 +113,75 @@  </dependency> +  + <dependency> <groupId>org.swinglabs</groupId> <artifactId>jxlayer</artifactId> <version>3.0.1</version> </dependency> - <dependency> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - <version>1.3</version> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - </dependencies> </dependencyManagement>  +  +  + + <name>${project.artifactId}</name> + <description>Jaxx lutin library parent pom</description> + <inceptionYear>2008</inceptionYear> + +  +  +  + + <packaging>pom</packaging> + + <properties> + +  + <labs.id>38</labs.id> + +  + <labs.project>buix</labs.project> + +  + <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> + +  + <jaxx.version>${project.version}</jaxx.version> + </properties> + + <build> + + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.4.3</version> + </plugin> + + </plugins> + </pluginManagement> + + </build> + +    <scm> Modified: jaxx/trunk/src/site/site.xml =================================================================== --- jaxx/trunk/src/site/site.xml 2009-01-22 00:11:09 UTC (rev 1174) +++ jaxx/trunk/src/site/site.xml 2009-01-22 15:27:03 UTC (rev 1175) @@ -6,12 +6,12 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.2</version> </skin> <bannerLeft> <name>${project.name}</name> - <src>http://buix.labs.libre-entreprise.org/lutinjaxx/jaxx.png</src> + <src>http://buix.labs.libre-entreprise.org/jaxx/jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -21,8 +21,10 @@ </bannerRight> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="http://buix.labs.libre-entreprise.org/lutinjaxx/images/logos/maven-feather.…"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="http://buix.labs.libre-entreprise.org/lutinjaxx/images/jrst-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" + img="http://buix.labs.libre-entreprise.org/lutinjaxx/images/logos/maven-feather.…"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" + img="http://buix.labs.libre-entreprise.org/lutinjaxx/images/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="http://buix.labs.libre-entreprise.org/lutinjaxx/images/restructuredtext-log…"/> </poweredBy>

1 0

[Buix-commits] r1174 - in jaxx/trunk: jaxx-runtime-swing jaxx-runtime-swing/src/main/java/jaxx/runtime/swing jaxx-runtime-validator/src/test/java/jaxx jaxx-runtime-validator/src/test/resources/jaxx
by tchemit＠users.labs.libre-entreprise.org 22 Jan '09

22 Jan '09

Author: tchemit Date: 2009-01-22 00:11:09 +0000 (Thu, 22 Jan 2009) New Revision: 1174 Removed: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/junit/ Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Utils.java Log: - remove no more used junit directory in tests - add some usefull methods in JAXXList and JAXXComboBox Modified: jaxx/trunk/jaxx-runtime-swing/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-01-20 20:11:30 UTC (rev 1173) +++ jaxx/trunk/jaxx-runtime-swing/changelog.txt 2009-01-22 00:11:09 UTC (rev 1174) @@ -1,3 +1,6 @@ +1.1 chemit 200901?? + * 20090121 [letellier] - add some usefull methods in JAXXList and JAXXComboBox + 1.0 chemit 20090111 * 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) * 20090105 [chemit] - improve CardLayout2 Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2009-01-20 20:11:30 UTC (rev 1173) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXComboBox.java 2009-01-22 00:11:09 UTC (rev 1174) @@ -15,7 +15,10 @@ import java.awt.event.ItemListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collection; import java.util.List; public class JAXXComboBox extends JComboBox { @@ -120,8 +123,9 @@ break; } } - } else + } else { item = (Item) items.get(index); + } if (item != null) { String label = item.getLabel(); @@ -151,7 +155,39 @@ }); } + /** + * Fill a combo box model with some datas, and select after all the given object + * + * @param data data ot inject in combo + * @param select the object to select in combo after reflling his model + * @param methodName method to invoke to display data's name + */ + public void fillComboBox(Collection<?> data, Object select, String methodName) { + // prepare method to use + Method m; + try { + m = select.getClass().getMethod(methodName); + m.setAccessible(true); + } catch (NoSuchMethodException e) { + throw new IllegalArgumentException("could not find method " + methodName + " on " + select.getClass()); + } + List<Item> items = new ArrayList<Item>(); + for (Object o : data) { + boolean selected = o.equals(select); + try { + items.add(new Item(o.toString(), (String) m.invoke(o), o, selected)); + } catch (IllegalAccessException e) { + // shoudl never happen ? + throw new RuntimeException(e); + } catch (InvocationTargetException e) { + // shoudl never happen ? + throw new RuntimeException(e); + } + } + 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) { @@ -161,10 +197,11 @@ public void setItems(List<Item> items) { setModel(new JAXXComboBoxModel(items)); List<Integer> selectedIndexList = new ArrayList<Integer>(); - for (int i = 0; i < items.size(); i++) + for (int i = 0; i < items.size(); i++) { if (items.get(i).isSelected()) { selectedIndexList.add(i); } + } int[] selectedIndices = new int[selectedIndexList.size()]; for (int i = 0; i < selectedIndexList.size(); i++) { selectedIndices[i] = selectedIndexList.get(i); Modified: jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java =================================================================== --- jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java 2009-01-20 20:11:30 UTC (rev 1173) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/JAXXList.java 2009-01-22 00:11:09 UTC (rev 1174) @@ -13,7 +13,10 @@ import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collection; import java.util.List; public class JAXXList extends JList { @@ -145,4 +148,78 @@ } setSelectedIndices(selectedIndices); } + + /** + * Fill a list model with some datas, and select after all the given object + * + * @param data data ot inject in combo + * @param selects the objects to select in list after reflling his model + */ + public void fillList(Collection<?> data, Collection<?> selects) { + List<Item> items = new ArrayList<Item>(); + for (Object o : data) { + boolean selected = false; + for (Object select : selects) { + if (selected = o.equals(select)) { + break; + } + } + items.add(new Item(o.toString(), o.toString(), o, selected)); + } + setItems(items); + } + + /** + * Fill a list model with some datas, and select after all the given object + * + * @param data data ot inject in combo + * @param select object to select in list after reflling his model + */ + public void fillList(Collection<?> data, Object select) { + List<Item> items = new ArrayList<Item>(); + for (Object o : data) { + boolean selected = o.equals(select); + items.add(new Item(o.toString(), o.toString(), o, selected)); + } + setItems(items); + } + + /** + * Fill a list model with some datas, and select after all the given object + * + * @param data data ot inject in combo + * @param select object to select in list after reflling his model + * @param methodName method to invoke to display data's name + */ + public void fillList(Collection<?> data, Object select, String methodName) { + // prepare method to use + Method m; + try { + m = select.getClass().getMethod(methodName); + m.setAccessible(true); + } catch (NoSuchMethodException e) { + throw new IllegalArgumentException("could not find method " + methodName + " on " + select.getClass()); + } + + List<Item> items = new ArrayList<Item>(); + for (Object o : data) { + boolean selected = o.equals(select); + try { + items.add(new Item(o.toString(), (String) m.invoke(o), o, selected)); + } catch (SecurityException e) { + // shoudl never happen ? + throw new RuntimeException(e); + } catch (IllegalAccessException e) { + // shoudl never happen ? + throw new RuntimeException(e); + } catch (IllegalArgumentException e) { + // shoudl never happen ? + throw new RuntimeException(e); + } catch (InvocationTargetException e) { + // shoudl never happen ? + throw new RuntimeException(e); + } + } + setItems(items); + } } \ No newline at end of file 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-01-20 20:11:30 UTC (rev 1173) +++ jaxx/trunk/jaxx-runtime-swing/src/main/java/jaxx/runtime/swing/Utils.java 2009-01-22 00:11:09 UTC (rev 1174) @@ -15,12 +15,7 @@ import javax.swing.text.AbstractDocument; import javax.swing.text.JTextComponent; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collection; -import java.lang.reflect.Method; -import java.util.List; +import java.util.Collection; public class Utils { private static Field numReaders; @@ -131,121 +126,7 @@ model.setSelectedItem(select); } - /** - * TODO put this code directly in JAXXList, since we can do it :) - * <p/> - * Fill a list model with some datas, and select after all the given object - * - * @param list the list to fill - * @param data data ot inject in combo - * @param selects the objects to select in list after reflling his model - */ - public static void fillList(jaxx.runtime.swing.JAXXList list, Collection<?> data, Collection<?> selects) { - List<Item> items = new ArrayList<Item>(); - for (Object o : data) { - boolean selected = false; - for (Object select : selects) { - selected = (o.equals(select) || selected); - } - items.add(new Item(o.toString(), o.toString(), o, selected)); - } - list.setItems(items); - } - /** - * TODO put this code directly in JAXXList, since we can do it :) - * Fill a list model with some datas, and select after all the given object - * - * @param list the list to fill - * @param data data ot inject in combo - * @param select object to select in list after reflling his model - */ - public static void fillList(jaxx.runtime.swing.JAXXList list, Collection<?> data, Object select) { - List<Item> items = new ArrayList<Item>(); - for (Object o : data) { - boolean selected = o.equals(select); - items.add(new Item(o.toString(), o.toString(), o, selected)); - } - list.setItems(items); - } - - - /** - * TODO put this code directly in JAXXComboBox, since we can do it :) - * Fill a combo box model with some datas, and select after all the given object - * - * @param combo the combo to fill - * @param data data ot inject in combo - * @param select the object to select in combo after reflling his model - * @param methodName method to invoke to display data's name - */ - public static void fillComboBox(jaxx.runtime.swing.JAXXComboBox combo, Collection<?> data, Object select, String methodName) { - // prepare method to use - Method m; - try { - m = select.getClass().getMethod(methodName); - m.setAccessible(true); - } catch (NoSuchMethodException e) { - throw new IllegalArgumentException("could not find method " + methodName + " on " + select.getClass()); - } - - List<Item> items = new ArrayList<Item>(); - for (Object o : data) { - boolean selected = o.equals(select); - try { - items.add(new Item(o.toString(), (String) m.invoke(o), o, selected)); - } catch (IllegalAccessException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } - } - combo.setItems(items); - } - - /** - * TODO put this code directly in JAXXList, since we can do it :) - * Fill a list model with some datas, and select after all the given object - * - * @param list the list to fill - * @param data data ot inject in combo - * @param select object to select in list after reflling his model - * @param methodName method to invoke to display data's name - */ - public static void fillList(jaxx.runtime.swing.JAXXList list, Collection<?> data, Object select, String methodName) { - // prepare method to use - Method m; - try { - m = select.getClass().getMethod(methodName); - m.setAccessible(true); - } catch (NoSuchMethodException e) { - throw new IllegalArgumentException("could not find method " + methodName + " on " + select.getClass()); - } - - List<Item> items = new ArrayList<Item>(); - for (Object o : data) { - boolean selected = o.equals(select); - try { - items.add(new Item(o.toString(), (String) m.invoke(o), o, selected)); - } catch (SecurityException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (IllegalArgumentException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } catch (InvocationTargetException e) { - // shoudl never happen ? - throw new RuntimeException(e); - } - } - list.setItems(items); - } - public static void fixTableColumnWidth(JTable table, int columnIndex, int width) { TableColumn column = table.getColumnModel().getColumn(columnIndex); column.setMaxWidth(width);

1 0

[Buix-commits] r1173 - jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit
by tchemit＠users.labs.libre-entreprise.org 20 Jan '09

20 Jan '09

Author: tchemit Date: 2009-01-20 20:11:30 +0000 (Tue, 20 Jan 2009) New Revision: 1173 Removed: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorTest.java Log: - improve validators tests (one test by validator with a common AbstractValidatorTest super class) - add a CollectionFieldExpressionValidator to validate a collection of a bean Deleted: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorTest.java 2009-01-20 20:11:30 UTC (rev 1173) @@ -1,173 +0,0 @@ -package jaxx.junit; - -import jaxx.runtime.validator.BeanValidator; -import jaxx.runtime.validator.BeanValidatorError; -import jaxx.runtime.validator.BeanValidatorErrorListModel; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import javax.swing.JLabel; -import java.io.File; -import java.util.Enumeration; - -/** @author chemit */ -public class ValidatorTest { - - ValidatorBean bean; - - static protected BeanValidator<ValidatorBean> validator; - static protected BeanValidatorErrorListModel errors; - static protected File basedir; - - @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); - validator.setErrorListModel(errors = new BeanValidatorErrorListModel()); - JLabel label = new JLabel(); - validator.setFieldRepresentation("existingFile", label); - validator.setFieldRepresentation("existingDirectory", label); - validator.setFieldRepresentation("notExistingFile", label); - validator.setFieldRepresentation("notExistingDirectory", label); - - } - - @Before - public void setUp() throws Exception { - validator.setBean(bean = new ValidatorBean()); - } - - @Test - public void testRequiredFileFieldValidator() throws Exception { - - Assert.assertNull(bean.getExistingFile()); - assertFieldInError("existingFile", "existingFile.required", true); - - bean.setExistingFile(new File("")); - assertFieldInError("existingFile", "existingFile.required", true); - - bean.setExistingFile(basedir); - assertFieldInError("existingFile", "existingFile.required", false); - - assertFieldInError("existingFile", "existingFile.not.exist", true); - - bean.setExistingFile(new File(basedir, "pom.xml")); - assertFieldInError("existingFile", "existingFile.required", false); - assertFieldInError("existingFile", "existingFile.not.exist", false); - - } - - @Test - public void testExistingFileFieldValidator() throws Exception { - - Assert.assertNull(bean.getExistingFile()); - assertFieldInError("existingFile", "existingFile.required", true); - - bean.setExistingFile(new File("")); - assertFieldInError("existingFile", "existingFile.required", true); - - // existing directory - bean.setExistingFile(basedir); - assertFieldInError("existingFile", "existingFile.required", false); - assertFieldInError("existingFile", "existingFile.not.exist", true); - - // existing file - bean.setExistingFile(new File(basedir, "pom.xml")); - assertFieldInError("existingFile", "existingFile.required", false); - assertFieldInError("existingFile", "existingFile.not.exist", false); - - } - - @Test - public void testNotExistingFileFieldValidator() throws Exception { - - Assert.assertNull(bean.getNotExistingFile()); - assertFieldInError("notExistingFile", "notExistingFile.required", true); - - bean.setNotExistingFile(new File("")); - assertFieldInError("notExistingFile", "notExistingFile.required", true); - - // existing directory - bean.setNotExistingFile(basedir); - assertFieldInError("notExistingFile", "notExistingFile.required", false); - assertFieldInError("notExistingFile", "notExistingFile.exist", true); - - // existing file - bean.setNotExistingFile(new File(basedir, "pom.xml")); - assertFieldInError("notExistingFile", "notExistingFile.required", false); - assertFieldInError("notExistingFile", "notExistingFile.exist", true); - - // none existing file - bean.setNotExistingFile(new File(basedir, "pom.xml-" + System.currentTimeMillis())); - assertFieldInError("notExistingFile", "notEexistingFile.required", false); - assertFieldInError("notExistingFile", "notExistingFile.exist", false); - - - } - - @Test - public void testExistingDirectoryFieldValidator() throws Exception { - - Assert.assertNull(bean.getExistingDirectory()); - assertFieldInError("existingDirectory", "existingDirectory.required", true); - - bean.setExistingDirectory(new File("")); - assertFieldInError("existingDirectory", "existingDirectory.required", true); - - // existing file - bean.setExistingDirectory(new File(basedir, "pom.xml")); - assertFieldInError("existingDirectory", "existingDirectory.required", false); - assertFieldInError("existingDirectory", "existingDirectory.not.exist", true); - - // existing directory - bean.setExistingDirectory(basedir); - assertFieldInError("existingDirectory", "existingDirectory.required", false); - assertFieldInError("existingDirectory", "existingDirectory.not.exist", false); - - } - - @Test - public void testNotExistingDirectoryFieldValidator() throws Exception { - Assert.assertNull(bean.getNotExistingDirectory()); - assertFieldInError("notExistingDirectory", "notExistingDirectory.required", true); - - bean.setNotExistingDirectory(new File("")); - assertFieldInError("notExistingDirectory", "notExistingDirectory.required", true); - - // existing directory - bean.setNotExistingDirectory(basedir); - assertFieldInError("notExistingDirectory", "notExistingDirectory.required", false); - assertFieldInError("notExistingDirectory", "notExistingDirectory.exist", true); - - // existing file - bean.setNotExistingDirectory(new File(basedir, "pom.xml")); - assertFieldInError("notExistingDirectory", "notExistingDirectory.required", false); - assertFieldInError("notExistingDirectory", "notExistingDirectory.exist", true); - - // none existing directory - bean.setNotExistingDirectory(new File(basedir, "pom.xml-" + System.currentTimeMillis())); - assertFieldInError("notExistingDirectory", "notEexistingFile.required", false); - assertFieldInError("notExistingDirectory", "notExistingDirectory.exist", false); - } - - - protected void assertFieldInError(String s, String error, boolean required) { - Enumeration<?> myErrors = errors.elements(); - while (myErrors.hasMoreElements()) { - BeanValidatorError o = (BeanValidatorError) myErrors.nextElement(); - if (o.getFieldName().equals(s) && o.getError().equals(error)) { - Assert.assertTrue(required); - return; - } - } - // error was not found - Assert.assertFalse(required); - } -}

1 0

[Buix-commits] r1172 - in jaxx/trunk/jaxx-runtime-validator: . src/main/java/jaxx/runtime/validator/field src/main/resources src/test/java/jaxx/junit src/test/java/jaxx/runtime src/test/java/jaxx/runtime/validator src/test/java/jaxx/runtime/validator/field src/test/resources src/test/resources/jaxx src/test/resources/jaxx/junit src/test/resources/jaxx/runtime src/test/resources/jaxx/runtime/validator src/test/resources/jaxx/runtime/validator/field
by tchemit＠users.labs.libre-entreprise.org 20 Jan '09

20 Jan '09

Author: tchemit Date: 2009-01-20 19:39:17 +0000 (Tue, 20 Jan 2009) New Revision: 1172 Added: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ 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/CollectionFieldExpressionValidatorTest.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 jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml Removed: jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorBean.java jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/junit/ValidatorBean-validation.xml Modified: jaxx/trunk/jaxx-runtime-validator/changelog.txt jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties Log: - improve validators tests (one test by validator with a common AbstractValidatorTest super class) - add a CollectionFieldExpressionValidator to validate a collection of a bean Modified: jaxx/trunk/jaxx-runtime-validator/changelog.txt =================================================================== --- jaxx/trunk/jaxx-runtime-validator/changelog.txt 2009-01-19 12:57:33 UTC (rev 1171) +++ jaxx/trunk/jaxx-runtime-validator/changelog.txt 2009-01-20 19:39:17 UTC (rev 1172) @@ -1,3 +1,7 @@ +1.1 chemit 200901?? +* 20090120 [chemit] - improve validators tests (one test by validator with a common AbstractValidatorTest super class) + - add a CollectionFieldExpressionValidator to validate a collection of a bean + 1.0 chemit 20090111 * 20090111 [chemit] - integrate new architecture to allow to have runtime code with NO link with compiler :) * 20090111 [chemit] - add parent attribute on BeanValidator to chain validators Added: jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/main/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidator.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,192 @@ +package jaxx.runtime.validator.field; + +import com.opensymphony.xwork2.validator.ValidationException; +import com.opensymphony.xwork2.validator.validators.FieldExpressionValidator; + +import java.util.Collection; + +/** + * Un validateur basé sur {@link FieldExpressionValidator} qui valide sur une collection de propriéte. + * + * @author chemit + */ +public class CollectionFieldExpressionValidator extends FieldExpressionValidator { + + + public enum Mode { + /** au moins une entrée de la collection doit etre valide */ + AT_LEAST_ONE, + /** exactement une entrée dela collection doit être valide */ + EXACTLY_ONE, + /** toutes les valeurs de la collection doivent etre valides */ + ALL, + /** aucune valeur de la collection doivent etre valides */ + NONE + } + + /** le mode de validation sur la liste */ + protected Mode mode; + + public Mode getMode() { + return mode; + } + + public void setMode(Mode mode) { + this.mode = mode; + } + + public void setMode(String mode) { + this.mode = Mode.valueOf(mode); + } + + @Override + public void validate(Object object) throws ValidationException { + if (mode == null) { + throw new ValidationException("no mode was setted"); + } + + String fieldName = getFieldName(); + + Collection<?> col = getCollection(object); + + boolean answer; + + switch (mode) { + case ALL: + answer = validateAllEntries(col); + break; + case AT_LEAST_ONE: + answer = validateAtLeastOneEntry(col); + break; + case EXACTLY_ONE: + answer = validateExtacltyOneEntry(col); + break; + case NONE: + answer = validateNoneEntry(col); + break; + + default: + // should never come here... + answer = false; + } + + if (!answer) { + addFieldError(fieldName, object); + } + } + + protected Boolean validateAllEntries(Collection<?> col) throws ValidationException { + boolean answer = true; + for (Object entry : col) { + answer = validateOneEntry(entry); + if (!answer) { + // validation on one entry has failed + // no need to continue + break; + } + } + return answer; + } + + protected Boolean validateNoneEntry(Collection<?> col) throws ValidationException { + boolean answer = true; + for (Object entry : col) { + boolean b = validateOneEntry(entry); + if (b) { + // one entry has sucessed, validation has failed + // no need to continue + answer = false; + break; + } + } + return answer; + } + + protected Boolean validateAtLeastOneEntry(Collection<?> col) throws ValidationException { + boolean answer = false; + for (Object entry : col) { + answer = validateOneEntry(entry); + if (answer) { + // one entry was succes, validation is ok, + // no need to continue + break; + } + } + return answer; + } + + protected Boolean validateExtacltyOneEntry(Collection<?> col) throws ValidationException { + int count = 0; + for (Object entry : col) { + boolean answer = validateOneEntry(entry); + if (answer) { + // one entry has succed + count++; + if (count > 1) { + // more than one entriy was successfull + // so validation has failed + break; + } + + } + } + return count == 1; + } + + protected boolean validateOneEntry(Object object) throws ValidationException { + // obtain the validation of one entry of the collection + Object obj = null; + try { + obj = getFieldValue(getExpression(), object); + } catch (ValidationException e) { + throw e; + } catch (Exception e) { + // let this pass, but it will be logged right below + } + + Boolean answer = Boolean.FALSE; + + if (obj != null && obj instanceof Boolean) { + answer = (Boolean) obj; + } else { + log.warn("Got result of " + obj + " when trying to get Boolean."); + } + return answer; + } + + /** + * @param object the incoming object containing the collection to test + * @return the collection of the incoming object given by the fieldName property + * @throws ValidationException if any pb to retreave the collection + */ + protected Collection<?> getCollection(Object object) throws ValidationException { + String fieldName = getFieldName(); + + Object obj = null; + + // obtain the collection to test + try { + obj = getFieldValue(fieldName, object); + } catch (ValidationException e) { + throw e; + } catch (Exception e) { + // let this pass, but it will be logged right below + } + + if (obj == null) { + // la collection est nulle, donc on renvoie une collection vide + return java.util.Collections.EMPTY_LIST; + } + + if (!Collection.class.isInstance(obj)) { + throw new ValidationException("field " + fieldName + " is not a collection type! (" + obj.getClass() + ")"); + } + return (Collection<?>) obj; + } + + @Override + public String getValidatorType() { + return "collectionFieldExpression"; + } + +} Deleted: jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml 2009-01-19 12:57:33 UTC (rev 1171) +++ jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml 2009-01-20 19:39:17 UTC (rev 1172) @@ -1,14 +0,0 @@ -<?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="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> - Added: jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/main/resources/validators.xml 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,16 @@ +<?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="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"/> + <validator name="collectionFieldExpression" + class="jaxx.runtime.validator.field.CollectionFieldExpressionValidator"/> +</validators> +  Deleted: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorBean.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorBean.java 2009-01-19 12:57:33 UTC (rev 1171) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorBean.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -1,78 +0,0 @@ -package jaxx.junit; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.File; - -public class ValidatorBean { - - protected File existingFile; - protected File notExistingFile; - - protected File existingDirectory; - protected File notExistingDirectory; - - 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 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); - } - -} \ No newline at end of file Added: 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 (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/AbstractValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,72 @@ +package jaxx.runtime.validator.field; + +import jaxx.runtime.validator.BeanValidator; +import jaxx.runtime.validator.BeanValidatorError; +import jaxx.runtime.validator.BeanValidatorErrorListModel; +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 javax.swing.JLabel; +import java.io.File; +import java.util.Enumeration; + +/** @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); + + protected ValidatorBean bean; + + static protected BeanValidator<ValidatorBean> validator; + static protected BeanValidatorErrorListModel errors; + static protected File basedir; + + 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); + validator.setErrorListModel(errors = new BeanValidatorErrorListModel()); + JLabel label = new JLabel(); + validator.setFieldRepresentation("existingFile", label); + validator.setFieldRepresentation("existingDirectory", label); + validator.setFieldRepresentation("notExistingFile", label); + validator.setFieldRepresentation("notExistingDirectory", label); + validator.setFieldRepresentation("entries", label); + } + + @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 s, String error, boolean required) { + Enumeration<?> myErrors = errors.elements(); + while (myErrors.hasMoreElements()) { + BeanValidatorError o = (BeanValidatorError) myErrors.nextElement(); + if (o.getFieldName().equals(s) && o.getError().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/field/CollectionFieldExpressionValidatorTest.java =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/CollectionFieldExpressionValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,56 @@ +package jaxx.runtime.validator.field; + +import jaxx.runtime.validator.field.ValidatorBean.ValidatorBeanEntry; + +import java.util.Arrays; + +/** @author chemit */ +public class CollectionFieldExpressionValidatorTest extends AbstractValidatorTest { + + static protected ValidatorBeanEntry beanEntry = new ValidatorBeanEntry(0, "stringValue"); + static protected ValidatorBeanEntry beanEntry2 = new ValidatorBeanEntry(0, "fake"); + + @org.junit.Test + @Override + public void testValidator() throws Exception { + assertNull(bean.getEntries()); + + // no entry + assertFieldInError("entries", "collectionFieldExpression.atLeastOne", true); + assertFieldInError("entries", "collectionFieldExpression.exactlyOne", true); + assertFieldInError("entries", "collectionFieldExpression.all", false); + assertFieldInError("entries", "collectionFieldExpression.none", false); + + // add a matching etry + bean.setEntries(Arrays.asList(beanEntry)); + + assertFieldInError("entries", "collectionFieldExpression.atLeastOne", false); + assertFieldInError("entries", "collectionFieldExpression.exactlyOne", false); + assertFieldInError("entries", "collectionFieldExpression.all", false); + assertFieldInError("entries", "collectionFieldExpression.none", true); + + // two matching etries + bean.setEntries(Arrays.asList(beanEntry, beanEntry)); + + assertFieldInError("entries", "collectionFieldExpression.atLeastOne", false); + assertFieldInError("entries", "collectionFieldExpression.exactlyOne", true); + assertFieldInError("entries", "collectionFieldExpression.all", false); + assertFieldInError("entries", "collectionFieldExpression.none", true); + + // add a none matching etry + bean.setEntries(Arrays.asList(beanEntry2)); + + assertFieldInError("entries", "collectionFieldExpression.atLeastOne", true); + assertFieldInError("entries", "collectionFieldExpression.exactlyOne", true); + assertFieldInError("entries", "collectionFieldExpression.all", true); + assertFieldInError("entries", "collectionFieldExpression.none", false); + + // add a none matching etry and a matching entry + bean.setEntries(Arrays.asList(beanEntry2, beanEntry)); + + assertFieldInError("entries", "collectionFieldExpression.atLeastOne", false); + assertFieldInError("entries", "collectionFieldExpression.exactlyOne", false); + assertFieldInError("entries", "collectionFieldExpression.all", true); + assertFieldInError("entries", "collectionFieldExpression.none", true); + } +} Added: 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 (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingDirectoryFieldValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,30 @@ +package jaxx.runtime.validator.field; + +import java.io.File; + +/** @author chemit */ +public class ExistingDirectoryFieldValidatorTest extends AbstractValidatorTest { + + @org.junit.Test + @Override + public void testValidator() throws Exception { + + assertNull(bean.getExistingDirectory()); + assertFieldInError("existingDirectory", "existingDirectory.required", true); + + bean.setExistingDirectory(new File("")); + assertFieldInError("existingDirectory", "existingDirectory.required", true); + + // existing file + bean.setExistingDirectory(new File(basedir, "pom.xml")); + assertFieldInError("existingDirectory", "existingDirectory.required", false); + assertFieldInError("existingDirectory", "existingDirectory.not.exist", true); + + // existing directory + bean.setExistingDirectory(basedir); + assertFieldInError("existingDirectory", "existingDirectory.required", false); + assertFieldInError("existingDirectory", "existingDirectory.not.exist", false); + + } + +} \ No newline at end of file Added: 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 (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ExistingFileFieldValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,30 @@ +package jaxx.runtime.validator.field; + +import java.io.File; + +/** @author chemit */ +public class ExistingFileFieldValidatorTest extends AbstractValidatorTest { + + @org.junit.Test + @Override + public void testValidator() throws Exception { + + assertNull(bean.getExistingFile()); + assertFieldInError("existingFile", "existingFile.required", true); + + bean.setExistingFile(new File("")); + assertFieldInError("existingFile", "existingFile.required", true); + + // existing directory + bean.setExistingFile(basedir); + assertFieldInError("existingFile", "existingFile.required", false); + assertFieldInError("existingFile", "existingFile.not.exist", true); + + // existing file + bean.setExistingFile(new File(basedir, "pom.xml")); + assertFieldInError("existingFile", "existingFile.required", false); + assertFieldInError("existingFile", "existingFile.not.exist", false); + + } + +} \ No newline at end of file Added: 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 (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingDirectoryFieldValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,33 @@ +package jaxx.runtime.validator.field; + +import java.io.File; + +/** @author chemit */ +public class NotExistingDirectoryFieldValidatorTest extends AbstractValidatorTest { + + @org.junit.Test + @Override + public void testValidator() throws Exception { + assertNull(bean.getNotExistingDirectory()); + assertFieldInError("notExistingDirectory", "notExistingDirectory.required", true); + + bean.setNotExistingDirectory(new File("")); + assertFieldInError("notExistingDirectory", "notExistingDirectory.required", true); + + // existing directory + bean.setNotExistingDirectory(basedir); + assertFieldInError("notExistingDirectory", "notExistingDirectory.required", false); + assertFieldInError("notExistingDirectory", "notExistingDirectory.exist", true); + + // existing file + bean.setNotExistingDirectory(new File(basedir, "pom.xml")); + assertFieldInError("notExistingDirectory", "notExistingDirectory.required", false); + assertFieldInError("notExistingDirectory", "notExistingDirectory.exist", true); + + // none existing directory + bean.setNotExistingDirectory(new File(basedir, "pom.xml-" + System.currentTimeMillis())); + assertFieldInError("notExistingDirectory", "notEexistingFile.required", false); + assertFieldInError("notExistingDirectory", "notExistingDirectory.exist", false); + } + +} \ No newline at end of file Added: 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 (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/NotExistingFileFieldValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,37 @@ +package jaxx.runtime.validator.field; + +import java.io.File; + +/** @author chemit */ +public class NotExistingFileFieldValidatorTest extends AbstractValidatorTest { + + + @org.junit.Test + @Override + public void testValidator() throws Exception { + + assertNull(bean.getNotExistingFile()); + assertFieldInError("notExistingFile", "notExistingFile.required", true); + + bean.setNotExistingFile(new File("")); + assertFieldInError("notExistingFile", "notExistingFile.required", true); + + // existing directory + bean.setNotExistingFile(basedir); + assertFieldInError("notExistingFile", "notExistingFile.required", false); + assertFieldInError("notExistingFile", "notExistingFile.exist", true); + + // existing file + bean.setNotExistingFile(new File(basedir, "pom.xml")); + assertFieldInError("notExistingFile", "notExistingFile.required", false); + assertFieldInError("notExistingFile", "notExistingFile.exist", true); + + // none existing file + bean.setNotExistingFile(new File(basedir, "pom.xml-" + System.currentTimeMillis())); + assertFieldInError("notExistingFile", "notEexistingFile.required", false); + assertFieldInError("notExistingFile", "notExistingFile.exist", false); + + + } + +} \ No newline at end of file Added: 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 (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/RequiredFileFieldValidatorTest.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,29 @@ +package jaxx.runtime.validator.field; + +import java.io.File; + +/** @author chemit */ +public class RequiredFileFieldValidatorTest extends AbstractValidatorTest { + + @org.junit.Test + @Override + public void testValidator() throws Exception { + + assertNull(bean.getExistingFile()); + assertFieldInError("existingFile", "existingFile.required", true); + + bean.setExistingFile(new File("")); + assertFieldInError("existingFile", "existingFile.required", true); + + bean.setExistingFile(basedir); + assertFieldInError("existingFile", "existingFile.required", false); + + assertFieldInError("existingFile", "existingFile.not.exist", true); + + bean.setExistingFile(new File(basedir, "pom.xml")); + assertFieldInError("existingFile", "existingFile.required", false); + assertFieldInError("existingFile", "existingFile.not.exist", false); + + } + +} \ No newline at end of file Copied: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java (from rev 1169, jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/junit/ValidatorBean.java) =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,117 @@ +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; + + public ValidatorBeanEntry(int intValue, String stringValue) { + this.intValue = intValue; + this.stringValue = stringValue; + } + + 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; + } + } + + 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) { + Collection<ValidatorBeanEntry> old = this.entries; + this.entries = entries; + p.firePropertyChange("entries", old, entries); + } +} \ No newline at end of file Property changes on: jaxx/trunk/jaxx-runtime-validator/src/test/java/jaxx/runtime/validator/field/ValidatorBean.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/junit/ValidatorBean-validation.xml =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/junit/ValidatorBean-validation.xml 2009-01-19 12:57:33 UTC (rev 1171) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/junit/ValidatorBean-validation.xml 2009-01-20 19:39:17 UTC (rev 1172) @@ -1,44 +0,0 @@ -<!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="existingFile"> - <field-validator type="requiredFile" short-circuit="true"> - <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> - -</validators> \ No newline at end of file Copied: jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml (from rev 1169, jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/junit/ValidatorBean-validation.xml) =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml (rev 0) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml 2009-01-20 19:39:17 UTC (rev 1172) @@ -0,0 +1,67 @@ +<!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="existingFile"> + <field-validator type="requiredFile" short-circuit="true"> + <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> + +</validators> \ No newline at end of file Property changes on: jaxx/trunk/jaxx-runtime-validator/src/test/resources/jaxx/runtime/validator/field/ValidatorBean-validation.xml ___________________________________________________________________ Name: svn:mergeinfo + Modified: jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties =================================================================== --- jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties 2009-01-19 12:57:33 UTC (rev 1171) +++ jaxx/trunk/jaxx-runtime-validator/src/test/resources/log4j.properties 2009-01-20 19:39:17 UTC (rev 1172) @@ -5,4 +5,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n -log4j.logger.jaxx=DEBUG +log4j.logger.jaxx=INFO

1 0