Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/build.properties	Thu Jan 08 16:34:58 2009 -0800
     1.2 +++ b/make/build.properties	Tue Jan 13 13:27:14 2009 +0000
     1.3 @@ -66,7 +66,7 @@
     1.4  # set the following to -version to verify the versions of javac being used
     1.5  javac.version.opt = 
     1.6  # in time, there should be no exceptions to -Xlint:all
     1.7 -javac.lint.opts = -Xlint:all,-deprecation,-fallthrough,-serial,-unchecked,-cast,-rawtypes
     1.8 +javac.lint.opts = -Xlint:all,-deprecation,-fallthrough,-serial,-unchecked,-cast
     1.9  
    1.10  # options for the <javadoc> task for javac
    1.11  javadoc.jls3.url=http://java.sun.com/docs/books/jls/

     2.1 --- a/src/share/classes/com/sun/source/util/Trees.java	Thu Jan 08 16:34:58 2009 -0800
     2.2 +++ b/src/share/classes/com/sun/source/util/Trees.java	Tue Jan 13 13:27:14 2009 +0000
     2.3 @@ -74,7 +74,7 @@
     2.4              ClassLoader cl = arg.getClass().getClassLoader();
     2.5              Class<?> c = Class.forName("com.sun.tools.javac.api.JavacTrees", false, cl);
     2.6              argType = Class.forName(argType.getName(), false, cl);
     2.7 -            Method m = c.getMethod("instance", new Class[] { argType });
     2.8 +            Method m = c.getMethod("instance", new Class<?>[] { argType });
     2.9              return (Trees) m.invoke(null, new Object[] { arg });
    2.10          } catch (Throwable e) {
    2.11              throw new AssertionError(e);

     3.1 --- a/src/share/classes/com/sun/tools/apt/comp/Apt.java	Thu Jan 08 16:34:58 2009 -0800
     3.2 +++ b/src/share/classes/com/sun/tools/apt/comp/Apt.java	Tue Jan 13 13:27:14 2009 +0000
     3.3 @@ -281,7 +281,7 @@
     3.4              // Discovery process
     3.5  
     3.6              // List of annotation processory factory instances
     3.7 -            java.util.Iterator providers = null;
     3.8 +            java.util.Iterator<AnnotationProcessorFactory> providers = null;
     3.9              {
    3.10                  /*
    3.11                   * If a factory is provided by the user, the

     4.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java	Thu Jan 08 16:34:58 2009 -0800
     4.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java	Tue Jan 13 13:27:14 2009 +0000
     4.3 @@ -217,7 +217,7 @@
     4.4              }
     4.5          }
     4.6  
     4.7 -        @SuppressWarnings("unchecked")
     4.8 +        @SuppressWarnings({"unchecked", "rawtypes"})
     4.9          public void visitEnum(Attribute.Enum e) {
    4.10              if (runtimeType.isEnum()) {
    4.11                  String constName = e.value.toString();
    4.12 @@ -225,7 +225,7 @@
    4.13                      value = Enum.valueOf((Class)runtimeType, constName);
    4.14                  } catch (IllegalArgumentException ex) {
    4.15                      value = new EnumConstantNotPresentExceptionProxy(
    4.16 -                                                        (Class)runtimeType, constName);
    4.17 +                                                        (Class<Enum<?>>)runtimeType, constName);
    4.18                  }
    4.19              } else {
    4.20                  value = null;   // indicates a type mismatch

     5.1 --- a/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java	Thu Jan 08 16:34:58 2009 -0800
     5.2 +++ b/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java	Tue Jan 13 13:27:14 2009 +0000
     5.3 @@ -130,8 +130,8 @@
     5.4                  append((EnumConstantDeclarationImpl) val);
     5.5              } else if (val instanceof AnnotationMirror) {
     5.6                  append((AnnotationMirrorImpl) val);
     5.7 -            } else if (val instanceof Collection) {
     5.8 -                append((Collection) val);
     5.9 +            } else if (val instanceof Collection<?>) {
    5.10 +                append((Collection<?>) val);
    5.11              } else {
    5.12                  appendUnquoted(val.toString());
    5.13              }
    5.14 @@ -234,7 +234,7 @@
    5.15           * and separated by ", ".  Useful for array-valued annotation
    5.16           * elements.
    5.17           */
    5.18 -        void append(Collection vals) {
    5.19 +        void append(Collection<?> vals) {
    5.20              buf.append('{');
    5.21              boolean first = true;
    5.22              for (Object val : vals) {

     6.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Thu Jan 08 16:34:58 2009 -0800
     6.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java	Tue Jan 13 13:27:14 2009 +0000
     6.3 @@ -95,14 +95,14 @@
     6.4       * @param unicode Unicode for which member list information to be generated.
     6.5       * @param memberlist List of members for the unicode character.
     6.6       */
     6.7 -    protected void generateContents(Character unicode, List memberlist) {
     6.8 +    protected void generateContents(Character unicode, List<? extends Doc> memberlist) {
     6.9          anchor("_" + unicode + "_");
    6.10          h2();
    6.11          strong(unicode.toString());
    6.12          h2End();
    6.13          dl();
    6.14          for (int i = 0; i < memberlist.size(); i++) {
    6.15 -            Doc element = (Doc)memberlist.get(i);
    6.16 +            Doc element = memberlist.get(i);
    6.17              if (element instanceof MemberDoc) {
    6.18                  printDescription((MemberDoc)element);
    6.19              } else if (element instanceof ClassDoc) {

     7.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Thu Jan 08 16:34:58 2009 -0800
     7.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java	Tue Jan 13 13:27:14 2009 +0000
     7.3 @@ -317,7 +317,7 @@
     7.4       * format for listing the API. Call methods from the sub-class to complete
     7.5       * the generation.
     7.6       */
     7.7 -    protected void printDeprecatedAPI(List deprmembers, String headingKey) {
     7.8 +    protected void printDeprecatedAPI(List<Doc> deprmembers, String headingKey) {
     7.9          if (deprmembers.size() > 0) {
    7.10              writer.tableIndexSummary();
    7.11              writer.tableHeaderStart("#CCCCFF");
    7.12 @@ -377,12 +377,12 @@
    7.13          }
    7.14      }
    7.15  
    7.16 -    protected void navDetailLink(List members) {
    7.17 +    protected void navDetailLink(List<?> members) {
    7.18              printNavDetailLink(members.size() > 0? true: false);
    7.19      }
    7.20  
    7.21  
    7.22 -    protected void navSummaryLink(List members,
    7.23 +    protected void navSummaryLink(List<?> members,
    7.24              VisibleMemberMap visibleMemberMap) {
    7.25          if (members.size() > 0) {
    7.26              printNavSummaryLink(null, true);
    7.27 @@ -390,7 +390,7 @@
    7.28          } else {
    7.29              ClassDoc icd = classdoc.superclass();
    7.30              while (icd != null) {
    7.31 -                List inhmembers = visibleMemberMap.getMembersFor(icd);
    7.32 +                List<?> inhmembers = visibleMemberMap.getMembersFor(icd);
    7.33                  if (inhmembers.size() > 0) {
    7.34                      printNavSummaryLink(icd, true);
    7.35                      return;

     8.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Thu Jan 08 16:34:58 2009 -0800
     8.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java	Tue Jan 13 13:27:14 2009 +0000
     8.3 @@ -96,12 +96,12 @@
     8.4       * @param list list of the sub-classes at this level.
     8.5       * @param isEnum true if we are generating a tree for enums.
     8.6       */
     8.7 -    protected void generateLevelInfo(ClassDoc parent, List list,
     8.8 +    protected void generateLevelInfo(ClassDoc parent, List<ClassDoc> list,
     8.9              boolean isEnum) {
    8.10          if (list.size() > 0) {
    8.11              ul();
    8.12              for (int i = 0; i < list.size(); i++) {
    8.13 -                ClassDoc local = (ClassDoc)list.get(i);
    8.14 +                ClassDoc local = list.get(i);
    8.15                  printPartialInfo(local);
    8.16                  printExtendsImplements(parent, local);
    8.17                  generateLevelInfo(local, classtree.subs(local, isEnum),
    8.18 @@ -119,9 +119,9 @@
    8.19       * other classes in this run will derive from these classes.
    8.20       * @param heading Heading for the tree.
    8.21       */
    8.22 -    protected void generateTree(List list, String heading) {
    8.23 +    protected void generateTree(List<ClassDoc> list, String heading) {
    8.24          if (list.size() > 0) {
    8.25 -            ClassDoc firstClassDoc = (ClassDoc)list.get(0);
    8.26 +            ClassDoc firstClassDoc = list.get(0);
    8.27              printTreeHeading(heading);
    8.28              generateLevelInfo(!firstClassDoc.isInterface()? firstClassDoc : null,
    8.29                  list,

     9.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Thu Jan 08 16:34:58 2009 -0800
     9.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java	Tue Jan 13 13:27:14 2009 +0000
     9.3 @@ -137,9 +137,9 @@
     9.4       * @param classlist Sorted list of classes.
     9.5       * @param wantFrames True if we want frames.
     9.6       */
     9.7 -    protected void generateContents(List classlist, boolean wantFrames) {
     9.8 +    protected void generateContents(List<Doc> classlist, boolean wantFrames) {
     9.9          for (int i = 0; i < classlist.size(); i++) {
    9.10 -            ClassDoc cd = (ClassDoc)(classlist.get(i));
    9.11 +            ClassDoc cd = (ClassDoc)classlist.get(i);
    9.12              if (!Util.isCoreClass(cd)) {
    9.13                  continue;
    9.14              }

    10.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Thu Jan 08 16:34:58 2009 -0800
    10.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java	Tue Jan 13 13:27:14 2009 +0000
    10.3 @@ -38,7 +38,7 @@
    10.4  public class ClassUseWriter extends SubWriterHolderWriter {
    10.5  
    10.6      final ClassDoc classdoc;
    10.7 -    Set pkgToPackageAnnotations = null;
    10.8 +    Set<PackageDoc> pkgToPackageAnnotations = null;
    10.9      final Map<String,List<ProgramElementDoc>> pkgToClassTypeParameter;
   10.10      final Map<String,List<ProgramElementDoc>> pkgToClassAnnotations;
   10.11      final Map<String,List<ProgramElementDoc>> pkgToMethodTypeParameter;
   10.12 @@ -220,8 +220,8 @@
   10.13                  false)));
   10.14          tableHeaderEnd();
   10.15  
   10.16 -        for (Iterator it = pkgSet.iterator(); it.hasNext();) {
   10.17 -            PackageDoc pkg = (PackageDoc)it.next();
   10.18 +        for (Iterator<PackageDoc> it = pkgSet.iterator(); it.hasNext();) {
   10.19 +            PackageDoc pkg = it.next();
   10.20              generatePackageUse(pkg);
   10.21          }
   10.22          tableEnd();
   10.23 @@ -240,8 +240,8 @@
   10.24              getLink(new LinkInfoImpl(LinkInfoImpl.CONTEXT_CLASS_USE_HEADER, classdoc,
   10.25                  false)));
   10.26          tableHeaderEnd();
   10.27 -        for (Iterator it = pkgToPackageAnnotations.iterator(); it.hasNext();) {
   10.28 -            PackageDoc pkg = (PackageDoc)it.next();
   10.29 +        for (Iterator<PackageDoc> it = pkgToPackageAnnotations.iterator(); it.hasNext();) {
   10.30 +            PackageDoc pkg = it.next();
   10.31              trBgcolorStyle("white", "TableRowColor");
   10.32              summaryRow(0);
   10.33              //Just want an anchor here.
   10.34 @@ -259,8 +259,8 @@
   10.35      }
   10.36  
   10.37      protected void generateClassList() throws IOException {
   10.38 -        for (Iterator it = pkgSet.iterator(); it.hasNext();) {
   10.39 -            PackageDoc pkg = (PackageDoc)it.next();
   10.40 +        for (Iterator<PackageDoc> it = pkgSet.iterator(); it.hasNext();) {
   10.41 +            PackageDoc pkg = it.next();
   10.42              anchor(pkg.name());
   10.43              tableIndexSummary();
   10.44              tableHeaderStart("#CCCCFF");

    11.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Thu Jan 08 16:34:58 2009 -0800
    11.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java	Tue Jan 13 13:27:14 2009 +0000
    11.3 @@ -355,7 +355,7 @@
    11.4                  classDoc.qualifiedName().equals("org.omg.CORBA.Object")) {
    11.5                  return;    // Don't generate the list, too huge
    11.6              }
    11.7 -            List subclasses = classtree.subs(classDoc, false);
    11.8 +            List<ClassDoc> subclasses = classtree.subs(classDoc, false);
    11.9              if (subclasses.size() > 0) {
   11.10                  dl();
   11.11                  dt();
   11.12 @@ -371,7 +371,7 @@
   11.13       */
   11.14      public void writeSubInterfacesInfo() {
   11.15          if (classDoc.isInterface()) {
   11.16 -            List subInterfaces = classtree.allSubs(classDoc, false);
   11.17 +            List<ClassDoc> subInterfaces = classtree.allSubs(classDoc, false);
   11.18              if (subInterfaces.size() > 0) {
   11.19                  dl();
   11.20                  dt();
   11.21 @@ -393,7 +393,7 @@
   11.22              classDoc.qualifiedName().equals("java.io.Serializable")) {
   11.23              return;   // Don't generate the list, too big
   11.24          }
   11.25 -        List implcl = classtree.implementingclasses(classDoc);
   11.26 +        List<ClassDoc> implcl = classtree.implementingclasses(classDoc);
   11.27          if (implcl.size() > 0) {
   11.28              dl();
   11.29              dt();
   11.30 @@ -409,7 +409,7 @@
   11.31      public void writeImplementedInterfacesInfo() {
   11.32          //NOTE:  we really should be using ClassDoc.interfaceTypes() here, but
   11.33          //       it doesn't walk up the tree like we want it to.
   11.34 -        List interfaceArray = Util.getAllInterfaces(classDoc, configuration);
   11.35 +        List<Type> interfaceArray = Util.getAllInterfaces(classDoc, configuration);
   11.36          if (classDoc.isClass() && interfaceArray.size() > 0) {
   11.37              dl();
   11.38              dt();
   11.39 @@ -425,7 +425,7 @@
   11.40      public void writeSuperInterfacesInfo() {
   11.41          //NOTE:  we really should be using ClassDoc.interfaceTypes() here, but
   11.42          //       it doesn't walk up the tree like we want it to.
   11.43 -        List interfaceArray = Util.getAllInterfaces(classDoc, configuration);
   11.44 +        List<Type> interfaceArray = Util.getAllInterfaces(classDoc, configuration);
   11.45          if (classDoc.isInterface() && interfaceArray.size() > 0) {
   11.46              dl();
   11.47              dt();
   11.48 @@ -438,7 +438,7 @@
   11.49      /**
   11.50       * Generate links to the given classes.
   11.51       */
   11.52 -    private void writeClassLinks(int context, List list) {
   11.53 +    private void writeClassLinks(int context, List<?> list) {
   11.54          Object[] typeList = list.toArray();
   11.55          //Sort the list to be printed.
   11.56          print(' ');

    12.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Thu Jan 08 16:34:58 2009 -0800
    12.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java	Tue Jan 13 13:27:14 2009 +0000
    12.3 @@ -194,10 +194,10 @@
    12.4      /**
    12.5       * {@inheritDoc}
    12.6       */
    12.7 -    public void writeConstantMembers(ClassDoc cd, List fields) {
    12.8 +    public void writeConstantMembers(ClassDoc cd, List<FieldDoc> fields) {
    12.9          currentClassDoc = cd;
   12.10          for (int i = 0; i < fields.size(); ++i) {
   12.11 -            writeConstantMember((FieldDoc)(fields.get(i)));
   12.12 +            writeConstantMember(fields.get(i));
   12.13          }
   12.14      }
   12.15  

    13.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java	Thu Jan 08 16:34:58 2009 -0800
    13.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java	Tue Jan 13 13:27:14 2009 +0000
    13.3 @@ -238,7 +238,7 @@
    13.4          return VisibleMemberMap.CONSTRUCTORS;
    13.5      }
    13.6  
    13.7 -    protected void navSummaryLink(List members) {
    13.8 +    protected void navSummaryLink(List<?> members) {
    13.9          printNavSummaryLink(classdoc,
   13.10                  members.size() > 0? true: false);
   13.11      }

    14.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Thu Jan 08 16:34:58 2009 -0800
    14.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Tue Jan 13 13:27:14 2009 +0000
    14.3 @@ -1728,13 +1728,13 @@
    14.4       * @param descList the array of {@link AnnotationDesc}.
    14.5       */
    14.6      private boolean writeAnnotationInfo(int indent, Doc doc, AnnotationDesc[] descList, boolean lineBreak) {
    14.7 -        List annotations = getAnnotations(indent, descList, lineBreak);
    14.8 +        List<String> annotations = getAnnotations(indent, descList, lineBreak);
    14.9          if (annotations.size() == 0) {
   14.10              return false;
   14.11          }
   14.12          fontNoNewLine("-1");
   14.13 -        for (Iterator iter = annotations.iterator(); iter.hasNext();) {
   14.14 -            print((String) iter.next());
   14.15 +        for (Iterator<String> iter = annotations.iterator(); iter.hasNext();) {
   14.16 +            print(iter.next());
   14.17          }
   14.18          fontEnd();
   14.19          return true;
   14.20 @@ -1792,8 +1792,8 @@
   14.21                          annotationTypeValues.add(annotationValue);
   14.22                      }
   14.23                      annotation.append(annotationTypeValues.size() == 1 ? "" : "{");
   14.24 -                    for (Iterator iter = annotationTypeValues.iterator(); iter.hasNext(); ) {
   14.25 -                        annotation.append(annotationValueToString((AnnotationValue) iter.next()));
   14.26 +                    for (Iterator<AnnotationValue> iter = annotationTypeValues.iterator(); iter.hasNext(); ) {
   14.27 +                        annotation.append(annotationValueToString(iter.next()));
   14.28                          annotation.append(iter.hasNext() ? "," : "");
   14.29                      }
   14.30                      annotation.append(annotationTypeValues.size() == 1 ? "" : "}");
   14.31 @@ -1820,11 +1820,11 @@
   14.32                  return type.typeName() + type.dimension() + ".class";
   14.33              }
   14.34          } else if (annotationValue.value() instanceof AnnotationDesc) {
   14.35 -            List list = getAnnotations(0,
   14.36 +            List<String> list = getAnnotations(0,
   14.37                  new AnnotationDesc[]{(AnnotationDesc) annotationValue.value()},
   14.38                      false);
   14.39              StringBuffer buf = new StringBuffer();
   14.40 -            for (Iterator iter = list.iterator(); iter.hasNext(); ) {
   14.41 +            for (Iterator<String> iter = list.iterator(); iter.hasNext(); ) {
   14.42                  buf.append(iter.next());
   14.43              }
   14.44              return buf.toString();

    15.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Thu Jan 08 16:34:58 2009 -0800
    15.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialFieldWriter.java	Tue Jan 13 13:27:14 2009 +0000
    15.3 @@ -51,7 +51,7 @@
    15.4          super(writer, classdoc);
    15.5      }
    15.6  
    15.7 -    public List members(ClassDoc cd) {
    15.8 +    public List<FieldDoc> members(ClassDoc cd) {
    15.9          return Util.asList(cd.serializableFields());
   15.10      }
   15.11  

    16.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Thu Jan 08 16:34:58 2009 -0800
    16.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java	Tue Jan 13 13:27:14 2009 +0000
    16.3 @@ -49,7 +49,7 @@
    16.4       * The classes to be documented.  Use this to filter out classes
    16.5       * that will not be documented.
    16.6       */
    16.7 -    private Set documentedClasses;
    16.8 +    private Set<ClassDoc> documentedClasses;
    16.9  
   16.10      /**
   16.11       * The name of the output file.

    17.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Thu Jan 08 16:34:58 2009 -0800
    17.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Tue Jan 13 13:27:14 2009 +0000
    17.3 @@ -54,7 +54,7 @@
    17.4      /**
    17.5       * List to store the order groups as specified on the command line.
    17.6       */
    17.7 -    private List groupList;
    17.8 +    private List<String> groupList;
    17.9  
   17.10      /**
   17.11       * Construct the PackageIndexWriter. Also constructs the grouping

    18.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Thu Jan 08 16:34:58 2009 -0800
    18.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java	Tue Jan 13 13:27:14 2009 +0000
    18.3 @@ -63,8 +63,8 @@
    18.4              ClassDoc usedClass = content[i];
    18.5              Set<ClassDoc> usingClasses = mapper.classToClass.get(usedClass.qualifiedName());
    18.6              if (usingClasses != null) {
    18.7 -                for (Iterator it = usingClasses.iterator(); it.hasNext(); ) {
    18.8 -                    ClassDoc usingClass = (ClassDoc)it.next();
    18.9 +                for (Iterator<ClassDoc> it = usingClasses.iterator(); it.hasNext(); ) {
   18.10 +                    ClassDoc usingClass = it.next();
   18.11                      PackageDoc usingPackage = usingClass.containingPackage();
   18.12                      Set<ClassDoc> usedClasses = usingPackageToUsedClasses
   18.13                          .get(usingPackage.name());
   18.14 @@ -136,9 +136,9 @@
   18.15          printText("doclet.ClassUse_Packages.that.use.0",
   18.16              getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false));
   18.17          tableHeaderEnd();
   18.18 -        Iterator it = usingPackageToUsedClasses.keySet().iterator();
   18.19 +        Iterator<String> it = usingPackageToUsedClasses.keySet().iterator();
   18.20          while (it.hasNext()) {
   18.21 -            PackageDoc pkg = configuration.root.packageNamed((String)it.next());
   18.22 +            PackageDoc pkg = configuration.root.packageNamed(it.next());
   18.23              generatePackageUse(pkg);
   18.24          }
   18.25          tableEnd();
   18.26 @@ -147,9 +147,9 @@
   18.27      }
   18.28  
   18.29      protected void generateClassList() throws IOException {
   18.30 -        Iterator itp = usingPackageToUsedClasses.keySet().iterator();
   18.31 +        Iterator<String> itp = usingPackageToUsedClasses.keySet().iterator();
   18.32          while (itp.hasNext()) {
   18.33 -            String packageName = (String)itp.next();
   18.34 +            String packageName = itp.next();
   18.35              PackageDoc usingPackage = configuration.root.packageNamed(packageName);
   18.36              if (usingPackage != null) {
   18.37                  anchor(usingPackage.name());
   18.38 @@ -160,11 +160,10 @@
   18.39                  getPackageLink(pkgdoc, Util.getPackageName(pkgdoc), false),
   18.40                  getPackageLink(usingPackage,Util.getPackageName(usingPackage), false));
   18.41              tableHeaderEnd();
   18.42 -            Iterator itc =
   18.43 -                ((Collection)usingPackageToUsedClasses.get(packageName))
   18.44 -                .iterator();
   18.45 +            Iterator<ClassDoc> itc =
   18.46 +                    usingPackageToUsedClasses.get(packageName).iterator();
   18.47              while (itc.hasNext()) {
   18.48 -                printClassRow((ClassDoc)itc.next(), packageName);
   18.49 +                printClassRow(itc.next(), packageName);
   18.50              }
   18.51              tableEnd();
   18.52              space();

    19.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Thu Jan 08 16:34:58 2009 -0800
    19.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Tue Jan 13 13:27:14 2009 +0000
    19.3 @@ -441,13 +441,13 @@
    19.4       * @param customTagStrs the set two dimentional arrays of strings.  These arrays contain
    19.5       * either -tag or -taglet arguments.
    19.6       */
    19.7 -    private void initTagletManager(Set customTagStrs) {
    19.8 +    private void initTagletManager(Set<String[]> customTagStrs) {
    19.9          tagletManager = tagletManager == null ?
   19.10              new TagletManager(nosince, showversion, showauthor, message) :
   19.11              tagletManager;
   19.12          String[] args;
   19.13 -        for (Iterator it = customTagStrs.iterator(); it.hasNext(); ) {
   19.14 -            args = (String[]) it.next();
   19.15 +        for (Iterator<String[]> it = customTagStrs.iterator(); it.hasNext(); ) {
   19.16 +            args = it.next();
   19.17              if (args[0].equals("-taglet")) {
   19.18                  tagletManager.addCustomTag(args[1], tagletpath);
   19.19                  continue;

    20.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Thu Jan 08 16:34:58 2009 -0800
    20.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java	Tue Jan 13 13:27:14 2009 +0000
    20.3 @@ -103,7 +103,7 @@
    20.4       * @param cd the class whose constants are being documented.
    20.5       * @param fields the constants being documented.
    20.6       */
    20.7 -    public abstract void writeConstantMembers(ClassDoc cd, List fields);
    20.8 +    public abstract void writeConstantMembers(ClassDoc cd, List<FieldDoc> fields);
    20.9  
   20.10      /**
   20.11       * Document the given constants.

    21.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    21.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    21.3 @@ -97,22 +97,22 @@
    21.4       * @param elements the XML elements that specify which components to
    21.5       *                 document.
    21.6       */
    21.7 -    protected void build(List elements) {
    21.8 +    protected void build(List<?> elements) {
    21.9          for (int i = 0; i < elements.size(); i++ ) {
   21.10              Object element = elements.get(i);
   21.11              String component = (String)
   21.12                  ((element instanceof String) ?
   21.13                       element :
   21.14 -                    ((List) element).get(0));
   21.15 +                    ((List<?>) element).get(0));
   21.16              try {
   21.17                  invokeMethod("build" + component,
   21.18                      element instanceof String ?
   21.19 -                        new Class[] {} :
   21.20 -                        new Class[] {List.class},
   21.21 +                        new Class<?>[] {} :
   21.22 +                        new Class<?>[] {List.class},
   21.23                      element instanceof String ?
   21.24                          new Object[] {} :
   21.25 -                        new Object[] {((List) element).subList(1,
   21.26 -                            ((List) element).size())});
   21.27 +                        new Object[] {((List<?>) element).subList(1,
   21.28 +                            ((List<?>) element).size())});
   21.29              } catch (NoSuchMethodException e) {
   21.30                  e.printStackTrace();
   21.31                  configuration.root.printError("Unknown element: " + component);
   21.32 @@ -138,7 +138,7 @@
   21.33       * @param paramClasses the types for each parameter.
   21.34       * @param params       the parameters of the method.
   21.35       */
   21.36 -    protected abstract void invokeMethod(String methodName, Class[] paramClasses,
   21.37 +    protected abstract void invokeMethod(String methodName, Class<?>[] paramClasses,
   21.38              Object[] params)
   21.39      throws Exception;
   21.40  }

    22.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    22.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    22.3 @@ -69,7 +69,7 @@
    22.4       *
    22.5       * @param elements {@inheritDoc}
    22.6       */
    22.7 -    public void build(List elements) {
    22.8 +    public void build(List<?> elements) {
    22.9          if (hasMembersToDocument()) {
   22.10              super.build(elements);
   22.11          }

    23.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    23.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    23.3 @@ -92,7 +92,7 @@
    23.4      /**
    23.5       * {@inheritDoc}
    23.6       */
    23.7 -    public void invokeMethod(String methodName, Class[] paramClasses,
    23.8 +    public void invokeMethod(String methodName, Class<?>[] paramClasses,
    23.9              Object[] params)
   23.10      throws Exception {
   23.11          if (DEBUG) {
   23.12 @@ -122,7 +122,7 @@
   23.13        *
   23.14        * @param elements the XML elements that specify how to document a class.
   23.15        */
   23.16 -     public void buildAnnotationTypeDoc(List elements) throws Exception {
   23.17 +     public void buildAnnotationTypeDoc(List<?> elements) throws Exception {
   23.18          build(elements);
   23.19          writer.close();
   23.20          copyDocFiles();
   23.21 @@ -197,7 +197,7 @@
   23.22       * @param elements the XML elements that specify how a member summary is
   23.23       *                 documented.
   23.24       */
   23.25 -    public void buildMemberSummary(List elements) throws Exception {
   23.26 +    public void buildMemberSummary(List<?> elements) throws Exception {
   23.27          configuration.getBuilderFactory().
   23.28              getMemberSummaryBuilder(writer).build(elements);
   23.29          writer.completeMemberSummaryBuild();
   23.30 @@ -209,7 +209,7 @@
   23.31       * @param elements the XML elements that specify how a annotation type
   23.32       *                 members are documented.
   23.33       */
   23.34 -    public void buildAnnotationTypeOptionalMemberDetails(List elements)
   23.35 +    public void buildAnnotationTypeOptionalMemberDetails(List<?> elements)
   23.36      throws Exception {
   23.37          configuration.getBuilderFactory().
   23.38              getAnnotationTypeOptionalMemberBuilder(writer).build(elements);
   23.39 @@ -221,7 +221,7 @@
   23.40       * @param elements the XML elements that specify how a annotation type
   23.41       *                 members are documented.
   23.42       */
   23.43 -    public void buildAnnotationTypeRequiredMemberDetails(List elements)
   23.44 +    public void buildAnnotationTypeRequiredMemberDetails(List<?> elements)
   23.45      throws Exception {
   23.46          configuration.getBuilderFactory().
   23.47              getAnnotationTypeRequiredMemberBuilder(writer).build(elements);

    24.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    24.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeOptionalMemberBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    24.3 @@ -95,7 +95,7 @@
    24.4       * @param elements the XML elements that specify how to construct this
    24.5       *                documentation.
    24.6       */
    24.7 -    public void buildAnnotationTypeOptionalMember(List elements) {
    24.8 +    public void buildAnnotationTypeOptionalMember(List<?> elements) {
    24.9          if (writer == null) {
   24.10              return;
   24.11          }
   24.12 @@ -108,7 +108,7 @@
   24.13      /**
   24.14       * {@inheritDoc}
   24.15       */
   24.16 -    public void invokeMethod(String methodName, Class[] paramClasses,
   24.17 +    public void invokeMethod(String methodName, Class<?>[] paramClasses,
   24.18              Object[] params)
   24.19      throws Exception {
   24.20          if (DEBUG) {

    25.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    25.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    25.3 @@ -116,7 +116,7 @@
    25.4      /**
    25.5       * {@inheritDoc}
    25.6       */
    25.7 -    public void invokeMethod(String methodName, Class[] paramClasses,
    25.8 +    public void invokeMethod(String methodName, Class<?>[] paramClasses,
    25.9              Object[] params)
   25.10      throws Exception {
   25.11          if (DEBUG) {
   25.12 @@ -135,7 +135,7 @@
   25.13       * @param classDoc the {@link ClassDoc} we want to check.
   25.14       * @return a list of members that will be documented.
   25.15       */
   25.16 -    public List members(ClassDoc classDoc) {
   25.17 +    public List<ProgramElementDoc> members(ClassDoc classDoc) {
   25.18          return visibleMemberMap.getMembersFor(classDoc);
   25.19      }
   25.20  
   25.21 @@ -161,7 +161,7 @@
   25.22       * @param elements the XML elements that specify how to construct this
   25.23       *                documentation.
   25.24       */
   25.25 -    public void buildAnnotationTypeRequiredMember(List elements) {
   25.26 +    public void buildAnnotationTypeRequiredMember(List<?> elements) {
   25.27          if (writer == null) {
   25.28              return;
   25.29          }

    26.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    26.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    26.3 @@ -108,7 +108,7 @@
    26.4      /**
    26.5       * {@inheritDoc}
    26.6       */
    26.7 -    public void invokeMethod(String methodName, Class[] paramClasses,
    26.8 +    public void invokeMethod(String methodName, Class<?>[] paramClasses,
    26.9              Object[] params)
   26.10      throws Exception {
   26.11          if (DEBUG) {
   26.12 @@ -138,7 +138,7 @@
   26.13        *
   26.14        * @param elements the XML elements that specify how to document a class.
   26.15        */
   26.16 -     public void buildClassDoc(List elements) throws Exception {
   26.17 +     public void buildClassDoc(List<?> elements) throws Exception {
   26.18          build(elements);
   26.19          writer.close();
   26.20          copyDocFiles();
   26.21 @@ -293,7 +293,7 @@
   26.22       * @param elements the XML elements that specify how a member summary is
   26.23       *                 documented.
   26.24       */
   26.25 -    public void buildMemberSummary(List elements) throws Exception {
   26.26 +    public void buildMemberSummary(List<?> elements) throws Exception {
   26.27          configuration.getBuilderFactory().
   26.28              getMemberSummaryBuilder(writer).build(elements);
   26.29          writer.completeMemberSummaryBuild();
   26.30 @@ -305,7 +305,7 @@
   26.31       * @param elements the XML elements that specify how a enum constants are
   26.32       *                 documented.
   26.33       */
   26.34 -    public void buildEnumConstantsDetails(List elements) throws Exception {
   26.35 +    public void buildEnumConstantsDetails(List<?> elements) throws Exception {
   26.36          configuration.getBuilderFactory().
   26.37              getEnumConstantsBuilder(writer).build(elements);
   26.38      }
   26.39 @@ -315,7 +315,7 @@
   26.40       *
   26.41       * @param elements the XML elements that specify how a field is documented.
   26.42       */
   26.43 -    public void buildFieldDetails(List elements) throws Exception {
   26.44 +    public void buildFieldDetails(List<?> elements) throws Exception {
   26.45          configuration.getBuilderFactory().
   26.46              getFieldBuilder(writer).build(elements);
   26.47      }
   26.48 @@ -326,7 +326,7 @@
   26.49       * @param elements the XML elements that specify how to document a
   26.50       * constructor.
   26.51       */
   26.52 -    public void buildConstructorDetails(List elements) throws Exception {
   26.53 +    public void buildConstructorDetails(List<?> elements) throws Exception {
   26.54          configuration.getBuilderFactory().
   26.55              getConstructorBuilder(writer).build(elements);
   26.56      }
   26.57 @@ -336,7 +336,7 @@
   26.58       *
   26.59       * @param elements the XML elements that specify how a method is documented.
   26.60       */
   26.61 -    public void buildMethodDetails(List elements) throws Exception {
   26.62 +    public void buildMethodDetails(List<?> elements) throws Exception {
   26.63          configuration.getBuilderFactory().
   26.64                  getMethodBuilder(writer).build(elements);
   26.65      }

    27.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    27.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    27.3 @@ -109,7 +109,7 @@
    27.4      /**
    27.5       * {@inheritDoc}
    27.6       */
    27.7 -    public void invokeMethod(String methodName, Class[] paramClasses,
    27.8 +    public void invokeMethod(String methodName, Class<?>[] paramClasses,
    27.9              Object[] params)
   27.10      throws Exception {
   27.11          if (DEBUG) {
   27.12 @@ -144,7 +144,7 @@
   27.13       * @param elements the list of elements describing constant summary
   27.14       *                 documentation.
   27.15       */
   27.16 -    public void buildConstantSummary(List elements) throws Exception {
   27.17 +    public void buildConstantSummary(List<?> elements) throws Exception {
   27.18          build(elements);
   27.19          writer.close();
   27.20      }
   27.21 @@ -186,7 +186,7 @@
   27.22       * @param elements the XML elements that represent the components
   27.23       *                 of documentation for each package.
   27.24       */
   27.25 -    public void buildConstantSummaries(List elements) {
   27.26 +    public void buildConstantSummaries(List<?> elements) {
   27.27          PackageDoc[] packages = configuration.packages;
   27.28          printedPackageHeaders = new HashSet<String>();
   27.29          for (int i = 0; i < packages.length; i++) {
   27.30 @@ -204,7 +204,7 @@
   27.31       * @param elements the list of XML elements that make up package
   27.32       *                 documentation.
   27.33       */
   27.34 -    public void buildPackageConstantSummary(List elements) {
   27.35 +    public void buildPackageConstantSummary(List<?> elements) {
   27.36          build(elements);
   27.37      }
   27.38  
   27.39 @@ -214,7 +214,7 @@
   27.40       * @param elements the list of XML elements that make up the class
   27.41       *                 constant summary.
   27.42       */
   27.43 -    public void buildClassConstantSummary(List elements) {
   27.44 +    public void buildClassConstantSummary(List<?> elements) {
   27.45          ClassDoc[] classes = currentPackage.name().length() > 0 ?
   27.46              currentPackage.allClasses() :
   27.47              configuration.classDocCatalog.allClasses(
   27.48 @@ -297,8 +297,8 @@
   27.49      private boolean hasConstantField (ClassDoc classDoc) {
   27.50          VisibleMemberMap visibleMemberMapFields = new VisibleMemberMap(classDoc,
   27.51              VisibleMemberMap.FIELDS, configuration.nodeprecated);
   27.52 -        List fields = visibleMemberMapFields.getLeafClassMembers(configuration);
   27.53 -        for (Iterator iter = fields.iterator(); iter.hasNext(); ) {
   27.54 +        List<?> fields = visibleMemberMapFields.getLeafClassMembers(configuration);
   27.55 +        for (Iterator<?> iter = fields.iterator(); iter.hasNext(); ) {
   27.56              FieldDoc field = (FieldDoc) iter.next();
   27.57              if (field.constantValueExpression() != null) {
   27.58                  classDocsWithConstFields.add(classDoc);

    28.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    28.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstructorBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    28.3 @@ -138,7 +138,7 @@
    28.4           */
    28.5          public void invokeMethod(
    28.6                  String methodName,
    28.7 -                Class[] paramClasses,
    28.8 +                Class<?>[] paramClasses,
    28.9                  Object[] params)
   28.10                  throws Exception {
   28.11                  if (DEBUG) {
   28.12 @@ -156,7 +156,7 @@
   28.13           *
   28.14           * @return a list of constructors that will be documented.
   28.15           */
   28.16 -        public List members(ClassDoc classDoc) {
   28.17 +        public List<ProgramElementDoc> members(ClassDoc classDoc) {
   28.18                  return visibleMemberMap.getMembersFor(classDoc);
   28.19          }
   28.20  
   28.21 @@ -175,7 +175,7 @@
   28.22           * @param elements the XML elements that specify how to construct this
   28.23           *                documentation.
   28.24           */
   28.25 -        public void buildConstructorDoc(List elements) {
   28.26 +        public void buildConstructorDoc(List<?> elements) {
   28.27                  if (writer == null) {
   28.28                          return;
   28.29                  }

    29.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    29.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    29.3 @@ -120,7 +120,7 @@
    29.4           */
    29.5          public void invokeMethod(
    29.6                  String methodName,
    29.7 -                Class[] paramClasses,
    29.8 +                Class<?>[] paramClasses,
    29.9                  Object[] params)
   29.10                  throws Exception {
   29.11                  if (DEBUG) {
   29.12 @@ -139,7 +139,7 @@
   29.13           * @param classDoc the {@link ClassDoc} we want to check.
   29.14           * @return a list of enum constants that will be documented.
   29.15           */
   29.16 -        public List members(ClassDoc classDoc) {
   29.17 +        public List<ProgramElementDoc> members(ClassDoc classDoc) {
   29.18                  return visibleMemberMap.getMembersFor(classDoc);
   29.19          }
   29.20  
   29.21 @@ -165,7 +165,7 @@
   29.22           * @param elements the XML elements that specify how to construct this
   29.23           *                documentation.
   29.24           */
   29.25 -        public void buildEnumConstant(List elements) {
   29.26 +        public void buildEnumConstant(List<?> elements) {
   29.27                  if (writer == null) {
   29.28                          return;
   29.29                  }

    30.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    30.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/FieldBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    30.3 @@ -121,7 +121,7 @@
    30.4           */
    30.5          public void invokeMethod(
    30.6                  String methodName,
    30.7 -                Class[] paramClasses,
    30.8 +                Class<?>[] paramClasses,
    30.9                  Object[] params)
   30.10                  throws Exception {
   30.11                  if (DEBUG) {
   30.12 @@ -140,7 +140,7 @@
   30.13           * @param classDoc the {@link ClassDoc} we want to check.
   30.14           * @return a list of fields that will be documented.
   30.15           */
   30.16 -        public List members(ClassDoc classDoc) {
   30.17 +        public List<ProgramElementDoc> members(ClassDoc classDoc) {
   30.18                  return visibleMemberMap.getMembersFor(classDoc);
   30.19          }
   30.20  
   30.21 @@ -166,7 +166,7 @@
   30.22           * @param elements the XML elements that specify how to construct this
   30.23           *                documentation.
   30.24           */
   30.25 -        public void buildFieldDoc(List elements) {
   30.26 +        public void buildFieldDoc(List<?> elements) {
   30.27                  if (writer == null) {
   30.28                          return;
   30.29                  }

    31.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Thu Jan 08 16:34:58 2009 -0800
    31.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java	Tue Jan 13 13:27:14 2009 +0000
    31.3 @@ -78,9 +78,9 @@
    31.4       *
    31.5       * @return List the list of XML elements parsed.
    31.6       */
    31.7 -    public List parseXML(String root) {
    31.8 +    public List<?> parseXML(String root) {
    31.9          if (xmlElementsMap.containsKey(root)) {
   31.10 -            return (List) xmlElementsMap.get(root);
   31.11 +            return xmlElementsMap.get(root);
   31.12          }
   31.13          try {
   31.14              List<Object> xmlElements = new ArrayList<Object>();

    32.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    32.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    32.3 @@ -170,7 +170,7 @@
    32.4           * @return a list of methods that will be documented.
    32.5           * @see VisibleMemberMap
    32.6           */
    32.7 -        public List members(int type) {
    32.8 +        public List<ProgramElementDoc> members(int type) {
    32.9                  return visibleMemberMaps[type].getLeafClassMembers(configuration);
   32.10          }
   32.11  
   32.12 @@ -179,7 +179,7 @@
   32.13           */
   32.14          public void invokeMethod(
   32.15                  String methodName,
   32.16 -                Class[] paramClasses,
   32.17 +                Class<?>[] paramClasses,
   32.18                  Object[] params)
   32.19                  throws Exception {
   32.20                  if (DEBUG) {
   32.21 @@ -339,9 +339,9 @@
   32.22       */
   32.23          private void buildInheritedSummary(MemberSummaryWriter writer,
   32.24              VisibleMemberMap visibleMemberMap) {
   32.25 -        for (Iterator iter = visibleMemberMap.getVisibleClassesList().iterator();
   32.26 +        for (Iterator<ClassDoc> iter = visibleMemberMap.getVisibleClassesList().iterator();
   32.27                  iter.hasNext();) {
   32.28 -            ClassDoc inhclass = (ClassDoc) (iter.next());
   32.29 +            ClassDoc inhclass = iter.next();
   32.30              if (! (inhclass.isPublic() ||
   32.31                  Util.isLinkable(inhclass, configuration))) {
   32.32                  continue;

    33.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    33.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    33.3 @@ -116,7 +116,7 @@
    33.4           */
    33.5          public void invokeMethod(
    33.6                  String methodName,
    33.7 -                Class[] paramClasses,
    33.8 +                Class<?>[] paramClasses,
    33.9                  Object[] params)
   33.10                  throws Exception {
   33.11                  if (DEBUG) {
   33.12 @@ -135,7 +135,7 @@
   33.13           * @param classDoc the {@link ClassDoc} we want to check.
   33.14           * @return a list of methods that will be documented.
   33.15           */
   33.16 -        public List members(ClassDoc classDoc) {
   33.17 +        public List<ProgramElementDoc> members(ClassDoc classDoc) {
   33.18                  return visibleMemberMap.getMembersFor(classDoc);
   33.19          }
   33.20  
   33.21 @@ -158,7 +158,7 @@
   33.22          /**
   33.23           * Build the method documentation.
   33.24           */
   33.25 -        public void buildMethodDoc(List elements) {
   33.26 +        public void buildMethodDoc(List<?> elements) {
   33.27                  if (writer == null) {
   33.28                          return;
   33.29                  }

    34.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    34.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    34.3 @@ -88,7 +88,7 @@
    34.4           */
    34.5          public void invokeMethod(
    34.6                  String methodName,
    34.7 -                Class[] paramClasses,
    34.8 +                Class<?>[] paramClasses,
    34.9                  Object[] params)
   34.10                  throws Exception {
   34.11                  if (DEBUG) {
   34.12 @@ -120,7 +120,7 @@
   34.13          /**
   34.14           * Build the package documentation.
   34.15           */
   34.16 -        public void buildPackageDoc(List elements) throws Exception {
   34.17 +        public void buildPackageDoc(List<?> elements) throws Exception {
   34.18                  build(elements);
   34.19                  packageWriter.close();
   34.20                  Util.copyDocFiles(
   34.21 @@ -162,7 +162,7 @@
   34.22          /**
   34.23           * Build the package summary.
   34.24           */
   34.25 -        public void buildSummary(List elements) {
   34.26 +        public void buildSummary(List<?> elements) {
   34.27                  build(elements);
   34.28          }
   34.29  

    35.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    35.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    35.3 @@ -130,7 +130,7 @@
    35.4      /**
    35.5       * Build the serialized form.
    35.6       */
    35.7 -    public void buildSerializedForm(List elements) throws Exception {
    35.8 +    public void buildSerializedForm(List<?> elements) throws Exception {
    35.9          build(elements);
   35.10          writer.close();
   35.11      }
   35.12 @@ -138,7 +138,7 @@
   35.13      /**
   35.14       * {@inheritDoc}
   35.15       */
   35.16 -    public void invokeMethod(String methodName, Class[] paramClasses,
   35.17 +    public void invokeMethod(String methodName, Class<?>[] paramClasses,
   35.18              Object[] params)
   35.19      throws Exception {
   35.20          if (DEBUG) {
   35.21 @@ -159,7 +159,7 @@
   35.22      /**
   35.23       * Build the contents.
   35.24       */
   35.25 -    public void buildSerializedFormSummaries(List elements) {
   35.26 +    public void buildSerializedFormSummaries(List<?> elements) {
   35.27          PackageDoc[] packages = configuration.packages;
   35.28          for (int i = 0; i < packages.length; i++) {
   35.29              currentPackage = packages[i];
   35.30 @@ -170,7 +170,7 @@
   35.31      /**
   35.32       * Build the package serialized for for the current package being processed.
   35.33       */
   35.34 -    public void buildPackageSerializedForm(List elements) {
   35.35 +    public void buildPackageSerializedForm(List<?> elements) {
   35.36          String foo = currentPackage.name();
   35.37          ClassDoc[] classes = currentPackage.allClasses(false);
   35.38          if (classes == null || classes.length == 0) {
   35.39 @@ -189,7 +189,7 @@
   35.40          writer.writePackageHeader(Util.getPackageName(currentPackage));
   35.41      }
   35.42  
   35.43 -    public void buildClassSerializedForm(List elements) {
   35.44 +    public void buildClassSerializedForm(List<?> elements) {
   35.45          ClassDoc[] classes = currentPackage.allClasses(false);
   35.46          Arrays.sort(classes);
   35.47          for (int j = 0; j < classes.length; j++) {
   35.48 @@ -368,7 +368,7 @@
   35.49      /**
   35.50       * build the information for the method.
   35.51       */
   35.52 -    public void buildMethodInfo(List elements)  {
   35.53 +    public void buildMethodInfo(List<?> elements)  {
   35.54          if(configuration.nocomment){
   35.55              return;
   35.56          }
   35.57 @@ -478,7 +478,7 @@
   35.58       * Build the summaries for the methods that belong to the given
   35.59       * class.
   35.60       */
   35.61 -    public void buildSerializableMethods(List elements) {
   35.62 +    public void buildSerializableMethods(List<?> elements) {
   35.63          MemberDoc[] members = currentClass.serializationMethods();
   35.64          if (members.length > 0) {
   35.65              for (int i = 0; i < members.length; i++) {
   35.66 @@ -492,7 +492,7 @@
   35.67       * Build the summaries for the fields that belong to the given
   35.68       * class.
   35.69       */
   35.70 -    public void buildSerializableFields(List elements) {
   35.71 +    public void buildSerializableFields(List<?> elements) {
   35.72          MemberDoc[] members = currentClass.serializableFields();
   35.73          if (members.length > 0) {
   35.74              for (int i = 0; i < members.length; i++) {

    36.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Thu Jan 08 16:34:58 2009 -0800
    36.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java	Tue Jan 13 13:27:14 2009 +0000
    36.3 @@ -100,7 +100,7 @@
    36.4          }
    36.5          ParamTag[] tags = input.isTypeVariableParamTag ?
    36.6              input.method.typeParamTags() : input.method.paramTags();
    36.7 -        Map rankMap = getRankMap(input.isTypeVariableParamTag ?
    36.8 +        Map<String, String> rankMap = getRankMap(input.isTypeVariableParamTag ?
    36.9              (Object[]) input.method.typeParameters() :
   36.10              (Object[]) input.method.parameters());
   36.11          for (int i = 0; i < tags.length; i++) {
   36.12 @@ -262,7 +262,7 @@
   36.13       * @return the TagletOutput representation of this <code>Tag</code>.
   36.14       */
   36.15      private TagletOutput processParamTags(boolean isNonTypeParams,
   36.16 -            ParamTag[] paramTags, Map rankMap, TagletWriter writer,
   36.17 +            ParamTag[] paramTags, Map<String, String> rankMap, TagletWriter writer,
   36.18              Set<String> alreadyDocumented) {
   36.19          TagletOutput result = writer.getOutputInstance();
   36.20          if (paramTags.length > 0) {
   36.21 @@ -277,7 +277,7 @@
   36.22                              "doclet.Type_Parameters_warn",
   36.23                          paramName);
   36.24                  }
   36.25 -                String rank = (String) rankMap.get(pt.parameterName());
   36.26 +                String rank = rankMap.get(pt.parameterName());
   36.27                  if (rank != null && alreadyDocumented.contains(rank)) {
   36.28                      writer.getMsgRetriever().warning(pt.position(),
   36.29                         isNonTypeParams ?

    37.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Thu Jan 08 16:34:58 2009 -0800
    37.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletManager.java	Tue Jan 13 13:27:14 2009 +0000
    37.3 @@ -212,7 +212,7 @@
    37.4              URLClassLoader appClassLoader = new URLClassLoader(pathToURLs(cpString));
    37.5              customTagClass = appClassLoader.loadClass(classname);
    37.6              Method meth = customTagClass.getMethod("register",
    37.7 -                                                   new Class[] {Class.forName("java.util.Map")});
    37.8 +                                                   new Class<?>[] {java.util.Map.class});
    37.9              Object[] list = customTags.values().toArray();
   37.10              Taglet lastTag = (list != null && list.length > 0)
   37.11                  ? (Taglet) list[list.length-1] : null;
   37.12 @@ -705,9 +705,9 @@
   37.13       * Initialize lowercase version of standard Javadoc tags.
   37.14       */
   37.15      private void initStandardTagsLowercase() {
   37.16 -        Iterator it = standardTags.iterator();
   37.17 +        Iterator<String> it = standardTags.iterator();
   37.18          while (it.hasNext()) {
   37.19 -            standardTagsLowercase.add(((String)it.next()).toLowerCase());
   37.20 +            standardTagsLowercase.add(it.next().toLowerCase());
   37.21          }
   37.22      }
   37.23  

    38.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java	Thu Jan 08 16:34:58 2009 -0800
    38.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassTree.java	Tue Jan 13 13:27:14 2009 +0000
    38.3 @@ -177,9 +177,9 @@
    38.4                  bases.add(cd);
    38.5              }
    38.6          }
    38.7 -        List intfacs = Util.getAllInterfaces(cd, configuration);
    38.8 -        for (Iterator iter = intfacs.iterator(); iter.hasNext();) {
    38.9 -            add(implementingclasses, ((Type) iter.next()).asClassDoc(), cd);
   38.10 +        List<Type> intfacs = Util.getAllInterfaces(cd, configuration);
   38.11 +        for (Iterator<Type> iter = intfacs.iterator(); iter.hasNext();) {
   38.12 +            add(implementingclasses, iter.next().asClassDoc(), cd);
   38.13          }
   38.14      }
   38.15  
   38.16 @@ -278,13 +278,13 @@
   38.17  
   38.18          //If class x implements a subinterface of cd, then it follows
   38.19          //that class x implements cd.
   38.20 -        Iterator implementingClassesIter, subInterfacesIter = subinterfaces.listIterator();
   38.21 +        Iterator<ClassDoc> implementingClassesIter, subInterfacesIter = subinterfaces.listIterator();
   38.22          ClassDoc c;
   38.23          while(subInterfacesIter.hasNext()){
   38.24 -            implementingClassesIter = implementingclasses((ClassDoc)
   38.25 +            implementingClassesIter = implementingclasses(
   38.26                      subInterfacesIter.next()).listIterator();
   38.27              while(implementingClassesIter.hasNext()){
   38.28 -                c = (ClassDoc)implementingClassesIter.next();
   38.29 +                c = implementingClassesIter.next();
   38.30                  if(! result.contains(c)){
   38.31                      result.add(c);
   38.32                  }
   38.33 @@ -328,9 +328,9 @@
   38.34          List<ClassDoc> list = subs(cd, isEnum);
   38.35          for (int i = 0; i < list.size(); i++) {
   38.36              cd = list.get(i);
   38.37 -            List tlist = subs(cd, isEnum);
   38.38 +            List<ClassDoc> tlist = subs(cd, isEnum);
   38.39              for (int j = 0; j < tlist.size(); j++) {
   38.40 -                ClassDoc tcd = (ClassDoc)tlist.get(j);
   38.41 +                ClassDoc tcd = tlist.get(j);
   38.42                  if (!list.contains(tcd)) {
   38.43                      list.add(tcd);
   38.44                  }
   38.45 @@ -345,7 +345,7 @@
   38.46       *  thw classdoc for java.lang.Object, since this is the base class for all
   38.47       *  classes.
   38.48       */
   38.49 -    public List baseclasses() {
   38.50 +    public List<ClassDoc> baseclasses() {
   38.51          return baseclasses;
   38.52      }
   38.53  
   38.54 @@ -353,7 +353,7 @@
   38.55       *  Return the list of base interfaces. This is the list of interfaces
   38.56       *  which do not have super-interface.
   38.57       */
   38.58 -    public List baseinterfaces() {
   38.59 +    public List<ClassDoc> baseinterfaces() {
   38.60          return baseinterfaces;
   38.61      }
   38.62  
   38.63 @@ -361,7 +361,7 @@
   38.64       *  Return the list of base enums. This is the list of enums
   38.65       *  which do not have super-enums.
   38.66       */
   38.67 -    public List baseEnums() {
   38.68 +    public List<ClassDoc> baseEnums() {
   38.69          return baseEnums;
   38.70      }
   38.71  
   38.72 @@ -369,7 +369,7 @@
   38.73       *  Return the list of base annotation types. This is the list of
   38.74       *  annotation types which do not have super-annotation types.
   38.75       */
   38.76 -    public List baseAnnotationTypes() {
   38.77 +    public List<ClassDoc> baseAnnotationTypes() {
   38.78          return baseAnnotationTypes;
   38.79      }
   38.80  }

    39.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java	Thu Jan 08 16:34:58 2009 -0800
    39.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java	Tue Jan 13 13:27:14 2009 +0000
    39.3 @@ -184,12 +184,12 @@
    39.4          this.classtree = classtree;
    39.5  
    39.6          // Map subclassing, subinterfacing implementing, ...
    39.7 -        for (Iterator it = classtree.baseclasses().iterator(); it.hasNext();) {
    39.8 -            subclasses((ClassDoc)it.next());
    39.9 +        for (Iterator<ClassDoc> it = classtree.baseclasses().iterator(); it.hasNext();) {
   39.10 +            subclasses(it.next());
   39.11          }
   39.12 -        for (Iterator it = classtree.baseinterfaces().iterator(); it.hasNext();) {
   39.13 +        for (Iterator<ClassDoc> it = classtree.baseinterfaces().iterator(); it.hasNext();) {
   39.14              // does subinterfacing as side-effect
   39.15 -            implementingClasses((ClassDoc)it.next());
   39.16 +            implementingClasses(it.next());
   39.17          }
   39.18          // Map methods, fields, constructors using a class.
   39.19          ClassDoc[] classes = root.classes();
   39.20 @@ -279,12 +279,12 @@
   39.21              List<ClassDoc> impl = classtree.implementingclasses(cd);
   39.22              if (impl != null) {
   39.23                  ret.addAll(impl);
   39.24 -                for (Iterator it = impl.iterator(); it.hasNext();) {
   39.25 -                    ret.addAll(subclasses((ClassDoc)it.next()));
   39.26 +                for (Iterator<ClassDoc> it = impl.iterator(); it.hasNext();) {
   39.27 +                    ret.addAll(subclasses(it.next()));
   39.28                  }
   39.29              }
   39.30 -            for (Iterator it = subinterfaces(cd).iterator(); it.hasNext();) {
   39.31 -                ret.addAll(implementingClasses((ClassDoc)it.next()));
   39.32 +            for (Iterator<ClassDoc> it = subinterfaces(cd).iterator(); it.hasNext();) {
   39.33 +                ret.addAll(implementingClasses(it.next()));
   39.34              }
   39.35              addAll(classToImplementingClass, cd, ret);
   39.36          }
   39.37 @@ -328,8 +328,7 @@
   39.38      private <T> List<T> refList(Map<String,List<T>> map, ClassDoc cd) {
   39.39          List<T> list = map.get(cd.qualifiedName());
   39.40          if (list == null) {
   39.41 -            @SuppressWarnings("unchecked")
   39.42 -            List<T> l = new ArrayList();
   39.43 +            List<T> l = new ArrayList<T>();
   39.44              list = l;
   39.45              map.put(cd.qualifiedName(), list);
   39.46          }
   39.47 @@ -348,8 +347,7 @@
   39.48      private Set<ClassDoc> classSet(ClassDoc cd) {
   39.49          Set<ClassDoc> clsSet = classToClass.get(cd.qualifiedName());
   39.50          if (clsSet == null) {
   39.51 -            @SuppressWarnings("unchecked")
   39.52 -            Set<ClassDoc> s = new TreeSet();
   39.53 +            Set<ClassDoc> s = new TreeSet<ClassDoc>();
   39.54              clsSet = s;
   39.55              classToClass.put(cd.qualifiedName(), clsSet);
   39.56          }

    40.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java	Thu Jan 08 16:34:58 2009 -0800
    40.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java	Tue Jan 13 13:27:14 2009 +0000
    40.3 @@ -152,7 +152,7 @@
    40.4       *
    40.5       * @return true if package name format found in the map, else false.
    40.6       */
    40.7 -    boolean foundGroupFormat(Map map, String pkgFormat) {
    40.8 +    boolean foundGroupFormat(Map<String,?> map, String pkgFormat) {
    40.9          if (map.containsKey(pkgFormat)) {
   40.10              configuration.message.error("doclet.Same_package_name_used", pkgFormat);
   40.11              return true;
   40.12 @@ -239,7 +239,7 @@
   40.13       * Return the list of groups, in the same order as specified
   40.14       * on the command line.
   40.15       */
   40.16 -    public List getGroupList() {
   40.17 +    public List<String> getGroupList() {
   40.18          return groupList;
   40.19      }
   40.20  }

    41.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java	Thu Jan 08 16:34:58 2009 -0800
    41.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java	Tue Jan 13 13:27:14 2009 +0000
    41.3 @@ -86,9 +86,9 @@
    41.4       * from the array passed.
    41.5       */
    41.6      private void buildImplementedMethodList(boolean sort) {
    41.7 -        List intfacs = Util.getAllInterfaces(classdoc, configuration, sort);
    41.8 -        for (Iterator iter = intfacs.iterator(); iter.hasNext(); ) {
    41.9 -            Type interfaceType = (Type) iter.next();
   41.10 +        List<Type> intfacs = Util.getAllInterfaces(classdoc, configuration, sort);
   41.11 +        for (Iterator<Type> iter = intfacs.iterator(); iter.hasNext(); ) {
   41.12 +            Type interfaceType = iter.next();
   41.13              MethodDoc found = Util.findMethod(interfaceType.asClassDoc(), method);
   41.14              if (found != null) {
   41.15                  removeOverriddenMethod(found);

    42.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Thu Jan 08 16:34:58 2009 -0800
    42.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Tue Jan 13 13:27:14 2009 +0000
    42.3 @@ -114,7 +114,7 @@
    42.4          this.noDeprecated = noDeprecated;
    42.5          this.classesOnly = classesOnly;
    42.6          buildIndexMap(configuration.root);
    42.7 -        Set set = indexmap.keySet();
    42.8 +        Set<Character> set = indexmap.keySet();
    42.9          elements =  set.toArray();
   42.10          Arrays.sort(elements);
   42.11      }
   42.12 @@ -215,7 +215,7 @@
   42.13       *
   42.14       * @return Map index map.
   42.15       */
   42.16 -    public Map getIndexMap() {
   42.17 +    public Map<Character,List<Doc>> getIndexMap() {
   42.18          return indexmap;
   42.19      }
   42.20  
   42.21 @@ -225,8 +225,8 @@
   42.22       * @param index index Unicode character.
   42.23       * @return List member list for specific Unicode character.
   42.24       */
   42.25 -    public List getMemberList(Character index) {
   42.26 -        return (List)indexmap.get(index);
   42.27 +    public List<Doc> getMemberList(Character index) {
   42.28 +        return indexmap.get(index);
   42.29      }
   42.30  
   42.31      /**

    43.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Thu Jan 08 16:34:58 2009 -0800
    43.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java	Tue Jan 13 13:27:14 2009 +0000
    43.3 @@ -88,10 +88,10 @@
    43.4      /**
    43.5       * Return the list of ProgramElementDoc objects as Array.
    43.6       */
    43.7 -    public static ProgramElementDoc[] toProgramElementDocArray(List list) {
    43.8 +    public static ProgramElementDoc[] toProgramElementDocArray(List<ProgramElementDoc> list) {
    43.9          ProgramElementDoc[] pgmarr = new ProgramElementDoc[list.size()];
   43.10          for (int i = 0; i < list.size(); i++) {
   43.11 -            pgmarr[i] = (ProgramElementDoc)(list.get(i));
   43.12 +            pgmarr[i] = list.get(i);
   43.13          }
   43.14          return pgmarr;
   43.15      }
   43.16 @@ -416,9 +416,9 @@
   43.17                  continue;
   43.18              }
   43.19              results.put(interfaceClassDoc, interfaceType);
   43.20 -            List superInterfaces = getAllInterfaces(interfaceType, configuration, sort);
   43.21 -            for (Iterator iter = superInterfaces.iterator(); iter.hasNext(); ) {
   43.22 -                Type t = (Type) iter.next();
   43.23 +            List<Type> superInterfaces = getAllInterfaces(interfaceType, configuration, sort);
   43.24 +            for (Iterator<Type> iter = superInterfaces.iterator(); iter.hasNext(); ) {
   43.25 +                Type t = iter.next();
   43.26                  results.put(t.asClassDoc(), t);
   43.27              }
   43.28          }
   43.29 @@ -438,7 +438,7 @@
   43.30          return resultsList;
   43.31      }
   43.32  
   43.33 -    public static List getAllInterfaces(Type type, Configuration configuration) {
   43.34 +    public static List<Type> getAllInterfaces(Type type, Configuration configuration) {
   43.35          return getAllInterfaces(type, configuration, true);
   43.36      }
   43.37  
   43.38 @@ -480,9 +480,9 @@
   43.39              if (raw)
   43.40                  interfaceType = interfaceType.asClassDoc();
   43.41              results.put(interfaceClassDoc, interfaceType);
   43.42 -            List superInterfaces = getAllInterfaces(interfaceType, configuration);
   43.43 -            for (Iterator iter = superInterfaces.iterator(); iter.hasNext(); ) {
   43.44 -                Type superInterface = (Type) iter.next();
   43.45 +            List<Type> superInterfaces = getAllInterfaces(interfaceType, configuration);
   43.46 +            for (Iterator<Type> iter = superInterfaces.iterator(); iter.hasNext(); ) {
   43.47 +                Type superInterface = iter.next();
   43.48                  results.put(superInterface.asClassDoc(), superInterface);
   43.49              }
   43.50          }
   43.51 @@ -495,8 +495,8 @@
   43.52      }
   43.53  
   43.54  
   43.55 -    public static List<ProgramElementDoc> asList(ProgramElementDoc[] members) {
   43.56 -        List<ProgramElementDoc> list = new ArrayList<ProgramElementDoc>();
   43.57 +    public static <T extends ProgramElementDoc> List<T> asList(T[] members) {
   43.58 +        List<T> list = new ArrayList<T>();
   43.59          for (int i = 0; i < members.length; i++) {
   43.60              list.add(members[i]);
   43.61          }

    44.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Thu Jan 08 16:34:58 2009 -0800
    44.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java	Tue Jan 13 13:27:14 2009 +0000
    44.3 @@ -116,7 +116,7 @@
    44.4       *
    44.5       * @return the list of visible classes in this map.
    44.6       */
    44.7 -    public List getVisibleClassesList() {
    44.8 +    public List<ClassDoc> getVisibleClassesList() {
    44.9          sort(visibleClasses);
   44.10          return visibleClasses;
   44.11      }
   44.12 @@ -130,8 +130,8 @@
   44.13       */
   44.14      private List<ProgramElementDoc> getInheritedPackagePrivateMethods(Configuration configuration) {
   44.15          List<ProgramElementDoc> results = new ArrayList<ProgramElementDoc>();
   44.16 -        for (Iterator iter = visibleClasses.iterator(); iter.hasNext(); ) {
   44.17 -            ClassDoc currentClass = (ClassDoc) iter.next();
   44.18 +        for (Iterator<ClassDoc> iter = visibleClasses.iterator(); iter.hasNext(); ) {
   44.19 +            ClassDoc currentClass = iter.next();
   44.20              if (currentClass != classdoc &&
   44.21                  currentClass.isPackagePrivate() &&
   44.22                  !Util.isLinkable(currentClass, configuration)) {
   44.23 @@ -203,10 +203,10 @@
   44.24          }
   44.25      }
   44.26  
   44.27 -    private void purgeMemberLevelMap(List list, String level) {
   44.28 +    private void purgeMemberLevelMap(List<ProgramElementDoc> list, String level) {
   44.29          for (int i = 0; i < list.size(); i++) {
   44.30 -            Object key = getMemberKey((ProgramElementDoc)list.get(i));
   44.31 -            Map memberLevelMap = (Map) memberNameMap.get(key);
   44.32 +            Object key = getMemberKey(list.get(i));
   44.33 +            Map<ProgramElementDoc, String> memberLevelMap = memberNameMap.get(key);
   44.34              if (level.equals(memberLevelMap.get(list.get(i))))
   44.35                  memberLevelMap.remove(list.get(i));
   44.36          }
   44.37 @@ -230,7 +230,7 @@
   44.38          }
   44.39  
   44.40          public boolean isEqual(MethodDoc member) {
   44.41 -            for (Iterator iter = members.iterator(); iter.hasNext(); ) {
   44.42 +            for (Iterator<ProgramElementDoc> iter = members.iterator(); iter.hasNext(); ) {
   44.43                  MethodDoc member2 = (MethodDoc) iter.next();
   44.44                  if (Util.executableMembersEqual(member, member2)) {
   44.45                      members.add(member);
   44.46 @@ -438,9 +438,9 @@
   44.47              return targetMembers.toArray(new AnnotationTypeElementDoc[]{});
   44.48          }
   44.49  
   44.50 -        private boolean found(List list, ProgramElementDoc elem) {
   44.51 +        private boolean found(List<ProgramElementDoc> list, ProgramElementDoc elem) {
   44.52              for (int i = 0; i < list.size(); i++) {
   44.53 -                ProgramElementDoc pgmelem = (ProgramElementDoc)list.get(i);
   44.54 +                ProgramElementDoc pgmelem = list.get(i);
   44.55                  if (Util.matches(pgmelem, elem)) {
   44.56                      return true;
   44.57                  }
   44.58 @@ -455,13 +455,13 @@
   44.59           * level "111".
   44.60           */
   44.61          private boolean isOverridden(ProgramElementDoc pgmdoc, String level) {
   44.62 -            Map memberLevelMap = (Map) memberNameMap.get(getMemberKey(pgmdoc));
   44.63 +            Map<?,String> memberLevelMap = (Map<?,String>) memberNameMap.get(getMemberKey(pgmdoc));
   44.64              if (memberLevelMap == null)
   44.65                  return false;
   44.66              String mappedlevel = null;
   44.67 -            Iterator iterator = memberLevelMap.values().iterator();
   44.68 +            Iterator<String> iterator = memberLevelMap.values().iterator();
   44.69              while (iterator.hasNext()) {
   44.70 -                mappedlevel = (String)(iterator.next());
   44.71 +                mappedlevel = iterator.next();
   44.72                  if (mappedlevel.equals(STARTLEVEL) ||
   44.73                      (level.startsWith(mappedlevel) &&
   44.74                       !level.equals(mappedlevel))) {
   44.75 @@ -482,7 +482,7 @@
   44.76      }
   44.77  
   44.78      private ClassMember getClassMember(MethodDoc member) {
   44.79 -        for (Iterator iter = memberNameMap.keySet().iterator(); iter.hasNext();) {
   44.80 +        for (Iterator<?> iter = memberNameMap.keySet().iterator(); iter.hasNext();) {
   44.81              Object key = iter.next();
   44.82              if (key instanceof String) {
   44.83                  continue;

    45.1 --- a/src/share/classes/com/sun/tools/javac/Main.java	Thu Jan 08 16:34:58 2009 -0800
    45.2 +++ b/src/share/classes/com/sun/tools/javac/Main.java	Tue Jan 13 13:27:14 2009 +0000
    45.3 @@ -56,7 +56,7 @@
    45.4        if (args.length > 0 && args[0].equals("-Xjdb")) {
    45.5          String[] newargs = new String[args.length + 2];
    45.6          Class<?> c = Class.forName("com.sun.tools.example.debug.tty.TTY");
    45.7 -        Method method = c.getDeclaredMethod ("main", new Class[] {args.getClass()});
    45.8 +        Method method = c.getDeclaredMethod ("main", new Class<?>[] {args.getClass()});
    45.9          method.setAccessible(true);
   45.10          System.arraycopy(args, 1, newargs, 3, args.length - 1);
   45.11          newargs[0] = "-connect";

    46.1 --- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Thu Jan 08 16:34:58 2009 -0800
    46.2 +++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Tue Jan 13 13:27:14 2009 +0000
    46.3 @@ -949,8 +949,8 @@
    46.4          Iterable<? extends File> files)
    46.5      {
    46.6          ArrayList<RegularFileObject> result;
    46.7 -        if (files instanceof Collection)
    46.8 -            result = new ArrayList<RegularFileObject>(((Collection)files).size());
    46.9 +        if (files instanceof Collection<?>)
   46.10 +            result = new ArrayList<RegularFileObject>(((Collection<?>)files).size());
   46.11          else
   46.12              result = new ArrayList<RegularFileObject>();
   46.13          for (File f: files)

    47.1 --- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Thu Jan 08 16:34:58 2009 -0800
    47.2 +++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Tue Jan 13 13:27:14 2009 +0000
    47.3 @@ -1114,7 +1114,7 @@
    47.4                  writtenSoFar += dirNameBytesLen;
    47.5  
    47.6                  // Write the number of files in the dir
    47.7 -                List dirEntries = dirEntry.getEntriesAsCollection();
    47.8 +                List<Entry> dirEntries = dirEntry.getEntriesAsCollection();
    47.9                  raf.writeInt(dirEntries.size());
   47.10                  writtenSoFar += 4;
   47.11  

    48.1 --- a/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Thu Jan 08 16:34:58 2009 -0800
    48.2 +++ b/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Tue Jan 13 13:27:14 2009 +0000
    48.3 @@ -215,15 +215,15 @@
    48.4              }
    48.5          }
    48.6  
    48.7 -        @SuppressWarnings("unchecked")
    48.8 +        @SuppressWarnings({"unchecked", "rawtypes"})
    48.9          public void visitEnum(Attribute.Enum e) {
   48.10              if (returnClass.isEnum()) {
   48.11                  String constName = e.value.toString();
   48.12                  try {
   48.13 -                    value = Enum.valueOf((Class) returnClass, constName);
   48.14 +                    value = Enum.valueOf((Class)returnClass, constName);
   48.15                  } catch (IllegalArgumentException ex) {
   48.16                      value = new EnumConstantNotPresentExceptionProxy(
   48.17 -                                        (Class) returnClass, constName);
   48.18 +                                        (Class<Enum<?>>) returnClass, constName);
   48.19                  }
   48.20              } else {
   48.21                  value = null;   // indicates a type mismatch

    49.1 --- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Jan 08 16:34:58 2009 -0800
    49.2 +++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Tue Jan 13 13:27:14 2009 +0000
    49.3 @@ -1060,7 +1060,7 @@
    49.4              next.put(Names.namesKey, names);
    49.5          }
    49.6  
    49.7 -        DiagnosticListener dl = context.get(DiagnosticListener.class);
    49.8 +        DiagnosticListener<?> dl = context.get(DiagnosticListener.class);
    49.9          if (dl != null)
   49.10              next.put(DiagnosticListener.class, dl);
   49.11  

    50.1 --- a/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Thu Jan 08 16:34:58 2009 -0800
    50.2 +++ b/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Tue Jan 13 13:27:14 2009 +0000
    50.3 @@ -55,12 +55,12 @@
    50.4  
    50.5      private static final String prefix = "META-INF/services/";
    50.6  
    50.7 -    private static void fail(Class service, String msg)
    50.8 +    private static void fail(Class<?> service, String msg)
    50.9              throws ServiceConfigurationError {
   50.10          throw new ServiceConfigurationError(service.getName() + ": " + msg);
   50.11      }
   50.12  
   50.13 -    private static void fail(Class service, URL u, int line, String msg)
   50.14 +    private static void fail(Class<?> service, URL u, int line, String msg)
   50.15              throws ServiceConfigurationError {
   50.16          fail(service, u + ":" + line + ": " + msg);
   50.17      }
   50.18 @@ -81,7 +81,7 @@
   50.19       *         If an I/O error occurs while reading from the given URL, or
   50.20       *         if a configuration-file format error is detected
   50.21       */
   50.22 -    private static boolean parse(Class service, URL u) throws ServiceConfigurationError {
   50.23 +    private static boolean parse(Class<?> service, URL u) throws ServiceConfigurationError {
   50.24          InputStream in = null;
   50.25          BufferedReader r = null;
   50.26          try {

    51.1 --- a/src/share/classes/com/sun/tools/javac/util/Context.java	Thu Jan 08 16:34:58 2009 -0800
    51.2 +++ b/src/share/classes/com/sun/tools/javac/util/Context.java	Tue Jan 13 13:27:14 2009 +0000
    51.3 @@ -116,7 +116,7 @@
    51.4       * We maintain the invariant that this table contains only
    51.5       * mappings of the form
    51.6       * Key<T> -> T or Key<T> -> Factory<T> */
    51.7 -    private Map<Key,Object> ht = new HashMap<Key,Object>();
    51.8 +    private Map<Key<?>,Object> ht = new HashMap<Key<?>,Object>();
    51.9  
   51.10      /** Set the factory for the key in this context. */
   51.11      public <T> void put(Key<T> key, Factory<T> fac) {
   51.12 @@ -128,11 +128,11 @@
   51.13  
   51.14      /** Set the value for the key in this context. */
   51.15      public <T> void put(Key<T> key, T data) {
   51.16 -        if (data instanceof Factory)
   51.17 +        if (data instanceof Factory<?>)
   51.18              throw new AssertionError("T extends Context.Factory");
   51.19          checkState(ht);
   51.20          Object old = ht.put(key, data);
   51.21 -        if (old != null && !(old instanceof Factory) && old != data && data != null)
   51.22 +        if (old != null && !(old instanceof Factory<?>) && old != data && data != null)
   51.23              throw new AssertionError("duplicate context value");
   51.24      }
   51.25  
   51.26 @@ -140,10 +140,10 @@
   51.27      public <T> T get(Key<T> key) {
   51.28          checkState(ht);
   51.29          Object o = ht.get(key);
   51.30 -        if (o instanceof Factory) {
   51.31 -            Factory fac = (Factory)o;
   51.32 +        if (o instanceof Factory<?>) {
   51.33 +            Factory<?> fac = (Factory<?>)o;
   51.34              o = fac.make();
   51.35 -            if (o instanceof Factory)
   51.36 +            if (o instanceof Factory<?>)
   51.37                  throw new AssertionError("T extends Context.Factory");
   51.38              assert ht.get(key) == o;
   51.39          }

    52.1 --- a/src/share/classes/com/sun/tools/javac/util/List.java	Thu Jan 08 16:34:58 2009 -0800
    52.2 +++ b/src/share/classes/com/sun/tools/javac/util/List.java	Tue Jan 13 13:27:14 2009 +0000
    52.3 @@ -71,9 +71,10 @@
    52.4       */
    52.5      @SuppressWarnings("unchecked")
    52.6      public static <A> List<A> nil() {
    52.7 -        return EMPTY_LIST;
    52.8 +        return (List<A>)EMPTY_LIST;
    52.9      }
   52.10 -    private static List EMPTY_LIST = new List<Object>(null,null) {
   52.11 +
   52.12 +    private static List<?> EMPTY_LIST = new List<Object>(null,null) {
   52.13          public List<Object> setTail(List<Object> tail) {
   52.14              throw new UnsupportedOperationException();
   52.15          }
   52.16 @@ -318,7 +319,7 @@
   52.17  
   52.18      /** Are the two lists the same?
   52.19       */
   52.20 -    public static boolean equals(List xs, List ys) {
   52.21 +    public static boolean equals(List<?> xs, List<?> ys) {
   52.22          while (xs.tail != null && ys.tail != null) {
   52.23              if (xs.head == null) {
   52.24                  if (ys.head != null) return false;
   52.25 @@ -368,7 +369,7 @@
   52.26          return (List<T>)list;
   52.27      }
   52.28  
   52.29 -    private static Iterator EMPTYITERATOR = new Iterator() {
   52.30 +    private static Iterator<?> EMPTYITERATOR = new Iterator<Object>() {
   52.31              public boolean hasNext() {
   52.32                  return false;
   52.33              }
   52.34 @@ -382,7 +383,7 @@
   52.35  
   52.36      @SuppressWarnings("unchecked")
   52.37      private static <A> Iterator<A> emptyIterator() {
   52.38 -        return EMPTYITERATOR;
   52.39 +        return (Iterator<A>)EMPTYITERATOR;
   52.40      }
   52.41  
   52.42      @Override

    53.1 --- a/src/share/classes/com/sun/tools/javac/util/Pair.java	Thu Jan 08 16:34:58 2009 -0800
    53.2 +++ b/src/share/classes/com/sun/tools/javac/util/Pair.java	Tue Jan 13 13:27:14 2009 +0000
    53.3 @@ -52,9 +52,9 @@
    53.4  
    53.5      public boolean equals(Object other) {
    53.6          return
    53.7 -            other instanceof Pair &&
    53.8 -            equals(fst, ((Pair)other).fst) &&
    53.9 -            equals(snd, ((Pair)other).snd);
   53.10 +            other instanceof Pair<?,?> &&
   53.11 +            equals(fst, ((Pair<?,?>)other).fst) &&
   53.12 +            equals(snd, ((Pair<?,?>)other).snd);
   53.13      }
   53.14  
   53.15      public int hashCode() {

    54.1 --- a/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java	Thu Jan 08 16:34:58 2009 -0800
    54.2 +++ b/src/share/classes/com/sun/tools/javadoc/DocletInvoker.java	Tue Jan 13 13:27:14 2009 +0000
    54.3 @@ -88,7 +88,7 @@
    54.4              appClassLoader = new URLClassLoader(urls, docletParentClassLoader);
    54.5  
    54.6          // attempt to find doclet
    54.7 -        Class dc = null;
    54.8 +        Class<?> dc = null;
    54.9          try {
   54.10              dc = appClassLoader.loadClass(docletClassName);
   54.11          } catch (ClassNotFoundException exc) {
   54.12 @@ -104,7 +104,7 @@
   54.13      public boolean start(RootDoc root) {
   54.14          Object retVal;
   54.15          String methodName = "start";
   54.16 -        Class[] paramTypes = new Class[1];
   54.17 +        Class<?>[] paramTypes = new Class<?>[1];
   54.18          Object[] params = new Object[1];
   54.19          paramTypes[0] = RootDoc.class;
   54.20          params[0] = root;
   54.21 @@ -130,7 +130,7 @@
   54.22      public int optionLength(String option) {
   54.23          Object retVal;
   54.24          String methodName = "optionLength";
   54.25 -        Class[] paramTypes = new Class[1];
   54.26 +        Class<?>[] paramTypes = new Class<?>[1];
   54.27          Object[] params = new Object[1];
   54.28          paramTypes[0] = option.getClass();
   54.29          params[0] = option;
   54.30 @@ -157,7 +157,7 @@
   54.31          String options[][] = optlist.toArray(new String[optlist.length()][]);
   54.32          String methodName = "validOptions";
   54.33          DocErrorReporter reporter = messager;
   54.34 -        Class[] paramTypes = new Class[2];
   54.35 +        Class<?>[] paramTypes = new Class<?>[2];
   54.36          Object[] params = new Object[2];
   54.37          paramTypes[0] = options.getClass();
   54.38          paramTypes[1] = DocErrorReporter.class;
   54.39 @@ -185,7 +185,7 @@
   54.40          try {
   54.41              Object retVal;
   54.42              String methodName = "languageVersion";
   54.43 -            Class[] paramTypes = new Class[0];
   54.44 +            Class<?>[] paramTypes = new Class<?>[0];
   54.45              Object[] params = new Object[0];
   54.46              try {
   54.47                  retVal = invoke(methodName, JAVA_1_1, paramTypes, params);
   54.48 @@ -208,7 +208,7 @@
   54.49       * Utility method for calling doclet functionality
   54.50       */
   54.51      private Object invoke(String methodName, Object returnValueIfNonExistent,
   54.52 -                          Class[] paramTypes, Object[] params)
   54.53 +                          Class<?>[] paramTypes, Object[] params)
   54.54          throws DocletInvokeException {
   54.55              Method meth;
   54.56              try {

    55.1 --- a/src/share/classes/com/sun/tools/javah/Gen.java	Thu Jan 08 16:34:58 2009 -0800
    55.2 +++ b/src/share/classes/com/sun/tools/javah/Gen.java	Tue Jan 13 13:27:14 2009 +0000
    55.3 @@ -326,7 +326,7 @@
    55.4                  throws ClassNotFoundException {
    55.5          Vector<FieldDoc> fields = new Vector<FieldDoc>();
    55.6          ClassDoc cd = null;
    55.7 -        Stack s = new Stack();
    55.8 +        Stack<Object> s = new Stack<Object>();
    55.9  
   55.10          cd = subclazz;
   55.11          while (true) {

    56.1 --- a/src/share/classes/com/sun/tools/javah/LLNI.java	Thu Jan 08 16:34:58 2009 -0800
    56.2 +++ b/src/share/classes/com/sun/tools/javah/LLNI.java	Tue Jan 13 13:27:14 2009 +0000
    56.3 @@ -39,7 +39,7 @@
    56.4  
    56.5      protected final char  pathChar = File.separatorChar;
    56.6      protected final char  innerDelim = '$';     /* For inner classes */
    56.7 -    protected Hashtable   doneHandleTypes;
    56.8 +    protected Hashtable<Object, Object>   doneHandleTypes;
    56.9      MemberDoc []fields;
   56.10      MemberDoc [] methods;
   56.11      private boolean       doubleAlign;
   56.12 @@ -68,7 +68,7 @@
   56.13      protected void generateDeclsForClass(PrintWriter pw,
   56.14                                           ClassDoc clazz, String cname)
   56.15          throws ClassNotFoundException {
   56.16 -        doneHandleTypes  = new Hashtable();
   56.17 +        doneHandleTypes  = new Hashtable<Object, Object>();
   56.18          /* The following handle types are predefined in "typedefs.h". Suppress
   56.19             inclusion in the output by generating them "into the blue" here. */
   56.20          genHandleType(null, "java.lang.Class");

    57.1 --- a/src/share/classes/com/sun/tools/javah/TypeSignature.java	Thu Jan 08 16:34:58 2009 -0800
    57.2 +++ b/src/share/classes/com/sun/tools/javah/TypeSignature.java	Tue Jan 13 13:27:14 2009 +0000
    57.3 @@ -74,7 +74,7 @@
    57.4  
    57.5          String signature = null; //Java type signature.
    57.6          String typeSignature = null; //Internal type signature.
    57.7 -        Vector params = new Vector(); //List of parameters.
    57.8 +        Vector<Object> params = new Vector<Object>(); //List of parameters.
    57.9          String paramsig = null; //Java parameter signature.
   57.10          String paramJVMSig = null; //Internal parameter signature.
   57.11          String returnSig = null; //Java return type signature.

    58.1 --- a/src/share/classes/sun/tools/javap/FieldData.java	Thu Jan 08 16:34:58 2009 -0800
    58.2 +++ b/src/share/classes/sun/tools/javap/FieldData.java	Tue Jan 13 13:27:14 2009 +0000
    58.3 @@ -157,7 +157,7 @@
    58.4      /**
    58.5       * Returns list of attributes of field.
    58.6       */
    58.7 -    public Vector getAttributes(){
    58.8 +    public Vector<?> getAttributes(){
    58.9          return attrs;
   58.10      }
   58.11  }

    59.1 --- a/src/share/classes/sun/tools/javap/JavapPrinter.java	Thu Jan 08 16:34:58 2009 -0800
    59.2 +++ b/src/share/classes/sun/tools/javap/JavapPrinter.java	Tue Jan 13 13:27:14 2009 +0000
    59.3 @@ -175,7 +175,7 @@
    59.4  
    59.5      /* print field attribute information. */
    59.6      public void printFieldAttributes(FieldData field){
    59.7 -        Vector fieldattrs = field.getAttributes();
    59.8 +        Vector<?> fieldattrs = field.getAttributes();
    59.9          for(int j = 0; j < fieldattrs.size(); j++){
   59.10              String fieldattrname = ((AttrData)fieldattrs.elementAt(j)).getAttrName();
   59.11              if(fieldattrname.equals("ConstantValue")){
   59.12 @@ -256,8 +256,8 @@
   59.13       * print method attribute information.
   59.14       */
   59.15      public void printMethodAttributes(MethodData method){
   59.16 -        Vector methodattrs = method.getAttributes();
   59.17 -        Vector codeattrs =  method.getCodeAttributes();
   59.18 +        Vector<?> methodattrs = method.getAttributes();
   59.19 +        Vector<?> codeattrs =  method.getCodeAttributes();
   59.20          for(int k = 0; k < methodattrs.size(); k++){
   59.21              String methodattrname = ((AttrData)methodattrs.elementAt(k)).getAttrName();
   59.22              if(methodattrname.equals("Code")){
   59.23 @@ -519,7 +519,7 @@
   59.24       * Print the exception table for this method code
   59.25       */
   59.26      void printExceptionTable(MethodData method){//throws IOException
   59.27 -        Vector exception_table = method.getexception_table();
   59.28 +        Vector<?> exception_table = method.getexception_table();
   59.29          if (exception_table.size() > 0) {
   59.30              out.println("  Exception table:");
   59.31              out.println("   from   to  target type");
   59.32 @@ -546,7 +546,7 @@
   59.33       */
   59.34      public void printLineNumTable(MethodData method) {
   59.35          int numlines = method.getnumlines();
   59.36 -        Vector lin_num_tb = method.getlin_num_tb();
   59.37 +        Vector<?> lin_num_tb = method.getlin_num_tb();
   59.38          if( lin_num_tb.size() > 0){
   59.39              out.println("  LineNumberTable: ");
   59.40              for (int i=0; i<numlines; i++) {
   59.41 @@ -568,7 +568,7 @@
   59.42              out.print("   ");
   59.43              out.println("Start  Length  Slot  Name   Signature");
   59.44          }
   59.45 -        Vector loc_var_tb = method.getloc_var_tb();
   59.46 +        Vector<?> loc_var_tb = method.getloc_var_tb();
   59.47  
   59.48          for (int i=0; i<siz; i++) {
   59.49              LocVarData entry=(LocVarData)loc_var_tb.elementAt(i);

    60.1 --- a/src/share/classes/sun/tools/javap/MethodData.java	Thu Jan 08 16:34:58 2009 -0800
    60.2 +++ b/src/share/classes/sun/tools/javap/MethodData.java	Tue Jan 13 13:27:14 2009 +0000
    60.3 @@ -302,7 +302,7 @@
    60.4      /**
    60.5       * Return LineNumberTable
    60.6       */
    60.7 -    public Vector getlin_num_tb(){
    60.8 +    public Vector<?> getlin_num_tb(){
    60.9          return lin_num_tb;
   60.10      }
   60.11  
   60.12 @@ -317,7 +317,7 @@
   60.13      /**
   60.14       * Return LocalVariableTable.
   60.15       */
   60.16 -    public Vector getloc_var_tb(){
   60.17 +    public Vector<?> getloc_var_tb(){
   60.18          return loc_var_tb;
   60.19      }
   60.20  
   60.21 @@ -378,7 +378,7 @@
   60.22      /**
   60.23       * Return exception table in code attributre.
   60.24       */
   60.25 -    public Vector getexception_table(){
   60.26 +    public Vector<?> getexception_table(){
   60.27          return exception_table;
   60.28      }
   60.29  
   60.30 @@ -386,7 +386,7 @@
   60.31      /**
   60.32       * Return method attributes.
   60.33       */
   60.34 -    public Vector getAttributes(){
   60.35 +    public Vector<?> getAttributes(){
   60.36          return attrs;
   60.37      }
   60.38  
   60.39 @@ -394,7 +394,7 @@
   60.40      /**
   60.41       * Return code attributes.
   60.42       */
   60.43 -    public Vector getCodeAttributes(){
   60.44 +    public Vector<?> getCodeAttributes(){
   60.45          return code_attrs;
   60.46      }
   60.47