click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r941227 - in /click/trunk/click/framework/src/org/apache/click: Context.java Page.java service/TemplateService.java service/VelocityTemplateService.java
Date Wed, 05 May 2010 10:07:04 GMT
Author: sabob
Date: Wed May  5 10:07:04 2010
New Revision: 941227

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

Modified:
    click/trunk/click/framework/src/org/apache/click/Context.java
    click/trunk/click/framework/src/org/apache/click/Page.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/framework/src/org/apache/click/Context.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/Context.java?rev=941227&r1=941226&r2=941227&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/Context.java (original)
+++ click/trunk/click/framework/src/org/apache/click/Context.java Wed May  5 10:07:04 2010
@@ -757,7 +757,7 @@ public class Context {
      * @throws RuntimeException if an error occurs
      */
     @SuppressWarnings("unchecked")
-    public String renderTemplate(Class templateClass, Map<String, ? extends Object>
model) {
+    public String renderTemplate(Class templateClass, Map<String, ?> model) {
 
         if (templateClass == null) {
             String msg = "Null templateClass parameter";
@@ -785,7 +785,7 @@ public class Context {
      * @return rendered Velocity template merged with the model data
      * @throws RuntimeException if an error occurs
      */
-    public String renderTemplate(String templatePath, Map<String, ? extends Object>
model) {
+    public String renderTemplate(String templatePath, Map<String, ?> model) {
 
         if (templatePath == null) {
             String msg = "Null templatePath parameter";

Modified: click/trunk/click/framework/src/org/apache/click/Page.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/Page.java?rev=941227&r1=941226&r2=941227&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/Page.java (original)
+++ click/trunk/click/framework/src/org/apache/click/Page.java Wed May  5 10:07:04 2010
@@ -1200,7 +1200,7 @@ public class Page implements Serializabl
      * @param location the path to redirect the request to
      * @param params the map of request parameter name and value pairs
      */
-    public void setRedirect(String location, Map<String, ? extends Object> params)
{
+    public void setRedirect(String location, Map<String, ?> params) {
         Context context = getContext();
         if (StringUtils.isNotBlank(location)) {
             if (location.charAt(0) == '/') {
@@ -1271,7 +1271,7 @@ public class Page implements Serializabl
      * with a unique path
      */
     public void setRedirect(Class<? extends Page> pageClass,
-        Map<String, ? extends Object> params) {
+        Map<String, ?> params) {
 
         String target = getContext().getPagePath(pageClass);
 

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=941227&r1=941226&r2=941227&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 Wed May
 5 10:07:04 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, ? extends Object> model, Writer
writer)
+    public void renderTemplate(Page page, Map<String, ?> 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, ? extends Object> model,
Writer writer)
+    public void renderTemplate(String templatePath, Map<String, ?> 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=941227&r1=941226&r2=941227&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
Wed May  5 10:07:04 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, ? extends Object> model, Writer
writer)
+    public void renderTemplate(Page page, Map<String, ?> 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, ? extends Object> model,
Writer writer)
+    public void renderTemplate(String templatePath, Map<String, ?> 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, ? extends Object> model,
+                                          Map<String, ?> model,
                                           Writer writer)
         throws IOException, TemplateException {
 



Mime
View raw message