langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java
changeset 25454 376a52c9540c
parent 24221 2376793dd33b
equal deleted inserted replaced
25453:be80cf0463b3 25454:376a52c9540c
    26 
    26 
    27 import java.io.*;
    27 import java.io.*;
    28 import java.util.*;
    28 import java.util.*;
    29 
    29 
    30 import com.sun.javadoc.*;
    30 import com.sun.javadoc.*;
    31 import com.sun.tools.javac.sym.Profiles;
       
    32 import com.sun.tools.javac.jvm.Profile;
    31 import com.sun.tools.javac.jvm.Profile;
    33 import com.sun.tools.doclets.internal.toolkit.*;
    32 import com.sun.tools.doclets.internal.toolkit.*;
    34 import com.sun.tools.doclets.internal.toolkit.builders.*;
    33 import com.sun.tools.doclets.internal.toolkit.builders.*;
    35 import com.sun.tools.doclets.internal.toolkit.util.*;
    34 import com.sun.tools.doclets.internal.toolkit.util.*;
    36 
    35 
   221                 for (int j = 0; j < packages.size(); j++) {
   220                 for (int j = 0; j < packages.size(); j++) {
   222                     // if -nodeprecated option is set and the package is marked as
   221                     // if -nodeprecated option is set and the package is marked as
   223                     // deprecated, do not generate the profilename-package-summary.html
   222                     // deprecated, do not generate the profilename-package-summary.html
   224                     // and profilename-package-frame.html pages for that package.
   223                     // and profilename-package-frame.html pages for that package.
   225                     PackageDoc pkg = packages.get(j);
   224                     PackageDoc pkg = packages.get(j);
   226                     if (!(configuration.nodeprecated && Util.isDeprecated(pkg))) {
   225                     if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
   227                         ProfilePackageFrameWriter.generate(configuration, pkg, i);
   226                         ProfilePackageFrameWriter.generate(configuration, pkg, i);
   228                         next = getNamedPackage(packages, j + 1);
   227                         next = getNamedPackage(packages, j + 1);
   229                         AbstractBuilder profilePackageSummaryBuilder =
   228                         AbstractBuilder profilePackageSummaryBuilder =
   230                                 configuration.getBuilderFactory().getProfilePackageSummaryBuilder(
   229                                 configuration.getBuilderFactory().getProfilePackageSummaryBuilder(
   231                                 pkg, prev, next, Profile.lookup(i));
   230                                 pkg, prev, next, Profile.lookup(i));
   267         for (int i = 0; i < pList.size(); i++) {
   266         for (int i = 0; i < pList.size(); i++) {
   268             // if -nodeprecated option is set and the package is marked as
   267             // if -nodeprecated option is set and the package is marked as
   269             // deprecated, do not generate the package-summary.html, package-frame.html
   268             // deprecated, do not generate the package-summary.html, package-frame.html
   270             // and package-tree.html pages for that package.
   269             // and package-tree.html pages for that package.
   271             PackageDoc pkg = pList.get(i);
   270             PackageDoc pkg = pList.get(i);
   272             if (!(configuration.nodeprecated && Util.isDeprecated(pkg))) {
   271             if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
   273                 PackageFrameWriter.generate(configuration, pkg);
   272                 PackageFrameWriter.generate(configuration, pkg);
   274                 next = getNamedPackage(pList, i + 1);
   273                 next = getNamedPackage(pList, i + 1);
   275                 //If the next package is unnamed package, skip 2 ahead if possible
   274                 //If the next package is unnamed package, skip 2 ahead if possible
   276                 if (next == null)
   275                 if (next == null)
   277                     next = getNamedPackage(pList, i + 2);
   276                     next = getNamedPackage(pList, i + 2);