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

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

Sept. 11, 2010

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

1 0

r2082 - trunk
by tchemit＠users.nuiton.org Sept. 9, 2010

Sept. 9, 2010

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

1 0

r2081 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 14:38:23 +0200 (Tue, 07 Sep 2010) New Revision: 2081 Url: http://nuiton.org/repositories/revision/jaxx/2081 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-compiler/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-demo/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-runtime/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-tutorial/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-tutorial-config/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-tutorial-css/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/jaxx-widgets/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/maven-jaxx-plugin/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-07 12:38:20 UTC (rev 2080) +++ trunk/pom.xml 2010-09-07 12:38:23 UTC (rev 2081) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.2</version> + <version>2.3-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -505,9 +505,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> <profiles>

1 0

r2080 - tags
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 14:38:20 +0200 (Tue, 07 Sep 2010) New Revision: 2080 Url: http://nuiton.org/repositories/revision/jaxx/2080 Log: [maven-release-plugin] copy for tag jaxx-2.2 Added: tags/jaxx-2.2/

1 0

r2079 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-tutorial jaxx-tutorial-config jaxx-tutorial-css jaxx-tutorial-databinding jaxx-tutorial-helloworld jaxx-tutorial-helloworld2 jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 14:38:18 +0200 (Tue, 07 Sep 2010) New Revision: 2079 Url: http://nuiton.org/repositories/revision/jaxx/2079 Log: [maven-release-plugin] prepare release jaxx-2.2 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-compiler/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-demo/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-runtime/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-tutorial/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-tutorial-config/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-tutorial-css/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/jaxx-widgets/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/maven-jaxx-plugin/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-07 12:31:33 UTC (rev 2078) +++ trunk/pom.xml 2010-09-07 12:38:18 UTC (rev 2079) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <modules> <module>jaxx-runtime</module> @@ -505,9 +505,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.2</url> </scm> <profiles>

1 0

r2078 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 14:31:33 +0200 (Tue, 07 Sep 2010) New Revision: 2078 Url: http://nuiton.org/repositories/revision/jaxx/2078 Log: add header + svn:keywords Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html 2010-09-07 12:31:01 UTC (rev 2077) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html 2010-09-07 12:31:33 UTC (rev 2078) @@ -2,8 +2,8 @@ #%L JAXX :: Widgets - $Id: $ - $HeadURL: $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin %% Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author

1 0

r2077 - in trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor: . bean
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 14:31:01 +0200 (Tue, 07 Sep 2010) New Revision: 2077 Url: http://nuiton.org/repositories/revision/jaxx/2077 Log: add javadoc Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html Added: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html (rev 0) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/package.html 2010-09-07 12:31:01 UTC (rev 2077) @@ -0,0 +1,35 @@ + +<html> +<body> +<h1>Package jaxx.runtime.swing.editor.bean</h1> + +Package containing several rich editors based on JavaBeans: +<ul> + <li>BeanComboBox : a rich combo box selector (reset, auto-complete + use of decorators to customize view)</li> + <li>BeanListHeader : a rich list header (reset, use of decorators to customize view)</li> +</ul> +</body> +</html> Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html 2010-09-07 12:26:00 UTC (rev 2076) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/package.html 2010-09-07 12:31:01 UTC (rev 2077) @@ -1,3 +1,27 @@ + <html> <body> <h1>Package jaxx.runtime.swing.editor</h1>

1 0

r2076 - in trunk: jaxx-demo/src/main/java/jaxx/demo/component/jaxx jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor jaxx-demo/src/main/java/jaxx/demo/entities jaxx-demo/src/main/java/jaxx/demo/feature/nav jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean jaxx-widgets/src/main/resources/icons src/site/rst
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 14:26:00 +0200 (Tue, 07 Sep 2010) New Revision: 2076 Url: http://nuiton.org/repositories/revision/jaxx/2076 Log: add header + svn:keywords Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java trunk/jaxx-widgets/src/main/resources/icons/action-bean-sort-down.png trunk/jaxx-widgets/src/main/resources/icons/action-bean-sort-up.png trunk/jaxx-widgets/src/main/resources/icons/action-bean-sort.png trunk/jaxx-widgets/src/main/resources/icons/action-combobox-reset.png trunk/jaxx-widgets/src/main/resources/icons/action-combobox-sort.png trunk/src/site/rst/spec-validator2.rst Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/BoxedDecoratorDemo.css ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.css ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemo.jaxx ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/TimeEditorDemoModel.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2010-09-07 11:04:40 UTC (rev 2075) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java 2010-09-07 12:26:00 UTC (rev 2076) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package jaxx.demo.entities; import java.beans.PropertyChangeListener; Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/AbstractDemoBean.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java 2010-09-07 11:04:40 UTC (rev 2075) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java 2010-09-07 12:26:00 UTC (rev 2076) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package jaxx.demo.entities; import jaxx.runtime.decorator.DecoratorProvider; Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/entities/DemoDecoratorProvider.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2010-09-07 11:04:40 UTC (rev 2075) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java 2010-09-07 12:26:00 UTC (rev 2076) @@ -1,3 +1,27 @@ +/* + * #%L + * JAXX :: Demo + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2008 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package jaxx.demo.feature.nav; import jaxx.demo.entities.AbstractDemoBean; Property changes on: trunk/jaxx-demo/src/main/java/jaxx/demo/feature/nav/NavDemoHandler.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBox.jaxx ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanComboBoxHandler.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeader.jaxx ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanUIUtil.java ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-bean-sort-down.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-bean-sort-up.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-bean-sort.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-combobox-reset.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/jaxx-widgets/src/main/resources/icons/action-combobox-sort.png ___________________________________________________________________ Added: svn:keywords + HeadURL Id Date Revision Author Property changes on: trunk/src/site/rst/spec-validator2.rst ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision HeadURL + HeadURL Id Date Revision Author

