Remove redundant field and constructor from PsiJetTypeParameterStubImpl

This commit is contained in:
Pavel V. Talanov
2014-04-23 15:25:50 +04:00
parent c9193818e7
commit bf20377759
3 changed files with 4 additions and 29 deletions
@@ -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();
}
@@ -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);
}
}
@@ -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();