--- old/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ElementListWriter.java	2020-01-21 10:51:22.489141421 -0800
+++ new/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/ElementListWriter.java	2020-01-21 10:51:22.169127281 -0800
@@ -32,6 +32,7 @@
 
 import jdk.javadoc.doclet.DocletEnvironment;
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 
 
 /**
@@ -45,6 +46,7 @@
 public class ElementListWriter {
 
     private final BaseConfiguration configuration;
+    private final BaseOptions options;
     private final Utils utils;
     private final DocFile file;
 
@@ -56,6 +58,7 @@
     public ElementListWriter(BaseConfiguration configuration) {
         file = DocFile.createFileForOutput(configuration, DocPaths.ELEMENT_LIST);
         this.configuration = configuration;
+        this.options = configuration.getOptions();
         this.utils = configuration.utils;
     }
 
@@ -74,7 +77,7 @@
         try (BufferedWriter out = new BufferedWriter(file.openWriter())) {
             if (configuration.showModules) {
                 for (ModuleElement mdle : configuration.modulePackages.keySet()) {
-                    if (!(configuration.nodeprecated && utils.isDeprecated(mdle))) {
+                    if (!(options.noDeprecated && utils.isDeprecated(mdle))) {
                         out.write(DocletConstants.MODULE_PREFIX + mdle.toString());
                         out.newLine();
                         for (PackageElement pkg : configuration.modulePackages.get(mdle)) {
@@ -87,7 +90,7 @@
                 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))) {
+                    if (!(options.noDeprecated && utils.isDeprecated(pkg))) {
                         out.write(pkg.toString());
                         out.newLine();
                     }