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

r2263 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/java
by tchemit＠users.nuiton.org April 21, 2011

April 21, 2011

Author: tchemit Date: 2011-04-21 17:12:51 +0200 (Thu, 21 Apr 2011) New Revision: 2263 Url: http://nuiton.org/repositories/revision/jaxx/2263 Log: add getDataBinding in JAXXObject Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java 2011-04-21 15:12:23 UTC (rev 2262) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/java/JavaMethod.java 2011-04-21 15:12:51 UTC (rev 2263) @@ -155,7 +155,8 @@ "processDataBinding", "removeDataBinding", "registerDataBinding", - "getDataBindings"); + "getDataBindings", + "getDataBinding"); @Override public boolean accept(JavaMethod method) {

1 0

r2262 - trunk/jaxx-runtime/src/main/java/jaxx/runtime
by tchemit＠users.nuiton.org April 21, 2011

April 21, 2011

Author: tchemit Date: 2011-04-21 17:12:23 +0200 (Thu, 21 Apr 2011) New Revision: 2262 Url: http://nuiton.org/repositories/revision/jaxx/2262 Log: add method getDataBinding on JAXXObject contract add usefull methods to reload a data binding Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java 2011-04-19 11:55:35 UTC (rev 2261) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXObject.java 2011-04-21 15:12:23 UTC (rev 2262) @@ -25,6 +25,7 @@ package jaxx.runtime; import java.awt.Container; +import java.beans.PropertyChangeListener; import java.io.Serializable; import java.util.Map; @@ -98,6 +99,16 @@ void removeDataBinding(String id); /** + * Obtain a binding given his id. + * + * @param bindingId the id of the binding + * @return the binding, or {@code null} if not found. + * @since 2.4.2 + * @see JAXXBinding + */ + JAXXBinding getDataBinding(String bindingId); + + /** * All <code>JAXXObject</code> implements are capable of broadcasting <code>PropertyChangeEvent</code>, and * furthermore (for technical reasons) must allow code in outside packages, specifically the JAXX runtime, * to trigger these events. @@ -109,34 +120,34 @@ void firePropertyChange(String name, Object oldValue, Object newValue); /** - * Register a general {@link java.beans.PropertyChangeListener}. + * Register a general {@link PropertyChangeListener}. * * @param listener the listener to register */ - void addPropertyChangeListener(java.beans.PropertyChangeListener listener); + void addPropertyChangeListener(PropertyChangeListener listener); /** - * Register a {@link java.beans.PropertyChangeListener}. for the given {@code propertyName}. + * Register a {@link PropertyChangeListener}. for the given {@code propertyName}. * * @param property the property name to listen * @param listener the listener to register */ - void addPropertyChangeListener(String property, java.beans.PropertyChangeListener listener); + void addPropertyChangeListener(String property, PropertyChangeListener listener); /** - * Unregister a general {@link java.beans.PropertyChangeListener}. + * Unregister a general {@link PropertyChangeListener}. * * @param listener the listener to unregister */ - void removePropertyChangeListener(java.beans.PropertyChangeListener listener); + void removePropertyChangeListener(PropertyChangeListener listener); /** - * Unregister a {@link java.beans.PropertyChangeListener}. for the given {@code propertyName}. + * Unregister a {@link PropertyChangeListener}. for the given {@code propertyName}. * * @param property the property name to listen * @param listener the listener to unregister */ - void removePropertyChangeListener(String property, java.beans.PropertyChangeListener listener); + void removePropertyChangeListener(String property, PropertyChangeListener listener); /** * Return parent's container corresponding to the Class clazz Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2011-04-19 11:55:35 UTC (rev 2261) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/JAXXUtil.java 2011-04-21 15:12:23 UTC (rev 2262) @@ -226,7 +226,7 @@ // an exemple is the TableColumnModelListener : http://download.oracle.com/javase/6/docs/api/javax/swing/event/TableColumnM… // This fix the bug http://nuiton.org/issues/show/1124 Class<?>[] parameterTypes; - if (listenerMethodName!=null) { + if (listenerMethodName != null) { // search an exact method, so must use the exact found listener method parameterTypes = listenerMethod.getParameterTypes(); @@ -250,7 +250,7 @@ Object[] args) { String methodName = method.getName(); if (listenerMethodName == null && - listenerMethods.contains(method) || + listenerMethods.contains(method) || methodName.equals(listenerMethodName)) { try { targetMethod.setAccessible(true); @@ -356,6 +356,8 @@ } } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static boolean assignment(boolean value, String name, JAXXObject src) { @@ -363,41 +365,58 @@ return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated + public static byte assignment(byte value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static short assignment(short value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static int assignment(int value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static long assignment(long value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static float assignment(float value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static double assignment(double value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static char assignment(char value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; } + /** @deprecated since 2.4.2, never use, will not be replaced */ + @Deprecated public static Object assignment(Object value, String name, JAXXObject src) { src.firePropertyChange(name.trim(), null, "dummy value"); return value; @@ -470,6 +489,39 @@ } /** + * To reload a binding, the method will invoke + * <ul> + * <li>{@link JAXXBinding#removeDataBinding()}</li> + * <li>{@link JAXXBinding#applyDataBinding()}</li> + * </ul> + * + * @param binding the binding to reload. + * @since 2.4.2 + */ + public static void reloadBinding(JAXXBinding binding) { + binding.removeDataBinding(); + binding.applyDataBinding(); + } + + /** + * Convinient method to reload a given binding by his id on a JAXX ui. + * + * @param src the ui to treate + * @param bindingId the id of binding to reload. + * @since 2.4.2 + */ + public static void reloadBinding(JAXXObject src, String bindingId) { + JAXXBinding dataBinding = src.getDataBinding(bindingId); + if (dataBinding != null) { + reloadBinding(dataBinding); + } else { + if (log.isWarnEnabled()) { + log.warn("Could not found binding[" + bindingId + "] on ui " + src); + } + } + } + + /** * Convinient method to apply more than one binding on a JAXX ui. * * @param src the ui to treate

