From 2002e9a0bd9fa578004cc1b762118b8fc60dbcdb Mon Sep 17 00:00:00 2001
From: Paul Elder
Date: Thu, 28 Feb 2013 13:54:05 -0500
Subject: Bug 394336 - File->Close menu item is disabled even when current
 editor is activated

Change getActive(*) to simpler process

Change-Id: I44d9d9434157a9cf5472d14bdce1dbe9c120227c
---
 .../e4/core/internal/contexts/EclipseContext.java  | 24 +---------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

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 f64cc111b..6f5696380 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 @@ public class EclipseContext implements IEclipseContext {
 		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) {
-- 
cgit v1.2.3