Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 308220 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/e4/core/internal/contexts/ContextObjectSupplier.java (-3 / +6 lines)
Lines 54-69 Link Here
54
				return true;
54
				return true;
55
			}
55
			}
56
56
57
			IEclipseContext originatingContext = event.getContext();
58
			ContextObjectSupplier originatingSupplier = getObjectSupplier(originatingContext, injector);
59
			if (event.getEventType() == ContextChangeEvent.DISPOSE) {
57
			if (event.getEventType() == ContextChangeEvent.DISPOSE) {
58
				IEclipseContext originatingContext = event.getContext();
59
				ContextObjectSupplier originatingSupplier = getObjectSupplier(originatingContext, injector);
60
				injector.disposed(originatingSupplier);
60
				injector.disposed(originatingSupplier);
61
				return false;
61
				return false;
62
			} else if (event.getEventType() == ContextChangeEvent.UNINJECTED) {
62
			} else if (event.getEventType() == ContextChangeEvent.UNINJECTED) {
63
				IEclipseContext originatingContext = event.getContext();
64
				ContextObjectSupplier originatingSupplier = getObjectSupplier(originatingContext, injector);
63
				injector.uninject(event.getArguments()[0], originatingSupplier);
65
				injector.uninject(event.getArguments()[0], originatingSupplier);
64
				return false;
66
				return false;
65
			} else {
67
			} else {
66
				injector.update(new IRequestor[] { requestor }, originatingSupplier);
68
				ContextObjectSupplier supplier = getObjectSupplier(context, injector);
69
				injector.update(new IRequestor[] { requestor }, supplier);
67
			}
70
			}
68
			return true;
71
			return true;
69
		}
72
		}

Return to bug 308220