svn commit: r584510 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java

[jdonnerstag]

Author: jdonnerstag
Date: Sun Oct 14 01:27:14 2007
New Revision: 584510

URL: http://svn.apache.org/viewvc?rev=584510&view=rev
Log:
wicket-1054: don't escape all none-ascii chars, only HTML sensitive ones. 
Enhanced javadoc

Modified:
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java

Modified: 
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?rev=584510&r1=584509&r2=584510&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java 
(original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java 
Sun Oct 14 01:27:14 2007
@@ -1278,7 +1278,14 @@
        }
 
        /**
-        * Gets a model object as a string.
+        * Gets a model object as a string. Depending on the "escape model 
strings" flag of the
+        * component, the string is either HTML escaped or not. "HTML escaped" 
meaning that only HTML
+        * sensitive chars are escaped but not all none-ascii chars. Proper 
HTML encoding should be used
+        * instead. In case you realy need a fully escaped model string you may 
call
+        * [EMAIL PROTECTED] Strings#escapeMarkup(String, boolean, boolean)} on 
the model string returned.
+        * 
+        * @see Strings#escapeMarkup(String, boolean, boolean)
+        * @see #getEscapeModelStrings()
         * 
         * @return Model object for this component as a string
         */
@@ -1288,6 +1295,15 @@
        }
 
        /**
+        * Gets a model object as a string. Depending on the "escape model 
strings" flag of the
+        * component, the string is either HTML escaped or not. "HTML escaped" 
meaning that only HTML
+        * sensitive chars are escaped but not all none-ascii chars. Proper 
HTML encoding should be used
+        * instead. In case you realy need a fully escaped model string you may 
call
+        * [EMAIL PROTECTED] Strings#escapeMarkup(String, boolean, boolean)} on 
the model string returned.
+        * 
+        * @see Strings#escapeMarkup(String, boolean, boolean)
+        * @see #getEscapeModelStrings()
+        * 
         * @param modelObject
         *            Model object to convert to string
         * @return The string
@@ -1307,8 +1323,8 @@
                                // If we should escape the markup
                                if (getFlag(FLAG_ESCAPE_MODEL_STRINGS))
                                {
-                                       // Escape it
-                                       return 
Strings.escapeMarkup(modelString, false, true).toString();
+                                       // Escape HTML sensitive characters 
only. Not all none-ascii chars
+                                       return 
Strings.escapeMarkup(modelString, false, false).toString();
                                }
                                return modelString;
                        }