src/share/classes/com/sun/tools/javac/comp/Resolve.java

*** 1162,1172 ****
              JCClassDecl encl = env1.baseClause ? (JCClassDecl)env1.tree : env1.enclClass;
              if ((encl.sym.flags() & STATIC) != 0)
                  staticOnly = true;
          }
  
!         if (env.tree.getTag() != JCTree.IMPORT) {
              sym = findGlobalType(env, env.toplevel.namedImportScope, name);
              if (sym.exists()) return sym;
              else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
  
              sym = findGlobalType(env, env.toplevel.packge.members(), name);
--- 1162,1172 ----
              JCClassDecl encl = env1.baseClause ? (JCClassDecl)env1.tree : env1.enclClass;
              if ((encl.sym.flags() & STATIC) != 0)
                  staticOnly = true;
          }
  
!         if (env.tree.getTag() != JCTree.Tag.IMPORT) {
              sym = findGlobalType(env, env.toplevel.namedImportScope, name);
              if (sym.exists()) return sym;
              else if (sym.kind < bestSoFar.kind) bestSoFar = sym;
  
              sym = findGlobalType(env, env.toplevel.packge.members(), name);
*** 1682,1692 ****
       *  @param pos       The position to use for error reporting.
       *  @param optag     The tag of the operation tree.
       *  @param env       The environment current at the operation.
       *  @param argtypes  The types of the operands.
       */
!     Symbol resolveOperator(DiagnosticPosition pos, int optag,
                             Env<AttrContext> env, List<Type> argtypes) {
          startResolution();
          Name name = treeinfo.operatorName(optag);
          Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes,
                                  null, false, false, true);
--- 1682,1692 ----
       *  @param pos       The position to use for error reporting.
       *  @param optag     The tag of the operation tree.
       *  @param env       The environment current at the operation.
       *  @param argtypes  The types of the operands.
       */
!     Symbol resolveOperator(DiagnosticPosition pos, JCTree.Tag optag,
                             Env<AttrContext> env, List<Type> argtypes) {
          startResolution();
          Name name = treeinfo.operatorName(optag);
          Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes,
                                  null, false, false, true);
*** 1701,1711 ****
       *  @param pos       The position to use for error reporting.
       *  @param optag     The tag of the operation tree.
       *  @param env       The environment current at the operation.
       *  @param arg       The type of the operand.
       */
!     Symbol resolveUnaryOperator(DiagnosticPosition pos, int optag, Env<AttrContext> env, Type arg) {
          return resolveOperator(pos, optag, env, List.of(arg));
      }
  
      /** Resolve binary operator.
       *  @param pos       The position to use for error reporting.
--- 1701,1711 ----
       *  @param pos       The position to use for error reporting.
       *  @param optag     The tag of the operation tree.
       *  @param env       The environment current at the operation.
       *  @param arg       The type of the operand.
       */
!     Symbol resolveUnaryOperator(DiagnosticPosition pos, JCTree.Tag optag, Env<AttrContext> env, Type arg) {
          return resolveOperator(pos, optag, env, List.of(arg));
      }
  
      /** Resolve binary operator.
       *  @param pos       The position to use for error reporting.
*** 1713,1723 ****
       *  @param env       The environment current at the operation.
       *  @param left      The types of the left operand.
       *  @param right     The types of the right operand.
       */
      Symbol resolveBinaryOperator(DiagnosticPosition pos,
!                                  int optag,
                                   Env<AttrContext> env,
                                   Type left,
                                   Type right) {
          return resolveOperator(pos, optag, env, List.of(left, right));
      }
--- 1713,1723 ----
       *  @param env       The environment current at the operation.
       *  @param left      The types of the left operand.
       *  @param right     The types of the right operand.
       */
      Symbol resolveBinaryOperator(DiagnosticPosition pos,
!                                  JCTree.Tag optag,
                                   Env<AttrContext> env,
                                   Type left,
                                   Type right) {
          return resolveOperator(pos, optag, env, List.of(left, right));
      }