Delete WritableScopeImpl.addObjectDescriptor()

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java

@@ -193,13 +193,6 @@ public class WriteThroughScope extends WritableScopeWithImports {
         writableWorker.addClassifierDescriptor(classDescriptor);
     }
 
-    @Override
-    public void addObjectDescriptor(@NotNull ClassDescriptor objectDescriptor) {
-        checkMayWrite();
-
-        writableWorker.addObjectDescriptor(objectDescriptor);
-    }
-
     @Override
     public void addClassifierAlias(@NotNull Name name, @NotNull ClassifierDescriptor classifierDescriptor) {
         checkMayWrite();

compiler/tests/org/jetbrains/jet/descriptors/serialization/AbstractDescriptorSerializationTest.java

@@ -98,12 +98,7 @@ public abstract class AbstractDescriptorSerializationTest extends KotlinTestWith
             ClassId classId = getClassId(classDescriptor);
             ClassDescriptor descriptor = descriptorFinder.findClass(classId);
             assert descriptor != null : "Class not loaded: " + classId;
-            if (descriptor.getKind().isSingleton()) {
+            namespace.getMemberScope().addClassifierDescriptor(descriptor);
-                namespace.getMemberScope().addObjectDescriptor(descriptor);
-            }
-            else {
-                namespace.getMemberScope().addClassifierDescriptor(descriptor);
-            }
         }
 
         PackageData data = PackageData.read(serializedPackage, JavaProtoBufUtil.getExtensionRegistry());

compiler/tests/org/jetbrains/jet/descriptors/serialization/BuiltinsDeserializationTest.java

@@ -30,13 +30,13 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.NamespaceDescriptorImpl;
 import org.jetbrains.jet.lang.resolve.DescriptorUtils;
 import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
-import org.jetbrains.jet.storage.LockBasedStorageManager;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 import org.jetbrains.jet.renderer.DescriptorRendererBuilder;
+import org.jetbrains.jet.storage.LockBasedStorageManager;
 import org.jetbrains.jet.test.util.NamespaceComparator;
 
 import java.util.Arrays;
@@ -108,15 +108,13 @@ public class BuiltinsDeserializationTest extends KotlinTestWithEnvironment {
                     case TRAIT:
                     case ENUM_CLASS:
                     case ANNOTATION_CLASS:
-                        actualNamespace.getMemberScope().addClassifierDescriptor(classDescriptor);
-                        break;
                     case OBJECT:
-                        actualNamespace.getMemberScope().addObjectDescriptor(classDescriptor);
+                        actualNamespace.getMemberScope().addClassifierDescriptor(classDescriptor);
                         break;
                     case ENUM_ENTRY:
                         assert false : "Enum entry appears to be a top-level declaration: " + classDescriptor;
                     case CLASS_OBJECT:
-                        assert false : "Call object appears to be a top-level declaration: " + classDescriptor;
+                        assert false : "Class object appears to be a top-level declaration: " + classDescriptor;
                 }
             }
         };

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.java

@@ -43,8 +43,6 @@ public interface WritableScope extends JetScope {
 
     void addClassifierDescriptor(@NotNull ClassifierDescriptor classDescriptor);
 
-    void addObjectDescriptor(@NotNull ClassDescriptor objectDescriptor);
-
     void addClassifierAlias(@NotNull Name name, @NotNull ClassifierDescriptor classifierDescriptor);
 
     void addNamespaceAlias(@NotNull Name name, @NotNull NamespaceDescriptor namespaceDescriptor);

core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java

@@ -312,17 +312,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
         addClassifierAlias(classDescriptor.getName(), classDescriptor);
     }
 
-    @Override
-    public void addObjectDescriptor(@NotNull ClassDescriptor objectDescriptor) {
-        checkMayWrite();
-
-        if (!objectDescriptor.getKind().isSingleton()) {
-            throw new IllegalStateException("must be object: " + objectDescriptor);
-        }
-        
-        getObjectDescriptorsMap().put(objectDescriptor.getName(), objectDescriptor);
-    }
-
     @Override
     public void addClassifierAlias(@NotNull Name name, @NotNull ClassifierDescriptor classifierDescriptor) {
         checkMayWrite();