From 6a6a52e53c14a0118f5e4fa43b03d80d3f4d7b94 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 31 Mar 2014 14:09:17 +0400 Subject: [PATCH] Minor: inline consturctor of PsiJetClassStubImpl --- .../stubs/elements/JetClassElementType.java | 15 ++++--------- .../psi/stubs/impl/PsiJetClassStubImpl.java | 22 ++----------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java index 59b0386239d..96fe0758f6e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetClassElementType.java @@ -30,6 +30,7 @@ import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.psi.stubs.PsiJetClassStub; import org.jetbrains.jet.lang.psi.stubs.impl.PsiJetClassStubImpl; +import org.jetbrains.jet.lang.psi.stubs.impl.Utils; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -64,17 +65,9 @@ public class JetClassElementType extends JetStubElementType superNames = PsiUtilPackage.getSuperNames(psi); return new PsiJetClassStubImpl( - getStubType(isEnumEntry), - parentStub, - fqName != null ? fqName.asString() : null, - psi.getName(), - superNames, - psi.isTrait(), - psi.isEnum(), - isEnumEntry, - psi.isAnnotation(), - psi.isInner(), - JetPsiUtil.isLocal(psi) + getStubType(isEnumEntry), parentStub, StringRef.fromString(fqName != null ? fqName.asString() : null), + StringRef.fromString(psi.getName()), Utils.instance$.wrapStrings(superNames), psi.isTrait(), psi.isEnum(), isEnumEntry, + psi.isAnnotation(), psi.isInner(), JetPsiUtil.isLocal(psi) ); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetClassStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetClassStubImpl.java index f179a418fcb..2d949156bea 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetClassStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetClassStubImpl.java @@ -42,17 +42,6 @@ public class PsiJetClassStubImpl extends StubBase implements PsiJetCla private final boolean isInner; private final boolean isLocal; - public PsiJetClassStubImpl( - JetClassElementType type, - StubElement parent, - @Nullable String qualifiedName, - String name, - List superNames, - boolean isTrait, boolean isEnumClass, boolean isEnumEntry, boolean isAnnotation, boolean isInner, boolean isLocal) { - this(type, parent, StringRef.fromString(qualifiedName), StringRef.fromString(name), wrapStrings(superNames), - isTrait, isEnumClass, isEnumEntry, isAnnotation, isInner, isLocal); - } - public PsiJetClassStubImpl( JetClassElementType type, StubElement parent, @@ -64,7 +53,8 @@ public class PsiJetClassStubImpl extends StubBase implements PsiJetCla boolean isEnumEntry, boolean isAnnotation, boolean isInner, - boolean isLocal) { + boolean isLocal + ) { super(parent, type); this.qualifiedName = qualifiedName; this.name = name; @@ -77,14 +67,6 @@ public class PsiJetClassStubImpl extends StubBase implements PsiJetCla this.isLocal = isLocal; } - private static StringRef[] wrapStrings(List names) { - StringRef[] refs = new StringRef[names.size()]; - for (int i = 0; i < names.size(); i++) { - refs[i] = StringRef.fromString(names.get(i)); - } - return refs; - } - @Override public FqName getFqName() { String stringRef = StringRef.toString(qualifiedName);