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

-:05684554f040
+:b6d5f53b3b29
 if (instance == null)
 instance = new Factory(context);
 return instance;
 }
-final Messages messages;
+DiagnosticFormatter<JCDiagnostic> formatter;
 final String prefix;
 /** Create a new diagnostic factory. */
 protected Factory(Context context) {
+this(Messages.instance(context), "compiler");
 context.put(diagnosticFactoryKey, this);
-messages = Messages.instance(context);
-prefix = "compiler";
 }
 /** Create a new diagnostic factory. */
 public Factory(Messages messages, String prefix) {
-this.messages = messages;
 this.prefix = prefix;
+this.formatter = new BasicDiagnosticFormatter(messages);
 }
 /**
 * Create an error diagnostic.
 *  @param source The source of the compilation unit, if any, in which to report the error.
 *  @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 new JCDiagnostic(messages, ERROR, true, source, pos, qualify(ERROR, key), args);
+return new JCDiagnostic(formatter, ERROR, true, source, pos, qualify(ERROR, 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 error message.
 *  @see MandatoryWarningHandler
 */
 public JCDiagnostic mandatoryWarning(
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return new JCDiagnostic(messages, WARNING, true, source, pos, qualify(WARNING, key), args);
+return new JCDiagnostic(formatter, WARNING, true, source, pos, qualify(WARNING, 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 error message.
 *  @param args   Fields of the error message.
 */
 public JCDiagnostic warning(
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return new JCDiagnostic(messages, WARNING, false, source, pos, qualify(WARNING, key), args);
+return new JCDiagnostic(formatter, WARNING, false, source, pos, qualify(WARNING, 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 error message.
 *  @param args   Fields of the error message.
 *  @see MandatoryWarningHandler
 */
 public JCDiagnostic mandatoryNote(DiagnosticSource source, String key, Object... args) {
-return new JCDiagnostic(messages, NOTE, true, source, null, qualify(NOTE, key), args);
+return new JCDiagnostic(formatter, NOTE, true, source, null, qualify(NOTE, key), args);
 }
 /**
 * Create a note diagnostic.
 *  @param key    The key for the localized error message.
 *  @param key    The key for the localized error message.
 *  @param args   Fields of the error message.
 */
 public JCDiagnostic note(
 DiagnosticSource source, DiagnosticPosition pos, String key, Object... args) {
-return new JCDiagnostic(messages, NOTE, false, source, pos, qualify(NOTE, key), args);
+return new JCDiagnostic(formatter, NOTE, false, source, pos, qualify(NOTE, key), args);
 }
 /**
 * Create a fragment diagnostic, for use as an argument in other diagnostics
 *  @param key    The key for the localized error message.
 *  @param args   Fields of the error message.
 */
 public JCDiagnostic fragment(String key, Object... args) {
-return new JCDiagnostic(messages, FRAGMENT, false, null, null, qualify(FRAGMENT, key), args);
+return new JCDiagnostic(formatter, FRAGMENT, false, null, null, qualify(FRAGMENT, key), args);
 }
 protected String qualify(DiagnosticType t, String key) {
 return prefix + "." + t.key + "." + key;
 }
 /**
 * Create a fragment diagnostic, for use as an argument in other diagnostics
 *  @param key    The key for the localized error message.
 *  @param args   Fields of the error message.
-*/
+*
-// should be deprecated
+*/
+@Deprecated
 public static JCDiagnostic fragment(String key, Object... args) {
-return new JCDiagnostic(Messages.getDefaultMessages(),
+return new JCDiagnostic(getFragmentFormatter(),
 FRAGMENT,
 false,
 null,
 null,
 "compiler." + FRAGMENT.key + "." + key,
 args);
+}
+//where
+@Deprecated
+public static DiagnosticFormatter<JCDiagnostic> getFragmentFormatter() {
+if (fragmentFormatter == null) {
+fragmentFormatter = new BasicDiagnosticFormatter(Messages.getDefaultMessages());
+}
+return fragmentFormatter;
 }
 /**
 * A DiagnosticType defines the type of the diagnostic.
 **/
 }
 private final int pos;
 }
-private final Messages messages;
 private final DiagnosticType type;
 private final DiagnosticSource source;
 private final DiagnosticPosition position;
 private final int line;
 private final int column;
 * @param name the name of the source file, or null if none.
 * @param pos the character offset within the source file, if given.
 * @param key a resource key to identify the text of the diagnostic
 * @param args arguments to be included in the text of the diagnostic
 */
-protected JCDiagnostic(Messages messages,
+protected JCDiagnostic(DiagnosticFormatter<JCDiagnostic> formatter,
 DiagnosticType dt,
 boolean mandatory,
 DiagnosticSource source,
 DiagnosticPosition pos,
 String key,
 Object ... args) {
 if (source == null && pos != null && pos.getPreferredPosition() != Position.NOPOS)
 throw new IllegalArgumentException();
-this.messages = messages;
+this.defaultFormatter = formatter;
 this.type = dt;
 this.mandatory = mandatory;
 this.source = source;
 this.position = pos;
 this.key = key;
 /**
 * Get the prefix string associated with a particular type of diagnostic.
 * @return the prefix string associated with a particular type of diagnostic
 */
 public String getPrefix(DiagnosticType dt) {
-return getFormatter().formatKind(this, Locale.getDefault());
+return defaultFormatter.formatKind(this, Locale.getDefault());
 }
-private DiagnosticFormatter<JCDiagnostic> getFormatter() {
-if (defaultFormatter == null) {
-defaultFormatter = new BasicDiagnosticFormatter(messages);
-}
-return defaultFormatter;
-}
 /**
 * Return the standard presentation of this diagnostic.
 */
 public String toString() {
-return getFormatter().format(this,Locale.getDefault());
+return defaultFormatter.format(this,Locale.getDefault());
 }
-private static DiagnosticFormatter<JCDiagnostic> defaultFormatter;
+private DiagnosticFormatter<JCDiagnostic> defaultFormatter;
+@Deprecated
+private static DiagnosticFormatter<JCDiagnostic> fragmentFormatter;
 // Methods for javax.tools.Diagnostic
 public Diagnostic.Kind getKind() {
 switch (type) {
 return key;
 }
 public String getMessage(Locale locale) {
 // RFE 6406133: JCDiagnostic.getMessage ignores locale argument
-return getFormatter().formatMessage(this, locale);
+return defaultFormatter.formatMessage(this, locale);
 }
 }

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