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/05/05 12:08:04 UTC
svn commit: r941228 - in
/click/trunk/click/extras/src/org/apache/click/extras:
control/CheckList.java control/PickList.java
service/FreemarkerTemplateService.java
Author: sabob
Date: Wed May 5 10:08:04 2010
New Revision: 941228
URL: http://svn.apache.org/viewvc?rev=941228&view=rev
Log:
generics cleanup
Modified:
click/trunk/click/extras/src/org/apache/click/extras/control/CheckList.java
click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java
click/trunk/click/extras/src/org/apache/click/extras/service/FreemarkerTemplateService.java
Modified: click/trunk/click/extras/src/org/apache/click/extras/control/CheckList.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/CheckList.java?rev=941228&r1=941227&r2=941228&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/CheckList.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/CheckList.java Wed May 5 10:08:04 2010
@@ -361,7 +361,7 @@ public class CheckList extends Field {
* @throws IllegalArgumentException if options is null, or the collection
* contains an unsupported class
*/
- public void addAll(Collection<? extends Object> options) {
+ public void addAll(Collection<?> options) {
if (options == null) {
String msg = "options parameter cannot be null";
throw new IllegalArgumentException(msg);
Modified: click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java?rev=941228&r1=941227&r2=941228&view=diff
==============================================================================
--- click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java (original)
+++ click/trunk/click/extras/src/org/apache/click/extras/control/PickList.java Wed May 5 10:08:04 2010
@@ -315,7 +315,7 @@ public class PickList extends Field {
* @throws IllegalArgumentException if options is null, or the collection
* contains an unsupported class
*/
- public void addAll(Collection<? extends Object> options) {
+ public void addAll(Collection<?> options) {
if (options == null) {
String msg = "options parameter cannot be null";
throw new IllegalArgumentException(msg);
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=941228&r1=941227&r2=941228&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 Wed May 5 10:08:04 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, ? extends Object> model, Writer writer)
+ public void renderTemplate(Page page, Map<String, ?> 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, ? extends Object> model, Writer writer)
+ public void renderTemplate(String templatePath, Map<String, ?> model, Writer writer)
throws IOException, TemplateException {
// Get the template object