--- old/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java	2020-01-23 18:12:10.353299307 -0800
+++ new/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolEnvironment.java	2020-01-23 18:12:10.017284675 -0800
@@ -158,9 +158,9 @@
         elementToTreePath = new HashMap<>();
     }
 
-    public void initialize(Map<ToolOption, Object> toolOpts) {
-        this.quiet = (boolean)toolOpts.getOrDefault(ToolOption.QUIET, false);
-        this.ignoreSourceErrors = (boolean)toolOpts.getOrDefault(ToolOption.IGNORE_SOURCE_ERRORS, false);
+    public void initialize(ToolOptions options) {
+        this.quiet = options.quiet();
+        this.ignoreSourceErrors = options.ignoreSourceErrors();
     }
 
     /**