1 0

r2075 - trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 13:04:40 +0200 (Tue, 07 Sep 2010) New Revision: 2075 Url: http://nuiton.org/repositories/revision/jaxx/2075 Log: improve model notification Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2010-09-07 10:47:16 UTC (rev 2074) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/bean/BeanListHeaderHandler.java 2010-09-07 11:04:40 UTC (rev 2075) @@ -103,14 +103,14 @@ // build popup popupHandler.preparePopup(ui.getSelectedToolTipText(), - ui.getNotSelectedToolTipText(), - ui.getI18nPrefix(), - ui.getPopupTitleText(), - indexes, - ui.getPopupLabel(), - ui.getSortUp(), - ui.getSortDown(), - this.decorator); + ui.getNotSelectedToolTipText(), + ui.getI18nPrefix(), + ui.getPopupTitleText(), + indexes, + ui.getPopupLabel(), + ui.getSortUp(), + ui.getSortDown(), + this.decorator); ui.addPropertyChangeListener(this); @@ -188,31 +188,38 @@ log.warn(e.getMessage(), e); } - // reload the model - ui.getList().setListData(datas.toArray(new Object[datas.size()])); + ui.getList().setValueIsAdjusting(true); + try { + + // reload the model + ui.getList().setListData(datas.toArray(new Object[datas.size()])); - // re-apply selection - if (selection.length > 0) { + // re-apply selection + if (selection.length > 0) { - // re compute selection (the new data could not contains some - // previously selected items) - IntList newSelection = new ArrayIntList(); - for (Object o : selection) { - if (datas.contains(o)) { + // re compute selection (the new data could not contains some + // previously selected items) + IntList newSelection = new ArrayIntList(); + for (Object o : selection) { + if (datas.contains(o)) { - newSelection.add(datas.indexOf(o)); + newSelection.add(datas.indexOf(o)); + } } - } - if (!newSelection.isEmpty()) { + if (!newSelection.isEmpty()) { - // there is still a selection to re-apply - int[] ints = newSelection.toArray(new int[newSelection.size()]); - newSelection.clear(); - ui.getList().setSelectedIndices(ints); + // there is still a selection to re-apply + int[] ints = newSelection.toArray(new int[newSelection.size()]); + newSelection.clear(); + ui.getList().setSelectedIndices(ints); + } } + + } finally { + ui.getList().setValueIsAdjusting(false); } - + ui.getList().requestFocus(); }

1 0

r2074 - trunk/jaxx-demo/src/main/java/jaxx/demo
by tchemit＠users.nuiton.org Sept. 7, 2010

Sept. 7, 2010

Author: tchemit Date: 2010-09-07 12:47:16 +0200 (Tue, 07 Sep 2010) New Revision: 2074 Url: http://nuiton.org/repositories/revision/jaxx/2074 Log: make real bean + introduce DemoDecoratorProvider Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-09-07 10:47:05 UTC (rev 2073) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/RunDemo.java 2010-09-07 10:47:16 UTC (rev 2074) @@ -25,8 +25,7 @@ package jaxx.demo; -import jaxx.demo.entities.Movie; -import jaxx.demo.entities.People; +import jaxx.demo.entities.DemoDecoratorProvider; import jaxx.demo.tree.DemoDataProvider; import jaxx.demo.tree.DemoTreeHelper; import jaxx.runtime.SwingUtil; @@ -51,7 +50,7 @@ private static Log log = LogFactory.getLog(RunDemo.class); /** The singleton instance of the main context */ - protected static DefaultApplicationContext context; + protected static volatile DefaultApplicationContext context; public static void main(String[] args) { @@ -86,16 +85,8 @@ rootContext.setContextValue(config); // init decorator provider - DecoratorProvider p = new DecoratorProvider() { + DecoratorProvider p = new DemoDecoratorProvider(); - @Override - protected void loadDecorators() { - - registerMultiJXPathDecorator(Movie.class, "${title}$s##${year}$s", "##", " - "); - registerMultiJXPathDecorator(People.class, "${firstName}$s##${lastName}$s", "##", " "); - } - }; - // share the decorator provider rootContext.setContextValue(p); @@ -178,7 +169,7 @@ * @throws IllegalStateException si le contexte n'a pas été initialisé via * la méthode {@link #init()} */ - protected static DefaultApplicationContext get() throws IllegalStateException { + public static DefaultApplicationContext get() throws IllegalStateException { if (!isInit()) { throw new IllegalStateException("no application context registred."); }

1 0