Change Signature: Show conflict dialog in silent mode

2015-10-06 20:06:59 +03:00
parent 9e8600e52f
commit 21d27d9340
1 changed files with 5 additions and 7 deletions
@@ -77,13 +77,11 @@ public class JetChangeSignatureProcessor(project: Project,
                throw BaseRefactoringProcessor.ConflictsInTestsException(conflictDescriptions.values())
            }

-            myPrepareSuccessfulSwingThreadCallback?.let {
-                val dialog = prepareConflictsDialog(conflictDescriptions, usages)
-                dialog.show()
-                if (!dialog.isOK()) {
-                    if (dialog.isShowConflicts()) prepareSuccessful()
-                    return false
-                }
+            val dialog = prepareConflictsDialog(conflictDescriptions, usages)
+            dialog.show()
+            if (!dialog.isOK()) {
+                if (dialog.isShowConflicts()) prepareSuccessful()
+                return false
            }
        }