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

-:7798e3a5ecf5
+:ebf7c13df6c0
 /*
-* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 } finally {
 in.close();
 out.close();
 }
 } catch (IOException ie) {
-ie.printStackTrace();
+ie.printStackTrace(System.err);
 throw new DocletAbortException();
 }
 }
 /**
 PackageDoc pkgDoc){
 try{
 String pkgPath = DirectoryManager.getDirectoryPath(pkgDoc);
 String completePath = new SourcePath(configuration.sourcepath).
 getDirectory(pkgPath) + DirectoryManager.URL_FILE_SEPARATOR;
-//Make sure that both paths are using the same seperators.
+//Make sure that both paths are using the same separators.
 completePath = Util.replaceText(completePath, File.separator,
 DirectoryManager.URL_FILE_SEPARATOR);
 pkgPath = Util.replaceText(pkgPath, File.separator,
 DirectoryManager.URL_FILE_SEPARATOR);
-return completePath.substring(0, completePath.indexOf(pkgPath));
+return completePath.substring(0, completePath.lastIndexOf(pkgPath));
 } catch (Exception e){
 return "";
 }
 }
 findAllInterfaceTypes(results, (ClassDoc) type, raw, configuration);
 else
 findAllInterfaceTypes(results, (ClassDoc) type, true, configuration);
 }
-public static <T extends ProgramElementDoc> List<T> asList(T[] members) {
-List<T> list = new ArrayList<T>();
-for (int i = 0; i < members.length; i++) {
-list.add(members[i]);
-}
-return list;
-}
 /**
 * Enclose in quotes, used for paths and filenames that contains spaces
 */
 public static String quote(String filepath) {
 return ("\"" + filepath + "\"");
 public static String replaceText(String originalStr, String oldStr,
 String newStr) {
 if (oldStr == null || newStr == null || oldStr.equals(newStr)) {
 return originalStr;
 }
-StringBuffer result = new StringBuffer(originalStr);
+return originalStr.replace(oldStr, newStr);
-int startIndex = 0;
-while ((startIndex = result.indexOf(oldStr, startIndex)) != -1) {
-result = result.replace(startIndex, startIndex + oldStr.length(),
-newStr);
-startIndex += newStr.length();
-}
-return result.toString();
 }
 /**
 * Given a string, escape all special html characters and
 * return the result.
 * Given a string, replace all tabs with the appropriate
 * number of spaces.
 * @param tabLength the length of each tab.
 * @param s the String to scan.
 */
-public static void replaceTabs(int tabLength, StringBuffer s) {
+public static void replaceTabs(int tabLength, StringBuilder s) {
-int index, col;
+if (whitespace == null || whitespace.length() < tabLength)
-StringBuffer whitespace;
+whitespace = String.format("%" + tabLength + "s", " ");
-while ((index = s.indexOf("\t")) != -1) {
+int index = 0;
-whitespace = new StringBuffer();
+while ((index = s.indexOf("\t", index)) != -1) {
-col = index;
+int spaceCount = tabLength - index % tabLength;
-do {
+s.replace(index, index+1, whitespace.substring(0, spaceCount));
-whitespace.append(" ");
+index += spaceCount;
-col++;
+}
-} while ((col%tabLength) != 0);
+}
-s.replace(index, index+1, whitespace.toString());
+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