diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java index c3f5769479b9..6030e8090c10 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java @@ -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() { diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties index 9476aea980de..97fafdbdb98a 100644 --- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties +++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties @@ -244,7 +244,7 @@ method.does.not.have.a.body=Method {0} does not have a body. method.has.an.empty.body=Method {0} has an empty body. idea.has.not.found.any.code.that.can.be.replaced.with.method.call={0} has not found any code that can be replaced with method call method.duplicates.found.message={0, choice, 1#1 code fragment|2#{0,number} code fragments} found -0.with.1.visibility.is.not.accesible.from.2={0} with {1} visibility is not accesible from {2} +0.with.1.visibility.is.not.accesible.from.2={0} with {1} visibility won't be accesible from {2} 0.contains.call.with.null.argument.for.parameter.1={0} contains call with null argument for parameter {1} no.members.selected=No members selected 0.already.exists.in.the.target.class={0} already exists in the target class.