MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

merge multiple conflict dialogs (IDEADEV-39791)

Browse Source
This commit is contained in:
anna
2009-10-02 18:02:51 +04:00
parent a435ad948d
commit 832f94cf93
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
+4 -5
View File
@@ -232,6 +232,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
catch (IncorrectOperationException e) {
LOG.error(e);
}
conflicts.putAll(analyzeMoveConflicts(myMembersToMove, myTargetClass, myNewVisibility));
RefactoringUtil.analyzeModuleConflicts(myProject, myMembersToMove, usages, myTargetClass, conflicts);
return showConflicts(conflicts);
}
@@ -268,8 +269,8 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
if (!JavaResolveUtil.isAccessible(member, myTargetClass, modifierListCopies.get(member), element, accessObjectClass, null)) {
newVisibility = newVisibility == null ? VisibilityUtil.getVisibilityStringToDisplay(member) : newVisibility;
String message =
RefactoringBundle.message("0.with.1.visibility.is.not.accesible.from.2", RefactoringUIUtil.getDescription(member, true),
newVisibility, RefactoringUIUtil.getDescription(ConflictsUtil.getContainer(element), true));
CommonRefactoringUtil.capitalize(RefactoringBundle.message("0.with.1.visibility.is.not.accesible.from.2", RefactoringUIUtil.getDescription(member, false),
newVisibility, RefactoringUIUtil.getDescription(ConflictsUtil.getContainer(element), true)));
conflicts.put(member, message);
}
}
@@ -294,9 +295,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
CommonRefactoringUtil.showErrorMessage(MoveMembersImpl.REFACTORING_NAME, message, HelpID.MOVE_MEMBERS, myProject);
return;
}
if (canRefactor()) {
super.doRun();
}
super.doRun();
}
private boolean canRefactor() {