Migrate to Declarative Services for Adapters

Fix #585
eclipse-m2e · Jul 8, 2022 · 22a3184 · 22a3184
1 parent f4165c0
commit 22a3184
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 137 deletions.
diff --git a/org.eclipse.m2e.pde.ui/.project b/org.eclipse.m2e.pde.ui/.project
@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>

diff --git a/org.eclipse.m2e.pde.ui/.settings/org.eclipse.pde.ds.annotations.prefs b/org.eclipse.m2e.pde.ui/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,8 @@
+classpath=true
+dsVersion=V1_3
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF
@@ -19,6 +19,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0",
  org.eclipse.core.databinding.property;bundle-version="1.8.100",
  org.eclipse.ui.workbench
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.m2e.pde.ui.Activator
 Bundle-Vendor: Eclipse.org - m2e
-Import-Package: aQute.bnd.osgi;version="[5.5.0,6.0.0)"
+Import-Package: aQute.bnd.osgi;version="[5.5.0,6.0.0)",
+ org.slf4j;version="1.7.30"
+Service-Component: OSGI-INF/org.eclipse.m2e.pde.ui.target.adapter.DependencyNodeAdapterFactory.xml,
+ OSGI-INF/org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory.xml,
+ OSGI-INF/org.eclipse.m2e.pde.ui.target.adapter.MavenTargetBundleAdapterFactory.xml,
+ OSGI-INF/org.eclipse.m2e.pde.ui.target.adapter.MavenTargetDependencyAdapterFactory.xml
diff --git a/org.eclipse.m2e.pde.ui/OSGI-INF/.gitignore b/org.eclipse.m2e.pde.ui/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.m2e.*.xml
diff --git a/org.eclipse.m2e.pde.ui/build.properties b/org.eclipse.m2e.pde.ui/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/
+               icons/,\
+               OSGI-INF/
diff --git a/org.eclipse.m2e.pde.ui/plugin.xml b/org.eclipse.m2e.pde.ui/plugin.xml
@@ -15,62 +15,4 @@
        </locationProvider>
 
     </extension>
-    <extension
-          point="org.eclipse.core.runtime.adapters">
-       <factory
-             adaptableType="org.eclipse.m2e.pde.target.MavenTargetLocation"
-             class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetAdapterFactory">
-          <adapter
-                type="org.eclipse.jface.viewers.ILabelProvider">
-          </adapter>
-          <adapter
-                type="org.eclipse.jface.viewers.ITreeContentProvider">
-          </adapter>
-          <adapter
-                type="org.eclipse.pde.ui.target.ITargetLocationHandler">
-          </adapter>
-       </factory>
-    </extension>
-    <extension
-          point="org.eclipse.core.runtime.adapters">
-       <factory
-             adaptableType="org.eclipse.m2e.pde.target.MavenTargetBundle"
-             class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetBundleAdapterFactory">
-          <adapter
-                type="org.eclipse.jface.viewers.ILabelProvider">
-          </adapter>
-       </factory>
-    </extension>
-    <extension
-          point="org.eclipse.core.runtime.adapters">
-       <factory
-             adaptableType="org.eclipse.aether.graph.DependencyNode"
-             class="org.eclipse.m2e.pde.ui.target.adapter.DependencyNodeAdapterFactory">
-          <adapter
-                type="org.eclipse.jface.viewers.ITreeContentProvider">
-          </adapter>
-          <adapter
-                type="org.eclipse.jface.viewers.ILabelProvider">
-          </adapter>
-          <adapter
-                type="org.eclipse.pde.ui.target.ITargetLocationHandler">
-          </adapter>
-       </factory>
-    </extension>
-    <extension
-          point="org.eclipse.core.runtime.adapters">
-       <factory
-             adaptableType="org.eclipse.m2e.pde.target.MavenTargetDependency"
-             class="org.eclipse.m2e.pde.ui.target.adapter.MavenTargetDependencyAdapterFactory">
-          <adapter
-                type="org.eclipse.jface.viewers.ILabelProvider">
-          </adapter>
-          <adapter
-                type="org.eclipse.jface.viewers.ITreeContentProvider">
-          </adapter>
-          <adapter
-                type="org.eclipse.pde.ui.target.ITargetLocationHandler">
-          </adapter>
-       </factory>
-    </extension>
 </plugin>
diff --git a/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/Activator.java b/org.eclipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/Activator.java
diff --git a/...se.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/DependencyNodeAdapterFactory.java b/...se.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/DependencyNodeAdapterFactory.java
@@ -16,21 +16,23 @@
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
 import org.eclipse.m2e.pde.ui.target.provider.DependencyNodeLabelProvider;
 import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
 import org.eclipse.pde.ui.target.ITargetLocationHandler;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 
