aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Keimel2013-07-19 05:25:02 (EDT)
committerGerrit Code Review @ Eclipse.org2013-07-23 10:45:36 (EDT)
commit758c1cbfcf8ce44ea27d48ff0c9ff4d3fa479238 (patch)
treeb3bd074a674172672226e78be8dd3a8340bb7e31
parentfa694e6ccb5d1fdad75a158aaa19c33fcddef0e5 (diff)
downloadeclipse.platform.ui-758c1cbfcf8ce44ea27d48ff0c9ff4d3fa479238.zip
eclipse.platform.ui-758c1cbfcf8ce44ea27d48ff0c9ff4d3fa479238.tar.gz
eclipse.platform.ui-758c1cbfcf8ce44ea27d48ff0c9ff4d3fa479238.tar.bz2
Fixed bug 413149 by setting the defaultSupplier earlier during therefs/changes/66/14766/2
creation of the E4 workbench Change-Id: I3ec04dc454d1f3c60c7a50122566277de2683947 Signed-off-by: Christoph Keimel <c.keimel@emsw.de>
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/E4Application.java8
1 files changed, 4 insertions, 4 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 87b4099..52f8e5e 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
@@ -211,6 +211,10 @@ public class E4Application implements IApplication {
});
appContext.set(IApplicationContext.class, applicationContext);
+ // This context will be used by the injector for its
+ // extended data suppliers
+ ContextInjectionFactory.setDefault(appContext);
+
// Check if DS is running
if (!appContext
.containsKey("org.eclipse.e4.ui.workbench.modeling.EPartService")) {
@@ -254,10 +258,6 @@ public class E4Application implements IApplication {
// Set the app's context after adding itself
appContext.set(MApplication.class.getName(), appModel);
- // This context will be used by the injector for its
- // extended data suppliers
- ContextInjectionFactory.setDefault(appContext);
-
// adds basic services to the contexts
initializeServices(appModel);