Author: tchemit Date: 2008-10-17 17:34:03 +0000 (Fri, 17 Oct 2008) New Revision: 955 Added: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXValidator.java Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXObject.java Log: introduce JaxxValidator contract Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-10-17 17:33:22 UTC (rev 954) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/JAXXCompiler.java 2008-10-17 17:34:03 UTC (rev 955) @@ -608,7 +608,7 @@ // register validator for (CompiledBeanValidator validator : validators) { String id = TypeManager.getJavaCode(validator.getId()); - code.append("$validatorIds.add(").append(id).append(");"); + code.append("validatorIds.add(").append(id).append(");"); code.append(getLineSeparator()); code.append("getValidator(").append(id).append(").installLayers();"); code.append("getValidator(").append(id).append(").validate();"); @@ -696,7 +696,7 @@ } javaFile.addImport("jaxx.runtime.BeanValidator"); - javaFile.addField(new JavaField(Modifier.PROTECTED, "java.util.List<String>", "$validatorIds", "new ArrayList<String>()")); + javaFile.addField(new JavaField(Modifier.PROTECTED, "java.util.List<String>", "validatorIds", "new ArrayList<String>()")); if (stylesheet != null) { javaFile.addField(new JavaField(0, "java.util.Map", "$previousValues", "new java.util.HashMap()")); @@ -705,7 +705,7 @@ javaFile.addMethod(createConstructor(className)); javaFile.addMethod(createInitializer(className)); javaFile.addMethod(new JavaMethod(Modifier.PUBLIC, "BeanValidator<?>", "getValidator", new JavaArgument[]{new JavaArgument("String", "validatorId")}, - null, "return (BeanValidator)($validatorIds.contains(validatorId)?getObjectById(validatorId):null);")); + null, "return (BeanValidator)(validatorIds.contains(validatorId)?getObjectById(validatorId):null);")); for (DataBinding dataBinding : dataBindings) { if (dataBinding.compile(true)) { Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXObject.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXObject.java 2008-10-17 17:33:22 UTC (rev 954) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXObject.java 2008-10-17 17:34:03 UTC (rev 955) @@ -5,7 +5,7 @@ package jaxx.runtime; /** The <code>JAXXObject</code> interface is implemented by all classes produced by the JAXX compiler. */ -public interface JAXXObject extends JAXXContext{ +public interface JAXXObject extends JAXXContext, JAXXValidator { /** * Retrieves an object defined in an XML tag by its ID. * @@ -16,9 +16,10 @@ /** * Pretrieves the dictonary of knwon objects indexed by their ids. + * * @return the dictonary of objects. */ - public java.util.Map<String,Object> get$objectMap(); + public java.util.Map<String, Object> get$objectMap(); public void applyDataBinding(String id); Copied: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXValidator.java (from rev 948, lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXContext.java) =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXValidator.java (rev 0) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXValidator.java 2008-10-17 17:34:03 UTC (rev 955) @@ -0,0 +1,23 @@ +package jaxx.runtime; + +import java.util.List; + +/** + * The contract of a validator-able object. + * + * @author chemit + */ +public interface JAXXValidator { + + /** + * Obtain a validator from his id + * + * @param validatorId validator id + * @return the associated validator, or <code>null</code> if not find + */ + BeanValidator<?> getValidator(String validatorId); + + /** @return the list of ids of all registred validator */ + List<String> getValidatorIds(); + +} \ No newline at end of file Property changes on: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/runtime/JAXXValidator.java ___________________________________________________________________ Name: svn:mergeinfo +