# HG changeset patch # User mcimadamore # Date 1231853234 0 # Node ID 7ac8c0815000ea09bfac6bb5f87a7ddae341f59e # Parent ced0a1a7ec802cec1b14ed31c4e113e7d2c9bed2 6765045: Remove rawtypes warnings from langtools Summary: Removed all occurrences of rawtypes warnings from langtools Reviewed-by: jjg, bpatel diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/make/build.properties --- a/langtools/make/build.properties Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/make/build.properties Tue Jan 13 13:27:14 2009 +0000 @@ -66,7 +66,7 @@ # set the following to -version to verify the versions of javac being used javac.version.opt = # in time, there should be no exceptions to -Xlint:all -javac.lint.opts = -Xlint:all,-deprecation,-fallthrough,-serial,-unchecked,-cast,-rawtypes +javac.lint.opts = -Xlint:all,-deprecation,-fallthrough,-serial,-unchecked,-cast # options for the task for javac javadoc.jls3.url=http://java.sun.com/docs/books/jls/ diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/source/util/Trees.java --- a/langtools/src/share/classes/com/sun/source/util/Trees.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/source/util/Trees.java Tue Jan 13 13:27:14 2009 +0000 @@ -74,7 +74,7 @@ ClassLoader cl = arg.getClass().getClassLoader(); Class c = Class.forName("com.sun.tools.javac.api.JavacTrees", false, cl); argType = Class.forName(argType.getName(), false, cl); - Method m = c.getMethod("instance", new Class[] { argType }); + Method m = c.getMethod("instance", new Class[] { argType }); return (Trees) m.invoke(null, new Object[] { arg }); } catch (Throwable e) { throw new AssertionError(e); diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java --- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java Tue Jan 13 13:27:14 2009 +0000 @@ -281,7 +281,7 @@ // Discovery process // List of annotation processory factory instances - java.util.Iterator providers = null; + java.util.Iterator providers = null; { /* * If a factory is provided by the user, the diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java --- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java Tue Jan 13 13:27:14 2009 +0000 @@ -217,7 +217,7 @@ } } - @SuppressWarnings("unchecked") + @SuppressWarnings({"unchecked", "rawtypes"}) public void visitEnum(Attribute.Enum e) { if (runtimeType.isEnum()) { String constName = e.value.toString(); @@ -225,7 +225,7 @@ value = Enum.valueOf((Class)runtimeType, constName); } catch (IllegalArgumentException ex) { value = new EnumConstantNotPresentExceptionProxy( - (Class)runtimeType, constName); + (Class>)runtimeType, constName); } } else { value = null; // indicates a type mismatch diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java --- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java Tue Jan 13 13:27:14 2009 +0000 @@ -130,8 +130,8 @@ append((EnumConstantDeclarationImpl) val); } else if (val instanceof AnnotationMirror) { append((AnnotationMirrorImpl) val); - } else if (val instanceof Collection) { - append((Collection) val); + } else if (val instanceof Collection) { + append((Collection) val); } else { appendUnquoted(val.toString()); } @@ -234,7 +234,7 @@ * and separated by ", ". Useful for array-valued annotation * elements. */ - void append(Collection vals) { + void append(Collection vals) { buf.append('{'); boolean first = true; for (Object val : vals) { diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -95,14 +95,14 @@ * @param unicode Unicode for which member list information to be generated. * @param memberlist List of members for the unicode character. */ - protected void generateContents(Character unicode, List memberlist) { + protected void generateContents(Character unicode, List memberlist) { anchor("_" + unicode + "_"); h2(); strong(unicode.toString()); h2End(); dl(); for (int i = 0; i < memberlist.size(); i++) { - Doc element = (Doc)memberlist.get(i); + Doc element = memberlist.get(i); if (element instanceof MemberDoc) { printDescription((MemberDoc)element); } else if (element instanceof ClassDoc) { diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -317,7 +317,7 @@ * format for listing the API. Call methods from the sub-class to complete * the generation. */ - protected void printDeprecatedAPI(List deprmembers, String headingKey) { + protected void printDeprecatedAPI(List deprmembers, String headingKey) { if (deprmembers.size() > 0) { writer.tableIndexSummary(); writer.tableHeaderStart("#CCCCFF"); @@ -377,12 +377,12 @@ } } - protected void navDetailLink(List members) { + protected void navDetailLink(List members) { printNavDetailLink(members.size() > 0? true: false); } - protected void navSummaryLink(List members, + protected void navSummaryLink(List members, VisibleMemberMap visibleMemberMap) { if (members.size() > 0) { printNavSummaryLink(null, true); @@ -390,7 +390,7 @@ } else { ClassDoc icd = classdoc.superclass(); while (icd != null) { - List inhmembers = visibleMemberMap.getMembersFor(icd); + List inhmembers = visibleMemberMap.getMembersFor(icd); if (inhmembers.size() > 0) { printNavSummaryLink(icd, true); return; diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -96,12 +96,12 @@ * @param list list of the sub-classes at this level. * @param isEnum true if we are generating a tree for enums. */ - protected void generateLevelInfo(ClassDoc parent, List list, + protected void generateLevelInfo(ClassDoc parent, List list, boolean isEnum) { if (list.size() > 0) { ul(); for (int i = 0; i < list.size(); i++) { - ClassDoc local = (ClassDoc)list.get(i); + ClassDoc local = list.get(i); printPartialInfo(local); printExtendsImplements(parent, local); generateLevelInfo(local, classtree.subs(local, isEnum), @@ -119,9 +119,9 @@ * other classes in this run will derive from these classes. * @param heading Heading for the tree. */ - protected void generateTree(List list, String heading) { + protected void generateTree(List list, String heading) { if (list.size() > 0) { - ClassDoc firstClassDoc = (ClassDoc)list.get(0); + ClassDoc firstClassDoc = list.get(0); printTreeHeading(heading); generateLevelInfo(!firstClassDoc.isInterface()? firstClassDoc : null, list, diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -137,9 +137,9 @@ * @param classlist Sorted list of classes. * @param wantFrames True if we want frames. */ - protected void generateContents(List classlist, boolean wantFrames) { + protected void generateContents(List classlist, boolean wantFrames) { for (int i = 0; i < classlist.size(); i++) { - ClassDoc cd = (ClassDoc)(classlist.get(i)); + ClassDoc cd = (ClassDoc)classlist.get(i); if (!Util.isCoreClass(cd)) { continue; } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -38,7 +38,7 @@ public class ClassUseWriter extends SubWriterHolderWriter { final ClassDoc classdoc; - Set pkgToPackageAnnotations = null; + Set pkgToPackageAnnotations = null; final Map> pkgToClassTypeParameter; final Map> pkgToClassAnnotations; final Map> pkgToMethodTypeParameter; @@ -220,8 +220,8 @@ false))); tableHeaderEnd(); - for (Iterator it = pkgSet.iterator(); it.hasNext();) { - PackageDoc pkg = (PackageDoc)it.next(); + for (Iterator it = pkgSet.iterator(); it.hasNext();) { + PackageDoc pkg = it.next(); generatePackageUse(pkg); } tableEnd(); @@ -240,8 +240,8 @@ getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc, false))); tableHeaderEnd(); - for (Iterator it = pkgToPackageAnnotations.iterator(); it.hasNext();) { - PackageDoc pkg = (PackageDoc)it.next(); + for (Iterator it = pkgToPackageAnnotations.iterator(); it.hasNext();) { + PackageDoc pkg = it.next(); trBgcolorStyle("white", "TableRowColor"); summaryRow(0); //Just want an anchor here. @@ -259,8 +259,8 @@ } protected void generateClassList() throws IOException { - for (Iterator it = pkgSet.iterator(); it.hasNext();) { - PackageDoc pkg = (PackageDoc)it.next(); + for (Iterator it = pkgSet.iterator(); it.hasNext();) { + PackageDoc pkg = it.next(); anchor(pkg.name()); tableIndexSummary(); tableHeaderStart("#CCCCFF"); diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java Tue Jan 13 13:27:14 2009 +0000 @@ -355,7 +355,7 @@ classDoc.qualifiedName().equals("org.omg.CORBA.Object")) { return; // Don't generate the list, too huge } - List subclasses = classtree.subs(classDoc, false); + List subclasses = classtree.subs(classDoc, false); if (subclasses.size() > 0) { dl(); dt(); @@ -371,7 +371,7 @@ */ public void writeSubInterfacesInfo() { if (classDoc.isInterface()) { - List subInterfaces = classtree.allSubs(classDoc, false); + List subInterfaces = classtree.allSubs(classDoc, false); if (subInterfaces.size() > 0) { dl(); dt(); @@ -393,7 +393,7 @@ classDoc.qualifiedName().equals("java.io.Serializable")) { return; // Don't generate the list, too big } - List implcl = classtree.implementingclasses(classDoc); + List implcl = classtree.implementingclasses(classDoc); if (implcl.size() > 0) { dl(); dt(); @@ -409,7 +409,7 @@ public void writeImplementedInterfacesInfo() { //NOTE: we really should be using ClassDoc.interfaceTypes() here, but // it doesn't walk up the tree like we want it to. - List interfaceArray = Util.getAllInterfaces(classDoc, configuration); + List interfaceArray = Util.getAllInterfaces(classDoc, configuration); if (classDoc.isClass() && interfaceArray.size() > 0) { dl(); dt(); @@ -425,7 +425,7 @@ public void writeSuperInterfacesInfo() { //NOTE: we really should be using ClassDoc.interfaceTypes() here, but // it doesn't walk up the tree like we want it to. - List interfaceArray = Util.getAllInterfaces(classDoc, configuration); + List interfaceArray = Util.getAllInterfaces(classDoc, configuration); if (classDoc.isInterface() && interfaceArray.size() > 0) { dl(); dt(); @@ -438,7 +438,7 @@ /** * Generate links to the given classes. */ - private void writeClassLinks(int context, List list) { + private void writeClassLinks(int context, List list) { Object[] typeList = list.toArray(); //Sort the list to be printed. print(' '); diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java Tue Jan 13 13:27:14 2009 +0000 @@ -194,10 +194,10 @@ /** * {@inheritDoc} */ - public void writeConstantMembers(ClassDoc cd, List fields) { + public void writeConstantMembers(ClassDoc cd, List fields) { currentClassDoc = cd; for (int i = 0; i < fields.size(); ++i) { - writeConstantMember((FieldDoc)(fields.get(i))); + writeConstantMember(fields.get(i)); } } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java Tue Jan 13 13:27:14 2009 +0000 @@ -238,7 +238,7 @@ return VisibleMemberMap.CONSTRUCTORS; } - protected void navSummaryLink(List members) { + protected void navSummaryLink(List members) { printNavSummaryLink(classdoc, members.size() > 0? true: false); } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -1728,13 +1728,13 @@ * @param descList the array of {@link AnnotationDesc}. */ private boolean writeAnnotationInfo(int indent, Doc doc, AnnotationDesc[] descList, boolean lineBreak) { - List annotations = getAnnotations(indent, descList, lineBreak); + List annotations = getAnnotations(indent, descList, lineBreak); if (annotations.size() == 0) { return false; } fontNoNewLine("-1"); - for (Iterator iter = annotations.iterator(); iter.hasNext();) { - print((String) iter.next()); + for (Iterator iter = annotations.iterator(); iter.hasNext();) { + print(iter.next()); } fontEnd(); return true; @@ -1792,8 +1792,8 @@ annotationTypeValues.add(annotationValue); } annotation.append(annotationTypeValues.size() == 1 ? "" : "{"); - for (Iterator iter = annotationTypeValues.iterator(); iter.hasNext(); ) { - annotation.append(annotationValueToString((AnnotationValue) iter.next())); + for (Iterator iter = annotationTypeValues.iterator(); iter.hasNext(); ) { + annotation.append(annotationValueToString(iter.next())); annotation.append(iter.hasNext() ? "," : ""); } annotation.append(annotationTypeValues.size() == 1 ? "" : "}"); @@ -1820,11 +1820,11 @@ return type.typeName() + type.dimension() + ".class"; } } else if (annotationValue.value() instanceof AnnotationDesc) { - List list = getAnnotations(0, + List list = getAnnotations(0, new AnnotationDesc[]{(AnnotationDesc) annotationValue.value()}, false); StringBuffer buf = new StringBuffer(); - for (Iterator iter = list.iterator(); iter.hasNext(); ) { + for (Iterator iter = list.iterator(); iter.hasNext(); ) { buf.append(iter.next()); } return buf.toString(); diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -51,7 +51,7 @@ super(writer, classdoc); } - public List members(ClassDoc cd) { + public List members(ClassDoc cd) { return Util.asList(cd.serializableFields()); } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -49,7 +49,7 @@ * The classes to be documented. Use this to filter out classes * that will not be documented. */ - private Set documentedClasses; + private Set documentedClasses; /** * The name of the output file. diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -54,7 +54,7 @@ /** * List to store the order groups as specified on the command line. */ - private List groupList; + private List groupList; /** * Construct the PackageIndexWriter. Also constructs the grouping diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -63,8 +63,8 @@ ClassDoc usedClass = content[i]; Set usingClasses = mapper.classToClass.get(usedClass.qualifiedName()); if (usingClasses != null) { - for (Iterator it = usingClasses.iterator(); it.hasNext(); ) { - ClassDoc usingClass = (ClassDoc)it.next(); + for (Iterator it = usingClasses.iterator(); it.hasNext(); ) { + ClassDoc usingClass = it.next(); PackageDoc usingPackage = usingClass.containingPackage(); Set usedClasses = usingPackageToUsedClasses .get(usingPackage.name()); @@ -136,9 +136,9 @@ printText("doclet.ClassUse_Packages.that.use.0", getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false)); tableHeaderEnd(); - Iterator it = usingPackageToUsedClasses.keySet().iterator(); + Iterator it = usingPackageToUsedClasses.keySet().iterator(); while (it.hasNext()) { - PackageDoc pkg = configuration.root.packageNamed((String)it.next()); + PackageDoc pkg = configuration.root.packageNamed(it.next()); generatePackageUse(pkg); } tableEnd(); @@ -147,9 +147,9 @@ } protected void generateClassList() throws IOException { - Iterator itp = usingPackageToUsedClasses.keySet().iterator(); + Iterator itp = usingPackageToUsedClasses.keySet().iterator(); while (itp.hasNext()) { - String packageName = (String)itp.next(); + String packageName = itp.next(); PackageDoc usingPackage = configuration.root.packageNamed(packageName); if (usingPackage != null) { anchor(usingPackage.name()); @@ -160,11 +160,10 @@ getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false), getPackageLink(usingPackage,Util.getPackageName(usingPackage), false)); tableHeaderEnd(); - Iterator itc = - ((Collection)usingPackageToUsedClasses.get(packageName)) - .iterator(); + Iterator itc = + usingPackageToUsedClasses.get(packageName).iterator(); while (itc.hasNext()) { - printClassRow((ClassDoc)itc.next(), packageName); + printClassRow(itc.next(), packageName); } tableEnd(); space(); diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java Tue Jan 13 13:27:14 2009 +0000 @@ -441,13 +441,13 @@ * @param customTagStrs the set two dimentional arrays of strings. These arrays contain * either -tag or -taglet arguments. */ - private void initTagletManager(Set customTagStrs) { + private void initTagletManager(Set customTagStrs) { tagletManager = tagletManager == null ? new TagletManager(nosince, showversion, showauthor, message) : tagletManager; String[] args; - for (Iterator it = customTagStrs.iterator(); it.hasNext(); ) { - args = (String[]) it.next(); + for (Iterator it = customTagStrs.iterator(); it.hasNext(); ) { + args = it.next(); if (args[0].equals("-taglet")) { tagletManager.addCustomTag(args[1], tagletpath); continue; diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java Tue Jan 13 13:27:14 2009 +0000 @@ -103,7 +103,7 @@ * @param cd the class whose constants are being documented. * @param fields the constants being documented. */ - public abstract void writeConstantMembers(ClassDoc cd, List fields); + public abstract void writeConstantMembers(ClassDoc cd, List fields); /** * Document the given constants. diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -97,22 +97,22 @@ * @param elements the XML elements that specify which components to * document. */ - protected void build(List elements) { + protected void build(List elements) { for (int i = 0; i < elements.size(); i++ ) { Object element = elements.get(i); String component = (String) ((element instanceof String) ? element : - ((List) element).get(0)); + ((List) element).get(0)); try { invokeMethod("build" + component, element instanceof String ? - new Class[] {} : - new Class[] {List.class}, + new Class[] {} : + new Class[] {List.class}, element instanceof String ? new Object[] {} : - new Object[] {((List) element).subList(1, - ((List) element).size())}); + new Object[] {((List) element).subList(1, + ((List) element).size())}); } catch (NoSuchMethodException e) { e.printStackTrace(); configuration.root.printError("Unknown element: " + component); @@ -138,7 +138,7 @@ * @param paramClasses the types for each parameter. * @param params the parameters of the method. */ - protected abstract void invokeMethod(String methodName, Class[] paramClasses, + protected abstract void invokeMethod(String methodName, Class[] paramClasses, Object[] params) throws Exception; } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -69,7 +69,7 @@ * * @param elements {@inheritDoc} */ - public void build(List elements) { + public void build(List elements) { if (hasMembersToDocument()) { super.build(elements); } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -92,7 +92,7 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class[] paramClasses, + public void invokeMethod(String methodName, Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { @@ -122,7 +122,7 @@ * * @param elements the XML elements that specify how to document a class. */ - public void buildAnnotationTypeDoc(List elements) throws Exception { + public void buildAnnotationTypeDoc(List elements) throws Exception { build(elements); writer.close(); copyDocFiles(); @@ -197,7 +197,7 @@ * @param elements the XML elements that specify how a member summary is * documented. */ - public void buildMemberSummary(List elements) throws Exception { + public void buildMemberSummary(List elements) throws Exception { configuration.getBuilderFactory(). getMemberSummaryBuilder(writer).build(elements); writer.completeMemberSummaryBuild(); @@ -209,7 +209,7 @@ * @param elements the XML elements that specify how a annotation type * members are documented. */ - public void buildAnnotationTypeOptionalMemberDetails(List elements) + public void buildAnnotationTypeOptionalMemberDetails(List elements) throws Exception { configuration.getBuilderFactory(). getAnnotationTypeOptionalMemberBuilder(writer).build(elements); @@ -221,7 +221,7 @@ * @param elements the XML elements that specify how a annotation type * members are documented. */ - public void buildAnnotationTypeRequiredMemberDetails(List elements) + public void buildAnnotationTypeRequiredMemberDetails(List elements) throws Exception { configuration.getBuilderFactory(). getAnnotationTypeRequiredMemberBuilder(writer).build(elements); diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -95,7 +95,7 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildAnnotationTypeOptionalMember(List elements) { + public void buildAnnotationTypeOptionalMember(List elements) { if (writer == null) { return; } @@ -108,7 +108,7 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class[] paramClasses, + public void invokeMethod(String methodName, Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -116,7 +116,7 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class[] paramClasses, + public void invokeMethod(String methodName, Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { @@ -135,7 +135,7 @@ * @param classDoc the {@link ClassDoc} we want to check. * @return a list of members that will be documented. */ - public List members(ClassDoc classDoc) { + public List members(ClassDoc classDoc) { return visibleMemberMap.getMembersFor(classDoc); } @@ -161,7 +161,7 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildAnnotationTypeRequiredMember(List elements) { + public void buildAnnotationTypeRequiredMember(List elements) { if (writer == null) { return; } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -108,7 +108,7 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class[] paramClasses, + public void invokeMethod(String methodName, Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { @@ -138,7 +138,7 @@ * * @param elements the XML elements that specify how to document a class. */ - public void buildClassDoc(List elements) throws Exception { + public void buildClassDoc(List elements) throws Exception { build(elements); writer.close(); copyDocFiles(); @@ -293,7 +293,7 @@ * @param elements the XML elements that specify how a member summary is * documented. */ - public void buildMemberSummary(List elements) throws Exception { + public void buildMemberSummary(List elements) throws Exception { configuration.getBuilderFactory(). getMemberSummaryBuilder(writer).build(elements); writer.completeMemberSummaryBuild(); @@ -305,7 +305,7 @@ * @param elements the XML elements that specify how a enum constants are * documented. */ - public void buildEnumConstantsDetails(List elements) throws Exception { + public void buildEnumConstantsDetails(List elements) throws Exception { configuration.getBuilderFactory(). getEnumConstantsBuilder(writer).build(elements); } @@ -315,7 +315,7 @@ * * @param elements the XML elements that specify how a field is documented. */ - public void buildFieldDetails(List elements) throws Exception { + public void buildFieldDetails(List elements) throws Exception { configuration.getBuilderFactory(). getFieldBuilder(writer).build(elements); } @@ -326,7 +326,7 @@ * @param elements the XML elements that specify how to document a * constructor. */ - public void buildConstructorDetails(List elements) throws Exception { + public void buildConstructorDetails(List elements) throws Exception { configuration.getBuilderFactory(). getConstructorBuilder(writer).build(elements); } @@ -336,7 +336,7 @@ * * @param elements the XML elements that specify how a method is documented. */ - public void buildMethodDetails(List elements) throws Exception { + public void buildMethodDetails(List elements) throws Exception { configuration.getBuilderFactory(). getMethodBuilder(writer).build(elements); } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -109,7 +109,7 @@ /** * {@inheritDoc} */ - public void invokeMethod(String methodName, Class[] paramClasses, + public void invokeMethod(String methodName, Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { @@ -144,7 +144,7 @@ * @param elements the list of elements describing constant summary * documentation. */ - public void buildConstantSummary(List elements) throws Exception { + public void buildConstantSummary(List elements) throws Exception { build(elements); writer.close(); } @@ -186,7 +186,7 @@ * @param elements the XML elements that represent the components * of documentation for each package. */ - public void buildConstantSummaries(List elements) { + public void buildConstantSummaries(List elements) { PackageDoc[] packages = configuration.packages; printedPackageHeaders = new HashSet(); for (int i = 0; i < packages.length; i++) { @@ -204,7 +204,7 @@ * @param elements the list of XML elements that make up package * documentation. */ - public void buildPackageConstantSummary(List elements) { + public void buildPackageConstantSummary(List elements) { build(elements); } @@ -214,7 +214,7 @@ * @param elements the list of XML elements that make up the class * constant summary. */ - public void buildClassConstantSummary(List elements) { + public void buildClassConstantSummary(List elements) { ClassDoc[] classes = currentPackage.name().length() > 0 ? currentPackage.allClasses() : configuration.classDocCatalog.allClasses( @@ -297,8 +297,8 @@ private boolean hasConstantField (ClassDoc classDoc) { VisibleMemberMap visibleMemberMapFields = new VisibleMemberMap(classDoc, VisibleMemberMap.FIELDS, configuration.nodeprecated); - List fields = visibleMemberMapFields.getLeafClassMembers(configuration); - for (Iterator iter = fields.iterator(); iter.hasNext(); ) { + List fields = visibleMemberMapFields.getLeafClassMembers(configuration); + for (Iterator iter = fields.iterator(); iter.hasNext(); ) { FieldDoc field = (FieldDoc) iter.next(); if (field.constantValueExpression() != null) { classDocsWithConstFields.add(classDoc); diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -138,7 +138,7 @@ */ public void invokeMethod( String methodName, - Class[] paramClasses, + Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { @@ -156,7 +156,7 @@ * * @return a list of constructors that will be documented. */ - public List members(ClassDoc classDoc) { + public List members(ClassDoc classDoc) { return visibleMemberMap.getMembersFor(classDoc); } @@ -175,7 +175,7 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildConstructorDoc(List elements) { + public void buildConstructorDoc(List elements) { if (writer == null) { return; } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -120,7 +120,7 @@ */ public void invokeMethod( String methodName, - Class[] paramClasses, + Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { @@ -139,7 +139,7 @@ * @param classDoc the {@link ClassDoc} we want to check. * @return a list of enum constants that will be documented. */ - public List members(ClassDoc classDoc) { + public List members(ClassDoc classDoc) { return visibleMemberMap.getMembersFor(classDoc); } @@ -165,7 +165,7 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildEnumConstant(List elements) { + public void buildEnumConstant(List elements) { if (writer == null) { return; } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java Tue Jan 13 13:27:14 2009 +0000 @@ -121,7 +121,7 @@ */ public void invokeMethod( String methodName, - Class[] paramClasses, + Class[] paramClasses, Object[] params) throws Exception { if (DEBUG) { @@ -140,7 +140,7 @@ * @param classDoc the {@link ClassDoc} we want to check. * @return a list of fields that will be documented. */ - public List members(ClassDoc classDoc) { + public List members(ClassDoc classDoc) { return visibleMemberMap.getMembersFor(classDoc); } @@ -166,7 +166,7 @@ * @param elements the XML elements that specify how to construct this * documentation. */ - public void buildFieldDoc(List elements) { + public void buildFieldDoc(List elements) { if (writer == null) { return; } diff -r ced0a1a7ec80 -r 7ac8c0815000 langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java --- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Thu Jan 08 16:34:58 2009 -0800 +++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java Tue Jan 13 13:27:14 2009 +0000 @@ -78,9 +78,9 @@ * * @return List the list of XML elements parsed. */ - public List parseXML(String root) { + public List parseXML(String root) { if (xmlElementsMap.containsKey(root)) { - return (List) xmlElementsMap.get(root); + return xmlElementsMap.get(root); } try { List