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

IDEA-212235 merge: do not access Swing components on pooled thread

Browse Source 
GitOrigin-RevId: 773b8bc167559b5e30840162421c36b0e7d49bc1
This commit is contained in:
Aleksey Pivovarov
2019-05-07 16:07:18 +03:00
committed by intellij-monorepo-bot
parent 8ffec214be
commit 0b14159f9f
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java
+13 -10
View File
@@ -290,17 +290,20 @@ public abstract class MergeRequestProcessor implements Disposable {
}
private void showInvalidRequestNotification() {
if (!myNotificationPanel.isNull()) return;
ApplicationManager.getApplication().invokeLater(() -> {
if (myDisposed) return;
if (!myNotificationPanel.isNull()) return;
EditorNotificationPanel notification = new EditorNotificationPanel(LightColors.RED);
notification.setText("Conflict is not valid and no longer can be resolved.");
notification.createActionLabel("Abort Resolve", () -> {
applyRequestResult(MergeResult.CANCEL);
closeDialog();
});
myNotificationPanel.setContent(notification);
myMainPanel.validate();
myMainPanel.repaint();
EditorNotificationPanel notification = new EditorNotificationPanel(LightColors.RED);
notification.setText("Conflict is not valid and no longer can be resolved.");
notification.createActionLabel("Abort Resolve", () -> {
applyRequestResult(MergeResult.CANCEL);
closeDialog();
});
myNotificationPanel.setContent(notification);
myMainPanel.validate();
myMainPanel.repaint();
}, ModalityState.stateForComponent(myPanel));
}
@Override