From 9e95d310f467242b8839e6ab87c170bbec412c09 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <leijdekkers@carp-technologies.nl>
Date: Thu, 25 Nov 2010 22:16:28 +0100
Subject: [PATCH] IDEA-61858 ("Unnecessarily qualified statically imported
 element" false positive)

---
 .../com/siyeh/ig/abstraction/InstanceofChainInspection.java   | 2 +-
 .../src/com/siyeh/ig/psiutils/ImportUtils.java                | 3 ++-
 ...cessarilyQualifiedStaticallyImportedElementInspection.java | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java
index 4380f004276a..174abc476fb3 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofChainInspection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers
+ * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java
index 93c3a0660cc9..642a8bc5b2b8 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/ImportUtils.java
@@ -537,7 +537,8 @@ public class ImportUtils{
         final String memberName = member.getName();
         final PsiImportStatementBase existingImportStatement =
                 importList.findSingleImportStatement(memberName);
-        if (existingImportStatement != null) {
+        if (existingImportStatement != null &&
+                existingImportStatement instanceof PsiImportStaticStatement) {
             final PsiElement target = existingImportStatement.resolve();
             return member.equals(target);
         } else {
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java
index 82ebb8fa5f56..6c187ac56717 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java
@@ -55,7 +55,6 @@ public class UnnecessarilyQualifiedStaticallyImportedElementInspection
             extends InspectionGadgetsFix {
 
         @NotNull
-        @Override
         public String getName() {
             return InspectionGadgetsBundle.message(
                     "unnecesarily.qualified.statically.imported.element.quickfix");
@@ -95,6 +94,9 @@ public class UnnecessarilyQualifiedStaticallyImportedElementInspection
             if (parent instanceof PsiReferenceExpression) {
                 return;
             }
+            if (parent instanceof PsiImportStatement) {
+                return;
+            }
             final PsiElement target = reference.resolve();
             if (!(target instanceof PsiMember)) {
                 return;