You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2010/04/25 17:02:55 UTC
svn commit: r937809 - in /click/trunk/click: extras/src/org/apache/click/extras/service/FreemarkerTemplateService.java framework/src/org/apache/click/service/TemplateService.java framework/src/org/apache/click/service/VelocityTemplateService.java

Author: sabob
Date: Sun Apr 25 15:02:55 2010
New Revision: 937809

URL: http://svn.apache.org/viewvc?rev=937809&view=rev
Log:
improved generics

Modified:
    click/trunk/click/extras/src/org/apache/click/extras/service/FreemarkerTemplateService.java
    click/trunk/click/framework/src/org/apache/click/service/TemplateService.java
    click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java

Modified: click/trunk/click/extras/src/org/apache/click/extras/service/FreemarkerTemplateService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/service/FreemarkerTemplateService.java?rev=937809&r1=937808&r2=937809&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/service/FreemarkerTemplateService.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/service/FreemarkerTemplateService.java Sun Apr 25 15:02:55 2010
@@ -242,7 +242,7 @@ public class FreemarkerTemplateService i
      * @throws IOException if an IO error occurs
      * @throws TemplateException if template error occurs
      */
-    public void renderTemplate(Page page, Map<String, Object> model, Writer writer)
+    public void renderTemplate(Page page, Map<String, ? extends Object> model, Writer writer)
         throws IOException, TemplateException {
 
         String templatePath = page.getTemplate();
@@ -275,7 +275,7 @@ public class FreemarkerTemplateService i
      * @throws IOException if an IO error occurs
      * @throws TemplateException if template error occurs
      */
-    public void renderTemplate(String templatePath, Map<String, Object> model, Writer writer)
+    public void renderTemplate(String templatePath, Map<String, ? extends Object> model, Writer writer)
             throws IOException, TemplateException {
 
         // Get the template object

Modified: click/trunk/click/framework/src/org/apache/click/service/TemplateService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/TemplateService.java?rev=937809&r1=937808&r2=937809&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/service/TemplateService.java (original)
+++ click/trunk/click/framework/src/org/apache/click/service/TemplateService.java Sun Apr 25 15:02:55 2010
@@ -75,7 +75,7 @@ public interface TemplateService {
      * @throws IOException if an IO error occurs
      * @throws TemplateException if template error occurs
      */
-    public void renderTemplate(Page page, Map<String, Object> model, Writer writer)
+    public void renderTemplate(Page page, Map<String, ? extends Object> model, Writer writer)
         throws IOException, TemplateException;
 
     /**
@@ -87,7 +87,7 @@ public interface TemplateService {
      * @throws IOException if an IO error occurs
      * @throws TemplateException if template error occurs
      */
-    public void renderTemplate(String templatePath, Map<String, Object> model, Writer writer)
+    public void renderTemplate(String templatePath, Map<String, ? extends Object> model, Writer writer)
         throws IOException, TemplateException;
 
 }

Modified: click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java?rev=937809&r1=937808&r2=937809&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java (original)
+++ click/trunk/click/framework/src/org/apache/click/service/VelocityTemplateService.java Sun Apr 25 15:02:55 2010
@@ -316,7 +316,7 @@ public class VelocityTemplateService imp
      * @throws IOException if an IO error occurs
      * @throws TemplateException if template error occurs
      */
-    public void renderTemplate(Page page, Map<String, Object> model, Writer writer)
+    public void renderTemplate(Page page, Map<String, ? extends Object> model, Writer writer)
         throws IOException, TemplateException {
 
         String templatePath = page.getTemplate();
@@ -340,7 +340,7 @@ public class VelocityTemplateService imp
      * @throws IOException if an IO error occurs
      * @throws TemplateException if an error occurs
      */
-    public void renderTemplate(String templatePath, Map<String, Object> model, Writer writer)
+    public void renderTemplate(String templatePath, Map<String, ? extends Object> model, Writer writer)
         throws IOException, TemplateException {
 
         internalRenderTemplate(templatePath, null, model, writer);
@@ -507,7 +507,7 @@ public class VelocityTemplateService imp
      */
     protected void internalRenderTemplate(String templatePath,
                                           Page page,
-                                          Map<String, Object> model,
+                                          Map<String, ? extends Object> model,
                                           Writer writer)
         throws IOException, TemplateException {