Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2011-11-02 10:09:22 +0000
committerTomasz Zarna2011-11-02 10:09:22 +0000
commit97174e215a5dcdb7bf682873e42b68ae118ee99f (patch)
treef2a5355a08f0465c2cee5256341e4e56f102a6ef
parent9e817837eb2a032139e9d2ed3b4169b5728c630f (diff)
downloadeclipse.platform.team-97174e215a5dcdb7bf682873e42b68ae118ee99f.tar.gz
eclipse.platform.team-97174e215a5dcdb7bf682873e42b68ae118ee99f.tar.xz
eclipse.platform.team-97174e215a5dcdb7bf682873e42b68ae118ee99f.zip
bug 361192: Incorrect parent shell selected when a compare dialog is
opened by a dialog
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index 15815f375..e1d7e210b 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -446,7 +446,7 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
* no workbench window is active
*/
public static Shell getShell() {
- IWorkbenchWindow window= getActiveWorkbenchWindow();
+ IWorkbenchWindow window = getActiveWorkbenchWindow();
if (window == null)
return null;
return window.getShell();
@@ -1249,7 +1249,9 @@ public final class CompareUIPlugin extends AbstractUIPlugin {
private void internalOpenDialog(final CompareEditorInput input) {
Runnable runnable = new Runnable() {
public void run() {
- CompareDialog dialog= new CompareDialog(getShell(), input);
+ CompareDialog dialog = new CompareDialog(PlatformUI
+ .getWorkbench().getModalDialogShellProvider()
+ .getShell(), input);
dialog.open();
}
};

Back to the top