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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Jan 23 20:57:40 2013 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Jan 23 13:27:24 2013 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -55,7 +55,6 @@
    1.11  import java.util.LinkedHashMap;
    1.12  import java.util.LinkedHashSet;
    1.13  import java.util.Map;
    1.14 -import java.util.Set;
    1.15  
    1.16  import javax.lang.model.element.ElementVisitor;
    1.17  
    1.18 @@ -696,7 +695,7 @@
    1.19  
    1.20              if (varargsFormal == null &&
    1.21                      argtypes.size() != formals.size()) {
    1.22 -                report(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
    1.23 +                reportMC(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
    1.24              }
    1.25  
    1.26              while (argtypes.nonEmpty() && formals.head != varargsFormal) {
    1.27 @@ -707,7 +706,7 @@
    1.28              }
    1.29  
    1.30              if (formals.head != varargsFormal) {
    1.31 -                report(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
    1.32 +                reportMC(MethodCheckDiag.ARITY_MISMATCH, inferenceContext); // not enough args
    1.33              }
    1.34  
    1.35              if (useVarargs) {
    1.36 @@ -724,7 +723,7 @@
    1.37              }
    1.38          }
    1.39  
    1.40 -        private void report(MethodCheckDiag diag, InferenceContext inferenceContext, Object... args) {
    1.41 +        private void reportMC(MethodCheckDiag diag, InferenceContext inferenceContext, Object... args) {
    1.42              boolean inferDiag = inferenceContext != infer.emptyContext;
    1.43              InapplicableMethodException ex = inferDiag ?
    1.44                      infer.inferenceException : inapplicableMethodException;
    1.45 @@ -748,7 +747,7 @@
    1.46              } else {
    1.47                  if (!isAccessible(env, t)) {
    1.48                      Symbol location = env.enclClass.sym;
    1.49 -                    report(MethodCheckDiag.INACCESSIBLE_VARARGS, inferenceContext, t, Kinds.kindName(location), location);
    1.50 +                    reportMC(MethodCheckDiag.INACCESSIBLE_VARARGS, inferenceContext, t, Kinds.kindName(location), location);
    1.51                  }
    1.52              }
    1.53          }
    1.54 @@ -761,7 +760,7 @@
    1.55  
    1.56                  @Override
    1.57                  public void report(DiagnosticPosition pos, JCDiagnostic details) {
    1.58 -                    report(methodDiag, deferredAttrContext.inferenceContext, details);
    1.59 +                    reportMC(methodDiag, deferredAttrContext.inferenceContext, details);
    1.60                  }
    1.61              };
    1.62              return new MethodResultInfo(to, checkContext);