svn commit: r924458 - in /tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src: main/resources/org/apache/tiles/autotag/freemarker/ test/resources/org/apache/tiles/autotag/freemarker/test/

[apetrelli]

Author: apetrelli
Date: Wed Mar 17 20:13:18 2010
New Revision: 924458

URL: http://svn.apache.org/viewvc?rev=924458&view=rev
Log:
TILESSB-27
Fixed some bugs in the velocity template.

Modified:
    
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
    
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
    
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat

Modified: 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm?rev=924458&r1=924457&r2=924458&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
 (original)
+++ 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/main/resources/org/apache/tiles/autotag/freemarker/fmModel.vm
 Wed Mar 17 20:13:18 2010
@@ -55,11 +55,10 @@ public class ${clazz.tagClassPrefix}FMMo
 
     /** {...@inheritdoc} */
     @Override
-    public void execute(Map<String, TemplateModel> parms, Request request,
-            ModelBody modelBody) throws IOException {
+    public void execute(Map<String, TemplateModel> parms, Request 
request#if(${clazz.hasBody()}), ModelBody modelBody#end) throws IOException {
         model.execute(
 #foreach($parameter in ${clazz.parameters})
-            ($stringTool.getClassToCast(${parameter.type})) 
FreeMarkerUtil.getAsObject(parms.get("${parameter.exportedName}"), 
$stringTool.getDefaultValue(${parameter.type}, ${parameter.defaultValue}));
+            ($stringTool.getClassToCast(${parameter.type})) 
FreeMarkerUtil.getAsObject(parms.get("${parameter.exportedName}"), 
$stringTool.getDefaultValue(${parameter.type}, ${parameter.defaultValue})),
 #end
                 request#if(${clazz.hasBody()}), modelBody#end
 

Modified: 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat?rev=924458&r1=924457&r2=924458&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
 (original)
+++ 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffFMModel.javat
 Wed Mar 17 20:13:18 2010
@@ -32,12 +32,11 @@ public class DoStuffFMModel extends Body
 
     /** {...@inheritdoc} */
     @Override
-    public void execute(Map<String, TemplateModel> parms, Request request,
-            ModelBody modelBody) throws IOException {
+    public void execute(Map<String, TemplateModel> parms, Request request, 
ModelBody modelBody) throws IOException {
         model.execute(
-            (java.lang.String) FreeMarkerUtil.getAsObject(parms.get("one"), 
null);
-            (java.lang.Integer) FreeMarkerUtil.getAsObject(parms.get("two"), 
0);
-            (java.lang.Boolean) FreeMarkerUtil.getAsObject(parms.get("three"), 
false);
+            (java.lang.String) FreeMarkerUtil.getAsObject(parms.get("one"), 
null),
+            (java.lang.Integer) FreeMarkerUtil.getAsObject(parms.get("two"), 
0),
+            (java.lang.Boolean) FreeMarkerUtil.getAsObject(parms.get("three"), 
false),
                 request, modelBody
         );
     }

Modified: 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat?rev=924458&r1=924457&r2=924458&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
 (original)
+++ 
tiles/sandbox/trunk/tiles-autotag/tiles-autotag-freemarker/src/test/resources/org/apache/tiles/autotag/freemarker/test/DoStuffNoBodyFMModel.javat
 Wed Mar 17 20:13:18 2010
@@ -31,12 +31,11 @@ public class DoStuffNoBodyFMModel extend
 
     /** {...@inheritdoc} */
     @Override
-    public void execute(Map<String, TemplateModel> parms, Request request,
-            ModelBody modelBody) throws IOException {
+    public void execute(Map<String, TemplateModel> parms, Request request) 
throws IOException {
         model.execute(
-            (java.lang.Double) FreeMarkerUtil.getAsObject(parms.get("one"), 
null);
-            (java.lang.Float) FreeMarkerUtil.getAsObject(parms.get("two"), 
0.0f);
-            (java.util.Date) FreeMarkerUtil.getAsObject(parms.get("three"), 
null);
+            (java.lang.Double) FreeMarkerUtil.getAsObject(parms.get("one"), 
null),
+            (java.lang.Float) FreeMarkerUtil.getAsObject(parms.get("two"), 
0.0f),
+            (java.util.Date) FreeMarkerUtil.getAsObject(parms.get("three"), 
null),
                 request
         );
     }