--- a/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Tue Jul 15 09:50:36 2008 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Tue Jul 15 19:22:51 2008 -0700
@@ -49,7 +49,7 @@
      * Mapping of each Unicode Character with the member list containing
      * members with names starting with it.
      */
-    private Map indexmap = new HashMap();
+    private Map<Character,List<Doc>> indexmap = new HashMap<Character,List<Doc>>();
 
     /**
      * Don't generate deprecated information if true.
@@ -68,10 +68,10 @@
      * A comparator used to sort classes and members.
      * Note:  Maybe this compare code belongs in the tool?
      */
-    private class DocComparator implements Comparator {
-        public int compare(Object d1, Object d2) {
-            String doc1 = (((Doc) d1).name());
-            String doc2 = (((Doc) d2).name());
+    private class DocComparator implements Comparator<Doc> {
+        public int compare(Doc d1, Doc d2) {
+            String doc1 = d1.name();
+            String doc2 = d2.name();
             int compareResult;
             if ((compareResult = doc1.compareToIgnoreCase(doc2)) != 0) {
                 return compareResult;
@@ -124,8 +124,8 @@
      * sort each element which is a list.
      */
     protected void sortIndexMap() {
-        for (Iterator it = indexmap.values().iterator(); it.hasNext(); ) {
-            Collections.sort((List)it.next(), new DocComparator());
+        for (Iterator<List<Doc>> it = indexmap.values().iterator(); it.hasNext(); ) {
+            Collections.sort(it.next(), new DocComparator());
         }
     }
 
@@ -141,7 +141,7 @@
         ClassDoc[] classes = root.classes();
         if (!classesOnly) {
             if (packages.length == 0) {
-                Set set = new HashSet();
+                Set<PackageDoc> set = new HashSet<PackageDoc>();
                 PackageDoc pd;
                 for (int i = 0; i < classes.length; i++) {
                     pd = classes[i].containingPackage();
@@ -149,7 +149,7 @@
                         set.add(pd);
                     }
                 }
-                adjustIndexMap((PackageDoc[]) set.toArray(packages));
+                adjustIndexMap(set.toArray(packages));
             } else {
                 adjustIndexMap(packages);
             }
@@ -193,9 +193,9 @@
                     '*' :
                     Character.toUpperCase(name.charAt(0));
                 Character unicode = new Character(ch);
-                List list = (List)indexmap.get(unicode);
+                List<Doc> list = indexmap.get(unicode);
                 if (list == null) {
-                    list = new ArrayList();
+                    list = new ArrayList<Doc>();
                     indexmap.put(unicode, list);
                 }
                 list.add(elements[i]);