src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/PropertyUtils.java

*** 29,38 ****
--- 29,40 ----
  import javax.lang.model.element.ExecutableElement;
  import javax.lang.model.type.TypeKind;
  import javax.lang.model.type.TypeMirror;
  import javax.lang.model.util.Types;
  
+ import jdk.javadoc.internal.doclets.formats.html.HtmlOptions;
+ 
  /**
   * This class provides basic JavaFX property related utility methods.
   * Refer to the JavaFX conventions in the VisibleMemberTable comments.
   */
  public class PropertyUtils {
*** 44,60 ****
      final boolean javafx;
  
      final Types typeUtils;
  
      PropertyUtils(BaseConfiguration configuration) {
! 
!         javafx = configuration.javafx;
  
          typeUtils = configuration.docEnv.getTypeUtils();
  
          // Disable strict check for JDK's without FX.
!         TypeMirror jboType = configuration.disableJavaFxStrictChecks
                  ? null
                  : configuration.utils.getSymbol("javafx.beans.Observable");
  
          jbObservableType = jboType != null
                  ? configuration.docEnv.getTypeUtils().erasure(jboType)
--- 46,62 ----
      final boolean javafx;
  
      final Types typeUtils;
  
      PropertyUtils(BaseConfiguration configuration) {
!         BaseOptions options = configuration.getOptions();
!         javafx = options.javafx;
  
          typeUtils = configuration.docEnv.getTypeUtils();
  
          // Disable strict check for JDK's without FX.
!         TypeMirror jboType = options.disableJavaFxStrictChecks
                  ? null
                  : configuration.utils.getSymbol("javafx.beans.Observable");
  
          jbObservableType = jboType != null
                  ? configuration.docEnv.getTypeUtils().erasure(jboType)