Author: jcompagner
Date: Tue Oct 30 15:24:04 2007
New Revision: 590494
URL: http://svn.apache.org/viewvc?rev=590494&view=rev
Log:
if a choice rendered does return already a string. Don't call the converter for
it again. But display that string if not a string class then do try to convert.
WICKET-382
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=590494&r1=590493&r2=590494&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
Tue Oct 30 15:24:04 2007
@@ -373,8 +373,15 @@
{
Object objectValue = renderer.getDisplayValue(choice);
Class objectClass = objectValue == null ? null :
objectValue.getClass();
- final String displayValue =
getConverter(objectClass).convertToString(objectValue,
- getLocale());
+ String displayValue = "";
+ if (objectClass != null && objectClass != String.class)
+ {
+ displayValue =
getConverter(objectClass).convertToString(objectValue, getLocale());
+ }
+ else if (objectValue != null)
+ {
+ displayValue = objectValue.toString();
+ }
buffer.append("\n<option ");
if (isSelected(choice, index, selected))
{
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=590494&r1=590493&r2=590494&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
Tue Oct 30 15:24:04 2007
@@ -375,8 +375,15 @@
Object displayValue =
getChoiceRenderer().getDisplayValue(choice);
Class objectClass = displayValue == null ? null :
displayValue.getClass();
// Get label for choice
- final String label =
getConverter(objectClass).convertToString(displayValue,
- getLocale());
+ String label = "";
+ if (objectClass != null && objectClass != String.class)
+ {
+ label =
getConverter(objectClass).convertToString(displayValue, getLocale());
+ }
+ else if (displayValue != null)
+ {
+ label = displayValue.toString();
+ }
// If there is a display value for the choice, then we
know that the
// choice is automatic in some way. If label is /null/
then we know
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=590494&r1=590493&r2=590494&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
Tue Oct 30 15:24:04 2007
@@ -426,8 +426,15 @@
Object displayValue =
getChoiceRenderer().getDisplayValue(choice);
Class objectClass = displayValue == null ? null :
displayValue.getClass();
// Get label for choice
- final String label =
getConverter(objectClass).convertToString(displayValue,
- getLocale());
+ String label = "";
+ if (objectClass != null && objectClass != String.class)
+ {
+ label =
getConverter(objectClass).convertToString(displayValue, getLocale());
+ }
+ else if (displayValue != null)
+ {
+ label = displayValue.toString();
+ }
// If there is a display value for the choice, then we
know that the
// choice is automatic in some way. If label is /null/
then we know
