From ea234d51074d3a0c7550e85ece84422b5b4a33a2 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Tue, 6 Oct 2009 14:42:42 +0400
Subject: [PATCH] pull up: skip "between" conflicts for cls elements; do not
 use walking visitor for module conflict detection (cls should be processed as
 well)

---
 .../intellij/refactoring/memberPullUp/PullUpConflictsUtil.java  | 2 +-
 .../com/intellij/refactoring/util/RefactoringConflictsUtil.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
index ba48c8f406d8..ce43c8152c70 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
@@ -69,7 +69,7 @@ public class PullUpConflictsUtil {
     // check if moved methods use other members in the classes between Subclass and Superclass
     List<PsiElement> checkModuleConflictsList = new ArrayList<PsiElement>();
     for (PsiMember member : movedMembers) {
-      if (member instanceof PsiMethod || member instanceof PsiClass) {
+      if (member instanceof PsiMethod || member instanceof PsiClass && !(member instanceof PsiCompiledElement)) {
         ConflictingUsagesOfSubClassMembers visitor =
           new ConflictingUsagesOfSubClassMembers(member, movedMembers, abstractMethods, subclass, superClass,
                                                  superClass != null ? null : targetPackage, conflicts,
diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java
index 4ece32dfe95e..b2082d503beb 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java
@@ -172,7 +172,7 @@ public class RefactoringConflictsUtil {
     final GlobalSearchScope resolveScope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(targetModule);
     final HashSet<PsiElement> reported = new HashSet<PsiElement>();
     for (final PsiElement scope : scopes) {
-      scope.accept(new JavaRecursiveElementWalkingVisitor() {
+      scope.accept(new JavaRecursiveElementVisitor() {
         @Override public void visitReferenceElement(PsiJavaCodeReferenceElement reference) {
           super.visitReferenceElement(reference);
           final PsiElement resolved = reference.resolve();