You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2011/02/17 08:30:50 UTC
svn commit: r1071526 -
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
Author: ivaynberg
Date: Thu Feb 17 07:30:49 2011
New Revision: 1071526
URL: http://svn.apache.org/viewvc?rev=1071526&view=rev
Log:
cleanup generics mess
Issue: WICKET-3439
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.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=1071526&r1=1071525&r2=1071526&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 Thu Feb 17 07:30:49 2011
@@ -364,13 +364,14 @@ public abstract class AbstractChoice<T,
protected void appendOptionHtml(AppendingStringBuffer buffer, E choice, int index,
String selected)
{
- T objectValue = (T)renderer.getDisplayValue(choice);
- Class<T> objectClass = (Class<T>)(objectValue == null ? null : objectValue.getClass());
+ Object objectValue = renderer.getDisplayValue(choice);
+ Class<?> objectClass = (objectValue == null ? null : objectValue.getClass());
String displayValue = "";
if (objectClass != null && objectClass != String.class)
{
- IConverter<T> converter = getConverter(objectClass);
+ @SuppressWarnings("rawtypes")
+ IConverter converter = getConverter(objectClass);
displayValue = converter.convertToString(objectValue, getLocale());
}
else if (objectValue != null)