From ab4d4a309a5e5fc070ede64da8735b74bf8af070 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 20 May 2014 16:32:09 +0400
Subject: [PATCH] Remove redundant isAnnotation(), isEnum() and isInner() from
 PsiJetClassStub

---
 .../org/jetbrains/jet/lang/psi/JetClass.java  | 15 --------
 .../jet/lang/psi/stubs/PsiJetClassStub.java   |  6 ---
 .../stubs/elements/JetClassElementType.java   | 13 ++-----
 .../psi/stubs/impl/PsiJetClassStubImpl.java   | 37 -------------------
 4 files changed, 3 insertions(+), 68 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
index 64da4641d14..d04c3d8ef18 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
@@ -138,29 +138,14 @@ public class JetClass extends JetTypeParameterListOwnerStub<PsiJetClassStub> imp
     }
 
     public boolean isEnum() {
-        PsiJetClassStub stub = getStub();
-        if (stub != null) {
-            return stub.isEnumClass();
-        }
-
         return hasModifier(JetTokens.ENUM_KEYWORD);
     }
 
     public boolean isAnnotation() {
-        PsiJetClassStub stub = getStub();
-        if (stub != null) {
-            return stub.isAnnotation();
-        }
-
         return hasModifier(JetTokens.ANNOTATION_KEYWORD);
     }
 
     public boolean isInner() {
-        PsiJetClassStub stub = getStub();
-        if (stub != null) {
-            return stub.isInner();
-        }
-
         return hasModifier(JetTokens.INNER_KEYWORD);
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetClassStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetClassStub.java
index 635aac85947..cce299753e8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetClassStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetClassStub.java
@@ -21,11 +21,5 @@ import org.jetbrains.jet.lang.psi.JetClass;
 public interface PsiJetClassStub extends PsiJetClassOrObjectStub<JetClass> {
     boolean isTrait();
 
-    boolean isAnnotation();
-
-    boolean isEnumClass();
-    
-    boolean isInner();
-
     boolean isEnumEntry();
 }
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 cf134082c95..0ed3897f41b 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
@@ -26,7 +26,6 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.JetEnumEntry;
-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;
@@ -66,8 +65,8 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         List<String> superNames = PsiUtilPackage.getSuperNames(psi);
         return new PsiJetClassStubImpl(
                 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(), psi.isLocal(), psi.isTopLevel());
+                StringRef.fromString(psi.getName()), Utils.instance$.wrapStrings(superNames), psi.isTrait(), isEnumEntry,
+                psi.isLocal(), psi.isTopLevel());
     }
 
     @Override
@@ -76,10 +75,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         FqName fqName = stub.getFqName();
         dataStream.writeName(fqName == null ? null : fqName.asString());
         dataStream.writeBoolean(stub.isTrait());
-        dataStream.writeBoolean(stub.isEnumClass());
         dataStream.writeBoolean(stub.isEnumEntry());
-        dataStream.writeBoolean(stub.isAnnotation());
-        dataStream.writeBoolean(stub.isInner());
         dataStream.writeBoolean(stub.isLocal());
         dataStream.writeBoolean(stub.isTopLevel());
 
@@ -96,10 +92,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         StringRef name = dataStream.readName();
         StringRef qualifiedName = dataStream.readName();
         boolean isTrait = dataStream.readBoolean();
-        boolean isEnumClass = dataStream.readBoolean();
         boolean isEnumEntry = dataStream.readBoolean();
-        boolean isAnnotation = dataStream.readBoolean();
-        boolean isInner = dataStream.readBoolean();
         boolean isLocal = dataStream.readBoolean();
         boolean isTopLevel = dataStream.readBoolean();
 
@@ -110,7 +103,7 @@ public class JetClassElementType extends JetStubElementType<PsiJetClassStub, Jet
         }
 
         return new PsiJetClassStubImpl(getStubType(isEnumEntry), parentStub, qualifiedName, name, superNames,
-                                       isTrait, isEnumClass, isEnumEntry, isAnnotation, isInner, isLocal, isTopLevel);
+                                       isTrait, isEnumEntry, isLocal, isTopLevel);
     }
 
     @Override
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 27aedb3052e..be30813392b 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
@@ -22,7 +22,6 @@ import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetClass;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetClassStub;
 import org.jetbrains.jet.lang.psi.stubs.elements.JetClassElementType;
@@ -36,10 +35,7 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
     private final StringRef name;
     private final StringRef[] superNames;
     private final boolean isTrait;
-    private final boolean isEnumClass;
     private final boolean isEnumEntry;
-    private final boolean isAnnotation;
-    private final boolean isInner;
     private final boolean isLocal;
     private final boolean isTopLevel;
 
@@ -50,10 +46,7 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
             StringRef name,
             StringRef[] superNames,
             boolean isTrait,
-            boolean isEnumClass,
             boolean isEnumEntry,
-            boolean isAnnotation,
-            boolean isInner,
             boolean isLocal,
             boolean isTopLevel
     ) {
@@ -62,10 +55,7 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
         this.name = name;
         this.superNames = superNames;
         this.isTrait = isTrait;
-        this.isEnumClass = isEnumClass;
         this.isEnumEntry = isEnumEntry;
-        this.isAnnotation = isAnnotation;
-        this.isInner = isInner;
         this.isLocal = isLocal;
         this.isTopLevel = isTopLevel;
     }
@@ -84,26 +74,11 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
         return isTrait;
     }
 
-    @Override
-    public boolean isAnnotation() {
-        return isAnnotation;
-    }
-
-    @Override
-    public boolean isEnumClass() {
-        return isEnumClass;
-    }
-
     @Override
     public boolean isEnumEntry() {
         return isEnumEntry;
     }
     
-    @Override
-    public boolean isInner() {
-        return isInner;
-    }
-
     @Override
     public boolean isLocal() {
         return isLocal;
@@ -134,10 +109,6 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
         StringBuilder builder = new StringBuilder();
         builder.append("PsiJetClassStubImpl[");
 
-        if (isEnumClass()) {
-            builder.append("enumClass ");
-        }
-
         if (isEnumEntry()) {
             builder.append("enumEntry ");
         }
@@ -146,14 +117,6 @@ public class PsiJetClassStubImpl extends StubBase<JetClass> implements PsiJetCla
             builder.append("trait ");
         }
 
-        if (isAnnotation()) {
-            builder.append("isAnnotation ");
-        }
-
-        if (isInner()) {
-            builder.append("inner ");
-        }
-
         if (isLocal()) {
             builder.append("local ");
         }