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

@@ -48,11 +48,11 @@
 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;
+import jdk.javadoc.internal.tool.ToolOptions;
 
 /**
  * Provides access to functionality specific to the JDK documentation tool,
  * javadoc.
  *

@@ -168,15 +168,9 @@
 
     @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;
+        return ToolOptions.isSupportedOption(option);
     }
 
 }