Attachment 163956 Details for Bug 308220 – Patch

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

[patch] Patch

patch DI outside 2.txt (text/plain), 1.69 KB, created by Oleg Besedin

on 2010-04-06 15:27:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Besedin

Created: 2010-04-06 15:27:09 EDT

Size: 1.69 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.e4.core.contexts
>Index: src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java,v
>retrieving revision 1.2
>diff -u -r1.2 ContextObjectSupplier.java
>--- src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java	6 Apr 2010 14:25:58 -0000	1.2
>+++ src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java	6 Apr 2010 19:22:24 -0000
>@@ -54,16 +54,19 @@
> 				return true;
> 			}
> 
>-			IEclipseContext originatingContext = event.getContext();
>-			ContextObjectSupplier originatingSupplier = getObjectSupplier(originatingContext, injector);
> 			if (event.getEventType() == ContextChangeEvent.DISPOSE) {
>+				IEclipseContext originatingContext = event.getContext();
>+				ContextObjectSupplier originatingSupplier = getObjectSupplier(originatingContext, injector);
> 				injector.disposed(originatingSupplier);
> 				return false;
> 			} else if (event.getEventType() == ContextChangeEvent.UNINJECTED) {
>+				IEclipseContext originatingContext = event.getContext();
>+				ContextObjectSupplier originatingSupplier = getObjectSupplier(originatingContext, injector);
> 				injector.uninject(event.getArguments()[0], originatingSupplier);
> 				return false;
> 			} else {
>-				injector.update(new IRequestor[] { requestor }, originatingSupplier);
>+				ContextObjectSupplier supplier = getObjectSupplier(context, injector);
>+				injector.update(new IRequestor[] { requestor }, supplier);
> 			}
> 			return true;
> 		}

Actions: View | Diff

Attachments on bug 308220: 163941 | 163956