Introduced JetNamed to unify named functions and properties

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamed.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.psi;
+
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.resolve.name.Name;
+
+/**
+ * @author abreslav
+ */
+public interface JetNamed {
+    @Nullable
+    Name getNameAsName();
+}

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedDeclaration.java

@@ -22,14 +22,13 @@ import com.intellij.psi.PsiNameIdentifierOwner;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lexer.JetTokens;
 
 /**
  * @author max
  */
-public abstract class JetNamedDeclaration extends JetDeclaration implements PsiNameIdentifierOwner, JetStatementExpression {
+public abstract class JetNamedDeclaration extends JetDeclaration implements PsiNameIdentifierOwner, JetStatementExpression, JetNamed {
     public JetNamedDeclaration(@NotNull ASTNode node) {
         super(node);
     }
@@ -46,7 +45,7 @@ public abstract class JetNamedDeclaration extends JetDeclaration implements PsiN
         }
     }
 
-    @Nullable
+    @Override
     public Name getNameAsName() {
         String name = getName();
         return name != null ? Name.identifier(name) : null;

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java

@@ -32,7 +32,7 @@ import org.jetbrains.jet.lexer.JetTokens;
 /**
  * @author max
  */
-public class JetNamedFunction extends JetFunction implements StubBasedPsiElement<PsiJetFunctionStub<?>> {
+public class JetNamedFunction extends JetFunction implements StubBasedPsiElement<PsiJetFunctionStub<?>>, JetNamed {
     public JetNamedFunction(@NotNull ASTNode node) {
         super(node);
     }