Refactor: introduce and use PackagePsiDeclarationProvider instead of ResolverNamespaceData

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProvider.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.java.data;
+
+import com.intellij.psi.PsiPackage;
+import org.jetbrains.annotations.NotNull;
+
+public interface PackagePsiDeclarationProvider extends PsiDeclarationProvider {
+
+    @NotNull
+    PsiPackage getPsiPackage();
+}

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverNamespaceData.java

@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 /**
  * Either package or class with static members
  */
-public class ResolverNamespaceData extends ResolverScopeData {
+public class ResolverNamespaceData extends ResolverScopeData implements PackagePsiDeclarationProvider {
 
     public ResolverNamespaceData(
             @Nullable PsiClass psiClass,

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ResolverScopeData.java

@@ -103,7 +103,7 @@ public abstract class ResolverScopeData implements ClassPsiDeclarationProvider {
         return psiClass == null;
     }
 
-    @Nullable
+    @NotNull
     public PsiPackage getPsiPackage() {
         return psiPackage;
     }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java

@@ -30,7 +30,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.java.*;
+import org.jetbrains.jet.lang.resolve.java.data.PackagePsiDeclarationProvider;
 import org.jetbrains.jet.lang.resolve.java.data.ResolverNamespaceData;
+import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
 import org.jetbrains.jet.lang.resolve.java.descriptor.JavaNamespaceDescriptor;
 import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -131,13 +133,14 @@ public final class JavaNamespaceResolver {
             @NotNull FqName fqName,
             @NotNull NamespaceDescriptor namespaceDescriptor
     ) {
-        ResolverNamespaceData namespaceData = createNamespaceData(fqName, namespaceDescriptor);
+        PackagePsiDeclarationProvider namespaceData = createNamespaceData(fqName, namespaceDescriptor);
         JavaPackageScope javaPackageScope;
         if (namespaceData == null) {
             javaPackageScope = null;
         }
         else {
-            javaPackageScope = new JavaPackageScope(namespaceDescriptor, fqName, javaSemanticServices, namespaceData);
+            //TODO:
+            javaPackageScope = new JavaPackageScope(namespaceDescriptor, fqName, javaSemanticServices, (ResolverScopeData) namespaceData);
         }
 
         cache(fqName, javaPackageScope);
@@ -146,7 +149,7 @@ public final class JavaNamespaceResolver {
     }
 
     @Nullable
-    private ResolverNamespaceData createNamespaceData(
+    private PackagePsiDeclarationProvider createNamespaceData(
             @NotNull FqName fqName,
             @NotNull NamespaceDescriptor namespaceDescriptor
     ) {