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

Directly loop through characters from the source string instead of

Browse source 
using a StringReader.
Dropped character entity encoding, since this limits us to western
encoding and should not be necessary because browsers usually
default to western encoding.
This commit is contained in:
hns 2001-09-14 16:04:23 +00:00
parent 7a6b473e22
commit 4f28990143
1 changed files with 94 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,33 +124,33 @@ public final class HtmlEncoder {
/** /**
* *
*/ */
public final static String encode (String what) { public final static String encode (String str) {
// try to make stringbuffer large enough from the start // try to make stringbuffer large enough from the start
StringBuffer ret = new StringBuffer (Math.round (what.length()*1.4f)); StringBuffer ret = new StringBuffer (Math.round (str.length()*1.4f));
encode (what, ret); encode (str, ret);
return ret.toString(); return ret.toString();
} }
/** /**
* *
*/ */
public final static void encode (String what, StringBuffer ret) { public final static void encode (String str, StringBuffer ret) {
if (what == null || what.length() == 0) { if (str == null)
return; return;
}
StringReader in = new StringReader (what); int l = str.length();
int c;
boolean closeTag=false, readTag=false, tagOpen=false; boolean closeTag=false, readTag=false, tagOpen=false;
// the difference between swallowOneNewline and ignoreNewline is that swallowOneNewline is just effective once (for the next newline) // the difference between swallowOneNewline and ignoreNewline is that swallowOneNewline is just effective once (for the next newline)
boolean ignoreNewline = false; boolean ignoreNewline = false;
boolean swallowOneNewline = false; boolean swallowOneNewline = false;
StringBuffer tag = new StringBuffer (); StringBuffer tag = new StringBuffer ();
try {
while ((c = in.read()) != -1) { for (int i=0; i<l; i++) {
char c = str.charAt (i);
if (readTag) { if (readTag) {
if (Character.isLetterOrDigit ((char) c)) if (Character.isLetterOrDigit (c))
tag.append ((char) c); tag.append (c);
else if ('/' == c) else if ('/' == c)
closeTag = true; closeTag = true;
else { else {
@ -197,28 +197,28 @@ public final class HtmlEncoder {
ret.append ('>'); ret.append ('>');
break; break;
default: default:
if (c < 160) ret.append (c);
ret.append ((char) c); // if (c < 160)
// ret.append ((char) c);
// else if (c >= 160 && c <= 255) // else if (c >= 160 && c <= 255)
// ret.append (convertor.get(new Integer(c))); // ret.append (convertor.get(new Integer(c)));
else { // else {
ret.append ("&#"); // ret.append ("&#");
ret.append (c); // ret.append (c);
ret.append (";"); // ret.append (";");
} // }
if (!tagOpen && !Character.isWhitespace ((char)c)) if (!tagOpen && !Character.isWhitespace (c))
swallowOneNewline = false; swallowOneNewline = false;
} }
} }
} catch (IOException e) {}
} }
/** /**
* *
*/ */
public final static String encodeFormValue (String what) { public final static String encodeFormValue (String str) {
StringBuffer ret = new StringBuffer (Math.round (what.length()*1.4f)); StringBuffer ret = new StringBuffer (Math.round (str.length()*1.2f));
encodeAll (what, ret, false); encodeAll (str, ret, false);
return ret.toString(); return ret.toString();
} }
@ -226,17 +226,17 @@ public final class HtmlEncoder {
/** /**
* *
*/ */
public final static String encodeAll (String what) { public final static String encodeAll (String str) {
StringBuffer ret = new StringBuffer (Math.round (what.length()*1.4f)); StringBuffer ret = new StringBuffer (Math.round (str.length()*1.2f));
encodeAll (what, ret, true); encodeAll (str, ret, true);
return ret.toString(); return ret.toString();
} }
/** /**
* *
*/ */
public final static String encodeAll (String what, StringBuffer ret) { public final static String encodeAll (String str, StringBuffer ret) {
encodeAll (what, ret, true); encodeAll (str, ret, true);
return ret.toString(); return ret.toString();
} }
@ -244,15 +244,13 @@ public final class HtmlEncoder {
/** /**
* *
*/ */
public final static void encodeAll (String what, StringBuffer ret, boolean encodeNewline) { public final static void encodeAll (String str, StringBuffer ret, boolean encodeNewline) {
if (what == null || what.length() == 0) { if (str == null)
return; return;
}
StringReader in = new StringReader (what); int l = str.length();
int c; for (int i=0; i<l; i++) {
try { char c = str.charAt (i);
while ((c = in.read()) != -1) {
switch (c) { switch (c) {
case '<' : case '<' :
ret.append ("&lt;"); ret.append ("&lt;");
@ -273,70 +271,34 @@ public final class HtmlEncoder {
} }
break; break;
default: default:
if (c < 160) ret.append (c);
ret.append ((char) c); // if (c < 160)
// ret.append ((char) c);
// else if (c >= 160 && c <= 255) // else if (c >= 160 && c <= 255)
// ret.append (convertor.get(new Integer(c))); // ret.append (convertor.get(new Integer(c)));
else { // else {
ret.append ("&#"); // ret.append ("&#");
ret.append (c); // ret.append (c);
ret.append (";"); // ret.append (";");
// }
} }
} }
} }
} catch (IOException e) {}
}
public final static String encodeSoft (String what) {
StringBuffer ret = new StringBuffer (Math.round (what.length()*1.4f)); public final static String encodeXml (String str) {
encodeSoft (what, ret); StringBuffer ret = new StringBuffer (Math.round (str.length()*1.2f));
encodeXml (str, ret);
return ret.toString(); return ret.toString();
} }
public final static void encodeSoft (String what, StringBuffer ret) { public final static void encodeXml (String str, StringBuffer ret) {
if (what == null || what.length() == 0) { if (str == null)
return; return;
}
StringReader in = new StringReader (what); int l = str.length();
int c; for (int i=0; i<l; i++) {
try { char c = str.charAt (i);
while ((c = in.read()) != -1) {
switch (c) {
case 128: // Euro-Symbol. This is for missing Unicode support in TowerJ.
ret.append ("&#8364;");
break;
default:
if (c < 160)
ret.append ((char) c);
// else if (c >= 160 && c <= 255)
// ret.append (convertor.get(new Integer(c)));
else {
ret.append ("&#");
ret.append (c);
ret.append (";");
}
}
}
} catch (IOException e) {}
}
public final static String encodeXml (String what) {
StringBuffer ret = new StringBuffer (Math.round (what.length()*1.4f));
encodeXml (what, ret);
return ret.toString();
}
public final static void encodeXml (String what, StringBuffer ret) {
if (what == null || what.length() == 0) {
return;
}
StringReader in = new StringReader (what);
int c;
try {
while ((c = in.read()) != -1) {
switch (c) { switch (c) {
case '<' : case '<' :
ret.append ("&lt;"); ret.append ("&lt;");
@ -348,12 +310,10 @@ public final class HtmlEncoder {
ret.append ("&amp;"); ret.append ("&amp;");
break; break;
default: default:
ret.append ((char) c); ret.append (c);
} }
} }
} catch (IOException e) {}
} }
} // end of class
}