+@Component(service = IAdapterFactory.class, property = {
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTABLE_CLASS + "=org.eclipse.aether.graph.DependencyNode",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.jface.viewers.ILabelProvider",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.jface.viewers.ITreeContentProvider",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.pde.ui.target.ITargetLocationHandler" })
 public class DependencyNodeAdapterFactory implements IAdapterFactory {
 
-	public static final ITreeContentProvider TREE_CONTENT_PROVIDER = new MavenTargetTreeContentProvider();
-	public static final ILabelProvider LABEL_PROVIDER = new DependencyNodeLabelProvider();
-	private static final MavenTargetLocationEditor LOCATION_EDITOR = new MavenTargetLocationEditor();
-	static {
-		Activator.runOnBundleStop(TREE_CONTENT_PROVIDER::dispose);
-		Activator.runOnBundleStop(LABEL_PROVIDER::dispose);
-	}
+	private final ITreeContentProvider TREE_CONTENT_PROVIDER = new MavenTargetTreeContentProvider();
+	private final ILabelProvider LABEL_PROVIDER = new DependencyNodeLabelProvider();
+	private final MavenTargetLocationEditor LOCATION_EDITOR = new MavenTargetLocationEditor();
 
 	@Override
 	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
@@ -51,4 +53,10 @@ public Class<?>[] getAdapterList() {
 		return new Class<?>[] { ITreeContentProvider.class, ILabelProvider.class, ITargetLocationHandler.class };
 	}
 
+	@Deactivate
+	void dispose() {
+		TREE_CONTENT_PROVIDER.dispose();
+		LABEL_PROVIDER.dispose();
+	}
+
 }
diff --git a/...lipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetAdapterFactory.java b/...lipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetAdapterFactory.java
@@ -16,21 +16,23 @@
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.m2e.pde.target.MavenTargetLocation;
-import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
 import org.eclipse.m2e.pde.ui.target.provider.MavenTargetLocationLabelProvider;
 import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
 import org.eclipse.pde.ui.target.ITargetLocationHandler;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 
+@Component(service = IAdapterFactory.class, property = {
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTABLE_CLASS + "=org.eclipse.m2e.pde.target.MavenTargetLocation",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.jface.viewers.ILabelProvider",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.jface.viewers.ITreeContentProvider",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.pde.ui.target.ITargetLocationHandler" })
 public class MavenTargetAdapterFactory implements IAdapterFactory {
 
-	public static final ILabelProvider LABEL_PROVIDER = new MavenTargetLocationLabelProvider();
-	public static final ITreeContentProvider TREE_CONTENT_PROVIDER = new MavenTargetTreeContentProvider();
-	private static final MavenTargetLocationEditor LOCATION_EDITOR = new MavenTargetLocationEditor();
-	static {
-		Activator.runOnBundleStop(LABEL_PROVIDER::dispose);
-		Activator.runOnBundleStop(TREE_CONTENT_PROVIDER::dispose);
-	}
+	private final ILabelProvider LABEL_PROVIDER = new MavenTargetLocationLabelProvider();
+	private final ITreeContentProvider TREE_CONTENT_PROVIDER = new MavenTargetTreeContentProvider();
+	private final MavenTargetLocationEditor LOCATION_EDITOR = new MavenTargetLocationEditor();
 	@Override
 	public Class<?>[] getAdapterList() {
 		return new Class[] { ILabelProvider.class, ITreeContentProvider.class, ITargetLocationHandler.class };
@@ -50,4 +52,10 @@ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		return null;
 	}
 
+	@Deactivate
+	void dispose() {
+		LABEL_PROVIDER.dispose();
+		TREE_CONTENT_PROVIDER.dispose();
+	}
+
 }
diff --git a/...m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetBundleAdapterFactory.java b/...m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetBundleAdapterFactory.java
@@ -15,15 +15,16 @@
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.m2e.pde.target.MavenTargetBundle;
-import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.m2e.pde.ui.target.provider.MavenTargetBundleLabelProvider;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 
+@Component(service = IAdapterFactory.class, property = {
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTABLE_CLASS + "=org.eclipse.m2e.pde.target.MavenTargetBundle",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.jface.viewers.ILabelProvider" })
 public class MavenTargetBundleAdapterFactory implements IAdapterFactory {
 
-	public static final ILabelProvider LABEL_PROVIDER = new MavenTargetBundleLabelProvider();
-	static {
-		Activator.runOnBundleStop(LABEL_PROVIDER::dispose);
-	}
+	private final ILabelProvider LABEL_PROVIDER = new MavenTargetBundleLabelProvider();
 	@Override
 	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (adaptableObject instanceof MavenTargetBundle) {
@@ -39,4 +40,9 @@ public Class<?>[] getAdapterList() {
 		return new Class<?>[] { ILabelProvider.class };
 	}
 
+	@Deactivate
+	void dispose() {
+		LABEL_PROVIDER.dispose();
+	}
+
 }
diff --git a/...pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetDependencyAdapterFactory.java b/...pde.ui/src/org/eclipse/m2e/pde/ui/target/adapter/MavenTargetDependencyAdapterFactory.java
@@ -16,21 +16,23 @@
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.m2e.pde.target.MavenTargetDependency;
-import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.m2e.pde.ui.target.editor.MavenTargetLocationEditor;
 import org.eclipse.m2e.pde.ui.target.provider.MavenTargetDependencyLabelProvider;
 import org.eclipse.m2e.pde.ui.target.provider.MavenTargetTreeContentProvider;
 import org.eclipse.pde.ui.target.ITargetLocationHandler;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
 
+@Component(service = IAdapterFactory.class, property = {
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTABLE_CLASS + "=org.eclipse.m2e.pde.target.MavenTargetDependency",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.jface.viewers.ILabelProvider",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.jface.viewers.ITreeContentProvider",
+		IAdapterFactory.SERVICE_PROPERTY_ADAPTER_NAMES + "=org.eclipse.pde.ui.target.ITargetLocationHandler" })
 public class MavenTargetDependencyAdapterFactory implements IAdapterFactory {
 
-	public static final ILabelProvider LABEL_PROVIDER = new MavenTargetDependencyLabelProvider();
-	public static final ITreeContentProvider TREE_CONTENT_PROVIDER = new MavenTargetTreeContentProvider();
-	private static final MavenTargetLocationEditor LOCATION_EDITOR = new MavenTargetLocationEditor();
-	static {
-		Activator.runOnBundleStop(LABEL_PROVIDER::dispose);
-		Activator.runOnBundleStop(TREE_CONTENT_PROVIDER::dispose);
-	}
+	private final ILabelProvider LABEL_PROVIDER = new MavenTargetDependencyLabelProvider();
+	private final ITreeContentProvider TREE_CONTENT_PROVIDER = new MavenTargetTreeContentProvider();
+	private final MavenTargetLocationEditor LOCATION_EDITOR = new MavenTargetLocationEditor();
 	@Override
 	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		if (adaptableObject instanceof MavenTargetDependency) {
@@ -50,4 +52,10 @@ public Class<?>[] getAdapterList() {
 		return new Class[] { ILabelProvider.class, ITreeContentProvider.class, ITargetLocationHandler.class };
 	}
 
+	@Deactivate
+	void dispose() {
+		LABEL_PROVIDER.dispose();
+		TREE_CONTENT_PROVIDER.dispose();
+	}
+
 }
diff --git a/...clipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationEditor.java b/...clipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationEditor.java
@@ -28,7 +28,6 @@
 import org.eclipse.m2e.pde.target.MavenTargetDependency;
 import org.eclipse.m2e.pde.target.MavenTargetLocation;
 import org.eclipse.m2e.pde.target.MissingMetadataMode;
-import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.pde.core.target.ITargetDefinition;
 import org.eclipse.pde.core.target.ITargetLocation;
 import org.eclipse.pde.ui.target.ITargetLocationHandler;
@@ -140,7 +139,8 @@ public boolean canUpdate(ITargetDefinition target, TreePath treePath) {
 	@Override
 	public IStatus update(ITargetDefinition target, TreePath[] treePaths, IProgressMonitor monitor) {
 		ITargetLocation[] targetLocations = target.getTargetLocations();
-		IStatus status = new Status(IStatus.OK, Activator.ID, ITargetLocationHandler.STATUS_CODE_NO_CHANGE, "", null);
+		IStatus status = new Status(IStatus.OK, "org.eclipse.m2e.pde.ui", ITargetLocationHandler.STATUS_CODE_NO_CHANGE,
+				"", null);
 		for (TreePath treePath : treePaths) {
 			Object segment = treePath.getFirstSegment();
 			if (segment instanceof MavenTargetLocation) {
@@ -256,7 +256,7 @@ public IStatus toggle(ITargetDefinition target, TreePath[] treePaths) {
 				}
 			}
 		}
-		return toggled > 0 ? new Status(IStatus.OK, Activator.class.getPackageName(), STATUS_FORCE_RELOAD, "", null)
+		return toggled > 0 ? new Status(IStatus.OK, "org.eclipse.m2e.pde.ui", STATUS_FORCE_RELOAD, "", null)
 				: Status.CANCEL_STATUS;
 	}
 

diff --git a/...clipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationWizard.java b/...clipse.m2e.pde.ui/src/org/eclipse/m2e/pde/ui/target/editor/MavenTargetLocationWizard.java
@@ -39,7 +39,6 @@
 import org.eclipse.m2e.pde.target.MavenTargetRepository;
 import org.eclipse.m2e.pde.target.MissingMetadataMode;
 import org.eclipse.m2e.pde.target.TemplateFeatureModel;
-import org.eclipse.m2e.pde.ui.Activator;
 import org.eclipse.pde.core.target.ITargetDefinition;
 import org.eclipse.pde.core.target.ITargetLocation;
 import org.eclipse.pde.ui.target.ITargetLocationWizard;
@@ -390,7 +389,7 @@ public boolean performFinish() {
 				featureSpecPage.update(featureModel, iscreate || targetLocation.getFeatureTemplate() == null);
 				pluginListPage.update(featureModel);
 			} catch (CoreException e) {
-				Platform.getLog(Activator.class).log(e.getStatus());
+				Platform.getLog(MavenTargetLocationWizard.class).log(e.getStatus());
 			}
 			featureModel.makeReadOnly();
 		}

diff --git a/org.eclipse.m2e.pde/.settings/org.eclipse.core.resources.prefs b/org.eclipse.m2e.pde/.settings/org.eclipse.core.resources.prefs