diff options
| author | Pierre-Charles David | 2018-07-12 09:50:53 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2018-07-19 09:20:34 +0000 |
| commit | 2fafdbc3e7b695422b8919f735cf73013ce0e877 (patch) | |
| tree | 840589996fca32f0d3b3e5315aadeea183e59d3e | |
| parent | 3c9883a999098bc8bfa93158bd267b24cf7b7380 (diff) | |
| download | org.eclipse.sirius-2fafdbc3e7b695422b8919f735cf73013ce0e877.tar.gz org.eclipse.sirius-2fafdbc3e7b695422b8919f735cf73013ce0e877.tar.xz org.eclipse.sirius-2fafdbc3e7b695422b8919f735cf73013ce0e877.zip | |
[536894] Make the server autostart feature depend on the server
Also mark it clearly "Experimental" like the server feature itself,
and make the plug-in itself more robust if the server is not
installed. It should not happen in practice but it costs almost
nothing.
Bug: 536894
Change-Id: Ie366255e5872e32c2e85b5ce2519d3037ff82366
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
3 files changed, 6 insertions, 2 deletions
diff --git a/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.properties b/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.properties index 4f10ddbed6..21d2d65539 100644 --- a/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.properties +++ b/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.properties @@ -8,7 +8,7 @@ # Contributors: # Obeo - initial API and implementation # ==================================================================== -featureName = Sirius Server Auto Start +featureName = Sirius Server Auto Start (Experimental) providerName = Eclipse Modeling Project description = Auto starter for Sirius Server copyright=\ diff --git a/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.xml b/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.xml index 60d883761c..c46a2580b6 100644 --- a/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.xml +++ b/packaging/org.eclipse.sirius.server.ui.autostart.feature/feature.xml @@ -19,6 +19,10 @@ %license </license> + <requires> + <import feature="org.eclipse.sirius.server.feature" version="6.0.1.qualifier"/> + </requires> + <plugin id="org.eclipse.sirius.server.ui.autostart" download-size="0" diff --git a/plugins/org.eclipse.sirius.server.ui.autostart/src/org/eclipse/sirius/server/ui/autostart/internal/SiriusServerStartup.java b/plugins/org.eclipse.sirius.server.ui.autostart/src/org/eclipse/sirius/server/ui/autostart/internal/SiriusServerStartup.java index b64ca10808..2aa2c11c6a 100644 --- a/plugins/org.eclipse.sirius.server.ui.autostart/src/org/eclipse/sirius/server/ui/autostart/internal/SiriusServerStartup.java +++ b/plugins/org.eclipse.sirius.server.ui.autostart/src/org/eclipse/sirius/server/ui/autostart/internal/SiriusServerStartup.java @@ -95,7 +95,7 @@ public class SiriusServerStartup implements IStartup { Job job = Job.create(DESCRIPTION, (ICoreRunnable) monitor -> { Display.getDefault().asyncExec(() -> { Bundle siriusServerBundle = Platform.getBundle(SIRIUS_SERVER_PLUGIN_ID); - if (siriusServerBundle.getState() != Bundle.ACTIVE) { + if (siriusServerBundle != null && siriusServerBundle.getState() != Bundle.ACTIVE) { try { siriusServerBundle.start(Bundle.START_TRANSIENT); } catch (BundleException exception) { |