MutableDeclarationDescriptor removed

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorBase.java

@@ -27,10 +27,7 @@ import java.util.Map;
 /**
  * @author abreslav
  */
-public abstract class ClassDescriptorBase extends MutableDeclarationDescriptor implements ClassDescriptor {
+public abstract class ClassDescriptorBase implements ClassDescriptor {
-    public ClassDescriptorBase(DeclarationDescriptor containingDeclaration) {
-        super(containingDeclaration);
-    }
 
     protected abstract JetScope getScopeForMemberLookup();
 

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java

@@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
+import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
@@ -60,9 +61,12 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
 
     private ClassReceiver implicitReceiver;
 
+    private Name name;
+    private final DeclarationDescriptor containingDeclaration;
+
     public MutableClassDescriptorLite(@NotNull DeclarationDescriptor containingDeclaration,
                                       @NotNull ClassKind kind) {
-        super(containingDeclaration);
+        this.containingDeclaration = containingDeclaration;
         this.kind = kind;
     }
 
@@ -76,6 +80,29 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
         return false;
     }
 
+    @NotNull
+    @Override
+    public DeclarationDescriptor getContainingDeclaration() {
+        return containingDeclaration;
+    }
+
+    @NotNull
+    @Override
+    public Name getName() {
+        return name;
+    }
+
+    public void setName(@NotNull Name name) {
+        assert this.name == null : this.name;
+        this.name = name;
+    }
+
+    @NotNull
+    @Override
+    public DeclarationDescriptor getOriginal() {
+        return this;
+    }
+
     private static boolean isStatic(DeclarationDescriptor declarationDescriptor) {
         if (declarationDescriptor instanceof NamespaceDescriptor) {
             return true;
@@ -277,6 +304,11 @@ public class MutableClassDescriptorLite extends ClassDescriptorBase
         return visitor.visitClassDescriptor(this, data);
     }
 
+    @Override
+    public void acceptVoid(DeclarationDescriptorVisitor<Void, Void> visitor) {
+        visitor.visitClassDescriptor(this, null);
+    }
+
     @Override
     public List<AnnotationDescriptor> getAnnotations() {
         return annotations;

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableDeclarationDescriptor.java

@@ -1,60 +0,0 @@
-/*
- * 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.descriptors;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.resolve.name.Name;
-
-/**
- * @author abreslav
- */
-public abstract class MutableDeclarationDescriptor implements DeclarationDescriptor {
-    private Name name;
-    private final DeclarationDescriptor containingDeclaration;
-
-    public MutableDeclarationDescriptor(@NotNull DeclarationDescriptor containingDeclaration) {
-        this.containingDeclaration = containingDeclaration;
-    }
-
-    @NotNull
-    @Override
-    public Name getName() {
-        return name;
-    }
-
-    public void setName(@NotNull Name name) {
-        assert this.name == null : this.name;
-        this.name = name;
-    }
-
-    @NotNull
-    @Override
-    public DeclarationDescriptor getOriginal() {
-        return this;
-    }
-
-    @NotNull
-    @Override
-    public DeclarationDescriptor getContainingDeclaration() {
-        return containingDeclaration;
-    }
-
-    @Override
-    public void acceptVoid(DeclarationDescriptorVisitor<Void, Void> visitor) {
-        accept(visitor, null);
-    }
-}