--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Wed Aug 10 13:52:02 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Wed Aug 10 15:47:46 2016 -0700
@@ -31,6 +31,7 @@
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.main.Option;
+import com.sun.tools.javac.main.OptionHelper;
import com.sun.tools.javac.util.ListBuffer;
import com.sun.tools.javac.util.Options;
@@ -50,21 +51,28 @@
BOOTCLASSPATH("-bootclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
+ helper.setFileManagerOpt(Option.BOOT_CLASS_PATH, arg);
}
},
CLASSPATH("-classpath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.CLASSPATH, arg);
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
}
},
CP("-cp", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.CP, arg);
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
+ }
+ },
+
+ CLASS_PATH("--class-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.CLASS_PATH, arg);
}
},
@@ -78,28 +86,49 @@
SOURCEPATH("-sourcepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.SOURCEPATH, arg);
+ helper.setFileManagerOpt(Option.SOURCE_PATH, arg);
+ }
+ },
+
+ SOURCE_PATH("--source-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.SOURCE_PATH, arg);
}
},
SYSCLASSPATH("-sysclasspath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.BOOTCLASSPATH, arg);
+ helper.setFileManagerOpt(Option.BOOT_CLASS_PATH, arg);
}
},
MODULESOURCEPATH("-modulesourcepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULESOURCEPATH, arg);
+ helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
+ }
+ },
+
+ MODULE_SOURCE_PATH("--module-source-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
}
},
UPGRADEMODULEPATH("-upgrademodulepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.UPGRADEMODULEPATH, arg);
+ helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
+ }
+ },
+
+ UPGRADE_MODULE_PATH("--upgrade-module-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
}
},
@@ -110,10 +139,31 @@
}
},
+ SYSTEM_("--system", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.SYSTEM, arg);
+ }
+ },
+
MODULEPATH("-modulepath", true) {
@Override
public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULEPATH, arg);
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
+ }
+ },
+
+ MODULE_PATH("--module-path", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
+ }
+ },
+
+ P("-p", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setFileManagerOpt(Option.MODULE_PATH, arg);
}
},
@@ -124,6 +174,13 @@
}
},
+ ADD_MODULES("--add-modules", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_MODULES.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
LIMITMODS("-limitmods", true) {
@Override
public void process(Helper helper, String arg) {
@@ -131,6 +188,13 @@
}
},
+ LIMIT_MODULES("--limit-modules", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.LIMIT_MODULES.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
ENCODING("-encoding", true) {
@Override
public void process(Helper helper, String arg) {
@@ -139,13 +203,20 @@
}
},
- RELEASE("-release", true) {
+ RELEASE("--release", true) {
@Override
public void process(Helper helper, String arg) {
helper.setCompilerOpt(opt, arg);
}
},
+ RELEASE_OLD("-release", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ helper.setCompilerOpt("--release", arg);
+ }
+ },
+
SOURCE("-source", true) {
@Override
public void process(Helper helper, String arg) {
@@ -167,6 +238,55 @@
}
},
+ XADDREADS("-XaddReads:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_READS.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ ADD_READS("--add-reads", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_READS.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
+ ADDEXPORTS("-XaddExports:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_EXPORTS.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ ADD_EXPORTS("--add-exports", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.ADD_EXPORTS.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
+ XMODULE("-Xmodule:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.XMODULE.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ XPATCH("-Xpatch:", false) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.XMODULE.process(helper.getOptionHelper(), arg);
+ }
+ },
+
+ PATCH_MODULE("--patch-module", true) {
+ @Override
+ public void process(Helper helper, String arg) {
+ Option.PATCH_MODULE.process(helper.getOptionHelper(), opt, arg);
+ }
+ },
+
// ----- doclet options -----
DOCLET("-doclet", true), // handled in setDocletInvoker
@@ -362,6 +482,7 @@
abstract void Xusage();
abstract void usageError(String msg, Object... args);
+ abstract OptionHelper getOptionHelper();
void addToList(ListBuffer<String> list, String str){
StringTokenizer st = new StringTokenizer(str, ":");