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

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Enter.java	Mon Nov 29 14:15:36 2010 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Enter.java	Thu Dec 02 16:37:23 2010 -0800
     1.3 @@ -30,16 +30,17 @@
     1.4  import javax.tools.JavaFileManager;
     1.5  
     1.6  import com.sun.tools.javac.code.*;
     1.7 +import com.sun.tools.javac.code.Scope.*;
     1.8 +import com.sun.tools.javac.code.Symbol.*;
     1.9 +import com.sun.tools.javac.code.Type.*;
    1.10  import com.sun.tools.javac.jvm.*;
    1.11 +import com.sun.tools.javac.main.RecognizedOptions.PkgInfo;
    1.12  import com.sun.tools.javac.tree.*;
    1.13 +import com.sun.tools.javac.tree.JCTree.*;
    1.14  import com.sun.tools.javac.util.*;
    1.15  import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
    1.16  import com.sun.tools.javac.util.List;
    1.17  
    1.18 -import com.sun.tools.javac.code.Type.*;
    1.19 -import com.sun.tools.javac.code.Symbol.*;
    1.20 -import com.sun.tools.javac.main.RecognizedOptions.PkgInfo;
    1.21 -import com.sun.tools.javac.tree.JCTree.*;
    1.22  
    1.23  import static com.sun.tools.javac.code.Flags.*;
    1.24  import static com.sun.tools.javac.code.Kinds.*;
    1.25 @@ -207,8 +208,8 @@
    1.26          Env<AttrContext> localEnv = new Env<AttrContext>(tree, new AttrContext());
    1.27          localEnv.toplevel = tree;
    1.28          localEnv.enclClass = predefClassDef;
    1.29 -        tree.namedImportScope = new Scope.ImportScope(tree.packge);
    1.30 -        tree.starImportScope = new Scope.ImportScope(tree.packge);
    1.31 +        tree.namedImportScope = new ImportScope(tree.packge);
    1.32 +        tree.starImportScope = new StarImportScope(tree.packge);
    1.33          localEnv.info.scope = tree.namedImportScope;
    1.34          localEnv.info.lint = lint;
    1.35          return localEnv;