[Jaxx-commits] r2490 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler jaxx-compiler/src/main/java/jaxx/compiler/tags/validator jaxx-maven-plugin jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin jaxx-validator/src/main/java/jaxx/runtime/validator/swing

11 Aug 2012

Author: tchemit
Date: 2012-08-11 09:57:06 +0200 (Sat, 11 Aug 2012)
New Revision: 2490

Url: http://nuiton.org/repositories/revision/jaxx/2490

Log:
fixes #2248: Make possible again to change SwingValidatorFactory
refs #2249: Remove deprecated BeanValidator api


Modified:
   trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java
   trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java
   trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java
   trunk/jaxx-maven-plugin/pom.xml
   trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java
   trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java
   trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java
   trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java
   trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java

Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java
===================================================================

--- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -61,6 +61,13 @@
      */
     String getHelpBrokerFQN();
 
+    /**
+     * @return the FQN of the validator factory used to instanciate new validators.
+     * @since 2.6
+     */
+    String getValidatorFactoryFQN();
+
+
     /** @return the type of context to use in each generated jaxx object */
     Class<? extends JAXXContext> getJaxxContextClass();
 

Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java
===================================================================
--- trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -104,6 +104,12 @@
      */
     private String helpBrokerFQN;
 
+    /**
+     * Fully qualified name of validator factory.
+     * @since 2.6
+     */
+    private String validatorFactoryFQN;
+
     /** Encoding to use to write files */
     private String encoding;
 
@@ -222,6 +228,11 @@
     }
 
     @Override
+    public String getValidatorFactoryFQN() {
+        return validatorFactoryFQN;
+    }
+
+    @Override
     public String getEncoding() {
         return encoding;
     }

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	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/validator/BeanValidatorHandler.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -88,11 +88,11 @@
 
     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";
+//    /**
+//     * @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";
 
     public static final String PARENT_VALIDATOR_ATTRIBUTE = "parentValidator";
@@ -198,12 +198,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.");
-            }
-        }
+//        if (CONTEXT_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);
@@ -295,14 +295,14 @@
                 return;
             }
 
