diff options
author | David Inglis | 2003-01-29 14:13:43 +0000 |
---|---|---|
committer | David Inglis | 2003-01-29 14:13:43 +0000 |
commit | f92700e14b5fd53a063e702d9dfad5f8f58cc95f (patch) | |
tree | 4c52c089bda28e604194981a82502b5e27192e16 /launch | |
parent | b75007a384f645d4f6120b2b5fdc909c0643da71 (diff) | |
download | org.eclipse.cdt-f92700e14b5fd53a063e702d9dfad5f8f58cc95f.tar.gz org.eclipse.cdt-f92700e14b5fd53a063e702d9dfad5f8f58cc95f.tar.xz org.eclipse.cdt-f92700e14b5fd53a063e702d9dfad5f8f58cc95f.zip |
make LaunchUIPlugin.getShell() always return a shell
Diffstat (limited to 'launch')
-rw-r--r-- | launch/org.eclipse.cdt.launch/ChangeLog | 4 | ||||
-rw-r--r-- | launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java | 11 |
2 files changed, 9 insertions, 6 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog index eeb828f3b5d..bba879d53dc 100644 --- a/launch/org.eclipse.cdt.launch/ChangeLog +++ b/launch/org.eclipse.cdt.launch/ChangeLog @@ -1,3 +1,7 @@ +2003-01-29 David Inglis
+ * src/.../launch/internal/ui/LaunchUIPluging.java (getShell)
+ change so that it will always return a shell.
+
2003-01-28 Alain Magloire
* src/.../launch/internal/CApplicationLaunchShortCut.java (getCLaunchConfigType):
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java index f9c13466db8..d0667cd5dc8 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPlugin.java @@ -57,18 +57,17 @@ public class LaunchUIPlugin extends AbstractUIPlugin } public static Shell getShell() { - Shell shell = null; - if (getActiveWorkbenchWindow() != null) { - shell = getActiveWorkbenchWindow().getShell(); - } - if ( shell == null ) { + if (getActiveWorkbenchShell() != null) { + return getActiveWorkbenchShell(); + } else { if ( debugDialogShell != null ) { if (!debugDialogShell.isDisposed() ) return debugDialogShell; debugDialogShell = null; } + IWorkbenchWindow[] windows = getDefault().getWorkbench().getWorkbenchWindows(); + return windows[0].getShell(); } - return shell; } public static void setDialogShell(Shell shell) { |