From 2a34dc5df36aa0ef7494f1e69d379a77bf47bce9 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Fri, 16 Oct 2015 14:12:05 +0300
Subject: [PATCH] guava type migration: method call chain process statically
 imported heads correctly

---
 .../rules/guava/GuavaFluentIterableConversionRule.java   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaFluentIterableConversionRule.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaFluentIterableConversionRule.java
index 42b022dbd692..e8f2cbee136d 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaFluentIterableConversionRule.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaFluentIterableConversionRule.java
@@ -229,15 +229,12 @@ public class GuavaFluentIterableConversionRule extends BaseGuavaTypeConversionRu
       if (qualifier instanceof PsiMethodCallExpression) {
         current = (PsiMethodCallExpression)qualifier;
       }
-      else if (qualifier instanceof PsiReferenceExpression) {
+      else if (method.hasModifierProperty(PsiModifier.STATIC)) {
         if (!CHAIN_HEAD_METHODS.contains(methodName)) {
           return null;
         }
-        final PsiElement maybeClass = ((PsiReferenceExpression)qualifier).resolve();
-        if (!(maybeClass instanceof PsiClass)) {
-          return null;
-        }
-        if (!FLUENT_ITERABLE.equals(((PsiClass)maybeClass).getQualifiedName())) {
+        final PsiClass aClass = method.getContainingClass();
+        if (aClass == null || !FLUENT_ITERABLE.equals(aClass.getQualifiedName())) {
           return null;
         }
         break;