diff options
| author | Tom Schindl | 2015-07-07 14:21:56 +0000 |
|---|---|---|
| committer | Tom Schindl | 2015-07-07 14:24:31 +0000 |
| commit | 886d07f2c5e44b4392fb34abae7d2f9a2fee7499 (patch) | |
| tree | 18f85085fd9600b3bd28be154c87ae7d7e376a39 | |
| parent | 30e24dfab6b69f6bd0914c5cd7c4d1e7f37d008b (diff) | |
| download | org.eclipse.rap.incubator.e4-886d07f2c5e44b4392fb34abae7d2f9a2fee7499.tar.gz org.eclipse.rap.incubator.e4-886d07f2c5e44b4392fb34abae7d2f9a2fee7499.tar.xz org.eclipse.rap.incubator.e4-886d07f2c5e44b4392fb34abae7d2f9a2fee7499.zip | |
Bug 470875 - [e4] Update to Mars
| -rw-r--r-- | bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/E4EntryPointFactory.java | 30 | ||||
| -rw-r--r-- | features/org.eclipse.rap.e4.base.feature/feature.xml | 14 | ||||
| -rw-r--r-- | releng/releng-base/pom.xml | 6 |
3 files changed, 33 insertions, 17 deletions
diff --git a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/E4EntryPointFactory.java b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/E4EntryPointFactory.java index e122b0b..05c0661 100644 --- a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/E4EntryPointFactory.java +++ b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/E4EntryPointFactory.java @@ -77,22 +77,24 @@ public class E4EntryPointFactory implements EntryPointFactory { // if (!checkInstanceLocation(instanceLocation, shell, // workbench.getContext())) // return EXIT_OK; - - IEclipseContext workbenchContext = workbench.getContext(); - - // Create and run the UI (if any) - workbench.createAndRunUI(workbench.getApplication()); - // Save the model into the targetURI - if (e4App.lcManager != null) { - ContextInjectionFactory.invoke(e4App.lcManager, PreSave.class, - workbenchContext, null); - } - e4App.saveModel(); - workbench.close(); + if( workbench != null ) { + IEclipseContext workbenchContext = workbench.getContext(); + + // Create and run the UI (if any) + workbench.createAndRunUI(workbench.getApplication()); + + // Save the model into the targetURI + if (e4App.lcManager != null) { + ContextInjectionFactory.invoke(e4App.lcManager, PreSave.class, + workbenchContext, null); + } + e4App.saveModel(); + workbench.close(); - if (workbench.isRestart()) { - return IApplication.EXIT_RESTART; + if (workbench.isRestart()) { + return IApplication.EXIT_RESTART; + } } return IApplication.EXIT_OK; diff --git a/features/org.eclipse.rap.e4.base.feature/feature.xml b/features/org.eclipse.rap.e4.base.feature/feature.xml index 7f1ff61..b683392 100644 --- a/features/org.eclipse.rap.e4.base.feature/feature.xml +++ b/features/org.eclipse.rap.e4.base.feature/feature.xml @@ -17,6 +17,20 @@ </license> <plugin + id="org.eclipse.e4.core.di" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.e4.core.di.annotations" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin id="org.eclipse.e4.core.contexts" download-size="0" install-size="0" diff --git a/releng/releng-base/pom.xml b/releng/releng-base/pom.xml index 3800dcc..7cb71f2 100644 --- a/releng/releng-base/pom.xml +++ b/releng/releng-base/pom.xml @@ -34,13 +34,13 @@ <repository> <id>luna</id> <layout>p2</layout> - <url>http://download.eclipse.org/releases/luna</url> + <url>http://download.eclipse.org/releases/mars</url> </repository> - <repository> + <!-- repository> <id>rap-nightly</id> <layout>p2</layout> <url>http://download.eclipse.org/rt/rap/nightly/runtime/</url> - </repository> + </repository--> <!-- repository> <id>luna-i-build</id> <layout>p2</layout> |