src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java

*** 48,58 ****
  import com.sun.tools.javac.file.JavacFileManager;
  import com.sun.tools.javac.file.BaseFileManager;
  import com.sun.tools.javac.util.ClientCodeException;
  import com.sun.tools.javac.util.Context;
  import com.sun.tools.javac.util.Log;
! import jdk.javadoc.internal.tool.ToolOption;
  
  /**
   * Provides access to functionality specific to the JDK documentation tool,
   * javadoc.
   *
--- 48,58 ----
  import com.sun.tools.javac.file.JavacFileManager;
  import com.sun.tools.javac.file.BaseFileManager;
  import com.sun.tools.javac.util.ClientCodeException;
  import com.sun.tools.javac.util.Context;
  import com.sun.tools.javac.util.Log;
! import jdk.javadoc.internal.tool.ToolOptions;
  
  /**
   * Provides access to functionality specific to the JDK documentation tool,
   * javadoc.
   *
*** 168,182 ****
  
      @Override
      public int isSupportedOption(String option) {
          if (option == null)
              throw new NullPointerException();
!         for (ToolOption o : ToolOption.values()) {
!             for (String name : o.names) {
!                 if (name.equals(option))
!                     return o.hasArg ? 1 : 0;
!             }
!         }
!         return -1;
      }
  
  }
--- 168,176 ----
  
      @Override
      public int isSupportedOption(String option) {
          if (option == null)
              throw new NullPointerException();
!         return ToolOptions.isSupportedOption(option);
      }
  
  }