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

EA-85118 Use Application.invokeAndWait

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-06-29 18:32:39 +03:00
parent aa92706881
commit 59beff1a5b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/branch/GitBranchUiHandlerImpl.java
+5 -6
View File
@@ -17,6 +17,8 @@ package git4idea.branch;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
@@ -149,12 +151,9 @@ public class GitBranchUiHandlerImpl implements GitBranchUiHandler {
@NotNull final String unmergedBranch, @NotNull final List<String> mergedToBranches,
@NotNull final String baseBranch) {
final AtomicBoolean forceDelete = new AtomicBoolean();
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
forceDelete.set(GitBranchIsNotFullyMergedDialog.showAndGetAnswer(myProject, history, unmergedBranch, mergedToBranches, baseBranch));
}
});
ApplicationManager.getApplication().invokeAndWait(() -> forceDelete.set(
GitBranchIsNotFullyMergedDialog.showAndGetAnswer(myProject, history, unmergedBranch, mergedToBranches, baseBranch)),
ModalityState.defaultModalityState());
return forceDelete.get();
}