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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Mon Sep 12 11:40:07 2011 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Tue Sep 13 14:14:57 2011 +0100
     1.3 @@ -306,7 +306,16 @@
     1.4       */
     1.5      void duplicateError(DiagnosticPosition pos, Symbol sym) {
     1.6          if (!sym.type.isErroneous()) {
     1.7 -            log.error(pos, "already.defined", sym, sym.location());
     1.8 +            Symbol location = sym.location();
     1.9 +            if (location.kind == MTH &&
    1.10 +                    ((MethodSymbol)location).isStaticOrInstanceInit()) {
    1.11 +                log.error(pos, "already.defined.in.clinit", kindName(sym), sym,
    1.12 +                        kindName(sym.location()), kindName(sym.location().enclClass()),
    1.13 +                        sym.location().enclClass());
    1.14 +            } else {
    1.15 +                log.error(pos, "already.defined", kindName(sym), sym,
    1.16 +                        kindName(sym.location()), sym.location());
    1.17 +            }
    1.18          }
    1.19      }
    1.20