diff options
| author | Pierre-Charles David | 2016-02-02 15:10:45 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2016-02-03 14:57:58 +0000 |
| commit | 0975112de0ed2d343bdff6183380f460509e30fe (patch) | |
| tree | 1bff710dae00a22a50fb5514abc0bfa033d5da66 | |
| parent | ea1660fa321305fa8b0d02dca159eced3236ce96 (diff) | |
| download | org.eclipse.sirius-0975112de0ed2d343bdff6183380f460509e30fe.tar.gz org.eclipse.sirius-0975112de0ed2d343bdff6183380f460509e30fe.tar.xz org.eclipse.sirius-0975112de0ed2d343bdff6183380f460509e30fe.zip | |
[482528] Remove dependency to GEF or GMF Runtime
The SiriusContext-based implementation of SiriusSemanticAdapter can do
its job without explicitly depending on GEF of GMF. The implicit
dependency is still here for now in the
org.eclipse.core.runtime.adapters extension point configuration.
Bug: 482528
Change-Id: Iedbea88e3379b5c98f608a42bbcce3df84eb065d
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
2 files changed, 4 insertions, 29 deletions
diff --git a/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF b/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF index de8ec02db9..9a7deaca83 100644 --- a/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF +++ b/incubation/org.eclipse.sirius.ui.properties/META-INF/MANIFEST.MF @@ -6,7 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.eef;bundle-version="1.6.0", - org.eclipse.gmf.runtime.diagram.ui, org.eclipse.sirius, org.eclipse.sirius.ext.emf;bundle-version="3.1.2", org.eclipse.sirius.properties, @@ -17,7 +16,10 @@ Require-Bundle: org.eclipse.eef;bundle-version="1.6.0", org.eclipse.sirius.ecore.extender, org.eclipse.sirius.ext.base, org.eclipse.sirius.common.interpreter;bundle-version="1.0.0", - org.eclipse.eef.properties.ui;bundle-version="1.6.0" + org.eclipse.eef.properties.ui;bundle-version="1.6.0", + org.eclipse.ui.ide, + org.eclipse.jface, + org.eclipse.emf.transaction;bundle-version="1.9.0" Import-Package: com.ibm.icu.util, org.eclipse.sirius.ui.tools.api.properties;version="2.1.0" Bundle-Activator: org.eclipse.sirius.ui.properties.internal.SiriusUIPropertiesPlugin$Implementation diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusUIPropertiesPlugin.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusUIPropertiesPlugin.java index b9e6378d3e..558cf6ab94 100644 --- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusUIPropertiesPlugin.java +++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusUIPropertiesPlugin.java @@ -11,16 +11,10 @@ package org.eclipse.sirius.ui.properties.internal; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdapterManager; import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart; -import org.eclipse.sirius.viewpoint.DSemanticDecorator; -import org.osgi.framework.BundleContext; /** * The plugin for <code>org.eclipse.sirius.ui.properties</code>. @@ -71,13 +65,6 @@ public class SiriusUIPropertiesPlugin extends EMFPlugin { * @author sbegaudeau */ public static class Implementation extends EclipsePlugin { - - /** - * The adapter is stateless, use a single instance that can be easily - * unregistered when stopped. - */ - private final SiriusSemanticAdapter adapterFactory = new SiriusSemanticAdapter(); - /** * The constructor. */ @@ -86,20 +73,6 @@ public class SiriusUIPropertiesPlugin extends EMFPlugin { SiriusUIPropertiesPlugin.plugin = this; } - @Override - public void start(BundleContext context) throws Exception { - IAdapterManager adapterManager = Platform.getAdapterManager(); - adapterManager.registerAdapters(adapterFactory, DSemanticDecorator.class); - adapterManager.registerAdapters(adapterFactory, GraphicalEditPart.class); - adapterManager.registerAdapters(adapterFactory, ConnectionEditPart.class); - } - - @Override - public void stop(BundleContext context) throws Exception { - IAdapterManager adapterManager = Platform.getAdapterManager(); - adapterManager.unregisterAdapters(adapterFactory); - } - /** * Logs the status. * |
