From 8df1f1b125b57255a8740ee5d659b6e91aaaf35e Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 19 Jun 2012 19:14:35 +0400
Subject: [PATCH] Use NamedStub and move stubbed getName implementation to base
 class

---
 .../src/org/jetbrains/jet/lang/psi/JetClass.java       | 10 ----------
 .../jet/lang/psi/JetNamedDeclarationStub.java          |  9 +++++++--
 .../org/jetbrains/jet/lang/psi/JetNamedFunction.java   | 10 ----------
 .../jetbrains/jet/lang/psi/stubs/PsiJetClassStub.java  |  9 ++++-----
 .../jet/lang/psi/stubs/PsiJetFunctionStub.java         |  8 ++------
 5 files changed, 13 insertions(+), 33 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 673a97744d2..dd30881604f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetClass.java
@@ -243,16 +243,6 @@ public class JetClass extends JetTypeParameterListOwnerStub<PsiJetClassStub> imp
         }
     }
 
-    @Override
-    public String getName() {
-        PsiJetClassStub stub = getStub();
-        if (stub != null) {
-            return stub.getName();
-        }
-
-        return super.getName();
-    }
-
     @Override
     public ItemPresentation getPresentation() {
         return ItemPresentationProviders.getItemPresentation(this);
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
index 4f983d74561..81b9a230e88 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclarationStub.java
@@ -19,7 +19,7 @@ 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.psi.stubs.StubElement;
+import com.intellij.psi.stubs.NamedStub;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lexer.JetTokens;
 /**
  * @author Nikolay Krasko
  */
-abstract class JetNamedDeclarationStub<T extends StubElement> extends JetDeclarationStub<T> implements JetNamedDeclaration {
+abstract class JetNamedDeclarationStub<T extends NamedStub> extends JetDeclarationStub<T> implements JetNamedDeclaration {
     public JetNamedDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
         super(stub, nodeType);
     }
@@ -41,6 +41,11 @@ abstract class JetNamedDeclarationStub<T extends StubElement> extends JetDeclara
 
     @Override
     public String getName() {
+        T stub = getStub();
+        if (stub != null) {
+            return stub.getName();
+        }
+
         PsiElement identifier = getNameIdentifier();
         if (identifier != null) {
             String text = identifier.getText();
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 0b6491f770c..9b61e4d291d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java
@@ -179,14 +179,4 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub<PsiJetFuncti
         PsiElement parent = getParent();
         return !(parent instanceof JetFile || parent instanceof JetClassBody || parent instanceof JetNamespaceBody);
     }
-
-    @Override
-    public String getName() {
-        PsiJetFunctionStub stub = getStub();
-        if (stub != null) {
-            return stub.getName();
-        }
-
-        return super.getName();
-    }
 }
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 ded2867ec72..3c74702a4e6 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
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.lang.psi.stubs;
 
-import com.intellij.psi.stubs.StubElement;
+import com.intellij.psi.stubs.NamedStub;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -27,14 +27,13 @@ import java.util.List;
 /**
  * @author Nikolay Krasko
  */
-public interface PsiJetClassStub extends StubElement<JetClass> {
+public interface PsiJetClassStub extends NamedStub<JetClass> {
+
+
     @NonNls
     @Nullable
     String getQualifiedName();
 
-    @Nullable
-    String getName();
-
     @NotNull
     List<String> getSuperNames();
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetFunctionStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetFunctionStub.java
index 200ccea30b0..32127c9ea85 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetFunctionStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetFunctionStub.java
@@ -16,18 +16,14 @@
 
 package org.jetbrains.jet.lang.psi.stubs;
 
-import com.intellij.psi.stubs.StubElement;
+import com.intellij.psi.stubs.NamedStub;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.psi.JetNamedFunction;
 
 /**
  * @author Nikolay Krasko
  */
-public interface PsiJetFunctionStub extends StubElement<JetNamedFunction> {
-    @Nullable
-    String getName();
-
+public interface PsiJetFunctionStub extends NamedStub<JetNamedFunction> {
     /**
      * Is function defined in directly in package.
      * @return