svn commit: r711783 - /wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java

[ivaynberg]

Author: ivaynberg
Date: Wed Nov  5 23:33:50 2008
New Revision: 711783

URL: http://svn.apache.org/viewvc?rev=711783&view=rev
Log:
api cleanup

Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java

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=711783&r1=711782&r2=711783&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
 Wed Nov  5 23:33:50 2008
@@ -434,7 +434,7 @@
                                }
 
                                CharSequence escaped;
-                               if (isEscapeLabelMarkup())
+                               if (isEscapeLabelMarkup() || 
getEscapeModelStrings())
                                {
                                        escaped = Strings.escapeMarkup(display, 
false, true);
                                }
@@ -459,9 +459,12 @@
        /**
         * Overridable method to determine whether the label markup should be 
escaped.
         * 
+        * @deprecated use [EMAIL PROTECTED] #setEscapeModelStrings(boolean)}
+        * 
         * @return true if label markup should be escaped
         */
-       protected boolean isEscapeLabelMarkup()
+       @Deprecated
+       protected final boolean isEscapeLabelMarkup()
        {
                return true;
        }