jdk-sandbox: comparison langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapTask.java

equal deleted inserted replaced

-:1a0fcaf3f2ed
+:274367a99f98
 }
 static final Option[] recognizedOptions = {
 new Option(false, "-help", "--help", "-?") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.help = true;
 }
 },
 new Option(false, "-version") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.version = true;
 }
 },
 new Option(false, "-fullversion") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.fullVersion = true;
 }
 },
 new Option(false, "-v", "-verbose", "-all") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.verbose = true;
 task.options.showDescriptors = true;
 task.options.showFlags = true;
 task.options.showAllAttrs = true;
 }
 },
 new Option(false, "-l") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.showLineAndLocalVariableTables = true;
 }
 },
 new Option(false, "-public") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.accessOptions.add(opt);
 task.options.showAccess = AccessFlags.ACC_PUBLIC;
 }
 },
 new Option(false, "-protected") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.accessOptions.add(opt);
 task.options.showAccess = AccessFlags.ACC_PROTECTED;
 }
 },
 new Option(false, "-package") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.accessOptions.add(opt);
 task.options.showAccess = 0;
 }
 },
 new Option(false, "-p", "-private") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 if (!task.options.accessOptions.contains("-p") &&
 !task.options.accessOptions.contains("-private")) {
 task.options.accessOptions.add(opt);
 }
 task.options.showAccess = AccessFlags.ACC_PRIVATE;
 }
 },
 new Option(false, "-c") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.showDisassembled = true;
 }
 },
 new Option(false, "-s") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.showDescriptors = true;
 }
 },
 new Option(false, "-sysinfo") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.sysInfo = true;
 }
 },
 new Option(false, "-XDdetails") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.details = EnumSet.allOf(InstructionDetailWriter.Kind.class);
 }
 },
 boolean matches(String opt) {
 int sep = opt.indexOf(":");
 return sep != -1 && super.matches(opt.substring(0, sep + 1));
 }
+@Override
 void process(JavapTask task, String opt, String arg) throws BadArgs {
 int sep = opt.indexOf(":");
 for (String v: opt.substring(sep + 1).split("[,: ]+")) {
 if (!handleArg(task, v))
 throw task.new BadArgs("err.invalid.arg.for.option", v);
 return false;
 }
 },
 new Option(false, "-constants") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.showConstants = true;
 }
 },
 new Option(false, "-XDinner") {
+@Override
 void process(JavapTask task, String opt, String arg) {
 task.options.showInnerClasses = true;
 }
 },
 boolean matches(String opt) {
 int sep = opt.indexOf(":");
 return sep != -1 && super.matches(opt.substring(0, sep + 1));
 }
+@Override
 void process(JavapTask task, String opt, String arg) throws BadArgs {
 int sep = opt.indexOf(":");
 try {
 int i = Integer.valueOf(opt.substring(sep + 1));
 if (i > 0) // silently ignore invalid values
 boolean matches(String opt) {
 int sep = opt.indexOf(":");
 return sep != -1 && super.matches(opt.substring(0, sep + 1));
 }
+@Override
 void process(JavapTask task, String opt, String arg) throws BadArgs {
 int sep = opt.indexOf(":");
 try {
 int i = Integer.valueOf(opt.substring(sep + 1));
 if (i > 0) // silently ignore invalid values
 } catch (NumberFormatException e) {
 }
 }
 },
-new Option(true, "-m") {
+new Option(true, "--module", "-m") {
 @Override
 void process(JavapTask task, String opt, String arg) throws BadArgs {
 task.options.moduleName = arg;
 }
 }
 }
 private void showHelp() {
 printLines(getMessage("main.usage", progname));
 for (Option o: recognizedOptions) {
-String name = o.aliases[0].substring(1); // there must always be at least one name
+String name = o.aliases[0].replaceAll("^-+", "").replaceAll("-+", "_"); // there must always be at least one name
 if (name.startsWith("X") || name.equals("fullversion") || name.equals("h") || name.equals("verify"))
 continue;
 printLines(getMessage("main.opt." + name));
 }
 String[] fmOptions = {
-"-classpath", "-cp", "-bootclasspath",
+"--module-path", "--system",
-"-upgrademodulepath", "-system", "-modulepath" };
+"--class-path", "-classpath", "-cp",
+"-bootclasspath"
+};
 for (String o: fmOptions) {
 if (fileManager.isSupportedOption(o) == -1)
 continue;
-String name = o.substring(1);
+String name = o.replaceAll("^-+", "").replaceAll("-+", "_");
 printLines(getMessage("main.opt." + name));
 }
+printLines(getMessage("main.usage.foot"));
 }
 private void showVersion(boolean full) {
 printLines(version(full ? "full" : "release"));
 }

changeset 40308	274367a99f98
parent 36526	3b41f1c69604
child 40606	eb2c81860c86