1 0

r2261 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers
by tchemit＠users.nuiton.org April 19, 2011

April 19, 2011

Author: tchemit Date: 2011-04-19 13:55:35 +0200 (Tue, 19 Apr 2011) New Revision: 2261 Url: http://nuiton.org/repositories/revision/jaxx/2261 Log: Anomalie #1470: Loading java source file does not take account of super classes Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2011-04-19 11:55:21 UTC (rev 2260) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/reflect/resolvers/ClassDescriptorResolverFromJavaFile.java 2011-04-19 11:55:35 UTC (rev 2261) @@ -237,6 +237,15 @@ // remove super class superclass = null; + + // load all super classes + if (!interfaces.isEmpty()) { + for (String anInterface : interfaces) { + ClassDescriptor superclassDescriptor = ClassDescriptorHelper.getClassDescriptor(anInterface, compiler.getClassLoader()); + methods.addAll(Arrays.asList(superclassDescriptor.getMethodDescriptors())); + fields.addAll(Arrays.asList(superclassDescriptor.getFieldDescriptors())); + } + } } if (isEnum) { @@ -254,6 +263,10 @@ methods.addAll(Arrays.asList(superclassDescriptor.getMethodDescriptors())); fields.addAll(Arrays.asList(superclassDescriptor.getFieldDescriptors())); } + + if (isInterface) { + + } return; } throw new CompilerException("Internal error: null node parsing Java file from " + src);

1 0

r2260 - trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding
by tchemit＠users.nuiton.org April 19, 2011

April 19, 2011

Author: tchemit Date: 2011-04-19 13:55:21 +0200 (Tue, 19 Apr 2011) New Revision: 2260 Url: http://nuiton.org/repositories/revision/jaxx/2260 Log: fix log Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2011-04-15 11:51:40 UTC (rev 2259) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/binding/DataSource.java 2011-04-19 11:55:21 UTC (rev 2260) @@ -581,7 +581,7 @@ String bindingId = objectCode + "." + memberName + (method ? "()" : ""); if (showLog()) { log.info("Detect a dependency from a event handler for memberName '" + memberName + "' for class " + objectClass); - log.info("Try to add a listenenr [symbol:" + bindingId + ", objectCode:" + objectCode + "]"); + log.info("Try to add a listener [symbol:" + bindingId + ", objectCode:" + objectCode + "]"); } addListener(bindingId, objectCode,

1 0

r2259 - 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-tutorial-validation jaxx-validator jaxx-widgets maven-jaxx-plugin
by hudson＠users.nuiton.org April 15, 2011

April 15, 2011

Author: hudson Date: 2011-04-15 13:51:40 +0200 (Fri, 15 Apr 2011) New Revision: 2259 Url: http://nuiton.org/repositories/revision/jaxx/2259 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-validation/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-validator/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 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-compiler/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-demo/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-runtime/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-tutorial/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-tutorial-config/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-tutorial-css/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-validator/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/jaxx-widgets/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/maven-jaxx-plugin/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-15 11:51:38 UTC (rev 2258) +++ trunk/pom.xml 2011-04-15 11:51:40 UTC (rev 2259) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> <modules> <module>jaxx-runtime</module> @@ -110,9 +110,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4.1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.4.1</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> <dependencyManagement>

