diff options
author | Alexander Kurtakov | 2021-04-24 07:23:40 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2021-04-24 19:42:39 +0000 |
commit | 07efa15db9ca1c90548db8d95e318303644a66f9 (patch) | |
tree | 51e14a23b01903fa9cf1351b6406eb2df238609e | |
parent | ad58ff31a3f1d942596649b6390bed17cc1e9d45 (diff) | |
download | eclipse.platform.team-07efa15db9ca1c90548db8d95e318303644a66f9.tar.gz eclipse.platform.team-07efa15db9ca1c90548db8d95e318303644a66f9.tar.xz eclipse.platform.team-07efa15db9ca1c90548db8d95e318303644a66f9.zip |
Get rido of activator in o.e.core.tests.net.
Change-Id: Ifade1e925b3401d35318d3dbc221cc1c963691cd
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.team/+/179785
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
4 files changed, 8 insertions, 43 deletions
diff --git a/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF index dd5644adc..86da25701 100644 --- a/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.core.tests.net/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Net Tests Plug-in Bundle-SymbolicName: org.eclipse.core.tests.net Bundle-Version: 1.5.0.qualifier -Bundle-Activator: org.eclipse.core.tests.net.Activator Bundle-Vendor: Eclipse.org Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)", org.eclipse.core.net;bundle-version="[1.0.0,2.0.0)", diff --git a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java index ec1dfa677..dd3476149 100644 --- a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java +++ b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/Activator.java @@ -14,52 +14,18 @@ package org.eclipse.core.tests.net; import org.eclipse.core.net.proxy.IProxyService; -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; +import org.osgi.framework.*; /** * The activator class controls the plug-in life cycle */ -public class Activator extends Plugin { +public class Activator { - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.net.tests"; - - // The shared instance - private static Activator plugin; - - /** - * The constructor - */ - public Activator() { - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - public IProxyService getProxyService() { - ServiceReference<IProxyService> serviceReference = getBundle().getBundleContext().getServiceReference(IProxyService.class); + public static IProxyService getProxyService() { + Bundle bundle = FrameworkUtil.getBundle(Activator.class); + ServiceReference<IProxyService> serviceReference = bundle.getBundleContext().getServiceReference(IProxyService.class); if (serviceReference != null) - return getBundle().getBundleContext().getService(serviceReference); + return bundle.getBundleContext().getService(serviceReference); return null; } diff --git a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java index 734b4ab4c..3abeba254 100644 --- a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java +++ b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/NetTest.java @@ -61,7 +61,7 @@ public class NetTest { } private IProxyService getProxyManager() { - return Activator.getDefault().getProxyService(); + return Activator.getProxyService(); } private void assertProxyDataEqual(IProxyData expected) { diff --git a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java index e5718e65b..3376dd264 100644 --- a/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java +++ b/tests/org.eclipse.core.tests.net/src/org/eclipse/core/tests/net/SystemProxyTest.java @@ -55,7 +55,7 @@ public class SystemProxyTest { } private IProxyService getProxyManager() { - return Activator.getDefault().getProxyService(); + return Activator.getProxyService(); } private boolean isProxiesEnabled() { |