You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/12/12 12:04:56 UTC
svn commit: r889924 - in
/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form:
AbstractChoice.java CheckBoxMultipleChoice.java RadioChoice.java
Author: jdonnerstag
Date: Sat Dec 12 11:04:55 2009
New Revision: 889924
URL: http://svn.apache.org/viewvc?rev=889924&view=rev
Log:
fixed: Some components still escape non-ASCII symbols by default
Issue: WICKET-2598
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.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/RadioChoice.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java?rev=889924&r1=889923&r2=889924&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/AbstractChoice.java Sat Dec 12 11:04:55 2009
@@ -429,7 +429,7 @@
*/
protected CharSequence escapeOptionHtml(String displayValue)
{
- return Strings.escapeMarkup(displayValue, false, true);
+ return Strings.escapeMarkup(displayValue);
}
/**
@@ -443,6 +443,4 @@
{
return false;
}
-
-
}
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=889924&r1=889923&r2=889924&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 Sat Dec 12 11:04:55 2009
@@ -390,8 +390,8 @@
display = getLocalizer().getString(label, this, label);
}
- final CharSequence escaped = (getEscapeModelStrings() ? Strings.escapeMarkup(display,
- false, true) : display);
+ final CharSequence escaped = (getEscapeModelStrings() ? Strings.escapeMarkup(display)
+ : display);
buffer.append("<label for=\"");
buffer.append(idAttr);
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java?rev=889924&r1=889923&r2=889924&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/RadioChoice.java Sat Dec 12 11:04:55 2009
@@ -442,15 +442,13 @@
{
display = getLocalizer().getString(label, this, label);
}
- final CharSequence escaped;
+
+ CharSequence escaped = display;
if (getEscapeModelStrings())
{
- escaped = Strings.escapeMarkup(display, false, true);
- }
- else
- {
- escaped = display;
+ escaped = Strings.escapeMarkup(display);
}
+
buffer.append("<label for=\"").append(idAttr).append("\">").append(escaped).append(
"</label>");