Author: jcompagner
Date: Mon Oct 29 15:46:46 2007
New Revision: 589898

URL: http://svn.apache.org/viewvc?rev=589898&view=rev
Log:
fix for WICKET-330, Checkbox always uses the default BooleanConverter (by 
default)

Modified:
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
    
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java?rev=589898&r1=589897&r2=589898&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBox.java
 Mon Oct 29 15:46:46 2007
@@ -22,6 +22,8 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.protocol.http.portlet.PortletRequestContext;
 import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.convert.converters.BooleanConverter;
 import org.apache.wicket.util.string.StringValueConversionException;
 import org.apache.wicket.util.string.Strings;
 
@@ -117,6 +119,17 @@
                        return false;
                }
                return super.getStatelessHint();
+       }
+
+       /**
+        * CheckBox will by default always just use the boolean converter 
because the implementation
+        * expects that the string is can be converted to a boolean [EMAIL 
PROTECTED] Strings#isTrue(String)}
+        * 
+        * @see org.apache.wicket.Component#getConverter(java.lang.Class)
+        */
+       public IConverter getConverter(Class type)
+       {
+               return BooleanConverter.INSTANCE;
        }
 
        /**

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java?rev=589898&r1=589897&r2=589898&view=diff
==============================================================================
--- 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java
 (original)
+++ 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/Bytes.java
 Mon Oct 29 15:46:46 2007
@@ -94,7 +94,7 @@
                        "([0-9]+([\\.,][0-9]+)?)\\s*(|K|M|G|T)B?", 
Pattern.CASE_INSENSITIVE);
 
        /** Maximum bytes value */
-       public static Bytes MAX = bytes(Long.MAX_VALUE);
+       public static final Bytes MAX = bytes(Long.MAX_VALUE);
 
        /**
         * Private constructor forces use of static factory methods.


Reply via email to