svn commit: r669699 - in /myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF: tagValidatorClass12.vm validatorClass12.vm

[lu...@apache.org]

Author: lu4242
Date: Thu Jun 19 14:17:01 2008
New Revision: 669699

URL: http://svn.apache.org/viewvc?rev=669699&view=rev
Log:
fix inheritance update

Modified:
    myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm
    myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm?rev=669699&r1=669698&r2=669699&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/tagValidatorClass12.vm Thu Jun 19 14:17:01 2008
@@ -31,7 +31,7 @@
 #if (${validator.tagSuperclass})
     extends ${validator.tagSuperclass}
 #else
-    extends javax.faces.webapp.ValidatorELTag;
+    extends javax.faces.webapp.ValidatorELTag
 #end
 {
 #if ($validator.serialuidtag)

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm?rev=669699&r1=669698&r2=669699&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/resources/META-INF/validatorClass12.vm Thu Jun 19 14:17:01 2008
@@ -1,15 +1,12 @@
-## Velocity template used to generate JSF1.1-compatible validator classes
+## Velocity template used to generate JSF1.2-compatible validator classes
 ## from validator meta-data.
 ##
 ## Note that there are only one type of validator generation:
 ##  * "subclass mode" (use annotated class as a parent class)
 ##
-## Variable $validator refers to a ComponentMeta object to process
+## Variable $validator refers to a ValidatorMeta object to process
 ## Variable $utils refers to an instance of MyfacesUtils.
 ##
-## When "template mode" is being used then variable $innersource
-## holds a String containing all the non-abstract functions defined
-## in the annotated class.
 ##
 ## The java package of the generated class is always the same as
 ## the package in which the annotated class exists.
@@ -38,10 +35,16 @@
 import javax.faces.context.FacesContext;
 $utils.importTagClasses($validator)
 
-// generated from class $validator.classSource
+#if ($validator.isTemplate())
+#set ($generatedClassParent = $validator.sourceClassParentClassName)
+#else
+#set ($generatedClassParent = $validator.sourceClassName)
+#end
+// Generated from class ${validator.sourceClassName}.
+//
 // WARNING: This file was automatically generated. Do not edit it directly,
 //          or you will lose your changes.
-public class ${utils.getClassFromFullClass($validator.className)} extends $validator.superClassName
+public class ${utils.getClassFromFullClass($validator.className)} extends $generatedClassParent
 #if ($validator.implements)
     implements $validator.implements
 #end