Attachment 115700 Details for Bug 247818 – Fix with IShellProvider

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

[patch] Fix with IShellProvider

ListeningMechanism.txt (text/plain), 2.85 KB, created by Krzysztof Daniel

on 2008-10-21 10:04:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2008-10-21 10:04:27 EDT

Size: 2.85 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 13:47:50 -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;
>@@ -1012,6 +1013,17 @@
> 	private LabelProviderWrapper labelProviderWrapper = new LabelProviderWrapper();
> 
> 	/**
>+	 * A class that allows for accessing dialog shell.
>+	 */
>+	private IShellProvider shellProvider = new IShellProvider() {
>+
>+		public Shell getShell() {
>+			return WorkbenchStatusDialogManager.this.getShell();
>+		}
>+
>+	};
>+
>+	/**
> 	 * This variable holds current details area provider.
> 	 */
> 	private DetailsAreaManager detailsManager = new DetailsAreaManager();
>@@ -1746,7 +1758,7 @@
> 	/**
> 	 * Returns the shell of the dialog.
> 	 */
>-	Shell getShell() {
>+	private Shell getShell() {
> 		if (this.dialog == null) return null;
> 		return this.dialog.getShell();
> 	}
>@@ -2282,4 +2294,13 @@
> 		}
> 		titleArea.layout();
> 	}
>+
>+	/**
>+	 * This methods allows for accessing dialog shell.
>+	 * @return IShellProvider an object that can be used to access dialog shell.
>+	 * @since 3.5
>+	 */
>+	public IShellProvider getShellProvider() {
>+		return shellProvider;
>+	}
> }
>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 13:47:49 -0000
>@@ -111,8 +111,8 @@
> 
> 		if (block) {
> 			Shell shell;
>-			while ((shell = getStatusDialogManager().getShell()) != null
>-					&& !getStatusDialogManager().getShell().isDisposed()) {
>+			while ((shell = getStatusDialogManager().getShellProvider().getShell()) != null
>+					&& !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