click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bck...@apache.org
Subject svn commit: r955875 - in /click/trunk/click/framework/src/org/apache/click: control/RadioGroup.java util/ClickUtils.java
Date Fri, 18 Jun 2010 07:54:34 GMT
Author: bckfnn
Date: Fri Jun 18 07:54:33 2010
New Revision: 955875

URL: http://svn.apache.org/viewvc?rev=955875&view=rev
Log:
reverting part of r955743 that was too strict. CLK-696

Modified:
    click/trunk/click/framework/src/org/apache/click/control/RadioGroup.java
    click/trunk/click/framework/src/org/apache/click/util/ClickUtils.java

Modified: click/trunk/click/framework/src/org/apache/click/control/RadioGroup.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/control/RadioGroup.java?rev=955875&r1=955874&r2=955875&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/control/RadioGroup.java (original)
+++ click/trunk/click/framework/src/org/apache/click/control/RadioGroup.java Fri Jun 18 07:54:33
2010
@@ -228,13 +228,14 @@ public class RadioGroup extends Field {
      * @param options the Map of radio option values and labels to add
      * @throws IllegalArgumentException if options is null
      */
-    public void addAll(Map<String, String> options) {
+    public void addAll(Map<?, ?> options) {
         if (options == null) {
             String msg = "options parameter cannot be null";
             throw new IllegalArgumentException(msg);
         }
-        for (Map.Entry<String, String> entry : options.entrySet()) {
-            Radio radio = new Radio(entry.getKey(), entry.getValue());
+        for (Map.Entry<?, ?> entry : options.entrySet()) {
+            Radio radio = new Radio(entry.getKey().toString(), 
+                                    entry.getValue().toString());
             add(radio);
         }
     }

Modified: click/trunk/click/framework/src/org/apache/click/util/ClickUtils.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/util/ClickUtils.java?rev=955875&r1=955874&r2=955875&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/util/ClickUtils.java (original)
+++ click/trunk/click/framework/src/org/apache/click/util/ClickUtils.java Fri Jun 18 07:54:33
2010
@@ -184,7 +184,7 @@ public class ClickUtils {
      *         of the response content
      */
     public static void autoPostRedirect(HttpServletRequest request,
-            HttpServletResponse response, String target, Map<String, String> params,
+            HttpServletResponse response, String target, Map<?, ?> params,
             boolean compress) {
 
         Validate.notNull(request, "Null response parameter");
@@ -196,7 +196,7 @@ public class ClickUtils {
         buffer.append("<form name=\"form\" method=\"post\" style=\"{display:none;}\" action=\"");
         buffer.append(target);
         buffer.append("\">");
-        for (String name : params.keySet()) {
+        for (Object name : params.keySet()) {
             String value = params.get(name).toString();
             buffer.elementStart("textarea");
             buffer.appendAttribute("name", name);



Mime
View raw message