langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java

*** 43,52 ****
--- 43,54 ----
  import com.sun.javadoc.*;
  import com.sun.tools.javac.file.JavacFileManager;
  import com.sun.tools.javac.main.CommandLine;
  import com.sun.tools.javac.main.Option;
  import com.sun.tools.javac.file.BaseFileManager;
+ import com.sun.tools.javac.main.OptionHelper;
+ import com.sun.tools.javac.main.OptionHelper.GrumpyHelper;
  import com.sun.tools.javac.platform.PlatformDescription;
  import com.sun.tools.javac.platform.PlatformUtils;
  import com.sun.tools.javac.util.ClientCodeException;
  import com.sun.tools.javac.util.Context;
  import com.sun.tools.javac.util.List;
*** 171,181 ****
      void usage() {
          usage(true);
      }
  
      void usage(boolean exit) {
!         usage("main.usage", "-help", null, exit);
      }
  
      @Override
      void Xusage() {
          Xusage(true);
--- 173,183 ----
      void usage() {
          usage(true);
      }
  
      void usage(boolean exit) {
!         usage("main.usage", "-help", "main.usage.foot", exit);
      }
  
      @Override
      void Xusage() {
          Xusage(true);
*** 363,380 ****
          }
          if (fileManager instanceof BaseFileManager) {
              ((BaseFileManager) fileManager).handleOptions(fileManagerOpts);
          }
  
!         String platformString = compOpts.get("-release");
  
          if (platformString != null) {
              if (compOpts.isSet("-source")) {
                  usageError("main.release.bootclasspath.conflict", "-source");
              }
!             if (fileManagerOpts.containsKey(Option.BOOTCLASSPATH)) {
!                 usageError("main.release.bootclasspath.conflict", Option.BOOTCLASSPATH.getText());
              }
  
              PlatformDescription platformDescription =
                      PlatformUtils.lookupPlatformDescription(platformString);
  
--- 365,382 ----
          }
          if (fileManager instanceof BaseFileManager) {
              ((BaseFileManager) fileManager).handleOptions(fileManagerOpts);
          }
  
!         String platformString = compOpts.get("--release");
  
          if (platformString != null) {
              if (compOpts.isSet("-source")) {
                  usageError("main.release.bootclasspath.conflict", "-source");
              }
!             if (fileManagerOpts.containsKey(Option.BOOT_CLASS_PATH)) {
!                 usageError("main.release.bootclasspath.conflict", Option.BOOT_CLASS_PATH.getPrimaryName());
              }
  
              PlatformDescription platformDescription =
                      PlatformUtils.lookupPlatformDescription(platformString);
  
*** 553,558 ****
--- 555,575 ----
          for (List<String> i = arguments; i.nonEmpty(); i=i.tail) {
              args[k++] = i.head;
          }
          options.append(args);
      }
+ 
+     @Override
+     OptionHelper getOptionHelper() {
+         return new GrumpyHelper(null) {
+             @Override
+             public String get(com.sun.tools.javac.main.Option option) {
+                 return compOpts.get(option);
+             }
+ 
+             @Override
+             public void put(String name, String value) {
+                 compOpts.put(name, value);
+             }
+         };
+     }
  }