diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java index 434ab354ff6..ef18547a3a9 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; @@ -29,11 +28,6 @@ import java.util.List; */ public class JavaBindingContext { - /** - * @see BindingContext#NAMESPACE_IS_SRC - */ - public static final WritableSlice JAVA_NAMESPACE_KIND = Slices.createSimpleSlice(); - public static final WritableSlice> LOAD_FROM_JAVA_SIGNATURE_ERRORS = Slices.createCollectiveSlice(); private JavaBindingContext() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceKind.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceKind.java deleted file mode 100644 index 945fe7661df..00000000000 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaNamespaceKind.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2010-2013 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; - -public enum JavaNamespaceKind { - PROPER, - CLASS_STATICS, -} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java index a4e81ec23fa..928789c27b4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java @@ -23,13 +23,14 @@ import com.intellij.psi.PsiField; import com.intellij.psi.impl.JavaConstantExpressionEvaluator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.AnnotationUtils; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; -import org.jetbrains.jet.lang.resolve.java.JavaNamespaceKind; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; @@ -124,14 +125,4 @@ public class TraceBasedJavaResolverCache implements JavaResolverCache { public void recordClass(@NotNull JavaClass javaClass, @NotNull ClassDescriptor descriptor) { trace.record(CLASS, ((JavaClassImpl) javaClass).getPsi(), descriptor); } - - @Override - public void recordProperPackage(@NotNull PackageFragmentDescriptor descriptor) { - trace.record(JavaBindingContext.JAVA_NAMESPACE_KIND, descriptor, JavaNamespaceKind.PROPER); - } - - @Override - public void recordClassStaticMembersNamespace(@NotNull PackageFragmentDescriptor descriptor) { - trace.record(JavaBindingContext.JAVA_NAMESPACE_KIND, descriptor, JavaNamespaceKind.CLASS_STATICS); - } } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java index fba11ea87b5..da790f12269 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPackageFragmentProviderImpl.java @@ -146,8 +146,6 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(fqName); KotlinJvmBinaryClass kotlinClass = kotlinClassFinder.find(packageClassFqName); - cache.recordProperPackage(packageFragment); - if (kotlinClass != null) { JetScope kotlinPackageScope = deserializedDescriptorResolver.createKotlinPackageScope(packageFragment, kotlinClass); if (kotlinPackageScope != null) { @@ -163,7 +161,6 @@ public final class JavaPackageFragmentProviderImpl implements JavaPackageFragmen JavaClass javaClass = javaClassFinder.findClass(fqName); if (javaClass != null && DescriptorResolverUtils.isJavaClassVisibleAsPackage(javaClass)) { - cache.recordClassStaticMembersNamespace(packageFragment); return new JavaClassStaticMembersScope(packageFragment, javaClass, memberResolver); } return null; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java index 7d0f8788b34..bf1f7600bc8 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java @@ -45,8 +45,4 @@ public interface JavaResolverCache { void recordField(@NotNull JavaField field, @NotNull PropertyDescriptor descriptor); void recordClass(@NotNull JavaClass javaClass, @NotNull ClassDescriptor descriptor); - - void recordProperPackage(@NotNull PackageFragmentDescriptor descriptor); - - void recordClassStaticMembersNamespace(@NotNull PackageFragmentDescriptor descriptor); }