Author: tchemit Date: 2011-01-26 15:14:52 +0100 (Wed, 26 Jan 2011) New Revision: 2173 Url: http://nuiton.org/repositories/revision/jaxx/2173 Log: Evolution #1250: Deprecate the validatorFQN in mojo Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java 2011-01-26 14:12:03 UTC (rev 2172) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/CompilerConfiguration.java 2011-01-26 14:14:52 UTC (rev 2173) @@ -98,7 +98,9 @@ */ File getTargetDirectory(); - /** @return the type of validator to use */ + /** @return the type of validator to use. + * @deprecated since 2.3, will not be replaced since new validator api does not support it.*/ + @Deprecated Class<?> getValidatorClass(); /** @return {@code true} if a logger must add on each generated jaxx object */ Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java 2011-01-26 14:12:03 UTC (rev 2172) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/DefaultCompilerConfiguration.java 2011-01-26 14:14:52 UTC (rev 2173) @@ -90,7 +90,10 @@ * the validator class to use. * * @since 1.6.0 + * @deprecated since 2.3, will not be replaced, since new validator api + * does not support it. */ + @Deprecated private Class<?> validatorClass; /** Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2011-01-26 14:12:03 UTC (rev 2172) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2011-01-26 14:14:52 UTC (rev 2173) @@ -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.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.apache.maven.plugin.MojoExecutionException; @@ -105,10 +106,16 @@ protected String compilerFQN; /** - * Le compilateur à utiliser (par défaut celui de Swing) + * Le compilateur à utiliser (par défaut celui de Swing). + * <p/> + * Ce paramètre n'est plus utilisable et ne sera pas pris en compte + * par le compilateur JAXX. * - * @parameter expression="${jaxx.validatorFQN}" default-value="jaxx.runtime.validator.swing.SwingValidator" + * @parameter expression="${jaxx.validatorFQN}" + * @deprecated since 2.3, will not be replaced, using the new api of validator + * does not support it */ + @Deprecated protected String validatorFQN; /** @@ -322,7 +329,7 @@ private Class<?> defaultErrorUIClass; /** type of validator to use */ - private Class<?> validatorClass; + private final Class<?> validatorClass = SwingValidator.class; /** type of {@link CompiledObjectDecorator} to use */ private Class<? extends CompiledObjectDecorator> defaultDecoratorClass; @@ -454,7 +461,7 @@ "jaxxContextFQN must be an implementation of " + JAXXContext.class + " but was : " + jaxxContextClass); } - validatorClass = Class.forName(validatorFQN, false, cl); +// validatorClass = Class.forName(validatorFQN, false, cl); if (defaultErrorUIFQN != null && !defaultErrorUIFQN.trim().isEmpty()) { defaultErrorUIClass = Class.forName(defaultErrorUIFQN, false, cl);