antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Replace ' with ' in encodeXml(), and remove some empty lines.

Browse source
This commit is contained in:
hns 2009-10-05 16:38:51 +00:00
parent 5d130c9ecb
commit f2904d1f29
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/helma/util/HtmlEncoder.java
View file

@ -884,22 +884,18 @@ public final class HtmlEncoder {
switch (c) { switch (c) {
case '<': case '<':
ret.append("&lt;"); ret.append("&lt;");
break; break;
case '>': case '>':
ret.append("&gt;"); ret.append("&gt;");
break; break;
case '&': case '&':
ret.append("&amp;"); ret.append("&amp;");
break; break;
case '"': case '"':
ret.append("&quot;"); ret.append("&quot;");
break; break;
case '\n': case '\n':
@ -907,11 +903,9 @@ public final class HtmlEncoder {
ret.append("<br />"); ret.append("<br />");
} }
ret.append('\n'); ret.append('\n');
break; break;
default: default:
// ret.append (c); // ret.append (c);
if (c < 128) { if (c < 128) {
ret.append(c); ret.append(c);
@ -939,15 +933,12 @@ public final class HtmlEncoder {
} }
int l = str.length(); int l = str.length();
if (l == 0) { if (l == 0) {
return ""; return "";
} }
StringBuffer ret = new StringBuffer(Math.round(l * 1.2f)); StringBuffer ret = new StringBuffer(Math.round(l * 1.2f));
encodeXml(str, ret); encodeXml(str, ret);
return ret.toString(); return ret.toString();
} }
@ -970,27 +961,22 @@ public final class HtmlEncoder {
switch (c) { switch (c) {
case '<': case '<':
ret.append("&lt;"); ret.append("&lt;");
break; break;
case '>': case '>':
ret.append("&gt;"); ret.append("&gt;");
break; break;
case '&': case '&':
ret.append("&amp;"); ret.append("&amp;");
break; break;
case '"': case '"':
ret.append("&quot;"); ret.append("&quot;");
break; break;
case '\'': case '\'':
ret.append("&apos;"); ret.append("&#39;");
break; break;
default: default: