From 252235787d238655b82ae8b6f9c6bfc69a52395f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 26 Jul 2016 15:15:24 +0300 Subject: [PATCH] Refactor: rename KtWrappingLightClass -> KtLightClassBase --- .../{KtWrappingLightClass.java => KtLightClassBase.java} | 8 ++++---- .../kotlin/asJava/classes/KtLightClassForFacade.kt | 2 +- .../asJava/classes/KtLightClassForSourceDeclaration.kt | 2 +- .../resolve/KtLightClassForDecompiledDeclaration.kt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/{KtWrappingLightClass.java => KtLightClassBase.java} (96%) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.java similarity index 96% rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtWrappingLightClass.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.java index 50c35bf1557..21acaf92823 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassBase.java @@ -44,10 +44,10 @@ import org.jetbrains.kotlin.psi.KtPropertyAccessor; import java.util.List; -public abstract class KtWrappingLightClass extends AbstractLightClass implements KtLightClass, PsiExtensibleClass { +public abstract class KtLightClassBase extends AbstractLightClass implements KtLightClass, PsiExtensibleClass { private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this); - protected KtWrappingLightClass(PsiManager manager) { + protected KtLightClassBase(PsiManager manager) { super(manager, KotlinLanguage.INSTANCE); } @@ -125,7 +125,7 @@ public abstract class KtWrappingLightClass extends AbstractLightClass implements @Override public PsiField fun(PsiField field) { LightMemberOrigin origin = ClsWrapperStubPsiFactory.getMemberOrigin(field); - return KtLightFieldImpl.Factory.create(origin, field, KtWrappingLightClass.this); + return KtLightFieldImpl.Factory.create(origin, field, KtLightClassBase.this); } }); } @@ -143,7 +143,7 @@ public abstract class KtWrappingLightClass extends AbstractLightClass implements origin = origin.copy(PsiTreeUtil.getParentOfType(originalElement, KtProperty.class), origin.getOriginKind()); } - return KtLightMethodImpl.Factory.create(method, origin, KtWrappingLightClass.this); + return KtLightMethodImpl.Factory.create(method, origin, KtLightClassBase.this); } }); } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt index e4f0207e762..2ec37ddda6a 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacade.kt @@ -52,7 +52,7 @@ class KtLightClassForFacade private constructor( private val facadeClassFqName: FqName, private val lightClassDataCache: CachedValue, files: Collection -) : KtWrappingLightClass(manager), KtJavaMirrorMarker { +) : KtLightClassBase(manager), KtJavaMirrorMarker { private data class StubCacheKey(val fqName: FqName, val searchScope: GlobalSearchScope) diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt index 30d03c4e91c..b09eb462b94 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt @@ -59,7 +59,7 @@ import javax.swing.Icon open class KtLightClassForSourceDeclaration( private val classFqNameFunction: ((KtClassOrObject) -> FqName), protected val classOrObject: KtClassOrObject) -: KtWrappingLightClass(classOrObject.manager), KtJavaMirrorMarker, StubBasedPsiElement> { +: KtLightClassBase(classOrObject.manager), KtJavaMirrorMarker, StubBasedPsiElement> { private val lightIdentifier = KtLightIdentifier(this, classOrObject) protected val classFqName : FqName by lazy(LazyThreadSafetyMode.PUBLICATION) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt index 17c578738bd..3f66309060c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass import com.intellij.psi.PsiField import com.intellij.psi.PsiMethod import com.intellij.psi.impl.compiled.ClsClassImpl -import org.jetbrains.kotlin.asJava.classes.KtWrappingLightClass +import org.jetbrains.kotlin.asJava.classes.KtLightClassBase import org.jetbrains.kotlin.asJava.elements.KtLightFieldImpl import org.jetbrains.kotlin.asJava.elements.KtLightMethodImpl import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile @@ -31,7 +31,7 @@ class KtLightClassForDecompiledDeclaration( override val clsDelegate: ClsClassImpl, override val kotlinOrigin: KtClassOrObject?, private val file: KtClsFile -) : KtWrappingLightClass(clsDelegate.manager) { +) : KtLightClassBase(clsDelegate.manager) { private val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedName) override fun copy() = this