diff -r dbe9e82f9d25 -r 905e151a185a src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Thu Jan 08 16:34:58 2009 -0800
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Tue Jan 13 13:27:14 2009 +0000
@@ -114,7 +114,7 @@
         this.noDeprecated = noDeprecated;
         this.classesOnly = classesOnly;
         buildIndexMap(configuration.root);
-        Set set = indexmap.keySet();
+        Set<Character> set = indexmap.keySet();
         elements =  set.toArray();
         Arrays.sort(elements);
     }
@@ -215,7 +215,7 @@
      *
      * @return Map index map.
      */
-    public Map getIndexMap() {
+    public Map<Character,List<Doc>> getIndexMap() {
         return indexmap;
     }
 
@@ -225,8 +225,8 @@
      * @param index index Unicode character.
      * @return List member list for specific Unicode character.
      */
-    public List getMemberList(Character index) {
-        return (List)indexmap.get(index);
+    public List<Doc> getMemberList(Character index) {
+        return indexmap.get(index);
     }
 
     /**