aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Besedin2011-11-15 14:18:09 (EST)
committerOleg Besedin2011-11-15 14:18:09 (EST)
commitd88527b505ef9486df93cbd8d9088745f248f57c (patch)
tree55648666fd065ac5b70c6ba66a214c29605d4b6f
parentafca0df60f9dea9c9dd216baf0503f8b7eebcd1a (diff)
downloadeclipse.platform.ui-d88527b505ef9486df93cbd8d9088745f248f57c.zip
eclipse.platform.ui-d88527b505ef9486df93cbd8d9088745f248f57c.tar.gz
eclipse.platform.ui-d88527b505ef9486df93cbd8d9088745f248f57c.tar.bz2
Bug 323424 - [Compatibility] Active editor tracking goes wrong withv20111115-1918I20111116-0810
multiple workbench windows
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java36
1 files changed, 0 insertions, 36 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
index e6d4afb..cb69911 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java
@@ -58,7 +58,6 @@ import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.e4.core.contexts.ContextFunction;
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IContextFunction;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.InjectionException;
import org.eclipse.e4.core.services.events.IEventBroker;
@@ -1317,47 +1316,12 @@ public final class Workbench extends EventManager implements IWorkbench {
return new LocalWorkingSetManager(WorkbenchPlugin.getDefault().getBundleContext());
}
- class ActiveWorkbenchWindowQueryContextFunction implements IContextFunction {
-
- private final String variable;
-
- public ActiveWorkbenchWindowQueryContextFunction(String variable) {
- this.variable = variable;
- }
-
- public Object compute(IEclipseContext context) {
- IEclipseContext child = context.getActiveChild();
- return child == null ? null : child.getLocal(variable);
- }
-
- }
-
/**
* Initializes the workbench now that the display is created.
*
* @return true if init succeeded.
*/
private boolean init() {
- application.getContext().set(ISources.ACTIVE_EDITOR_ID_NAME,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.ACTIVE_EDITOR_ID_NAME));
- application.getContext().set(ISources.ACTIVE_EDITOR_NAME,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.ACTIVE_EDITOR_NAME));
- application.getContext().set(ISources.ACTIVE_EDITOR_INPUT_NAME,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.ACTIVE_EDITOR_INPUT_NAME));
-
- application.getContext().set(ISources.SHOW_IN_INPUT,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.SHOW_IN_INPUT));
- application.getContext().set(ISources.SHOW_IN_SELECTION,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.SHOW_IN_SELECTION));
-
- application.getContext().set(ISources.ACTIVE_PART_NAME,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.ACTIVE_PART_NAME));
- application.getContext().set(ISources.ACTIVE_PART_ID_NAME,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.ACTIVE_PART_ID_NAME));
- application.getContext().set(ISources.ACTIVE_SITE_NAME,
- new ActiveWorkbenchWindowQueryContextFunction(ISources.ACTIVE_SITE_NAME));
- application.getContext().set("org.eclipse.core.runtime.Platform", Platform.class); //$NON-NLS-1$
-
// setup debug mode if required.
if (WorkbenchPlugin.getDefault().isDebugging()) {
WorkbenchPlugin.DEBUG = true;