1 0

r2258 - tags
by hudson＠users.nuiton.org April 15, 2011

April 15, 2011

Author: hudson Date: 2011-04-15 13:51:38 +0200 (Fri, 15 Apr 2011) New Revision: 2258 Url: http://nuiton.org/repositories/revision/jaxx/2258 Log: [maven-release-plugin] copy for tag jaxx-2.4.1 Added: tags/jaxx-2.4.1/

1 0

r2257 - 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-tutorial-validation jaxx-validator jaxx-widgets maven-jaxx-plugin
by hudson＠users.nuiton.org April 15, 2011

April 15, 2011

Author: hudson Date: 2011-04-15 13:51:37 +0200 (Fri, 15 Apr 2011) New Revision: 2257 Url: http://nuiton.org/repositories/revision/jaxx/2257 Log: [maven-release-plugin] prepare release jaxx-2.4.1 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-validator/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 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-compiler/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-demo/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-runtime/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-tutorial/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-tutorial-config/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-tutorial-css/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-tutorial-databinding/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-validator/pom.xml =================================================================== --- trunk/jaxx-validator/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-validator/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/jaxx-widgets/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/maven-jaxx-plugin/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) +++ trunk/pom.xml 2011-04-15 11:51:37 UTC (rev 2257) @@ -38,7 +38,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.4.1-SNAPSHOT</version> + <version>2.4.1</version> <modules> <module>jaxx-runtime</module> @@ -110,9 +110,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.4.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.4.1</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.4.1</url> </scm> <dependencyManagement>

1 0

r2256 - trunk/jaxx-tutorial-validation
by tchemit＠users.nuiton.org April 15, 2011

April 15, 2011

Author: tchemit Date: 2011-04-15 13:49:09 +0200 (Fri, 15 Apr 2011) New Revision: 2256 Url: http://nuiton.org/repositories/revision/jaxx/2256 Log: use license-m-p and no more m-license-p Modified: trunk/jaxx-tutorial-validation/pom.xml Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2011-04-15 10:46:53 UTC (rev 2255) +++ trunk/jaxx-tutorial-validation/pom.xml 2011-04-15 11:49:09 UTC (rev 2256) @@ -231,8 +231,8 @@ </plugin> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> <executions> <execution> <id>attach-licenses</id>

1 0

r2255 - in trunk/jaxx-compiler/src/main/java/jaxx/compiler: . tags tags/validator
by tchemit＠users.nuiton.org April 15, 2011

April 15, 2011

