From ee3f2e674092fe2cb0ae7b5683609e0c480f655e Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 14 Mar 2011 12:51:23 +0100
Subject: [PATCH] enable show conflicts: should be shown anyway?

---
 .../MoveClassesOrPackagesHandlerBase.java              | 10 ++++++++++
 .../MoveClassesOrPackagesToNewDirectoryDialog.java     |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java
index 32cf4cb8c812..7deacc03e155 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesHandlerBase.java
@@ -123,6 +123,11 @@ public class MoveClassesOrPackagesHandlerBase extends MoveHandlerDelegate {
             new MoveDirectoryWithClassesProcessor(project, directories, (PsiDirectory)targetContainer,
                                                   refactoringSettings.RENAME_SEARCH_IN_COMMENTS_FOR_PACKAGE,
                                                   refactoringSettings.RENAME_SEARCH_IN_COMMENTS_FOR_PACKAGE, true, callback);
+          processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
+            @Override
+            public void run() {
+            }
+          });
           processor.run();
         }
         else {
@@ -137,6 +142,11 @@ public class MoveClassesOrPackagesHandlerBase extends MoveHandlerDelegate {
                 final MoveDirectoryWithClassesProcessor processor =
                   new MoveDirectoryWithClassesProcessor(project, directories, targetDirectory, searchInComments, searchForTextOccurences,
                                                         true, callback);
+                processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
+                  @Override
+                  public void run() {
+                  }
+                });
                 processor.run();
               }
             };
diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
index 639a08defe38..29d88aa8aaea 100644
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java
@@ -206,6 +206,11 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends DialogWrapper {
                                                                                   searchInComments, searchForTextOccurences,
                                                                                   myMoveCallback);
     if (processor.verifyValidPackageName()) {
+      processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
+        @Override
+        public void run() {
+        }
+      });
       processor.run();
     }
   }