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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Feb 28 14:05:44 2013 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Feb 28 14:05:52 2013 +0000
     1.3 @@ -2661,22 +2661,12 @@
     1.4              super(referenceTree, name, site, argtypes, typeargtypes, maxPhase);
     1.5          }
     1.6  
     1.7 -        protected Symbol lookupReferenceInternal(Env<AttrContext> env, MethodResolutionPhase phase) {
     1.8 +        @Override
     1.9 +        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
    1.10              return findMethod(env, site, name, argtypes, typeargtypes,
    1.11                      phase.isBoxingRequired(), phase.isVarargsRequired(), syms.operatorNames.contains(name));
    1.12          }
    1.13  
    1.14 -        protected Symbol adjustLookupResult(Env<AttrContext> env, Symbol sym) {
    1.15 -            return !TreeInfo.isStaticSelector(referenceTree.expr, names) ||
    1.16 -                        sym.kind != MTH ||
    1.17 -                        sym.isStatic() ? sym : new StaticError(sym);
    1.18 -        }
    1.19 -
    1.20 -        @Override
    1.21 -        final Symbol lookup(Env<AttrContext> env, MethodResolutionPhase phase) {
    1.22 -            return adjustLookupResult(env, lookupReferenceInternal(env, phase));
    1.23 -        }
    1.24 -
    1.25          @Override
    1.26          ReferenceLookupHelper unboundLookup() {
    1.27              if (TreeInfo.isStaticSelector(referenceTree.expr, names) &&
    1.28 @@ -2721,11 +2711,6 @@
    1.29          }
    1.30  
    1.31          @Override
    1.32 -        protected Symbol adjustLookupResult(Env<AttrContext> env, Symbol sym) {
    1.33 -            return sym.kind != MTH || !sym.isStatic() ? sym : new StaticError(sym);
    1.34 -        }
    1.35 -
    1.36 -        @Override
    1.37          ReferenceLookupHelper unboundLookup() {
    1.38              return this;
    1.39          }