aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Besedin2012-01-09 14:01:05 (EST)
committerOleg Besedin2012-01-09 14:01:05 (EST)
commit44a5177c51082223c8d50b5eef8d28019d953b6f (patch)
treecba52c8dbc7e0817f27e83e37c0b191efdd50515
parent1c6b99d9ec9b8a47a19420609e65ea38a32b4b76 (diff)
downloadeclipse.platform.ui-44a5177c51082223c8d50b5eef8d28019d953b6f.zip
eclipse.platform.ui-44a5177c51082223c8d50b5eef8d28019d953b6f.tar.gz
eclipse.platform.ui-44a5177c51082223c8d50b5eef8d28019d953b6f.tar.bz2
Bug 368187 - Services pre-API cleanup
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java72
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java2
2 files changed, 0 insertions, 74 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java
index 7980e0a..e0de937 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java
@@ -487,78 +487,6 @@ public class E4Application implements IApplication {
// setup for commands and handlers
appContext.set(IServiceConstants.ACTIVE_PART,
new ActivePartLookupFunction());
- // appContext.set(EPartService.PART_SERVICE_ROOT, new ContextFunction()
- // {
- // private void log() {
- // StatusReporter statusReporter = (StatusReporter) appContext
- // .get(StatusReporter.class.getName());
- // statusReporter.report(new Status(IStatus.ERROR,
- // WorkbenchSWTActivator.PI_RENDERERS,
- // "Internal error, please post the trace to bug 315270",
- // new Exception()), StatusReporter.LOG);
- // }
- //
- // @Override
- // public Object compute(IEclipseContext context) {
- // MContext perceivedRoot = (MContext) context.get(MWindow.class
- // .getName());
- // if (perceivedRoot == null) {
- // perceivedRoot = (MContext) context.get(MApplication.class
- // .getName());
- // if (perceivedRoot == null) {
- // IEclipseContext ctxt = appContext.getActiveChild();
- // if (ctxt == null) {
- // return null;
- // }
- // log();
- // return ctxt.get(MWindow.class);
- // }
- // }
- //
- // IEclipseContext current = perceivedRoot.getContext();
- // if (current == null) {
- // IEclipseContext ctxt = appContext.getActiveChild();
- // if (ctxt == null) {
- // return null;
- // }
- // log();
- // return ctxt.get(MWindow.class);
- // }
- //
- // IEclipseContext next = current.getActiveChild();
- // MPerspective candidate = null;
- // while (next != null) {
- // current = next;
- // MPerspective perspective = current.get(MPerspective.class);
- // if (perspective != null) {
- // candidate = perspective;
- // }
- // next = current.getActiveChild();
- // }
- //
- // if (candidate != null) {
- // return candidate;
- // }
- //
- // // we need to consider detached windows
- // MUIElement window = (MUIElement) current.get(MWindow.class
- // .getName());
- // if (window == null) {
- // IEclipseContext ctxt = appContext.getActiveChild();
- // if (ctxt == null) {
- // return null;
- // }
- // log();
- // return ctxt.get(MWindow.class);
- // }
- // MElementContainer<?> parent = window.getParent();
- // while (parent != null && !(parent instanceof MApplication)) {
- // window = parent;
- // parent = parent.getParent();
- // }
- // return window;
- // }
- // });
appContext.set(IServiceConstants.ACTIVE_SHELL,
new ActiveChildLookupFunction(IServiceConstants.ACTIVE_SHELL,
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java
index 752e049..c5a659f 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/workbench/modeling/EPartService.java
@@ -53,8 +53,6 @@ public interface EPartService {
CREATE
}
- public static final String PART_SERVICE_ROOT = "partServiceRoot"; //$NON-NLS-1$
-
/**
* A tag on a part to indicate that it should be removed from the model when it is hidden.
*