Attachment 226842 Details for Bug 394336 – Proposed fix

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

[patch] Proposed fix

patch.txt (text/plain), 1.50 KB, created by Paul Elder

on 2013-02-11 11:23:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Elder

Created: 2013-02-11 11:23:23 EST

Size: 1.50 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java
>index f64cc11..6f56963 100644
>--- a/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java
>+++ b/bundles/org.eclipse.e4.core.contexts/src/org/eclipse/e4/core/internal/contexts/EclipseContext.java
>@@ -713,34 +713,12 @@
> 		return null;
> 	}
> 
>-	/**
>-	 * Prefix used to distinguish active variables
>-	 */
>-	static private final String ACTIVE_VARIABLE = "org.eclipse.ui.active_"; //$NON-NLS-1$
>-
> 	public <T> T getActive(Class<T> clazz) {
> 		return clazz.cast(getActive(clazz.getName()));
> 	}
> 
> 	public Object getActive(final String name) {
>-		final String internalName = ACTIVE_VARIABLE + name;
>-		if (containsKey(internalName, true)) {
>-			trackAccess(internalName);
>-			return internalGet(this, internalName, true);
>-		}
>-
>-		final EclipseContext originatingContext = this;
>-
>-		runAndTrack(new RunAndTrack() {
>-			public boolean changed(IEclipseContext context) {
>-				IEclipseContext activeContext = getActiveLeaf();
>-				Object result = activeContext.get(name);
>-				originatingContext.set(internalName, result);
>-				return true;
>-			}
>-		});
>-		trackAccess(internalName);
>-		return internalGet(this, internalName, true);
>+		return getActiveLeaf().get(name);
> 	}
> 
> 	public WeakReference<Object> trackedWeakReference(Object object) {

Actions: View | Diff

Attachments on bug 394336: 226842