From 8305d73682a34a937bfcae34f23ccaa6f9937a82 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 2 Feb 2015 12:42:29 +0300 Subject: [PATCH] Drop unused interface method There was the only usage and it's redundant. JetClass' implementation name is refined. --- .../kotlin/backend/common/DataClassMethodGenerator.java | 2 -- compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java | 3 +-- .../src/org/jetbrains/kotlin/psi/JetClassOrObject.java | 3 --- .../src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java | 5 ----- 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java index 575b24adc37..32673c28cd6 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java @@ -79,8 +79,6 @@ public abstract class DataClassMethodGenerator { } private void generateComponentFunctionsForDataClasses() { - if (!declaration.hasPrimaryConstructor()) return; - ConstructorDescriptor constructor = classDescriptor.getUnsubstitutedPrimaryConstructor(); assert constructor != null : "Data class should have primary constructor"; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java index 31a21ed35ef..eede0280959 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java @@ -126,8 +126,7 @@ public class JetClass extends JetTypeParameterListOwnerStub imp return body.getAnonymousInitializers(); } - @Override - public boolean hasPrimaryConstructor() { + private boolean hasExplicitPrimaryConstructor() { return getPrimaryConstructorParameterList() != null; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java index 594e98a3edf..b16767d9971 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java @@ -33,9 +33,6 @@ public interface JetClassOrObject extends PsiNameIdentifierOwner, JetDeclaration @NotNull List getAnonymousInitializers(); - // Objects always "have" a primary constructor - boolean hasPrimaryConstructor(); - @Override @Nullable Name getNameAsName(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java index c5c097808d2..6f96227b3e9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java @@ -122,11 +122,6 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub