diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index c60af64e510..57058b1ff5e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -211,11 +211,6 @@ public class TopDownAnalyzer { } - @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { - - } - @Override public void addFunctionDescriptor(@NotNull SimpleFunctionDescriptor functionDescriptor) { throw new UnsupportedOperationException(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java index 420414f404e..245f0c4dc06 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java @@ -186,11 +186,6 @@ public class MutableClassDescriptor extends MutableClassDescriptorLite { return superBuilder.getOwnerForChildren(); } - @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { - superBuilder.addObjectDescriptor(objectDescriptor); - } - @Override public void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor) { superBuilder.addClassifierDescriptor(classDescriptor); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java index f16389af1a3..31ffb604891 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptorLite.java @@ -204,11 +204,6 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase { getScopeForMemberLookupAsWritableScope().addClassifierDescriptor(classDescriptor); } - @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { - getScopeForMemberLookupAsWritableScope().addObjectDescriptor(objectDescriptor); - } - @Override public void addFunctionDescriptor(@NotNull SimpleFunctionDescriptor functionDescriptor) { getScopeForMemberLookupAsWritableScope().addFunctionDescriptor(functionDescriptor); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java index 0abe35a1b24..f5ea39d5ff0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceDescriptorImpl.java @@ -17,7 +17,10 @@ package org.jetbrains.jet.lang.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; +import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -70,11 +73,6 @@ public class NamespaceDescriptorImpl extends AbstractNamespaceDescriptorImpl { getMemberScope().addClassifierDescriptor(classDescriptor); } - @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { - getMemberScope().addObjectDescriptor(objectDescriptor); - } - @Override public void addFunctionDescriptor(@NotNull SimpleFunctionDescriptor functionDescriptor) { getMemberScope().addFunctionDescriptor(functionDescriptor); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java index 6a966a6b9db..6d037108472 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilder.java @@ -28,8 +28,6 @@ public interface NamespaceLikeBuilder { void addClassifierDescriptor(@NotNull MutableClassDescriptorLite classDescriptor); - void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor); - void addFunctionDescriptor(@NotNull SimpleFunctionDescriptor functionDescriptor); void addPropertyDescriptor(@NotNull PropertyDescriptor propertyDescriptor); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java index 56bef28f0eb..1e1c1619804 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/NamespaceLikeBuilderDummy.java @@ -33,11 +33,6 @@ public class NamespaceLikeBuilderDummy implements NamespaceLikeBuilder { throw new IllegalStateException(); } - @Override - public void addObjectDescriptor(@NotNull MutableClassDescriptorLite objectDescriptor) { - throw new IllegalStateException(); - } - @Override public void addFunctionDescriptor(@NotNull SimpleFunctionDescriptor functionDescriptor) { throw new IllegalStateException();