Rename JavaClassOrPackageScope -> JavaBaseScope

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java

@@ -28,10 +28,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl;
 
 import java.util.Collection;
 
-/**
+public abstract class JavaBaseScope extends JetScopeImpl {
- * @author Stepan Koltsov
- */
-public abstract class JavaClassOrPackageScope extends JetScopeImpl {
 
     @NotNull
     protected final JavaSemanticServices semanticServices;
@@ -41,7 +38,7 @@ public abstract class JavaClassOrPackageScope extends JetScopeImpl {
     // cache
     private Collection<DeclarationDescriptor> allDescriptors;
 
-    protected JavaClassOrPackageScope(
+    protected JavaBaseScope(
             @NotNull JavaSemanticServices semanticServices,
             @NotNull ResolverScopeData resolverScopeData
     ) {

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java

@@ -39,7 +39,7 @@ import java.util.*;
  *
  * @author abreslav
  */
-public class JavaClassMembersScope extends JavaClassOrPackageScope {
+public class JavaClassMembersScope extends JavaBaseScope {
     private final Map<Name, ClassifierDescriptor> classifiers = Maps.newHashMap();
 
     public JavaClassMembersScope(

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java

@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
 /**
  * @author abreslav
  */
-public class JavaPackageScope extends JavaClassOrPackageScope {
+public class JavaPackageScope extends JavaBaseScope {
 
     @NotNull
     private final FqName packageFQN;