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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Mon Aug 04 17:54:15 2008 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Tue Aug 05 12:54:40 2008 +0100
     1.3 @@ -59,6 +59,7 @@
     1.4      ClassReader reader;
     1.5      TreeInfo treeinfo;
     1.6      Types types;
     1.7 +    JCDiagnostic.Factory diags;
     1.8      public final boolean boxingEnabled; // = source.allowBoxing();
     1.9      public final boolean varargsEnabled; // = source.allowVarargs();
    1.10      private final boolean debugResolve;
    1.11 @@ -92,6 +93,7 @@
    1.12          reader = ClassReader.instance(context);
    1.13          treeinfo = TreeInfo.instance(context);
    1.14          types = Types.instance(context);
    1.15 +        diags = JCDiagnostic.Factory.instance(context);
    1.16          Source source = Source.instance(context);
    1.17          boxingEnabled = source.allowBoxing();
    1.18          varargsEnabled = source.allowVarargs();
    1.19 @@ -449,7 +451,7 @@
    1.20          Symbol sym = findField(env, site, name, site.tsym);
    1.21          if (sym.kind == VAR) return (VarSymbol)sym;
    1.22          else throw new FatalError(
    1.23 -                 JCDiagnostic.fragment("fatal.err.cant.locate.field",
    1.24 +                 diags.fragment("fatal.err.cant.locate.field",
    1.25                                  name));
    1.26      }
    1.27  
    1.28 @@ -1248,7 +1250,7 @@
    1.29              pos, env, site, name, argtypes, typeargtypes);
    1.30          if (sym.kind == MTH) return (MethodSymbol)sym;
    1.31          else throw new FatalError(
    1.32 -                 JCDiagnostic.fragment("fatal.err.cant.locate.meth",
    1.33 +                 diags.fragment("fatal.err.cant.locate.meth",
    1.34                                  name));
    1.35      }
    1.36  
    1.37 @@ -1320,7 +1322,7 @@
    1.38              pos, env, site, argtypes, typeargtypes);
    1.39          if (sym.kind == MTH) return (MethodSymbol)sym;
    1.40          else throw new FatalError(
    1.41 -                 JCDiagnostic.fragment("fatal.err.cant.locate.ctor", site));
    1.42 +                 diags.fragment("fatal.err.cant.locate.ctor", site));
    1.43      }
    1.44  
    1.45      /** Resolve operator.