svn commit: r1128170 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form: AbstractChoice.java FormComponent.java

[ivaynberg]

Author: ivaynberg
Date: Fri May 27 06:41:41 2011
New Revision: 1128170

URL: http://svn.apache.org/viewvc?rev=1128170&view=rev
Log:

Issue: WICKET-3745

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=1128170&r1=1128169&r2=1128170&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
 Fri May 27 06:41:41 2011
@@ -432,4 +432,12 @@ public abstract class AbstractChoice<T, 
        {
                return false;
        }
+
+       @Override
+       public final FormComponent<T> setType(Class<?> type)
+       {
+               throw new UnsupportedOperationException(
+                       "This class does not support type-conversion because it 
is performed "
+                               + "exclusively by the IChoiceRenderer assigned 
to this component");
+       }
 }

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=1128170&r1=1128169&r2=1128170&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
 Fri May 27 06:41:41 2011
@@ -1023,7 +1023,7 @@ public abstract class FormComponent<T> e
         * @param type
         * @return this for chaining
         */
-       public final FormComponent<T> setType(Class<?> type)
+       public FormComponent<T> setType(Class<?> type)
        {
                typeName = type == null ? null : type.getName();
                if (type != null && type.isPrimitive())
@@ -1174,7 +1174,7 @@ public abstract class FormComponent<T> e
                        error.getVariables().putAll(variables);
                }
 
-               error((IValidationError)error);
+               error(error);
        }
 
        /**
@@ -1386,7 +1386,7 @@ public abstract class FormComponent<T> e
         */
        private void reportRequiredError()
        {
-               error((IValidationError)new 
ValidationError().addMessageKey("Required"));
+               error(new ValidationError().addMessageKey("Required"));
        }
 
        /**