--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Tue Jul 15 09:50:36 2008 -0700
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java	Tue Jul 15 19:22:51 2008 -0700
@@ -49,7 +49,7 @@
      *
      * @see Group
      */
-    private Map groupPackageMap;
+    private Map<String,List<PackageDoc>> groupPackageMap;
 
     /**
      * List to store the order groups as specified on the command line.
@@ -120,10 +120,9 @@
     protected void generateIndex() {
         for (int i = 0; i < groupList.size(); i++) {
         String groupname = (String)groupList.get(i);
-        List list = (List)groupPackageMap.get(groupname);
+        List<PackageDoc> list = groupPackageMap.get(groupname);
             if (list != null && list.size() > 0) {
-                printIndexContents((PackageDoc[])list.
-                                       toArray(new PackageDoc[list.size()]),
+                printIndexContents(list.toArray(new PackageDoc[list.size()]),
                                     groupname);
             }
         }