Attachment 66445 Details for Bug 186100 – Valid patch

[patch] Valid patch

bug[186100]_patch.txt (text/plain), 1.90 KB, created by Piotr Jaworowski

on 2007-05-09 08:23:31 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Jaworowski

Created: 2007-05-09 08:23:31 EDT

Size: 1.90 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.corona.container.ui
>Index: src/org/eclipse/corona/container/ui/model/DeferredWorkbenchAdapterWraper.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.corona/plugins/org.eclipse.corona.container.ui/src/org/eclipse/corona/container/ui/model/DeferredWorkbenchAdapterWraper.java,v
>retrieving revision 1.1
>diff -u -r1.1 DeferredWorkbenchAdapterWraper.java
>--- src/org/eclipse/corona/container/ui/model/DeferredWorkbenchAdapterWraper.java	28 Mar 2007 09:22:42 -0000	1.1
>+++ src/org/eclipse/corona/container/ui/model/DeferredWorkbenchAdapterWraper.java	9 May 2007 12:22:18 -0000
>@@ -91,7 +91,9 @@
> 	 * {@inheritDoc}
> 	 */
> 	public void fetchDeferredChildren(Object object, IElementCollector collector, IProgressMonitor monitor) {
>-		collector.add(adapter.getChildren(object), monitor);
>+		Object[] elems = adapter.getChildren(object);
>+		if (!monitor.isCanceled())
>+			collector.add(elems, monitor);
> 	}
> 
> 	/**
>Index: src/org/eclipse/corona/container/ui/explorer/DeferredTreeContentProvider.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.corona/plugins/org.eclipse.corona.container.ui/src/org/eclipse/corona/container/ui/explorer/DeferredTreeContentProvider.java,v
>retrieving revision 1.2
>diff -u -r1.2 DeferredTreeContentProvider.java
>--- src/org/eclipse/corona/container/ui/explorer/DeferredTreeContentProvider.java	28 Mar 2007 09:59:06 -0000	1.2
>+++ src/org/eclipse/corona/container/ui/explorer/DeferredTreeContentProvider.java	9 May 2007 12:22:18 -0000
>@@ -68,6 +68,7 @@
> 	public Object[] getChildren(Object parent) {
> 		// handle it as deferred if it's possible.
> 		if (manager != null && manager.isDeferredAdapter(parent)) {
>+			manager.cancel(parent);
> 			return manager.getChildren(parent);
> 		}
> 		// handle it as a normal adapter.

Actions: View | Diff

Attachments on bug 186100: 66414 | 66429 | 66445