src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java

*** 52,61 ****
--- 52,62 ----
  import jdk.javadoc.internal.doclets.toolkit.util.ClassTree;
  import jdk.javadoc.internal.doclets.toolkit.util.ClassUseMapper;
  import jdk.javadoc.internal.doclets.toolkit.util.DocFileIOException;
  import jdk.javadoc.internal.doclets.toolkit.util.DocPath;
  import jdk.javadoc.internal.doclets.toolkit.util.DocPaths;
+ import jdk.javadoc.internal.doclets.toolkit.util.Utils;
  
  
  /**
   * Generate class usage information.
   *
*** 156,178 ****
       * @param classtree the class tree hierarchy
       * @throws DocFileIOException if there is an error while generating the documentation
       */
      public static void generate(HtmlConfiguration configuration, ClassTree classtree) throws DocFileIOException  {
          ClassUseMapper mapper = new ClassUseMapper(configuration, classtree);
          for (TypeElement aClass : configuration.getIncludedTypeElements()) {
              // If -nodeprecated option is set and the containing package is marked
              // as deprecated, do not generate the class-use page. We will still generate
              // the class-use page if the class is marked as deprecated but the containing
              // package is not since it could still be linked from that package-use page.
!             if (!(configuration.nodeprecated &&
!                   configuration.utils.isDeprecated(configuration.utils.containingPackage(aClass))))
                  ClassUseWriter.generate(configuration, mapper, aClass);
          }
          for (PackageElement pkg : configuration.packages) {
              // If -nodeprecated option is set and the package is marked
              // as deprecated, do not generate the package-use page.
!             if (!(configuration.nodeprecated && configuration.utils.isDeprecated(pkg)))
                  PackageUseWriter.generate(configuration, mapper, pkg);
          }
      }
  
      private Map<PackageElement, List<Element>> pkgDivide(Map<TypeElement, ? extends List<? extends Element>> classMap) {
--- 157,181 ----
       * @param classtree the class tree hierarchy
       * @throws DocFileIOException if there is an error while generating the documentation
       */
      public static void generate(HtmlConfiguration configuration, ClassTree classtree) throws DocFileIOException  {
          ClassUseMapper mapper = new ClassUseMapper(configuration, classtree);
+         boolean nodeprecated = configuration.getOptions().noDeprecated;
+         Utils utils = configuration.utils;
          for (TypeElement aClass : configuration.getIncludedTypeElements()) {
              // If -nodeprecated option is set and the containing package is marked
              // as deprecated, do not generate the class-use page. We will still generate
              // the class-use page if the class is marked as deprecated but the containing
              // package is not since it could still be linked from that package-use page.
!             if (!(nodeprecated &&
!                   utils.isDeprecated(utils.containingPackage(aClass))))
                  ClassUseWriter.generate(configuration, mapper, aClass);
          }
          for (PackageElement pkg : configuration.packages) {
              // If -nodeprecated option is set and the package is marked
              // as deprecated, do not generate the package-use page.
!             if (!(nodeprecated && utils.isDeprecated(pkg)))
                  PackageUseWriter.generate(configuration, mapper, pkg);
          }
      }
  
      private Map<PackageElement, List<Element>> pkgDivide(Map<TypeElement, ? extends List<? extends Element>> classMap) {