Bug 570554 - Remove unnecessary activator inY20210129-1200Y20210127-0710Y20210126-1200Y20210123-0110I20210128-1800I20210127-1800I20210126-1800I20210125-1800I20210124-1800I20210123-1800I20210123-0020

org.eclipse.equinox.p2.artifact.processors

Activator is only used for accessing a id hence we can only keep the id

Change-Id: Ia564d2b8feba5c18add282843de03a8be284f902
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

4 files changed, 5 insertions, 24 deletions

diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF
index 027e628ae..6e8b9b149 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.artifact.processors/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.equinox.p2.artifact.processors;singleton:=true
 Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.equinox.internal.p2.artifact.processors.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.equinox.internal.p2.artifact.processors;x-internal:=true,
diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java
index 5080995ed..6ae23807a 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/AbstractDeltaProcessorStep.java
@@ -49,7 +49,7 @@ public abstract class AbstractDeltaProcessorStep extends AbstractDeltaStep {
 			return;
 		IArtifactRepositoryManager repoMgr = agent.getService(IArtifactRepositoryManager.class);
 		if (repoMgr == null) {
-			setStatus(new Status(IStatus.ERROR, Activator.ID, "Could not get artifact repository manager."));
+			setStatus(new Status(IStatus.ERROR, BundleInfo.ID, "Could not get artifact repository manager."));
 			return;
 		}
 
@@ -65,7 +65,7 @@ public abstract class AbstractDeltaProcessorStep extends AbstractDeltaStep {
 				// just skip unreadable repositories
 			}
 		}
-		setStatus(new Status(IStatus.ERROR, Activator.ID, "No repository available containing key " + key));
+		setStatus(new Status(IStatus.ERROR, BundleInfo.ID, "No repository available containing key " + key));
 	}
 
 }
diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/Activator.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/BundleInfo.java
index 2454b0dc9..bbcf6181a 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/Activator.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/BundleInfo.java
@@ -14,26 +14,8 @@
 
 package org.eclipse.equinox.internal.p2.artifact.processors;
 
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
+public class BundleInfo {
 
 	public static final String ID = "org.eclipse.equinox.p2.artifact.processors"; //$NON-NLS-1$
-	private static BundleContext _context = null;
-
-	public static BundleContext getContext() {
-		return _context;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		Activator._context = context;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		// nothing to do
-	}
 
 }
diff --git a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java
index ac0bd5e13..47345f1a8 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java
+++ b/bundles/org.eclipse.equinox.p2.artifact.processors/src/org/eclipse/equinox/internal/p2/artifact/processors/jardelta/JarDeltaProcessorStep.java
@@ -17,7 +17,7 @@ import java.io.*;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.equinox.internal.p2.artifact.processors.AbstractDeltaProcessorStep;
-import org.eclipse.equinox.internal.p2.artifact.processors.Activator;
+import org.eclipse.equinox.internal.p2.artifact.processors.BundleInfo;
 import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
 import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactDescriptor;
 
@@ -55,7 +55,7 @@ public class JarDeltaProcessorStep extends AbstractDeltaProcessorStep {
 				InputStream resultStream = new BufferedInputStream(new FileInputStream(resultFile));
 				FileUtils.copyStream(resultStream, true, getDestination(), false);
 			} else {
-				setStatus(new Status(IStatus.ERROR, Activator.ID, "Empty optimized file: " + resultFile)); //$NON-NLS-1$
+				setStatus(new Status(IStatus.ERROR, BundleInfo.ID, "Empty optimized file: " + resultFile)); //$NON-NLS-1$
 			}
 		} finally {
 			if (resultFile != null)