You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2010/03/21 20:59:32 UTC
svn commit: r925877 - in
/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src:
main/resources/org/apache/tiles/autotag/velocity/
test/resources/org/apache/tiles/autotag/velocity/test/
Author: apetrelli
Date: Sun Mar 21 19:59:32 2010
New Revision: 925877
URL: http://svn.apache.org/viewvc?rev=925877&view=rev
Log:
TILESSB-29
Fixed generator for Velocity directive.
Modified:
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm?rev=925877&r1=925876&r2=925877&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/main/resources/org/apache/tiles/autotag/velocity/velocityDirective.vm Sun Mar 21 19:59:32 2010
@@ -19,17 +19,15 @@ package ${packageName};
* specific language governing permissions and limitations
* under the License.
*#
-
import java.io.IOException;
import java.util.Map;
#if(${clazz.hasBody()})
import org.apache.tiles.autotag.core.runtime.ModelBody;
#end
+import org.apache.tiles.autotag.velocity.runtime.Body#if(!${clazz.hasBody()})less#{end}Directive;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
-import org.apache.tiles.velocity.context.VelocityUtil;
-import org.apache.tiles.velocity.template.Body#if(!${clazz.hasBody()})less#{end}Directive;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
#foreach($line in $stringTool.splitOnNewlines(${clazz.documentation}))
@@ -54,7 +52,7 @@ public class ${clazz.tagClassPrefix}Dire
protected void execute(Map<String, Object> params, Request request#if(${clazz.hasBody()}), ModelBody modelBody#end) throws IOException {
model.execute(
#foreach($parameter in ${clazz.parameters})
- ($stringTool.getClassToCast(${parameter.type})) VelocityUtil.getObject(parms.get("${parameter.exportedName}"), $stringTool.getDefaultValue(${parameter.type}, ${parameter.defaultValue})),
+ ($stringTool.getClassToCast(${parameter.type})) VelocityUtil.getObject(params.get("${parameter.exportedName}"), $stringTool.getDefaultValue(${parameter.type}, ${parameter.defaultValue})),
#end
request#if(${clazz.hasBody()}), modelBody#end
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat?rev=925877&r1=925876&r2=925877&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffDirective.javat Sun Mar 21 19:59:32 2010
@@ -1,14 +1,12 @@
package org.apache.tiles.autotag.velocity.test;
-
import java.io.IOException;
import java.util.Map;
import org.apache.tiles.autotag.core.runtime.ModelBody;
+import org.apache.tiles.autotag.velocity.runtime.BodyDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
-import org.apache.tiles.velocity.context.VelocityUtil;
-import org.apache.tiles.velocity.template.BodyDirective;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Documentation of the DoStuff class.
@@ -30,9 +28,9 @@ public class DoStuffDirective extends Bo
@Override
protected void execute(Map<String, Object> params, Request request, ModelBody modelBody) throws IOException {
model.execute(
- (java.lang.String) VelocityUtil.getObject(parms.get("one"), null),
- (java.lang.Integer) VelocityUtil.getObject(parms.get("two"), 0),
- (java.lang.Boolean) VelocityUtil.getObject(parms.get("three"), false),
+ (java.lang.String) VelocityUtil.getObject(params.get("one"), null),
+ (java.lang.Integer) VelocityUtil.getObject(params.get("two"), 0),
+ (java.lang.Boolean) VelocityUtil.getObject(params.get("three"), false),
request, modelBody
);
}
Modified: tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat?rev=925877&r1=925876&r2=925877&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat (original)
+++ tiles/sandbox/trunk/tiles-autotag/tiles-autotag-velocity/src/test/resources/org/apache/tiles/autotag/velocity/test/DoStuffNoBodyDirective.javat Sun Mar 21 19:59:32 2010
@@ -1,13 +1,11 @@
package org.apache.tiles.autotag.velocity.test;
-
import java.io.IOException;
import java.util.Map;
+import org.apache.tiles.autotag.velocity.runtime.BodylessDirective;
+import org.apache.tiles.autotag.velocity.runtime.VelocityUtil;
import org.apache.tiles.request.Request;
-import org.apache.tiles.velocity.context.VelocityUtil;
-import org.apache.tiles.velocity.template.BodylessDirective;
-import org.apache.tiles.velocity.context.VelocityUtil;
/**
* Documentation of the DoStuffNoBody class.
@@ -29,9 +27,9 @@ public class DoStuffNoBodyDirective exte
@Override
protected void execute(Map<String, Object> params, Request request) throws IOException {
model.execute(
- (java.lang.Double) VelocityUtil.getObject(parms.get("one"), null),
- (java.lang.Float) VelocityUtil.getObject(parms.get("two"), 0.0f),
- (java.util.Date) VelocityUtil.getObject(parms.get("three"), null),
+ (java.lang.Double) VelocityUtil.getObject(params.get("one"), null),
+ (java.lang.Float) VelocityUtil.getObject(params.get("two"), 0.0f),
+ (java.util.Date) VelocityUtil.getObject(params.get("three"), null),
request
);
}