Attachment 115714 Details for Bug 247818 – Fix with IShellProvider (another proposal)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix with IShellProvider (another proposal)

247818_20081021.txt (text/plain), 2.78 KB, created by Szymon Brandys

on 2008-10-21 12:16:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Brandys

Created: 2008-10-21 12:16:11 EDT

Size: 2.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java,v
>retrieving revision 1.19
>diff -u -r1.19 WorkbenchStatusDialogManager.java
>--- Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java	21 Oct 2008 10:42:47 -0000	1.19
>+++ Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchStatusDialogManager.java	21 Oct 2008 16:14:54 -0000
>@@ -52,6 +52,7 @@
> import org.eclipse.jface.viewers.TableViewer;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.jface.viewers.ViewerComparator;
>+import org.eclipse.jface.window.IShellProvider;
> import org.eclipse.jface.window.Window;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.swt.SWT;
>@@ -133,9 +134,11 @@
>  * @see Policy#setErrorSupportProvider(ErrorSupportProvider)
>  * @see ErrorSupportProvider
>  * @see AbstractStatusAreaProvider
>+ * 
>  * @since 3.4
>+ * @since 3.5 it implements {@link IShellProvider}
>  */
>-public class WorkbenchStatusDialogManager {
>+public class WorkbenchStatusDialogManager implements IShellProvider {
> 
> 	/**
> 	 * The default status label provider.
>@@ -1744,14 +1747,6 @@
> 	}
> 
> 	/**
>-	 * Returns the shell of the dialog.
>-	 */
>-	Shell getShell() {
>-		if (this.dialog == null) return null;
>-		return this.dialog.getShell();
>-	}
>-
>-	/**
> 	 * Get the single selection. Return null if the selection is not just one
> 	 * element.
> 	 * 
>@@ -2282,4 +2277,16 @@
> 		}
> 		titleArea.layout();
> 	}
>+
>+	/**
>+	 * Gets the shell of the managed dialog.
>+	 * 
>+	 * @since 3.5
>+	 * @see org.eclipse.jface.window.IShellProvider#getShell()
>+	 */
>+	public Shell getShell() {
>+		if (this.dialog == null)
>+			return null;
>+		return this.dialog.getShell();
>+	}
> }
>Index: Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java,v
>retrieving revision 1.24
>diff -u -r1.24 WorkbenchErrorHandler.java
>--- Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java	3 Oct 2008 19:15:44 -0000	1.24
>+++ Eclipse UI/org/eclipse/ui/statushandlers/WorkbenchErrorHandler.java	21 Oct 2008 16:14:53 -0000
>@@ -112,7 +112,7 @@
> 		if (block) {
> 			Shell shell;
> 			while ((shell = getStatusDialogManager().getShell()) != null
>-					&& !getStatusDialogManager().getShell().isDisposed()) {
>+					&& !shell.isDisposed()) {
> 				if (!shell.getDisplay().readAndDispatch()) {
> 					Display.getDefault().sleep();
> 				}

Actions: View | Diff

Attachments on bug 247818: 113730 | 113856 | 113857 | 113964 | 114310 | 114311 | 114933 | 115700 | 115714