Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Tue Jul 15 09:50:36 2008 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java	Tue Jul 15 19:22:51 2008 -0700
     1.3 @@ -49,7 +49,7 @@
     1.4       * Mapping of each Unicode Character with the member list containing
     1.5       * members with names starting with it.
     1.6       */
     1.7 -    private Map indexmap = new HashMap();
     1.8 +    private Map<Character,List<Doc>> indexmap = new HashMap<Character,List<Doc>>();
     1.9  
    1.10      /**
    1.11       * Don't generate deprecated information if true.
    1.12 @@ -68,10 +68,10 @@
    1.13       * A comparator used to sort classes and members.
    1.14       * Note:  Maybe this compare code belongs in the tool?
    1.15       */
    1.16 -    private class DocComparator implements Comparator {
    1.17 -        public int compare(Object d1, Object d2) {
    1.18 -            String doc1 = (((Doc) d1).name());
    1.19 -            String doc2 = (((Doc) d2).name());
    1.20 +    private class DocComparator implements Comparator<Doc> {
    1.21 +        public int compare(Doc d1, Doc d2) {
    1.22 +            String doc1 = d1.name();
    1.23 +            String doc2 = d2.name();
    1.24              int compareResult;
    1.25              if ((compareResult = doc1.compareToIgnoreCase(doc2)) != 0) {
    1.26                  return compareResult;
    1.27 @@ -124,8 +124,8 @@
    1.28       * sort each element which is a list.
    1.29       */
    1.30      protected void sortIndexMap() {
    1.31 -        for (Iterator it = indexmap.values().iterator(); it.hasNext(); ) {
    1.32 -            Collections.sort((List)it.next(), new DocComparator());
    1.33 +        for (Iterator<List<Doc>> it = indexmap.values().iterator(); it.hasNext(); ) {
    1.34 +            Collections.sort(it.next(), new DocComparator());
    1.35          }
    1.36      }
    1.37  
    1.38 @@ -141,7 +141,7 @@
    1.39          ClassDoc[] classes = root.classes();
    1.40          if (!classesOnly) {
    1.41              if (packages.length == 0) {
    1.42 -                Set set = new HashSet();
    1.43 +                Set<PackageDoc> set = new HashSet<PackageDoc>();
    1.44                  PackageDoc pd;
    1.45                  for (int i = 0; i < classes.length; i++) {
    1.46                      pd = classes[i].containingPackage();
    1.47 @@ -149,7 +149,7 @@
    1.48                          set.add(pd);
    1.49                      }
    1.50                  }
    1.51 -                adjustIndexMap((PackageDoc[]) set.toArray(packages));
    1.52 +                adjustIndexMap(set.toArray(packages));
    1.53              } else {
    1.54                  adjustIndexMap(packages);
    1.55              }
    1.56 @@ -193,9 +193,9 @@
    1.57                      '*' :
    1.58                      Character.toUpperCase(name.charAt(0));
    1.59                  Character unicode = new Character(ch);
    1.60 -                List list = (List)indexmap.get(unicode);
    1.61 +                List<Doc> list = indexmap.get(unicode);
    1.62                  if (list == null) {
    1.63 -                    list = new ArrayList();
    1.64 +                    list = new ArrayList<Doc>();
    1.65                      indexmap.put(unicode, list);
    1.66                  }
    1.67                  list.add(elements[i]);