From 20265708b82ac5b40c5c6dce6d3e160fa07f0c69 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Fri, 30 Oct 2009 20:46:08 +0300
Subject: [PATCH] retarget conflict

---
 .../intellij/refactoring/memberPushDown/PushDownConflicts.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownConflicts.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownConflicts.java
index c233598aa2d6..e0dcbe78bc33 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownConflicts.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownConflicts.java
@@ -99,7 +99,7 @@ public class PushDownConflicts {
             }
 
             if (!InheritanceUtil.isInheritorOrSelf(aClass, targetClass, true)) {
-              myConflicts.putValue(aClass, RefactoringBundle.message("pushed.members.will.not.be.visible.from.certain.call.sites"));
+              myConflicts.putValue(referenceExpression, RefactoringBundle.message("pushed.members.will.not.be.visible.from.certain.call.sites"));
               break Members;
             }
           }