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

IDEA-88689 formatting of conflicts

Browse Source
This commit is contained in:
anna
2012-07-12 11:55:26 +02:00
parent e97267792e
commit 801a923a4d
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
+12 -6
View File
@@ -360,14 +360,20 @@ public class MoveInnerProcessor extends BaseRefactoringProcessor {
}
if (!containerSet.contains(container)) {
containerSet.add(container);
String placesDescription;
if (containerSet.size() == 1) {
placesDescription = RefactoringUIUtil.getDescription(container, true);
} else {
placesDescription = "<ol><li>" + StringUtil.join(containerSet, new Function<PsiElement, String>() {
@Override
public String fun(PsiElement element) {
return RefactoringUIUtil.getDescription(element, true);
}
}, "</li><li>") + "</li></ol>";
}
String message = RefactoringBundle.message("0.will.become.inaccessible.from.1",
RefactoringUIUtil.getDescription(resolved, true),
StringUtil.join(containerSet, new Function<PsiElement, String>() {
@Override
public String fun(PsiElement element) {
return RefactoringUIUtil.getDescription(element, true);
}
}, ", "));
placesDescription);
conflicts.put(resolved, Collections.singletonList(message));
}
}