1.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Aug 04 17:54:15 2008 -0700
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Tue Aug 05 12:54:40 2008 +0100
1.3 @@ -72,6 +72,7 @@
1.4 private final Todo todo;
1.5 private final Annotate annotate;
1.6 private final Types types;
1.7 + private final JCDiagnostic.Factory diags;
1.8 private final Target target;
1.9
1.10 private final boolean skipAnnotations;
1.11 @@ -96,6 +97,7 @@
1.12 todo = Todo.instance(context);
1.13 annotate = Annotate.instance(context);
1.14 types = Types.instance(context);
1.15 + diags = JCDiagnostic.Factory.instance(context);
1.16 target = Target.instance(context);
1.17 skipAnnotations =
1.18 Options.instance(context).get("skipAnnotations") != null;
1.19 @@ -133,7 +135,7 @@
1.20 if (tsym.kind == PCK && tsym.members().elems == null && !tsym.exists()) {
1.21 // If we can't find java.lang, exit immediately.
1.22 if (((PackageSymbol)tsym).fullname.equals(names.java_lang)) {
1.23 - JCDiagnostic msg = JCDiagnostic.fragment("fatal.err.no.java.lang");
1.24 + JCDiagnostic msg = diags.fragment("fatal.err.no.java.lang");
1.25 throw new FatalError(msg);
1.26 } else {
1.27 log.error(pos, "doesnt.exist", tsym);
1.28 @@ -319,7 +321,7 @@
1.29 log.error(pos, "cant.resolve.location",
1.30 KindName.STATIC,
1.31 name, List.<Type>nil(), List.<Type>nil(),
1.32 - typeKindName(tsym.type),
1.33 + Kinds.typeKindName(tsym.type),
1.34 tsym.type);
1.35 }
1.36 } finally {
