From 9aac8467982fc53593e0f3d850bab0225f67bab7 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 27 Dec 2013 21:31:08 +0400 Subject: [PATCH] Refactoring: remove unused jvmInternalName from KotlinPackageLightClassData --- .../asJava/KotlinLightClassForExplicitDeclaration.java | 2 +- .../org/jetbrains/jet/asJava/LightClassStubWithData.kt | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java index d3acb619558..5929d6c5d01 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java @@ -84,7 +84,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC private static String getJvmInternalName(JetClassOrObject classOrObject) { if (JetPsiUtil.isLocal(classOrObject)) { - LightClassData data = getLightClassDataExactly(classOrObject); + LightClassDataForKotlinClass data = getLightClassDataExactly(classOrObject); return data != null ? data.getJvmInternalName() : ""; } return PsiCodegenPredictor.getPredefinedJvmInternalName(classOrObject); diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt index 4ac1b568673..175f274fdae 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt @@ -20,18 +20,15 @@ import com.intellij.psi.impl.java.stubs.PsiJavaFileStub import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.psi.JetClassOrObject -trait LightClassData { - val jvmInternalName: String -} +trait LightClassData trait LightClassDataForKotlinClass: LightClassData { val classOrObject: JetClassOrObject val descriptor: ClassDescriptor? + val jvmInternalName: String } -object KotlinPackageLightClassData: LightClassData { - override val jvmInternalName: String = "" -} +object KotlinPackageLightClassData: LightClassData data class InnerKotlinClassLightClassData( override val jvmInternalName: String,