-            if (CONTEXT_NAME_ATTRIBUTE.equals(property)) {
-                if (value != null && !value.trim().isEmpty()) {
-                    context= value.trim();
-                }
+//            if (CONTEXT_NAME_ATTRIBUTE.equals(property)) {
+//                if (value != null && !value.trim().isEmpty()) {
+//                    context= value.trim();
+//                }
+//
+//                return;
+//            }
 
-                return;
-            }
-
             if (CONTEXT_ATTRIBUTE.equals(property)) {
                 if (value != null && !value.trim().isEmpty()) {
                     context = value.trim();
@@ -767,7 +767,10 @@
             String constructorParams = type + ".class, " +
                                        TypeManager.getJavaCode(context);
 //            setConstructorParams(constructorParams);
-            String prefix = compiler.getImportedType(SwingValidatorUtil.class);
+            String validatorFactoryFqn =
+                    compiler.getConfiguration().getValidatorFactoryFQN();
+
+            String prefix = compiler.getImportedType(validatorFactoryFqn);
             setInitializer(
                     prefix + ".newValidator(" + constructorParams + ")"
             );

Modified: trunk/jaxx-maven-plugin/pom.xml
===================================================================
--- trunk/jaxx-maven-plugin/pom.xml	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-maven-plugin/pom.xml	2012-08-11 07:57:06 UTC (rev 2490)
@@ -55,7 +55,6 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>jaxx-validator</artifactId>
       <version>${project.version}</version>
-      <scope>runtime</scope>
     </dependency>
 
     <dependency>

Modified: trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java
===================================================================
--- trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-maven-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -39,6 +39,7 @@
 import jaxx.runtime.JAXXContext;
 import jaxx.runtime.JAXXObject;
 import jaxx.runtime.swing.help.JAXXHelpBroker;
+import jaxx.runtime.validator.swing.SwingValidator;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -281,6 +282,16 @@
     protected String helpBrokerFQN;
 
     /**
+     * the FQN of validator factory.
+     * <p/>
+     * By default, use the JAXX implementation {@link SwingValidator}.
+     *
+     * @since 2.6
+     */
+    @Parameter(property = "jaxx.validatorFactoryFQN", defaultValue = "jaxx.runtime.validator.swing.SwingValidator")
+    protected String validatorFactoryFQN;
+
+    /**
      * To trace class descriptor loading.
      * <p/>
      * By default, do not trace it.
@@ -614,6 +625,11 @@
     }
 
     @Override
+    public String getValidatorFactoryFQN() {
+        return validatorFactoryFQN;
+    }
+
+    @Override
     public Map<String, CompiledObjectDecorator> getDecorators() {
         return decorators;
     }

Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java
===================================================================
--- trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -30,6 +30,7 @@
 import jaxx.compiler.JAXXEngine;
 import jaxx.compiler.decorators.DefaultCompiledObjectDecorator;
 import jaxx.runtime.context.DefaultJAXXContext;
+import jaxx.runtime.validator.swing.SwingValidator;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -70,6 +71,7 @@
                 log.error(e);
             }
         }
+        mojo.validatorFactoryFQN= SwingValidator.class.getName();
         mojo.jaxxContextFQN = DefaultJAXXContext.class.getName();
         mojo.compilerFQN = JAXXCompiler.class.getName();
         mojo.defaultDecoratorFQN = DefaultCompiledObjectDecorator.class.getName();

Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java
===================================================================
--- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidator.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -34,7 +34,6 @@
 import org.nuiton.validator.NuitonValidatorFactory;
 import org.nuiton.validator.NuitonValidatorProvider;
 import org.nuiton.validator.NuitonValidatorScope;
-import org.nuiton.validator.bean.BeanValidator;
 import org.nuiton.validator.bean.simple.SimpleBeanValidator;
 
 import javax.swing.JComponent;
@@ -46,7 +45,7 @@
 import java.util.Map.Entry;
 
 /**
- * La surcharge de {@link BeanValidator} pour les ui swing
+ * La surcharge de {@link SimpleBeanValidator} pour les ui swing
  * <p/>
  * Permet d'ajouter facilement le support de la validation des champs d'un bean
  * et de le relier a une interface graphique. Utilise xwork pour la validation

Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java
===================================================================
--- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorMessage.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -25,16 +25,15 @@
 package jaxx.runtime.validator.swing;
 
 import org.nuiton.validator.NuitonValidatorScope;
-import org.nuiton.validator.bean.BeanValidatorMessage;
 import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage;
 
 import javax.swing.JComponent;
 
 /**
- * The object to box a validation message within an u.
+ * The object to box a validation message within an swing ui.
  *
  * @author tchemit <chemit@codelutin.com>
- * @see BeanValidatorMessage
+ * @see SimpleBeanValidatorMessage
  * @since 1.3
  */
 public class SwingValidatorMessage extends SimpleBeanValidatorMessage<SwingValidatorMessage> {

Modified: trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java
===================================================================
--- trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java	2012-08-11 07:55:54 UTC (rev 2489)
+++ trunk/jaxx-validator/src/main/java/jaxx/runtime/validator/swing/SwingValidatorUtil.java	2012-08-11 07:57:06 UTC (rev 2490)
@@ -35,8 +35,8 @@
 import org.jdesktop.swingx.decorator.ColorHighlighter;
 import org.nuiton.util.ReflectUtil;
 import org.nuiton.validator.NuitonValidatorScope;
-import org.nuiton.validator.bean.BeanValidatorUtil;
 import org.nuiton.validator.bean.list.BeanListValidator;
+import org.nuiton.validator.bean.simple.SimpleBeanValidators;
 
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
@@ -65,7 +65,7 @@
  *
  * @author tchemit <chemit@codelutin.com>
  */
-public class SwingValidatorUtil extends BeanValidatorUtil {
+public class SwingValidatorUtil extends SimpleBeanValidators {
 
     /** Logger */
     static private final Log log = LogFactory.getLog(SwingValidatorUtil.class);
@@ -293,7 +293,7 @@
      * @since 2.5.3
      */
     public static void installUI(JTable errorTable,
-                                     SwingListValidatorMessageTableRenderer render) {
+                                 SwingListValidatorMessageTableRenderer render) {
 
         errorTable.setDefaultRenderer(Object.class, render);
         errorTable.getRowSorter().setSortKeys(
@@ -315,9 +315,8 @@
     /**
      * Prepare the ui where to display the validators messages.
      *
-     *
      * @param errorTableModel
-     * @param errorTable the table where to display validators messages
+     * @param errorTable      the table where to display validators messages
      * @since 2.5.3
      */
     public static <O> void registerListValidator(BeanListValidator<O> validator,

    

tchemit＠users.nuiton.org