From 24d0d2314478b9db0b0a60849dddccab191a8d96 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 28 Mar 2014 17:24:48 +0400 Subject: [PATCH] Minor: inline redundant constructor of PsiJetObjectStubImpl --- .../psi/stubs/elements/JetObjectElementType.java | 12 +++--------- .../lang/psi/stubs/impl/PsiJetObjectStubImpl.java | 12 ------------ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java index 5b9764811e5..92237a45749 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetObjectElementType.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.PsiJetObjectStub; import org.jetbrains.jet.lang.psi.stubs.impl.PsiJetObjectStubImpl; +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; @@ -51,15 +52,8 @@ public class JetObjectElementType extends JetStubElementType superNames = PsiUtilPackage.getSuperNames(psi); - return new PsiJetObjectStubImpl( - parentStub, - name, - fqName, - superNames, - psi.isTopLevel(), - isClassObject(psi), - JetPsiUtil.isLocal(psi) - ); + return new PsiJetObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.instance$.wrapStrings(superNames), + psi.isTopLevel(), isClassObject(psi), JetPsiUtil.isLocal(psi)); } @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java index 867fd1eea3d..5cea1f23daa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetObjectStubImpl.java @@ -39,18 +39,6 @@ public class PsiJetObjectStubImpl extends StubBase impleme private final boolean isClassObject; private final boolean isLocal; - public PsiJetObjectStubImpl( - @NotNull StubElement parent, - @Nullable String name, - @Nullable FqName fqName, - @NotNull List superNames, - boolean isTopLevel, - boolean isClassObject, - boolean isLocal - ) { - this(parent, StringRef.fromString(name), fqName, Utils.instance$.wrapStrings(superNames), isTopLevel, isClassObject, isLocal); - } - public PsiJetObjectStubImpl( @NotNull StubElement parent, @Nullable StringRef name,