--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java	Tue Jul 15 09:50:36 2008 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java	Tue Jul 15 19:22:51 2008 -0700
@@ -49,44 +49,44 @@
       * Stores the set of packages that the classes specified on the command line
       * belong to.  Note that the default package is "".
       */
-     private Set packageSet;
+     private Set<String> packageSet;
 
 
      /**
       * Stores all classes for each package
       */
-     private Map allClasses;
+     private Map<String,Set<ClassDoc>> allClasses;
 
      /**
       * Stores ordinary classes (excluding Exceptions and Errors) for each
       * package
       */
-     private Map ordinaryClasses;
+     private Map<String,Set<ClassDoc>> ordinaryClasses;
 
      /**
       * Stores exceptions for each package
       */
-     private Map exceptions;
+     private Map<String,Set<ClassDoc>> exceptions;
 
     /**
      * Stores enums for each package.
      */
-    private Map enums;
+    private Map<String,Set<ClassDoc>> enums;
 
     /**
      * Stores annotation types for each package.
      */
-    private Map annotationTypes;
+    private Map<String,Set<ClassDoc>> annotationTypes;
 
      /**
       * Stores errors for each package
       */
-     private Map errors;
+     private Map<String,Set<ClassDoc>> errors;
 
      /**
       * Stores interfaces for each package
       */
-     private Map interfaces;
+     private Map<String,Set<ClassDoc>> interfaces;
 
      /**
       * Construct a new ClassDocCatalog.
@@ -109,14 +109,14 @@
      }
 
      private void init() {
-         allClasses = new HashMap();
-         ordinaryClasses = new HashMap();
-         exceptions = new HashMap();
-         enums = new HashMap();
-         annotationTypes = new HashMap();
-         errors = new HashMap();
-         interfaces = new HashMap();
-         packageSet = new HashSet();
+         allClasses = new HashMap<String,Set<ClassDoc>>();
+         ordinaryClasses = new HashMap<String,Set<ClassDoc>>();
+         exceptions = new HashMap<String,Set<ClassDoc>>();
+         enums = new HashMap<String,Set<ClassDoc>>();
+         annotationTypes = new HashMap<String,Set<ClassDoc>>();
+         errors = new HashMap<String,Set<ClassDoc>>();
+         interfaces = new HashMap<String,Set<ClassDoc>>();
+         packageSet = new HashSet<String>();
      }
 
      /**
@@ -148,7 +148,7 @@
        * @param classdoc the ClassDoc to add to the catelog.
        * @param map the Map to add the ClassDoc to.
        */
-      private void addClass(ClassDoc classdoc, Map map) {
+      private void addClass(ClassDoc classdoc, Map<String,Set<ClassDoc>> map) {
 
           PackageDoc pkg = classdoc.containingPackage();
           if (pkg.isIncluded()) {
@@ -157,22 +157,22 @@
               return;
           }
           String key = Util.getPackageName(pkg);
-          Set s = (Set) map.get(key);
+          Set<ClassDoc> s = map.get(key);
           if (s == null) {
               packageSet.add(key);
-              s = new HashSet();
+              s = new HashSet<ClassDoc>();
           }
           s.add(classdoc);
           map.put(key, s);
 
       }
 
-      private ClassDoc[] getArray(Map m, String key) {
-          Set s = (Set) m.get(key);
+      private ClassDoc[] getArray(Map<String,Set<ClassDoc>> m, String key) {
+          Set<ClassDoc> s = m.get(key);
           if (s == null) {
               return new ClassDoc[] {};
           } else {
-              return (ClassDoc[]) s.toArray(new ClassDoc[] {});
+              return s.toArray(new ClassDoc[] {});
           }
       }
 
@@ -202,7 +202,7 @@
       * ClassDocs for.
       */
      public String[] packageNames() {
-         return (String[]) packageSet.toArray(new String[] {});
+         return packageSet.toArray(new String[] {});
      }
 
      /**