jdk-sandbox: comparison langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java

equal deleted inserted replaced

-:086a3c7a6b56
+:7b24b4c32ee6
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Locale;
 import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeSet;
 log.printRawLines(WriterKind.STDOUT,
 String.format(LINT_KEY_FORMAT,
 "all",
 log.localize(PrefixKind.JAVAC, "opt.Xlint.all")));
 for (LintCategory lc : LintCategory.values()) {
-if (lc.hidden) continue;
 log.printRawLines(WriterKind.STDOUT,
 String.format(LINT_KEY_FORMAT,
 lc.option,
 log.localize(PrefixKind.JAVAC,
 "opt.Xlint.desc." + lc.option)));
 private final ArgKind argKind;
 /** The kind of choices for this option, if any. */
 private final ChoiceKind choiceKind;
-/** The choices for this option, if any, and whether or not the choices are hidden. */
+/** The choices for this option, if any. */
-private final Map<String,Boolean> choices;
+private final Set<String> choices;
 /**
 * Looks up the first option matching the given argument in the full set of options.
 * @param arg the argument to be matches
 * @return the first option that matches, or null if none.
 return lookup(arg, EnumSet.allOf(Option.class));
 }
 /**
 * Looks up the first option matching the given argument within a set of options.
-* @param arg the argument to be matches
+* @param arg the argument to be matched
+* @param options the set of possible options
 * @return the first option that matches, or null if none.
 */
 public static Option lookup(String arg, Set<Option> options) {
 for (Option option: options) {
 if (option.matches(arg))
 OptionKind kind, OptionGroup group, ArgKind ak) {
 this(text, argsNameKey, descrKey, kind, group, null, null, ak);
 }
 Option(String text, String argsNameKey, String descrKey, OptionKind kind, OptionGroup group,
-ChoiceKind choiceKind, Map<String,Boolean> choices) {
+ChoiceKind choiceKind, Set<String> choices) {
 this(text, argsNameKey, descrKey, kind, group, choiceKind, choices, ArgKind.REQUIRED);
 }
 Option(String text, String descrKey,
 OptionKind kind, OptionGroup group,
 ChoiceKind choiceKind, String... choices) {
 this(text, null, descrKey, kind, group, choiceKind,
-createChoices(choices), ArgKind.REQUIRED);
+new LinkedHashSet<>(Arrays.asList(choices)), ArgKind.REQUIRED);
 }
-// where
-private static Map<String,Boolean> createChoices(String... choices) {
-Map<String,Boolean> map = new LinkedHashMap<>();
-for (String c: choices)
-map.put(c, false);
-return map;
-}
 private Option(String text, String argsNameKey, String descrKey,
 OptionKind kind, OptionGroup group,
-ChoiceKind choiceKind, Map<String,Boolean> choices,
+ChoiceKind choiceKind, Set<String> choices,
 ArgKind argKind) {
 this.names = text.trim().split("\\s+");
 Assert.check(names.length >= 1);
 this.primaryName = names[0];
 this.argsNameKey = argsNameKey;
 return false;
 if (choices != null) {
 String arg = option.substring(name.length());
 if (choiceKind == ChoiceKind.ONEOF)
-return choices.keySet().contains(arg);
+return choices.contains(arg);
 else {
 for (String a: arg.split(",+")) {
-if (!choices.keySet().contains(a))
+if (!choices.contains(a))
 return false;
 }
 }
 }
 */
 public boolean process(OptionHelper helper, String option, String arg) {
 if (choices != null) {
 if (choiceKind == ChoiceKind.ONEOF) {
 // some clients like to see just one of option+choice set
-for (String s: choices.keySet())
+for (String s : choices)
 helper.remove(primaryName + s);
 String opt = primaryName + arg;
 helper.put(opt, opt);
 // some clients like to see option (without trailing ":")
 // set to arg
 StringBuilder sb = new StringBuilder();
 sb.append(name);
 if (argsNameKey == null) {
 if (choices != null) {
 String sep = "{";
-for (Map.Entry<String,Boolean> e: choices.entrySet()) {
+for (String choice : choices) {
-if (!e.getValue()) {
+sb.append(sep);
-sb.append(sep);
+sb.append(choices);
-sb.append(e.getKey());
+sep = ",";
-sep = ",";
-}
 }
 sb.append("}");
 }
 } else {
 if (!name.matches(".*[=:]$") && argKind != ArgKind.ADJACENT)
 ? PkgInfo.LEGACY
 : PkgInfo.valueOf(StringUtils.toUpperCase(v)));
 }
 }
-private static Map<String,Boolean> getXLintChoices() {
+private static Set<String> getXLintChoices() {
-Map<String,Boolean> choices = new LinkedHashMap<>();
+Set<String> choices = new LinkedHashSet<>();
-choices.put("all", false);
+choices.add("all");
-for (Lint.LintCategory c : Lint.LintCategory.values())
+for (Lint.LintCategory c : Lint.LintCategory.values()) {
-choices.put(c.option, c.hidden);
+choices.add(c.option);
-for (Lint.LintCategory c : Lint.LintCategory.values())
+choices.add("-" + c.option);
-choices.put("-" + c.option, c.hidden);
+}
-choices.put("none", false);
+choices.add("none");
 return choices;
 }
 /**
 * Returns the set of options supported by the command line tool.

changeset 41637	7b24b4c32ee6
parent 41252	058d83c9b1c7
child 41938	8e66bf10fcec