src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ElementListWriter.java

*** 30,39 ****
--- 30,40 ----
  import javax.lang.model.element.ModuleElement;
  import javax.lang.model.element.PackageElement;
  
  import jdk.javadoc.doclet.DocletEnvironment;
  import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+ import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
  
  
  /**
   * Write out the element index.
   *
*** 43,52 ****
--- 44,54 ----
   *  deletion without notice.</b>
   */
  public class ElementListWriter {
  
      private final BaseConfiguration configuration;
+     private final BaseOptions options;
      private final Utils utils;
      private final DocFile file;
  
      /**
       * Constructor.
*** 54,63 ****
--- 56,66 ----
       * @param configuration the current configuration of the doclet.
       */
      public ElementListWriter(BaseConfiguration configuration) {
          file = DocFile.createFileForOutput(configuration, DocPaths.ELEMENT_LIST);
          this.configuration = configuration;
+         this.options = configuration.getOptions();
          this.utils = configuration.utils;
      }
  
      /**
       * Generate the element index.
*** 72,82 ****
  
      protected void generateElementListFile(DocletEnvironment docEnv) throws DocFileIOException {
          try (BufferedWriter out = new BufferedWriter(file.openWriter())) {
              if (configuration.showModules) {
                  for (ModuleElement mdle : configuration.modulePackages.keySet()) {
!                     if (!(configuration.nodeprecated && utils.isDeprecated(mdle))) {
                          out.write(DocletConstants.MODULE_PREFIX + mdle.toString());
                          out.newLine();
                          for (PackageElement pkg : configuration.modulePackages.get(mdle)) {
                              out.write(pkg.toString());
                              out.newLine();
--- 75,85 ----
  
      protected void generateElementListFile(DocletEnvironment docEnv) throws DocFileIOException {
          try (BufferedWriter out = new BufferedWriter(file.openWriter())) {
              if (configuration.showModules) {
                  for (ModuleElement mdle : configuration.modulePackages.keySet()) {
!                     if (!(options.noDeprecated && utils.isDeprecated(mdle))) {
                          out.write(DocletConstants.MODULE_PREFIX + mdle.toString());
                          out.newLine();
                          for (PackageElement pkg : configuration.modulePackages.get(mdle)) {
                              out.write(pkg.toString());
                              out.newLine();
*** 85,95 ****
                  }
              } else {
                  for (PackageElement pkg : configuration.packages) {
                      // if the -nodeprecated option is set and the package is marked as
                      // deprecated, do not include it in the packages list.
!                     if (!(configuration.nodeprecated && utils.isDeprecated(pkg))) {
                          out.write(pkg.toString());
                          out.newLine();
                      }
                  }
              }
--- 88,98 ----
                  }
              } else {
                  for (PackageElement pkg : configuration.packages) {
                      // if the -nodeprecated option is set and the package is marked as
                      // deprecated, do not include it in the packages list.
!                     if (!(options.noDeprecated && utils.isDeprecated(pkg))) {
                          out.write(pkg.toString());
                          out.newLine();
                      }
                  }
              }