From 3cc92ad24c4155d6aa46816fa8828c18707665ab Mon Sep 17 00:00:00 2001
From: Vladimir Rudev <vladimir.rudev@gmail.com>
Date: Sun, 4 Nov 2012 11:25:59 +0400
Subject: [PATCH] Move method to JetPsiUtil

---
 .../org/jetbrains/jet/lang/psi/JetPsiUtil.java  | 17 +++++++++++------
 .../jetbrains/jet/plugin/JetIconProvider.java   | 11 +++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
index a37b9f9f8f8..b4b18406235 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetPsiUtil.java
@@ -141,7 +141,7 @@ public class JetPsiUtil {
             if (objectDeclaration == null) {
                 objectDeclaration = PsiTreeUtil.getParentOfType(namedDeclaration, JetEnumEntry.class);
             }
-            
+
             if (objectDeclaration == null) {
                 return null;
             }
@@ -166,7 +166,7 @@ public class JetPsiUtil {
         }
         else if (parent instanceof JetNamedFunction || parent instanceof JetClass) {
             firstPart = getFQName((JetNamedDeclaration) parent);
-        } 
+        }
         else if (parent instanceof JetObjectDeclaration) {
             if (parent.getParent() instanceof JetClassObject) {
                 JetClassOrObject classOrObject = PsiTreeUtil.getParentOfType(parent, JetClassOrObject.class);
@@ -215,7 +215,8 @@ public class JetPsiUtil {
         return false;
     }
 
-    @Nullable @IfNotParsed
+    @Nullable
+    @IfNotParsed
     public static ImportPath getImportPath(JetImportDirective importDirective) {
         final JetExpression importedReference = importDirective.getImportedReference();
         if (importedReference == null) {
@@ -322,11 +323,11 @@ public class JetPsiUtil {
     @Nullable
     public static JetSimpleNameExpression getLastReference(@NotNull JetExpression importedReference) {
         if (importedReference instanceof JetDotQualifiedExpression) {
-            JetExpression selectorExpression = ((JetDotQualifiedExpression)importedReference).getSelectorExpression();
-            return (selectorExpression instanceof JetSimpleNameExpression) ? (JetSimpleNameExpression)selectorExpression : null;
+            JetExpression selectorExpression = ((JetDotQualifiedExpression) importedReference).getSelectorExpression();
+            return (selectorExpression instanceof JetSimpleNameExpression) ? (JetSimpleNameExpression) selectorExpression : null;
         }
         if (importedReference instanceof JetSimpleNameExpression) {
-            return (JetSimpleNameExpression)importedReference;
+            return (JetSimpleNameExpression) importedReference;
         }
         return null;
     }
@@ -418,4 +419,8 @@ public class JetPsiUtil {
         JetExpression deparenthesized = deparenthesize(expression);
         return deparenthesized instanceof JetConstantExpression && deparenthesized.getNode().getElementType() == JetNodeTypes.NULL;
     }
+
+    public static boolean isAbstract(@NotNull JetDeclarationWithBody declaration) {
+        return declaration.getBodyExpression() == null;
+    }
 }
diff --git a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
index 861793da3cd..3687a8cd411 100644
--- a/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
+++ b/idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
@@ -29,7 +29,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.asJava.JetLightClass;
 import org.jetbrains.jet.lang.psi.*;
-import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lexer.JetTokens;
 
 import javax.swing.*;
@@ -58,10 +57,6 @@ public class JetIconProvider extends IconProvider {
         return null;
     }
 
-    private static boolean isAbstract(@NotNull JetDeclarationWithBody declaration) {
-        return declaration.hasBlockBody() && declaration.getBodyExpression() == null;
-    }
-
     @Override
     public Icon getIcon(@NotNull PsiElement psiElement, int flags) {
         if (psiElement instanceof JetFile) {
@@ -73,7 +68,7 @@ public class JetIconProvider extends IconProvider {
         Icon result = getBaseIcon(psiElement);
         if ((flags & Iconable.ICON_FLAG_VISIBILITY) > 0 && psiElement instanceof JetModifierListOwner) {
             JetModifierList list = ((JetModifierListOwner) psiElement).getModifierList();
-            if (list!=null) {
+            if (list != null) {
                 RowIcon rowIcon = new RowIcon(2);
                 rowIcon.setIcon(result, 0);
                 rowIcon.setIcon(getVisibilityIcon(list), 1);
@@ -96,7 +91,7 @@ public class JetIconProvider extends IconProvider {
         return PlatformIcons.PACKAGE_LOCAL_ICON;
     }
 
-    private static Icon getBaseIcon(PsiElement psiElement) {
+    public static Icon getBaseIcon(PsiElement psiElement) {
         if (psiElement instanceof JetNamespaceHeader) {
             return PlatformIcons.PACKAGE_ICON;
         }
@@ -106,7 +101,7 @@ public class JetIconProvider extends IconProvider {
             }
 
             if (PsiTreeUtil.getParentOfType(psiElement, JetNamedDeclaration.class) instanceof JetClass) {
-                if (isAbstract((JetFunction) psiElement)) {
+                if (JetPsiUtil.isAbstract((JetFunction) psiElement)) {
                     return PlatformIcons.ABSTRACT_METHOD_ICON;
                 }
                 else {