jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java

-:17ce329d7bd0
+:7ceaee0e497b
 package com.sun.tools.doclets.formats.html;
 import java.io.*;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import com.sun.javadoc.*;
 import com.sun.tools.doclets.formats.html.markup.*;
 import com.sun.tools.doclets.internal.toolkit.*;
 import com.sun.tools.doclets.internal.toolkit.taglets.*;
 // Return if no inline tags exist
 int index = htmlstr.indexOf("{@");
 if (index < 0) {
 return htmlstr;
 }
-String lowerHtml = StringUtils.toLowerCase(htmlstr);
+Matcher docrootMatcher = docrootPattern.matcher(htmlstr);
-final String docroot = "{@docroot}";
+if (!docrootMatcher.find()) {
-// Return index of first occurrence of {@docroot}
-// Note: {@docRoot} is not case sensitive when passed in w/command line option
-index = lowerHtml.indexOf(docroot, index);
-if (index < 0) {
 return htmlstr;
 }
 StringBuilder buf = new StringBuilder();
-int previndex = 0;
+int prevEnd = 0;
-while (true) {
+do {
-// Search for lowercase version of {@docRoot}
+int match = docrootMatcher.start();
-index = lowerHtml.indexOf(docroot, previndex);
+// append htmlstr up to start of next {@docroot}
-// If next {@docRoot} tag not found, append rest of htmlstr and exit loop
+buf.append(htmlstr.substring(prevEnd, match));
-if (index < 0) {
+prevEnd = docrootMatcher.end();
-buf.append(htmlstr.substring(previndex));
+if (configuration.docrootparent.length() > 0 && htmlstr.startsWith("/..", prevEnd)) {
-break;
-}
-// If next {@docroot} tag found, append htmlstr up to start of tag
-buf.append(htmlstr.substring(previndex, index));
-previndex = index + docroot.length();
-if (configuration.docrootparent.length() > 0 && htmlstr.startsWith("/..", previndex)) {
 // Insert the absolute link if {@docRoot} is followed by "/..".
 buf.append(configuration.docrootparent);
-previndex += 3;
+prevEnd += 3;
 } else {
 // Insert relative path where {@docRoot} was located
 buf.append(pathToRoot.isEmpty() ? "." : pathToRoot.getPath());
 }
 // Append slash if next character is not a slash
-if (previndex < htmlstr.length() && htmlstr.charAt(previndex) != '/') {
+if (prevEnd < htmlstr.length() && htmlstr.charAt(prevEnd) != '/') {
 buf.append('/');
 }
-}
+} while (docrootMatcher.find());
+buf.append(htmlstr.substring(prevEnd));
 return buf.toString();
 }
+//where:
+// Note: {@docRoot} is not case sensitive when passed in w/command line option:
+private static final Pattern docrootPattern =
+Pattern.compile(Pattern.quote("{@docroot}"), Pattern.CASE_INSENSITIVE);
 /**
 * Get the script to show or hide the All classes link.
 *
 * @param id id of the element to show or hide
 } else {
 return text;
 }
 //Redirect all relative links.
-int end, begin = StringUtils.toLowerCase(text).indexOf("<a");
+int end, begin = StringUtils.indexOfIgnoreCase(text, "<a");
 if(begin >= 0){
 StringBuilder textBuff = new StringBuilder(text);
 while(begin >=0){
 if (textBuff.length() > begin + 2 && ! Character.isWhitespace(textBuff.charAt(begin+2))) {
-begin = StringUtils.toLowerCase(textBuff.toString()).indexOf("<a", begin + 1);
+begin = StringUtils.indexOfIgnoreCase(textBuff.toString(), "<a", begin + 1);
 continue;
 }
 begin = textBuff.indexOf("=", begin) + 1;
 end = textBuff.indexOf(">", begin +1);
 relativeLinkLowerCase.startsWith("file:"))) {
 relativeLink = "{@"+(new DocRootTaglet()).getName() + "}/"
 + redirectPathFromRoot.resolve(relativeLink).getPath();
 textBuff.replace(begin, end, relativeLink);
 }
-begin = StringUtils.toLowerCase(textBuff.toString()).indexOf("<a", begin + 1);
+begin = StringUtils.indexOfIgnoreCase(textBuff.toString(), "<a", begin + 1);
 }
 return textBuff.toString();
 }
 return text;
 }

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

comparison: src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java

src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java