jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java

-:33abf479f202
+:bfec2a1cc869
 * @author Jamie Ho
 */
 public class Util {
 /**
-* A mapping between characters and their
-* corresponding HTML escape character.
-*/
-public static final String[][] HTML_ESCAPE_CHARS =
-{{"&", "&amp;"}, {"<", "&lt;"}, {">", "&gt;"}};
-/**
 * Return array of class members whose documentation is to be generated.
 * If the member is deprecated do not include such a member in the
 * returned array.
 *
 * @param  members             Array of members to choose from.
 /**
 * Given a string, escape all special html characters and
 * return the result.
 *
 * @param s The string to check.
-* @return the original string with all of the HTML characters
+* @return the original string with all of the HTML characters escaped.
-* escaped.
-*
-* @see #HTML_ESCAPE_CHARS
 */
 public static String escapeHtmlChars(String s) {
-String result = s;
+for (int i = 0; i < s.length(); i++) {
-for (int i = 0; i < HTML_ESCAPE_CHARS.length; i++) {
+char ch = s.charAt(i);
-result = Util.replaceText(result,
+switch (ch) {
-HTML_ESCAPE_CHARS[i][0], HTML_ESCAPE_CHARS[i][1]);
+// only start building a new string if we need to
-}
+case '<': case '>': case '&':
-return result;
+StringBuilder sb = new StringBuilder(s.substring(0, i));
+for ( ; i < s.length(); i++) {
+ch = s.charAt(i);
+switch (ch) {
+case '<': sb.append("&lt;");  break;
+case '>': sb.append("&gt;");  break;
+case '&': sb.append("&amp;"); break;
+default:  sb.append(ch);      break;
+}
+}
+return sb.toString();
+}
+}
+return s;
+}
+/**
+* Escape all special html characters in a string buffer.
+*
+* @param sb The string buffer to update
+*/
+public static void escapeHtmlChars(StringBuilder sb) {
+// scan backwards, replacing characters as needed.
+for (int i = sb.length() - 1; i >= 0; i--) {
+switch (sb.charAt(i)) {
+case '<': sb.replace(i, i+1, "&lt;"); break;
+case '>': sb.replace(i, i+1, "&gt;"); break;
+case '&': sb.replace(i, i+1, "&amp;"); break;
+}
+}
 }
 /**
 * Given a string, strips all html characters and
 * return the result.
 return config.getText(
 lowerCaseOnly ? typeName.toLowerCase() : typeName);
 }
 /**
-* Given a string, replace all tabs with the appropriate
+* Replace all tabs with the appropriate number of spaces.
-* number of spaces.
+* @param configuration the doclet configuration defining the setting for the
-* @param tabLength the length of each tab.
+*                      tab length.
-* @param s the String to scan.
+* @param sb the StringBuilder in which to replace the tabs
 */
-public static void replaceTabs(int tabLength, StringBuilder s) {
+public static void replaceTabs(Configuration configuration, StringBuilder sb) {
-if (whitespace == null || whitespace.length() < tabLength)
+int tabLength = configuration.sourcetab;
-whitespace = String.format("%" + tabLength + "s", " ");
+String whitespace = configuration.tabSpaces;
 int index = 0;
-while ((index = s.indexOf("\t", index)) != -1) {
+while ((index = sb.indexOf("\t", index)) != -1) {
 int spaceCount = tabLength - index % tabLength;
-s.replace(index, index+1, whitespace.substring(0, spaceCount));
+sb.replace(index, index+1, whitespace.substring(0, spaceCount));
 index += spaceCount;
 }
 }
-private static String whitespace;
 /**
 * The documentation for values() and valueOf() in Enums are set by the
 * doclet.
 */

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java

src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java