From bf20377759d4bfdc5b54a7d7a9e4bdb2622b64c1 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 23 Apr 2014 15:25:50 +0400
Subject: [PATCH] Remove redundant field and constructor from
 PsiJetTypeParameterStubImpl

---
 .../psi/stubs/PsiJetTypeParameterStub.java    |  1 -
 .../elements/JetTypeParameterElementType.java | 13 +++----------
 .../impl/PsiJetTypeParameterStubImpl.java     | 19 +------------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetTypeParameterStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetTypeParameterStub.java
index 3e306c3708f..ae3ee638c26 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetTypeParameterStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetTypeParameterStub.java
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.psi.stubs;
 import org.jetbrains.jet.lang.psi.JetTypeParameter;
 
 public interface PsiJetTypeParameterStub extends PsiJetStubWithFqName<JetTypeParameter> {
-    String getExtendBoundTypeText();
     boolean isInVariance();
     boolean isOutVariance();
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java
index 3cabe17ef47..987cc1fdb0b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetTypeParameterElementType.java
@@ -37,18 +37,13 @@ public class JetTypeParameterElementType extends JetStubElementType<PsiJetTypePa
 
     @Override
     public PsiJetTypeParameterStub createStub(@NotNull JetTypeParameter psi, StubElement parentStub) {
-        JetTypeReference extendsBound = psi.getExtendsBound();
-        return new PsiJetTypeParameterStubImpl(parentStub,
-                psi.getName(),
-                extendsBound != null ? extendsBound.getText() : null,
-                psi.getVariance() == Variance.IN_VARIANCE,
-                psi.getVariance() == Variance.OUT_VARIANCE);
+        return new PsiJetTypeParameterStubImpl(parentStub, StringRef.fromString(psi.getName()),
+                                               psi.getVariance() == Variance.IN_VARIANCE, psi.getVariance() == Variance.OUT_VARIANCE);
     }
 
     @Override
     public void serialize(@NotNull PsiJetTypeParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
-        dataStream.writeName(stub.getExtendBoundTypeText());
         dataStream.writeBoolean(stub.isInVariance());
         dataStream.writeBoolean(stub.isOutVariance());
     }
@@ -57,11 +52,9 @@ public class JetTypeParameterElementType extends JetStubElementType<PsiJetTypePa
     @Override
     public PsiJetTypeParameterStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
         StringRef name = dataStream.readName();
-        StringRef extendBoundTypeText = dataStream.readName();
         boolean isInVariance = dataStream.readBoolean();
         boolean isOutVariance = dataStream.readBoolean();
 
-        return new PsiJetTypeParameterStubImpl(parentStub,
-                name, extendBoundTypeText, isInVariance, isOutVariance);
+        return new PsiJetTypeParameterStubImpl(parentStub, name, isInVariance, isOutVariance);
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java
index f83e583158a..bf709f873c9 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetTypeParameterStubImpl.java
@@ -27,32 +27,17 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 
 public class PsiJetTypeParameterStubImpl extends StubBase<JetTypeParameter> implements PsiJetTypeParameterStub {
     private final StringRef name;
-    private final StringRef extendBoundTypeText;
     private final boolean isInVariance;
     private final boolean isOutVariance;
 
-    public PsiJetTypeParameterStubImpl(
-            StubElement parent, StringRef name, StringRef extendBoundTypeText, boolean isInVariance, boolean isOutVariance
-    ) {
+    public PsiJetTypeParameterStubImpl(StubElement parent, StringRef name, boolean isInVariance, boolean isOutVariance) {
         super(parent, JetStubElementTypes.TYPE_PARAMETER);
 
         this.name = name;
-        this.extendBoundTypeText = extendBoundTypeText;
         this.isInVariance = isInVariance;
         this.isOutVariance = isOutVariance;
     }
 
-    public PsiJetTypeParameterStubImpl(
-            StubElement parent, String name, String extendBoundTypeText, boolean isInVariance, boolean isOutVariance
-    ) {
-        this(parent, StringRef.fromString(name), StringRef.fromString(extendBoundTypeText), isInVariance, isOutVariance);
-    }
-
-    @Override
-    public String getExtendBoundTypeText() {
-        return StringRef.toString(extendBoundTypeText);
-    }
-
     @Override
     public boolean isInVariance() {
         return isInVariance;
@@ -82,8 +67,6 @@ public class PsiJetTypeParameterStubImpl extends StubBase<JetTypeParameter> impl
         }
 
         builder.append("name=").append(getName());
-        builder.append(" extendText=").append(getExtendBoundTypeText());
-
         builder.append("]");
 
         return builder.toString();