r9979 - helma/helma/trunk/src/helma/util

Author: hannes
Date: 2009-10-05 18:38:51 +0200 (Mon, 05 Oct 2009)
New Revision: 9979

Modified:
   helma/helma/trunk/src/helma/util/HtmlEncoder.java
Log:
Replace ' with ' in encodeXml(), and remove some empty lines.

Details at http://dev.helma.org/trac/helma/changeset/9979

Modified: helma/helma/trunk/src/helma/util/HtmlEncoder.java
===================================================================
--- helma/helma/trunk/src/helma/util/HtmlEncoder.java	2009-10-03 19:07:50 UTC (rev 9978)
+++ helma/helma/trunk/src/helma/util/HtmlEncoder.java	2009-10-05 16:38:51 UTC (rev 9979)
@@ -884,22 +884,18 @@
             switch (c) {
                 case '<':
                     ret.append("&lt;");
-
                     break;
 
                 case '>':
                     ret.append("&gt;");
-
                     break;
 
                 case '&':
                     ret.append("&amp;");
-
                     break;
 
                 case '"':
                     ret.append("&quot;");
-
                     break;
 
                 case '\n':
@@ -907,11 +903,9 @@
                         ret.append("<br />");
                     }
                     ret.append('\n');
-
                     break;
 
                 default:
-
                     // ret.append (c);
                     if (c < 128) {
                         ret.append(c);
@@ -939,15 +933,12 @@
         }
 
         int l = str.length();
-
         if (l == 0) {
             return "";
         }
 
         StringBuffer ret = new StringBuffer(Math.round(l * 1.2f));
-
         encodeXml(str, ret);
-
         return ret.toString();
     }
 
@@ -970,27 +961,22 @@
             switch (c) {
                 case '<':
                     ret.append("&lt;");
-
                     break;
 
                 case '>':
                     ret.append("&gt;");
-
                     break;
 
                 case '&':
                     ret.append("&amp;");
-
                     break;
 
                 case '"':
                     ret.append("&quot;");
-
                     break;
 
                 case '\'':
-                    ret.append("&apos;");
-
+                    ret.append("&#39;");
                     break;
 
                 default: