jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java

-:6b95dd682538
+:a626d8c1de6e
 * questions.
 */
 package com.sun.tools.javac.util;
+import java.util.EnumSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
 import com.sun.tools.javac.api.DiagnosticFormatter;
 *  @param key    The key for the localized error message.
 *  @param args   Fields of the error message.
 */
 public JCDiagnostic error(
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return create(ERROR, null, true, source, pos, key, args);
+return create(ERROR, null, EnumSet.of(DiagnosticFlag.MANDATORY), source, pos, key, args);
 }
 /**
 * Create a warning diagnostic that will not be hidden by the -nowarn or -Xlint:none options.
 *  @param source The source of the compilation unit, if any, in which to report the warning.
 *  @param args   Fields of the warning message.
 *  @see MandatoryWarningHandler
 */
 public JCDiagnostic mandatoryWarning(
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return create(WARNING, null, true, source, pos, key, args);
+return create(WARNING, null, EnumSet.of(DiagnosticFlag.MANDATORY), source, pos, key, args);
 }
 /**
 * Create a warning diagnostic that will not be hidden by the -nowarn or -Xlint:none options.
 *  @param lc     The lint category for the diagnostic
 *  @see MandatoryWarningHandler
 */
 public JCDiagnostic mandatoryWarning(
 LintCategory lc,
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return create(WARNING, lc, true, source, pos, key, args);
+return create(WARNING, lc, EnumSet.of(DiagnosticFlag.MANDATORY), source, pos, key, args);
 }
 /**
 * Create a warning diagnostic.
 *  @param lc     The lint category for the diagnostic
 *  @param args   Fields of the warning message.
 *  @see MandatoryWarningHandler
 */
 public JCDiagnostic warning(
 LintCategory lc, String key, Object... args) {
-return create(WARNING, lc, false, null, null, key, args);
+return create(WARNING, lc, EnumSet.noneOf(DiagnosticFlag.class), null, null, key, args);
 }
 /**
 * Create a warning diagnostic.
 *  @param source The source of the compilation unit, if any, in which to report the warning.
 *  @param key    The key for the localized warning message.
 *  @param args   Fields of the warning message.
 */
 public JCDiagnostic warning(
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return create(WARNING, null, false, source, pos, key, args);
+return create(WARNING, null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
 }
 /**
 * Create a warning diagnostic.
 *  @param lc     The lint category for the diagnostic
 *  @param args   Fields of the warning message.
 *  @see MandatoryWarningHandler
 */
 public JCDiagnostic warning(
 LintCategory lc, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return create(WARNING, lc, false, source, pos, key, args);
+return create(WARNING, lc, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
 }
 /**
 * Create a note diagnostic that will not be hidden by the -nowarn or -Xlint:none options.
 *  @param key    The key for the localized message.
 *  @param args   Fields of the message.
 *  @see MandatoryWarningHandler
 */
 public JCDiagnostic mandatoryNote(DiagnosticSource source, String key, Object... args) {
-return create(NOTE, null, true, source, null, key, args);
+return create(NOTE, null, EnumSet.of(DiagnosticFlag.MANDATORY), source, null, key, args);
 }
 /**
 * Create a note diagnostic.
 *  @param key    The key for the localized error message.
 *  @param args   Fields of the message.
 */
 public JCDiagnostic note(String key, Object... args) {
-return create(NOTE, null, false, null, null, key, args);
+return create(NOTE, null, EnumSet.noneOf(DiagnosticFlag.class), null, null, key, args);
 }
 /**
 * Create a note diagnostic.
 *  @param source The source of the compilation unit, if any, in which to report the note.
 *  @param key    The key for the localized message.
 *  @param args   Fields of the message.
 */
 public JCDiagnostic note(
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return create(NOTE, null, false, source, pos, key, args);
+return create(NOTE, null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
 }
 /**
 * Create a fragment diagnostic, for use as an argument in other diagnostics
 *  @param key    The key for the localized message.
 *  @param args   Fields of the message.
 */
 public JCDiagnostic fragment(String key, Object... args) {
-return create(FRAGMENT, null, false, null, null, key, args);
+return create(FRAGMENT, null, EnumSet.noneOf(DiagnosticFlag.class), null, null, key, args);
 }
 /**
 * Create a new diagnostic of the given kind, which is not mandatory and which has
 * no lint category.
 *  @param key         The key for the localized message.
 *  @param args        Fields of the message.
 */
 public JCDiagnostic create(
 DiagnosticType kind, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return create(kind, null, false, source, pos, key, args);
+return create(kind, null, EnumSet.noneOf(DiagnosticFlag.class), source, pos, key, args);
 }
 /**
 * Create a new diagnostic of the given kind.
 *  @param kind        The diagnostic kind
 *  @param pos         The source position at which to report the message.
 *  @param key         The key for the localized message.
 *  @param args        Fields of the message.
 */
 public JCDiagnostic create(
-DiagnosticType kind, LintCategory lc, boolean isMandatory, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
+DiagnosticType kind, LintCategory lc, Set<DiagnosticFlag> flags, DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return new JCDiagnostic(formatter, kind, lc, isMandatory, source, pos, qualify(kind, key), args);
+return new JCDiagnostic(formatter, kind, lc, flags, source, pos, qualify(kind, key), args);
 }
 protected String qualify(DiagnosticType t, String key) {
 return prefix + "." + t.key + "." + key;
 }
 @Deprecated
 public static JCDiagnostic fragment(String key, Object... args) {
 return new JCDiagnostic(getFragmentFormatter(),
 FRAGMENT,
 null,
-false,
+EnumSet.noneOf(DiagnosticFlag.class),
 null,
 null,
 "compiler." + FRAGMENT.key + "." + key,
 args);
 }
 }
 private final int pos;
 }
+public enum DiagnosticFlag {
+MANDATORY,
+RESOLVE_ERROR
+}
 private final DiagnosticType type;
 private final DiagnosticSource source;
 private final DiagnosticPosition position;
 private final int line;
 private final int column;
 private final String key;
 protected final Object[] args;
-private final boolean mandatory;
+private final Set<DiagnosticFlag> flags;
 private final LintCategory lintCategory;
 /**
 * Create a diagnostic object.
 * @param fomatter the formatter to use for the diagnostic
 * @param args arguments to be included in the text of the diagnostic
 */
 protected JCDiagnostic(DiagnosticFormatter<JCDiagnostic> formatter,
 DiagnosticType dt,
 LintCategory lc,
-boolean mandatory,
+Set<DiagnosticFlag> flags,
 DiagnosticSource source,
 DiagnosticPosition pos,
 String key,
 Object... args) {
 if (source == null && pos != null && pos.getPreferredPosition() != Position.NOPOS)
 throw new IllegalArgumentException();
 this.defaultFormatter = formatter;
 this.type = dt;
 this.lintCategory = lc;
-this.mandatory = mandatory;
+this.flags = flags;
 this.source = source;
 this.position = pos;
 this.key = key;
 this.args = args;
 /**
 * Check whether or not this diagnostic is required to be shown.
 * @return true if this diagnostic is required to be shown.
 */
 public boolean isMandatory() {
-return mandatory;
+return flags.contains(DiagnosticFlag.MANDATORY);
 }
 /**
 * Check whether this diagnostic has an associated lint category.
 */
 public Diagnostic.Kind getKind() {
 switch (type) {
 case NOTE:
 return Diagnostic.Kind.NOTE;
 case WARNING:
-return mandatory ? Diagnostic.Kind.MANDATORY_WARNING
+return flags.contains(DiagnosticFlag.MANDATORY)
-: Diagnostic.Kind.WARNING;
+? Diagnostic.Kind.MANDATORY_WARNING
+: Diagnostic.Kind.WARNING;
 case ERROR:
 return Diagnostic.Kind.ERROR;
 default:
 return Diagnostic.Kind.OTHER;
 }
 public String getMessage(Locale locale) {
 return defaultFormatter.formatMessage(this, locale);
 }
+public void setFlag(DiagnosticFlag flag) {
+flags.add(flag);
+}
+public boolean isFlagSet(DiagnosticFlag flag) {
+return flags.contains(flag);
+}
 public static class MultilineDiagnostic extends JCDiagnostic {
 private final List<JCDiagnostic> subdiagnostics;
 public MultilineDiagnostic(JCDiagnostic other, List<JCDiagnostic> subdiagnostics) {
 super(other.defaultFormatter,
 other.getType(),
 other.getLintCategory(),
-other.isMandatory(),
+other.flags,
 other.getDiagnosticSource(),
 other.position,
 other.getCode(),
 other.getArgs());
 this.subdiagnostics = subdiagnostics;

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java

src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java