check for conflicts with escalate visibility setting on (IDEA-88719)

This commit is contained in:
anna
2012-08-01 16:54:11 +02:00
parent 03da4cdaa0
commit 4cdf6d94de
4 changed files with 25 additions and 1 deletions
@@ -104,7 +104,7 @@ public class PullUpConflictsUtil {
}
}
}
RefactoringConflictsUtil.analyzeAccessibilityConflicts(movedMembers, superClass, conflicts, null, targetRepresentativeElement, abstrMethods);
RefactoringConflictsUtil.analyzeAccessibilityConflicts(movedMembers, superClass, conflicts, VisibilityUtil.ESCALATE_VISIBILITY, targetRepresentativeElement, abstrMethods);
if (superClass != null) {
if (movedMembers2Super) {
checkSuperclassMembers(superClass, infos, conflicts);