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

OPEN_EDITOR_AND_CLOSE_DIFF closes all nested dialogs (comment of IDEA-42035)

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-02-02 19:58:23 +01:00
parent 4a29f73e9c
commit d570c83a1c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffPanelOptions.java
+9 -5
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.DialogWrapperDialog;
import com.intellij.openapi.util.Disposer;
import java.awt.*;
@@ -59,7 +60,7 @@ public class DiffPanelOptions {
myShowSourcePolicy.showSource(descriptor, myDiffPanel);
}
public static interface ShowSourcePolicy {
public interface ShowSourcePolicy {
void showSource(OpenFileDescriptor descriptor, DiffPanelImpl diffPanel);
ShowSourcePolicy DONT_SHOW = new ShowSourcePolicy() {
@@ -76,7 +77,7 @@ public class DiffPanelOptions {
public void showSource(OpenFileDescriptor descriptor, DiffPanelImpl diffPanel) {
OPEN_EDITOR.showSource(descriptor, diffPanel);
if (diffPanel.getOwnerWindow() == null) return;
diffPanel.dispose();
Disposer.dispose(diffPanel);
if (!dialogWrapperClose(diffPanel.getOwnerWindow())) {
diffPanel.getOwnerWindow().setVisible(false);
@@ -84,10 +85,13 @@ public class DiffPanelOptions {
}
}
private boolean dialogWrapperClose(Window window) {
private boolean dialogWrapperClose(Container window) {
if (!(window instanceof DialogWrapperDialog)) return false;
DialogWrapperDialog dlg = (DialogWrapperDialog)window;
dlg.getDialogWrapper().close(DialogWrapper.OK_EXIT_CODE);
while (window instanceof DialogWrapperDialog) {
DialogWrapperDialog dlg = (DialogWrapperDialog)window;
window = window.getParent();
dlg.getDialogWrapper().close(DialogWrapper.OK_EXIT_CODE);
}
return true;
}
};