1.1 --- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Feb 07 18:09:46 2011 +0000
1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java Mon Feb 07 18:10:13 2011 +0000
1.3 @@ -67,7 +67,6 @@
1.4 private final Check chk;
1.5 private final Attr attr;
1.6 private final Symtab syms;
1.7 - private final Scope.ScopeCounter scopeCounter;
1.8 private final TreeMaker make;
1.9 private final ClassReader reader;
1.10 private final Todo todo;
1.11 @@ -94,7 +93,6 @@
1.12 chk = Check.instance(context);
1.13 attr = Attr.instance(context);
1.14 syms = Symtab.instance(context);
1.15 - scopeCounter = Scope.ScopeCounter.instance(context);
1.16 make = TreeMaker.instance(context);
1.17 reader = ClassReader.instance(context);
1.18 todo = Todo.instance(context);
1.19 @@ -1023,7 +1021,7 @@
1.20 }
1.21
1.22 private Env<AttrContext> baseEnv(JCClassDecl tree, Env<AttrContext> env) {
1.23 - Scope baseScope = new Scope.ClassScope(tree.sym, scopeCounter);
1.24 + Scope baseScope = new Scope(tree.sym);
1.25 //import already entered local classes into base scope
1.26 for (Scope.Entry e = env.outer.info.scope.elems ; e != null ; e = e.sibling) {
1.27 if (e.sym.isLocal()) {
