From 801a923a4dea83733516d161d119646ff7f9439c Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 12 Jul 2012 11:43:38 +0200
Subject: [PATCH] IDEA-88689 formatting of conflicts

---
 .../move/moveInner/MoveInnerProcessor.java     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
index 4607e097c957..b6b796d1b861 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerProcessor.java
@@ -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));
     }
   }