--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java Fri Feb 02 23:21:12 2018 +0530
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/util/AbstractLog.java Fri Feb 02 07:43:54 2018 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -110,16 +110,6 @@
/** Report an error, unless another error was already reported at same
* source position.
* @param pos The source position at which to report the error.
- * @param key The key for the localized error message.
- * @param args Fields of the error message.
- */
- public void error(DiagnosticPosition pos, String key, Object... args) {
- error(pos, diags.errorKey(key, args));
- }
-
- /** Report an error, unless another error was already reported at same
- * source position.
- * @param pos The source position at which to report the error.
* @param errorKey The key for the localized error message.
*/
public void error(DiagnosticPosition pos, Error errorKey) {
@@ -130,17 +120,6 @@
* source position.
* @param flag A flag to set on the diagnostic
* @param pos The source position at which to report the error.
- * @param key The key for the localized error message.
- * @param args Fields of the error message.
- */
- public void error(DiagnosticFlag flag, DiagnosticPosition pos, String key, Object ... args) {
- error(flag, pos, diags.errorKey(key, args));
- }
-
- /** Report an error, unless another error was already reported at same
- * source position.
- * @param flag A flag to set on the diagnostic
- * @param pos The source position at which to report the error.
* @param errorKey The key for the localized error message.
*/
public void error(DiagnosticFlag flag, DiagnosticPosition pos, Error errorKey) {
@@ -170,17 +149,6 @@
* source position.
* @param flag A flag to set on the diagnostic
* @param pos The source position at which to report the error.
- * @param key The key for the localized error message.
- * @param args Fields of the error message.
- */
- public void error(DiagnosticFlag flag, int pos, String key, Object ... args) {
- error(flag, pos, diags.errorKey(key, args));
- }
-
- /** Report an error, unless another error was already reported at same
- * source position.
- * @param flag A flag to set on the diagnostic
- * @param pos The source position at which to report the error.
* @param errorKey The key for the localized error message.
*/
public void error(DiagnosticFlag flag, int pos, Error errorKey) {
@@ -189,15 +157,6 @@
/** Report a warning, unless suppressed by the -nowarn option or the
* maximum number of warnings has been reached.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void warning(String key, Object ... args) {
- warning(diags.warningKey(key, args));
- }
-
- /** Report a warning, unless suppressed by the -nowarn option or the
- * maximum number of warnings has been reached.
* @param warningKey The key for the localized warning message.
*/
public void warning(Warning warningKey) {
@@ -207,16 +166,6 @@
/** Report a lint warning, unless suppressed by the -nowarn option or the
* maximum number of warnings has been reached.
* @param lc The lint category for the diagnostic
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void warning(LintCategory lc, String key, Object ... args) {
- warning(lc, diags.warningKey(key, args));
- }
-
- /** Report a lint warning, unless suppressed by the -nowarn option or the
- * maximum number of warnings has been reached.
- * @param lc The lint category for the diagnostic
* @param warningKey The key for the localized warning message.
*/
public void warning(LintCategory lc, Warning warningKey) {
@@ -226,16 +175,6 @@
/** Report a warning, unless suppressed by the -nowarn option or the
* maximum number of warnings has been reached.
* @param pos The source position at which to report the warning.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void warning(DiagnosticPosition pos, String key, Object ... args) {
- warning(pos, diags.warningKey(key, args));
- }
-
- /** Report a warning, unless suppressed by the -nowarn option or the
- * maximum number of warnings has been reached.
- * @param pos The source position at which to report the warning.
* @param warningKey The key for the localized warning message.
*/
public void warning(DiagnosticPosition pos, Warning warningKey) {
@@ -246,17 +185,6 @@
* maximum number of warnings has been reached.
* @param lc The lint category for the diagnostic
* @param pos The source position at which to report the warning.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void warning(LintCategory lc, DiagnosticPosition pos, String key, Object ... args) {
- warning(lc, pos, diags.warningKey(key, args));
- }
-
- /** Report a lint warning, unless suppressed by the -nowarn option or the
- * maximum number of warnings has been reached.
- * @param lc The lint category for the diagnostic
- * @param pos The source position at which to report the warning.
* @param warningKey The key for the localized warning message.
*/
public void warning(LintCategory lc, DiagnosticPosition pos, Warning warningKey) {
@@ -266,16 +194,6 @@
/** Report a warning, unless suppressed by the -nowarn option or the
* maximum number of warnings has been reached.
* @param pos The source position at which to report the warning.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void warning(int pos, String key, Object ... args) {
- warning(pos, diags.warningKey(key, args));
- }
-
- /** Report a warning, unless suppressed by the -nowarn option or the
- * maximum number of warnings has been reached.
- * @param pos The source position at which to report the warning.
* @param warningKey The key for the localized warning message.
*/
public void warning(int pos, Warning warningKey) {
@@ -284,15 +202,6 @@
/** Report a warning.
* @param pos The source position at which to report the warning.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void mandatoryWarning(DiagnosticPosition pos, String key, Object ... args) {
- mandatoryWarning(pos, diags.warningKey(key, args));
- }
-
- /** Report a warning.
- * @param pos The source position at which to report the warning.
* @param warningKey The key for the localized warning message.
*/
public void mandatoryWarning(DiagnosticPosition pos, Warning warningKey) {
@@ -302,16 +211,6 @@
/** Report a warning.
* @param lc The lint category for the diagnostic
* @param pos The source position at which to report the warning.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void mandatoryWarning(LintCategory lc, DiagnosticPosition pos, String key, Object ... args) {
- mandatoryWarning(lc, pos, diags.warningKey(key, args));
- }
-
- /** Report a warning.
- * @param lc The lint category for the diagnostic
- * @param pos The source position at which to report the warning.
* @param warningKey The key for the localized warning message.
*/
public void mandatoryWarning(LintCategory lc, DiagnosticPosition pos, Warning warningKey) {
@@ -319,14 +218,6 @@
}
/** Provide a non-fatal notification, unless suppressed by the -nowarn option.
- * @param key The key for the localized notification message.
- * @param args Fields of the notint an error or warning message:
- */
- public void note(String key, Object ... args) {
- note(diags.noteKey(key, args));
- }
-
- /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
* @param noteKey The key for the localized notification message.
*/
public void note(Note noteKey) {
@@ -334,14 +225,6 @@
}
/** Provide a non-fatal notification, unless suppressed by the -nowarn option.
- * @param key The key for the localized notification message.
- * @param args Fields of the notification message.
- */
- public void note(DiagnosticPosition pos, String key, Object ... args) {
- note(pos, diags.noteKey(key, args));
- }
-
- /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
* @param noteKey The key for the localized notification message.
*/
public void note(DiagnosticPosition pos, Note noteKey) {
@@ -349,14 +232,6 @@
}
/** Provide a non-fatal notification, unless suppressed by the -nowarn option.
- * @param key The key for the localized notification message.
- * @param args Fields of the notification message.
- */
- public void note(int pos, String key, Object ... args) {
- note(pos, diags.noteKey(key, args));
- }
-
- /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
* @param noteKey The key for the localized notification message.
*/
public void note(int pos, Note noteKey) {
@@ -364,14 +239,6 @@
}
/** Provide a non-fatal notification, unless suppressed by the -nowarn option.
- * @param key The key for the localized notification message.
- * @param args Fields of the notification message.
- */
- public void note(JavaFileObject file, String key, Object ... args) {
- note(file, diags.noteKey(key, args));
- }
-
- /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
* @param noteKey The key for the localized notification message.
*/
public void note(JavaFileObject file, Note noteKey) {
@@ -379,14 +246,6 @@
}
/** Provide a non-fatal notification, unless suppressed by the -nowarn option.
- * @param key The key for the localized notification message.
- * @param args Fields of the notification message.
- */
- public void mandatoryNote(final JavaFileObject file, String key, Object ... args) {
- mandatoryNote(file, diags.noteKey(key, args));
- }
-
- /** Provide a non-fatal notification, unless suppressed by the -nowarn option.
* @param noteKey The key for the localized notification message.
*/
public void mandatoryNote(final JavaFileObject file, Note noteKey) {