Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/projects/opl-xdoclet/src/java/org/commonjava/opl/xdoclet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23133/projects/opl-xdoclet/src/java/org/commonjava/opl/xdoclet
Modified Files:
OplNodeParserPlugin.vm
Log Message:
fixed some issues with velocity NodeParser template and the global nature of #set() directives...
Index: OplNodeParserPlugin.vm
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/projects/opl-xdoclet/src/java/org/commonjava/opl/xdoclet/OplNodeParserPlugin.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- OplNodeParserPlugin.vm 16 Mar 2004 22:47:34 -0000 1.5
+++ OplNodeParserPlugin.vm 23 Mar 2004 01:49:00 -0000 1.6
@@ -56,21 +56,30 @@
protected final void doBeforeChildren(ElementInfo info) throws ParseException{
#foreach($method in $class.methods)
#if(!$method.getNamedParameter("opl.attribute", "use-body"))
- #if($method.getNamedParameter("opl.attribute", "before-children") == "true")
+ #if($method.getNamedParameter("opl.attribute", "before-children"))
try{
#set($attrName = $method.getNamedParameter("opl.attribute", "name"))
- String $attrName = getAttribute(${plugin.getAttributeConstant($method)}, info, ${method.getNamedParameter("opl.attribute", "resolve-value")});
+
+ #set($resolve = true)
+ #set($resolve = ${method.getNamedParameter("opl.attribute", "resolve-value")})
+ String ${attrName} = getAttribute(${plugin.getAttributeConstant($method)}, info, $resolve);
+
+ #set($extractor = false)
#set($extractor = $method.getNamedParameter("opl.attribute", "extractor"))
+
+ #set($validator = false)
#set($validator = $method.getNamedParameter("opl.attribute", "validator"))
- #set($notRequired = $method.getNamedParameter("opl.attribute", "required") == "false")
+
+ #set($required = false)
+ #set($required = $method.getNamedParameter("opl.attribute", "required"))
+
#if($extractor)
- #set($ex = ${extractor.replaceAll("@@value", $attrName)})
- #set($call = $plugin.formatInvocation($method, $ex))
- #if($notRequired)
+ #set($call = $plugin.formatInvocation($method, $extractor.replaceAll("@@value", $attrName)))
+ #if(!$required)
if($attrName != null){
#end
#if($validator)
- if(${validator.replaceAll("@@value", ${ex})}){
+ if(${validator.replaceAll("@@value", $extractor.replaceAll("@@value", $attrName))}){
instance.${call};
}
else{
@@ -79,12 +88,12 @@
#else
instance.${call};
#end
- #if($notRequired)
+ #if(!$required)
}
#end
#else
#set($call = $plugin.formatInvocation($method, $attrName))
- #if($notRequired)
+ #if(!$required)
if($attrName != null){
#end
#if($validator)
@@ -97,7 +106,7 @@
#else
instance.${call};
#end
- #if($notRequired)
+ #if(!$required)
}
#end
#end
@@ -115,32 +124,40 @@
}
#end
#end
+
#end
}
protected final void doAfterChildren(ElementInfo info, String bodyText) throws ParseException{
#foreach($method in $class.methods)
- #if($method.getNamedParameter("opl.attribute", "before-children") == "false" || $method.getNamedParameter("opl.attribute", "use-body") == "true")
+ #if($method.getNamedParameter("opl.attribute", "before-children") == "false" || $method.getNamedParameter("opl.attribute", "use-body"))
try{
#set($attrName = $method.getNamedParameter("opl.attribute", "name"))
- #if($method.getNamedParameter("opl.attribute", "use-body") == "true")
+ #if($method.getNamedParameter("opl.attribute", "use-body"))
String ${attrName} = bodyText;
#else
- String ${attrName} = getAttribute(${plugin.getAttributeConstant($method)}, info, ${method.getNamedParameter("opl.attribute", "resolve-value")});
+ #set($resolve = true)
+ #set($resolve = ${method.getNamedParameter("opl.attribute", "resolve-value")})
+ String ${attrName} = getAttribute(${plugin.getAttributeConstant($method)}, info, $resolve);
#end
+ #set($extractor = false)
#set($extractor = $method.getNamedParameter("opl.attribute", "extractor"))
+
+ #set($validator = false)
#set($validator = $method.getNamedParameter("opl.attribute", "validator"))
- #set($notRequired = $method.getNamedParameter("opl.attribute", "required") == "false")
+
+ #set($required = false)
+ #set($required = $method.getNamedParameter("opl.attribute", "required"))
+
#if($extractor)
- #set($ex = ${extractor.replaceAll("@@value", $attrName)})
- #set($call = $plugin.formatInvocation($method, $ex))
- #if($notRequired)
+ #set($call = $plugin.formatInvocation($method, $extractor.replaceAll("@@value", $attrName)))
+ #if(!$required)
if($attrName != null){
#end
#if($validator)
- if(${validator.replaceAll("@@value", ${ex})}){
+ if(${validator.replaceAll("@@value", $extractor.replaceAll("@@value", $attrName))}){
instance.${call};
}
else{
@@ -149,12 +166,12 @@
#else
instance.${call};
#end
- #if($notRequired)
+ #if(!$required)
}
#end
#else
#set($call = $plugin.formatInvocation($method, $attrName))
- #if($notRequired)
+ #if(!$required)
if($attrName != null){
#end
#if($validator)
@@ -167,7 +184,7 @@
#else
instance.${call};
#end
- #if($notRequired)
+ #if(!$required)
}
#end
#end
|
