From 47a95471fa17cab81560b664f6896c8120a49539 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <Pavel.Talanov@jetbrains.com>
Date: Mon, 15 Oct 2012 16:59:28 +0400
Subject: [PATCH] Rename JavaClassOrPackageScope -> JavaBaseScope

---
 .../{JavaClassOrPackageScope.java => JavaBaseScope.java}   | 7 ++-----
 .../jet/lang/resolve/java/scope/JavaClassMembersScope.java | 2 +-
 .../jet/lang/resolve/java/scope/JavaPackageScope.java      | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/{JavaClassOrPackageScope.java => JavaBaseScope.java} (95%)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassOrPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
similarity index 95%
rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassOrPackageScope.java
rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java
index 1bf11996a8c..14ded643dc7 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassOrPackageScope.java
+++ b/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;
 
-/**
- * @author Stepan Koltsov
- */
-public abstract class JavaClassOrPackageScope extends JetScopeImpl {
+public abstract class JavaBaseScope 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
     ) {
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
index 292c65fbadb..0c330559fe6 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java
+++ b/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(
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
index 6a8eeed52cf..3bcfbaa969e 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java
+++ b/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;