Author: tchemit Date: 2011-04-15 12:46:53 +0200 (Fri, 15 Apr 2011) New Revision: 2255 Url: http://nuiton.org/repositories/revision/jaxx/2255 Log: Anomalie #1460: Can't use <SwingValidator context="myContext"> Anomalie #1461: Warnings are not displayed Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXFactory.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java 2011-04-11 12:00:34 UTC (rev 2254) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXEngine.java 2011-04-15 10:46:53 UTC (rev 2255) @@ -200,7 +200,7 @@ } /** Resets all state in preparation for a new compilation session. */ - protected void reset() { + protected void reset(boolean cleanReports) { for (JAXXCompilerFile compilerFile : compilingFiles) { compilerFile.clear(); } @@ -209,7 +209,9 @@ profiler.clear(); profiler = null; } - clearReports(); + if (cleanReports) { + clearReports(); + } ClassDescriptorHelper.setShowLoading(false); } @@ -364,9 +366,8 @@ log.error(e.getMessage(), e); return -1; } finally { - //TC - 20081018 only reset when no error was detected - if (configuration.isResetAfterCompile() && errors.isEmpty()) { - reset(); + if (configuration.isResetAfterCompile()) { + reset(false); } } } Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXFactory.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXFactory.java 2011-04-11 12:00:34 UTC (rev 2254) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/JAXXFactory.java 2011-04-15 10:46:53 UTC (rev 2255) @@ -84,7 +84,7 @@ public static JAXXEngine newEngine(File basedir, String... relativePaths) { checkConfiguration(); if (engine != null) { - engine.reset(); + engine.reset(true); } engine = new JAXXEngine(configuration, basedir, relativePaths); return engine; Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2011-04-11 12:00:34 UTC (rev 2254) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2011-04-15 10:46:53 UTC (rev 2255) @@ -754,7 +754,7 @@ /** * Set a single property on an object. The value may be either a simple value or contain data binding expressions. - * Simple values are first converted to the property's type using {@link #convertFromString}. + * Simple values are first converted to the property's type using {@link #convertFromString(String, String, Class)}. * * @param object the object on which to set the property * @param propertyName the name of the property to set 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 2011-04-11 12:00:34 UTC (rev 2254) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java 2011-04-15 10:46:53 UTC (rev 2255) @@ -88,6 +88,12 @@ public static final String STRICT_MODE_ATTRIBUTE = "strictMode"; + public static final String CONTEXT_ATTRIBUTE = "context"; + + /** + * @deprecated since 2.4.1, now use the {@link #CONTEXT_ATTRIBUTE}. + */ + @Deprecated public static final String CONTEXT_NAME_ATTRIBUTE = "contextName"; //public static final String SCOPE_ATTRIBUTE = "scope"; @@ -135,8 +141,8 @@ } @Override - public void compileSecondPass( - Element tag, JAXXCompiler compiler) throws CompilerException, IOException { + public void compileSecondPass(Element tag, + JAXXCompiler compiler) throws CompilerException, IOException { super.compileSecondPass(tag, compiler); @@ -164,14 +170,6 @@ error = info.addBean(tag, this, compiler); } - /*if (!error) { - error = info.addContextName(this, compiler); - }*/ - - /*if (!error) { - error = info.addScope(this, compiler); - }*/ - if (!error) { error = info.addParentValidator(tag, this, compiler); } @@ -202,6 +200,12 @@ if (log.isDebugEnabled()) { log.debug(propertyName + " : " + stringValue + " for " + object); } + if (CONTEXT_NAME_ATTRIBUTE.equals(propertyName)) { + if (stringValue != null && !stringValue.trim().isEmpty()) { + // usage of a deprecated contextName, says it to user... + compiler.reportWarning("You are using a validator attribute named 'contextName' which is deprecated, prefer use now a context attribute."); + } + } // delegate to the compiled object with is statefull // (but not the tag handler) object.addProperty(propertyName, stringValue); @@ -223,7 +227,7 @@ protected String beanClass; - protected String contextName; + protected String context; protected String uiClass; @@ -295,11 +299,19 @@ if (CONTEXT_NAME_ATTRIBUTE.equals(property)) { if (value != null && !value.trim().isEmpty()) { - contextName = value.trim(); + context= value.trim(); } + return; } + if (CONTEXT_ATTRIBUTE.equals(property)) { + if (value != null && !value.trim().isEmpty()) { + context = value.trim(); + } + return; + } + if (BEAN_CLASS_ATTRIBUTE.equals(property)) { if (value != null && !value.trim().isEmpty()) { beanClass = value.trim(); @@ -397,8 +409,8 @@ return beanClass; } - public String getContextName() { - return contextName; + public String getContext() { + return context; } public String getParentValidator() { @@ -755,7 +767,7 @@ String type = compiler.getImportedType(beanClassName); // contextName must be in constructor to able to init validator with his correct contextName String constructorParams = type + ".class, " + - TypeManager.getJavaCode(contextName); + TypeManager.getJavaCode(context); // setConstructorParams(constructorParams); String prefix = compiler.getImportedType(SwingValidatorUtil.class); setInitializer(

1 0

r2254 - trunk/jaxx-runtime/src/main/resources
by tchemit＠users.nuiton.org April 11, 2011

April 11, 2011

Author: tchemit Date: 2011-04-11 14:00:34 +0200 (Mon, 11 Apr 2011) New Revision: 2254 Url: http://nuiton.org/repositories/revision/jaxx/2254 Log: Anomalie #1453: Jaxx should not be embed validators.xml file at runtime Removed: trunk/jaxx-runtime/src/main/resources/validators.xml Deleted: trunk/jaxx-runtime/src/main/resources/validators.xml =================================================================== --- trunk/jaxx-runtime/src/main/resources/validators.xml 2011-04-11 10:11:46 UTC (rev 2253) +++ trunk/jaxx-runtime/src/main/resources/validators.xml 2011-04-11 12:00:34 UTC (rev 2254) @@ -1,43 +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"/> - <validator name="collectionFieldExpression" - class="jaxx.runtime.validator.field.CollectionFieldExpressionValidator"/> - <validator name="collectionUniqueKey" - class="jaxx.runtime.validator.field.CollectionUniqueKeyValidator"/> -</validators> -

1 0