From 8d07bc60d03f01ffd940fad9bcd47c9018a3083f Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 7 Aug 2013 21:27:43 +0400
Subject: [PATCH] Refactor: remove redundant getElementType overrides is PSI

---
 .../org/jetbrains/jet/lang/psi/JetAnnotationEntry.java    | 7 -------
 .../frontend/src/org/jetbrains/jet/lang/psi/JetClass.java | 7 -------
 .../src/org/jetbrains/jet/lang/psi/JetEnumEntry.java      | 8 --------
 .../src/org/jetbrains/jet/lang/psi/JetNamedFunction.java  | 7 -------
 .../org/jetbrains/jet/lang/psi/JetObjectDeclaration.java  | 7 -------
 .../src/org/jetbrains/jet/lang/psi/JetParameter.java      | 7 -------
 .../src/org/jetbrains/jet/lang/psi/JetParameterList.java  | 6 ------
 .../src/org/jetbrains/jet/lang/psi/JetProperty.java       | 7 -------
 .../src/org/jetbrains/jet/lang/psi/JetTypeParameter.java  | 7 -------
 .../org/jetbrains/jet/lang/psi/JetTypeParameterList.java  | 6 ------
 10 files changed, 69 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
index 0d83c6d60cc..895ae9e6abd 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetAnnotationEntry.java
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.stubs.IStubElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
@@ -32,12 +31,6 @@ public class JetAnnotationEntry extends JetElementImplStub<PsiJetAnnotationStub>
         super(node);
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.ANNOTATION_ENTRY;
-    }
-
     public JetAnnotationEntry(@NotNull PsiJetAnnotationStub stub) {
         super(stub, JetStubElementTypes.ANNOTATION_ENTRY);
     }
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 86aa3fb110c..f8284841202 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
@@ -22,7 +22,6 @@ import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
@@ -165,12 +164,6 @@ public class JetClass extends JetTypeParameterListOwnerStub<PsiJetClassStub> imp
         return hasModifier(JetTokens.INNER_KEYWORD);
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.CLASS;
-    }
-
     @Override
     public void delete() throws IncorrectOperationException {
         JetPsiUtil.deleteClass(this);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java
index ed29be4a01d..9a13995b990 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetEnumEntry.java
@@ -18,13 +18,11 @@ package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetClassStub;
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 
 import java.util.Collections;
 import java.util.List;
@@ -55,12 +53,6 @@ public class JetEnumEntry extends JetClass {
         return nameAsDeclaration == null ? null : nameAsDeclaration.getNameIdentifier();
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.ENUM_ENTRY;
-    }
-
     @Override
     public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
         JetObjectDeclarationName nameAsDeclaration = getNameAsDeclaration();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
index a8301852c4b..64be9ecfc13 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
@@ -20,7 +20,6 @@ import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
@@ -106,12 +105,6 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<PsiJetFuncti
         return null;
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.FUNCTION;
-    }
-    
     @Override
     public ItemPresentation getPresentation() {
         return ItemPresentationProviders.getItemPresentation(this);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
index 340d64ebe76..b9adf34cbf2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetObjectDeclaration.java
@@ -20,7 +20,6 @@ import com.intellij.lang.ASTNode;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -44,12 +43,6 @@ public class JetObjectDeclaration extends JetNamedDeclarationStub<PsiJetObjectSt
         super(stub, JetStubElementTypes.OBJECT_DECLARATION);
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.OBJECT_DECLARATION;
-    }
-
     @Override
     public String getName() {
         PsiJetObjectStub stub = getStub();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
index 87a9df9e45d..19bcc07bbdc 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameter.java
@@ -25,7 +25,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetParameterStub;
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 import org.jetbrains.jet.lexer.JetTokens;
 
 public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
@@ -46,12 +45,6 @@ public class JetParameter extends JetNamedDeclarationStub<PsiJetParameterStub> {
         super(stub, nodeType);
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.VALUE_PARAMETER;
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitParameter(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java
index ea6d9610077..774f1586c32 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetParameterList.java
@@ -34,12 +34,6 @@ public class JetParameterList extends JetElementImplStub<PsiJetParameterListStub
         super(stub, nodeType);
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.VALUE_PARAMETER_LIST;
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitParameterList(this, data);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
index c11a4cc3956..374ca1005d6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetProperty.java
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetPropertyStub;
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 import org.jetbrains.jet.lexer.JetTokens;
 
 import java.util.List;
@@ -52,12 +51,6 @@ public class JetProperty extends JetTypeParameterListOwnerStub<PsiJetPropertyStu
         return visitor.visitProperty(this, data);
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.PROPERTY;
-    }
-
     @Override
     public boolean isVar() {
         PsiJetPropertyStub stub = getStub();
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java
index 74762eefcc3..6d55960e9a3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameter.java
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 import org.jetbrains.jet.lang.psi.stubs.PsiJetTypeParameterStub;
-import org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes;
 import org.jetbrains.jet.lang.types.Variance;
 import org.jetbrains.jet.lexer.JetTokens;
 
@@ -71,10 +70,4 @@ public class JetTypeParameter extends JetNamedDeclarationStub<PsiJetTypeParamete
     public JetTypeReference getExtendsBound() {
         return (JetTypeReference) findChildByType(JetNodeTypes.TYPE_REFERENCE);
     }
-
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.TYPE_PARAMETER;
-    }
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java
index 1cf2e30960f..9def0ba575e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetTypeParameterList.java
@@ -39,12 +39,6 @@ public class JetTypeParameterList extends JetElementImplStub<PsiJetTypeParameter
         return Arrays.asList(getStubOrPsiChildren(JetStubElementTypes.TYPE_PARAMETER, JetTypeParameter.ARRAY_FACTORY));
     }
 
-    @NotNull
-    @Override
-    public IStubElementType getElementType() {
-        return JetStubElementTypes.TYPE_PARAMETER_LIST;
-    }
-
     @Override
     public <R, D> R accept(@NotNull JetVisitor<R, D> visitor, D data) {
         return visitor.visitTypeParameterList(this, data);