Refactoring: Unify getClassOrObject() and getContainingClassOrObject() functions in constructor PSI

compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt

@@ -30,7 +30,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
     protected constructor(node: ASTNode) : super(node)
     protected constructor(stub: KotlinPlaceHolderStub<T>, nodeType: JetPlaceHolderStubElementType<T>) : super(stub, nodeType)
 
-    public abstract fun getClassOrObject(): JetClassOrObject
+    public abstract fun getContainingClassOrObject(): JetClassOrObject
 
     override fun isLocal() = false
 
@@ -65,7 +65,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
 
     override fun getTypeParameters() = emptyList<JetTypeParameter>()
 
-    override fun getName(): String = getClassOrObject().getName()!!
+    override fun getName(): String = getContainingClassOrObject().getName()!!
 
     override fun getNameAsSafeName() = Name.identifier(getName())
 

compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.kt

@@ -29,9 +29,7 @@ public class JetPrimaryConstructor : JetConstructor<JetPrimaryConstructor> {
 
     override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D) = visitor.visitPrimaryConstructor(this, data)
 
-    public fun getContainingClassOrObject(): JetClassOrObject = getParent() as JetClassOrObject
-
-    override fun getClassOrObject() = getContainingClassOrObject()
+    override fun getContainingClassOrObject() = getParent() as JetClassOrObject
 
     override fun addModifier(modifier: JetModifierKeywordToken) {
         val modifierList = getModifierList()

compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.kt

@@ -27,7 +27,7 @@ public class JetSecondaryConstructor : JetConstructor<JetSecondaryConstructor> {
 
     override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D) = visitor.visitSecondaryConstructor(this, data)
 
-    override fun getClassOrObject() = getParent().getParent() as JetClassOrObject
+    override fun getContainingClassOrObject() = getParent().getParent() as JetClassOrObject
 
     override fun getBodyExpression() = findChildByClass(javaClass<JetBlockExpression>())
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java

@@ -203,7 +203,7 @@ public class OverloadResolver {
             }
             else {
                 String containingClassName = jetDeclaration instanceof JetSecondaryConstructor ?
-                                               ((JetSecondaryConstructor) jetDeclaration).getClassOrObject().getName() : null;
+                                               ((JetSecondaryConstructor) jetDeclaration).getContainingClassOrObject().getName() : null;
 
                 trace.report(Errors.CONFLICTING_OVERLOADS.on(
                         jetDeclaration, memberDescriptor,

compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java

@@ -248,7 +248,7 @@ public class LightClassUtil {
         }
 
         if (declaration instanceof JetConstructor) {
-            return getPsiClass(((JetConstructor) declaration).getClassOrObject());
+            return getPsiClass(((JetConstructor) declaration).getContainingClassOrObject());
         }
 
         //noinspection unchecked