Bug 495239 - Remove Activator from org.eclipse.core.expressions.tests

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

3 files changed, 3 insertions, 30 deletions

diff --git a/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF
index b2de8bd29..888a94db1 100644
--- a/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.expressions.tests/META-INF/MANIFEST.MF
@@ -3,8 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.expressions.tests; singleton:=true
 Bundle-Version: 3.5.0.qualifier
-Bundle-Activator: org.eclipse.core.internal.expressions.tests.ExpressionTestPlugin
-Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 
diff --git a/tests/org.eclipse.core.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTestPlugin.java b/tests/org.eclipse.core.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTestPlugin.java
deleted file mode 100644
index fa1d11393..000000000
--- a/tests/org.eclipse.core.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTestPlugin.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.expressions.tests;
-
-import org.eclipse.core.runtime.Plugin;
-
-public class ExpressionTestPlugin extends Plugin {
-
-	private static ExpressionTestPlugin fgDefault;
-
-	public ExpressionTestPlugin() {
-		fgDefault= this;
-	}
-
-	public static ExpressionTestPlugin getDefault() {
-		return fgDefault;
-	}
-
-}
diff --git a/tests/org.eclipse.core.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTests.java b/tests/org.eclipse.core.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTests.java
index 39015fe5d..c197eb5e5 100644
--- a/tests/org.eclipse.core.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTests.java
+++ b/tests/org.eclipse.core.expressions.tests/src/org/eclipse/core/internal/expressions/tests/ExpressionTests.java
@@ -23,6 +23,8 @@ import java.util.List;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.osgi.framework.FrameworkUtil;
+
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -900,7 +902,7 @@ public class ExpressionTests extends TestCase {
 		IConfigurationElement[] ces= registry.getConfigurationElementsFor("org.eclipse.core.expressions.tests", "testParticipants"); //$NON-NLS-1$ //$NON-NLS-2$
 
 		DocumentBuilder builder= DocumentBuilderFactory.newInstance().newDocumentBuilder();
-		URL url= ExpressionTestPlugin.getDefault().getBundle().getEntry("plugin.xml");
+		URL url = FrameworkUtil.getBundle(ExpressionTests.class).getEntry("plugin.xml");
 		Document document= builder.parse(url.openStream());
 		NodeList testParticipants= document.getElementsByTagName("testParticipant");
 		for (int i= 0; i < testParticipants.getLength(); i++) {