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

     1.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Tue Jul 15 09:50:36 2008 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java	Tue Jul 15 19:22:51 2008 -0700
     1.3 @@ -120,12 +120,12 @@
     1.4      /**
     1.5       * The list of doc-file subdirectories to exclude
     1.6       */
     1.7 -    protected Set excludedDocFileDirs;
     1.8 +    protected Set<String> excludedDocFileDirs;
     1.9  
    1.10      /**
    1.11       * The list of qualifiers to exclude
    1.12       */
    1.13 -    protected Set excludedQualifiers;
    1.14 +    protected Set<String> excludedQualifiers;
    1.15  
    1.16      /**
    1.17       * The Root of the generated Program Structure from the Doclet API.
    1.18 @@ -255,8 +255,8 @@
    1.19          message =
    1.20              new MessageRetriever(this,
    1.21              "com.sun.tools.doclets.internal.toolkit.resources.doclets");
    1.22 -        excludedDocFileDirs = new HashSet();
    1.23 -        excludedQualifiers = new HashSet();
    1.24 +        excludedDocFileDirs = new HashSet<String>();
    1.25 +        excludedQualifiers = new HashSet<String>();
    1.26      }
    1.27  
    1.28      /**
    1.29 @@ -329,14 +329,14 @@
    1.30          DocErrorReporter reporter);
    1.31  
    1.32      private void initPackageArray() {
    1.33 -        Set set = new HashSet(Arrays.asList(root.specifiedPackages()));
    1.34 +        Set<PackageDoc> set = new HashSet<PackageDoc>(Arrays.asList(root.specifiedPackages()));
    1.35          ClassDoc[] classes = root.specifiedClasses();
    1.36          for (int i = 0; i < classes.length; i++) {
    1.37              set.add(classes[i].containingPackage());
    1.38          }
    1.39 -        ArrayList results = new ArrayList(set);
    1.40 +        ArrayList<PackageDoc> results = new ArrayList<PackageDoc>(set);
    1.41          Collections.sort(results);
    1.42 -        packages = (PackageDoc[]) results.toArray(new PackageDoc[] {});
    1.43 +        packages = results.toArray(new PackageDoc[] {});
    1.44      }
    1.45  
    1.46      /**
    1.47 @@ -345,7 +345,7 @@
    1.48       * @param options the two dimensional array of options.
    1.49       */
    1.50      public void setOptions(String[][] options) {
    1.51 -        LinkedHashSet customTagStrs = new LinkedHashSet();
    1.52 +        LinkedHashSet<String[]> customTagStrs = new LinkedHashSet<String[]>();
    1.53          for (int oi = 0; oi < options.length; ++oi) {
    1.54              String[] os = options[oi];
    1.55              String opt = os[0].toLowerCase();
    1.56 @@ -476,7 +476,7 @@
    1.57          }
    1.58      }
    1.59  
    1.60 -    private void addToSet(Set s, String str){
    1.61 +    private void addToSet(Set<String> s, String str){
    1.62          StringTokenizer st = new StringTokenizer(str, ":");
    1.63          String current;
    1.64          while(st.hasMoreTokens()){
    1.65 @@ -712,5 +712,5 @@
    1.66       *
    1.67       * @return the {@link java.util.Comparator} used to sort members.
    1.68       */
    1.69 -    public abstract Comparator getMemberComparator();
    1.70 +    public abstract Comparator<ProgramElementDoc> getMemberComparator();
    1.71  }