--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Mon Jul 26 14:18:45 2010 -0700
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Mon Jul 26 14:25:56 2010 -0700
@@ -111,13 +111,13 @@
boolean enforceMandatoryWarnings = source.enforceMandatoryWarnings();
deprecationHandler = new MandatoryWarningHandler(log, verboseDeprecated,
- enforceMandatoryWarnings, "deprecated");
+ enforceMandatoryWarnings, "deprecated", LintCategory.DEPRECATION);
uncheckedHandler = new MandatoryWarningHandler(log, verboseUnchecked,
- enforceMandatoryWarnings, "unchecked");
+ enforceMandatoryWarnings, "unchecked", LintCategory.UNCHECKED);
unsafeVarargsHandler = new MandatoryWarningHandler(log, verboseVarargs,
- enforceMandatoryWarnings, "varargs");
+ enforceMandatoryWarnings, "varargs", LintCategory.VARARGS);
sunApiHandler = new MandatoryWarningHandler(log, verboseSunApi,
- enforceMandatoryWarnings, "sunapi");
+ enforceMandatoryWarnings, "sunapi", null);
}
/** Switch: generics enabled?
@@ -209,7 +209,7 @@
public void warnStatic(DiagnosticPosition pos, String msg, Object... args) {
if (lint.isEnabled(LintCategory.STATIC))
- log.warning(pos, msg, args);
+ log.warning(LintCategory.STATIC, pos, msg, args);
}
/**
@@ -929,7 +929,8 @@
!TreeInfo.isDiamond(tree) &&
!env.enclClass.name.isEmpty() && //anonymous or intersection
tree.type.isRaw()) {
- log.warning(tree.pos(), "raw.class.use", tree.type, tree.type.tsym.type);
+ log.warning(Lint.LintCategory.RAW,
+ tree.pos(), "raw.class.use", tree.type, tree.type.tsym.type);
}
}
@@ -2156,7 +2157,8 @@
(s.flags() & DEPRECATED) != 0 &&
!syms.deprecatedType.isErroneous() &&
s.attribute(syms.deprecatedType.tsym) == null) {
- log.warning(pos, "missing.deprecated.annotation");
+ log.warning(Lint.LintCategory.DEP_ANN,
+ pos, "missing.deprecated.annotation");
}
}
@@ -2307,7 +2309,7 @@
int opc = ((OperatorSymbol)operator).opcode;
if (opc == ByteCodes.idiv || opc == ByteCodes.imod
|| opc == ByteCodes.ldiv || opc == ByteCodes.lmod) {
- log.warning(pos, "div.zero");
+ log.warning(Lint.LintCategory.DIVZERO, pos, "div.zero");
}
}
}
@@ -2317,7 +2319,7 @@
*/
void checkEmptyIf(JCIf tree) {
if (tree.thenpart.getTag() == JCTree.SKIP && tree.elsepart == null && lint.isEnabled(Lint.LintCategory.EMPTY))
- log.warning(tree.thenpart.pos(), "empty.if");
+ log.warning(Lint.LintCategory.EMPTY, tree.thenpart.pos(), "empty.if");
}
/** Check that symbol is unique in given scope.