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

@@ -46,10 +46,11 @@
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import jdk.javadoc.internal.doclets.toolkit.BaseConfiguration;
+import jdk.javadoc.internal.doclets.toolkit.BaseOptions;
 import jdk.javadoc.internal.doclets.toolkit.PropertyUtils;
 
 /**
  * This class computes the main data structure for the doclet's
  * operations. Essentially, the implementation encapsulating the

@@ -104,10 +105,11 @@
 
     final TypeElement te;
     final TypeElement parent;
 
     final BaseConfiguration config;
+    final BaseOptions options;
     final Utils utils;
     final VisibleMemberCache mcache;
 
     private List<VisibleMemberTable> allSuperclasses;
     private List<VisibleMemberTable> allSuperinterfaces;

@@ -124,10 +126,11 @@
 
     protected VisibleMemberTable(TypeElement typeElement, BaseConfiguration configuration,
                                  VisibleMemberCache mcache) {
         config = configuration;
         utils = configuration.utils;
+        options = configuration.getOptions();
         te = typeElement;
         parent = utils.getSuperClass(te);
         this.mcache = mcache;
         allSuperclasses = new ArrayList<>();
         allSuperinterfaces = new ArrayList<>();

@@ -656,11 +659,11 @@
             orderedMembers = new EnumMap<>(Kind.class);
             memberMap = new EnumMap<>(Kind.class);
 
             List<? extends Element> elements = te.getEnclosedElements();
             for (Element e : elements) {
-                if (config.nodeprecated && utils.isDeprecated(e)) {
+                if (options.noDeprecated && utils.isDeprecated(e)) {
                     continue;
                 }
                 switch (e.getKind()) {
                     case CLASS:
                     case INTERFACE:

@@ -798,11 +801,11 @@
      *
      * For example {@code Object getAcme()} is a property-getter, and
      * {@code boolean isFoo()}
      */
     private void computeVisibleProperties(LocalMemberTable lmt) {
-        if (!config.javafx)
+        if (!options.javafx)
             return;
 
         PropertyUtils pUtils = config.propertyUtils;
         List<ExecutableElement> list = visibleMembers.getOrDefault(Kind.METHODS, Collections.emptyList())
                 .stream()