Author: jcompagner
Date: Sun May 4 15:38:47 2008
New Revision: 653282
URL: http://svn.apache.org/viewvc?rev=653282&view=rev
Log:
build fixes
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=653282&r1=653281&r2=653282&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Sun May
4 15:38:47 2008
@@ -1648,10 +1648,6 @@
final IConverter<T> converter =
getConverter(objectClass);
- if (!converter.getClass().isAssignableFrom(objectClass))
- throw new IllegalArgumentException("converter
can not convert " +
- objectClass.getName() + " to string");
-
// Model string from property
final String modelString =
converter.convertToString(modelObject, getLocale());
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=653282&r1=653281&r2=653282&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
Sun May 4 15:38:47 2008
@@ -23,9 +23,9 @@
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.string.AppendingStringBuffer;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.version.undo.Change;
@@ -387,20 +387,14 @@
// Get next choice
final T choice = choices.get(index);
- Collection<T> displayValue = (Collection<T>)
getChoiceRenderer().getDisplayValue(choice);
-
- Class<?> objectClass = (displayValue == null ? null :
displayValue.getClass());
-
- // Get label for choice
+ Object displayValue =
getChoiceRenderer().getDisplayValue(choice);
+ Class objectClass = displayValue == null ? null :
displayValue.getClass();
+ // Get label for choice
String label = "";
if (objectClass != null && objectClass != String.class)
{
- final IConverter<Collection<T>> converter =
getConverter((Class<Collection<T>>) objectClass);
-
- if(!converter.getClass().isAssignableFrom(objectClass))
- throw new IllegalArgumentException("converter can not convert class
" + converter.getClass().getName() + " to string");
-
- label = converter.convertToString(displayValue, getLocale());
+ IConverter converter =
getConverter(objectClass);
+ label = converter.convertToString(displayValue,
getLocale());
}
else if (displayValue != null)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=653282&r1=653281&r2=653282&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Sun May 4 15:38:47 2008
@@ -636,11 +636,11 @@
}
}
- Form form = (Form)findParent(Form.class);
+ Form form = findParent(Form.class);
if (form == null)
{
// check whether the form is a child of a surrounding
border
- final Border border = (Border)findParent(Border.class);
+ final Border border = findParent(Border.class);
if (border != null)
{
FindFormVisitor formVisitor = new
FindFormVisitor();
@@ -728,7 +728,7 @@
{
inputName.prepend(Component.PATH_SEPARATOR);
}
- Form form = (Form)findParent(Form.class);
+ Form form = findParent(Form.class);
if (form != null)
{
@@ -765,7 +765,7 @@
*/
public String getValidatorKeyPrefix()
{
- Form form = (Form)findParent(Form.class);
+ Form form = findParent(Form.class);
if (form != null)
{
return getForm().getValidatorKeyPrefix();
@@ -1218,14 +1218,11 @@
}
else
{
- final IConverter<T> converter = getConverter(getType());
+ final IConverter<T> converter = getConverter(getType());
- try
+ try
{
- if(!getType().isAssignableFrom(converter.getClass()))
- throw new IllegalStateException("converter can not convert string to "
+ getType());
-
- convertedInput = converter.convertToObject(getInput(), getLocale());
+ convertedInput =
converter.convertToObject(getInput(), getLocale());
}
catch (ConversionException e)
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java?rev=653282&r1=653281&r2=653282&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/convert/IConverter.java
Sun May 4 15:38:47 2008
@@ -42,6 +42,9 @@
*
* @author Eelco Hillenius
* @author Jonathan Locke
+ *
+ * @param <T>
+ * The converter object type
*/
public interface IConverter<T> extends IClusterable
{
