Remove unnecessary activator bundle
diff --git a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
index 7696fa4..b23950d 100644
--- a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,6 @@
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ui.editors.tests;singleton:=true
Bundle-Version: 3.8.300.qualifier
-Bundle-Activator: org.eclipse.ui.editors.tests.EditorTestPlugin
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.ui.editors.tests
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorTestPlugin.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorTestPlugin.java
deleted file mode 100644
index fc602e8..0000000
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/EditorTestPlugin.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2015 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.ui.editors.tests;
-
-import org.osgi.framework.BundleContext;
-
-import org.eclipse.core.runtime.Plugin;
-
-public class EditorTestPlugin extends Plugin {
-
- /* (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
- */
- public static String PLUGIN_ID= "org.eclipse.ui.editors.tests";
-
- // The shared instance
- private static EditorTestPlugin fgPlugin;
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static EditorTestPlugin getDefault() {
- return fgPlugin;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- fgPlugin= this;
- }
-
- public EditorTestPlugin() {
- super();
- }
-
-}
diff --git a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java
index c5172f5..cd79c0e 100644
--- a/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java
+++ b/org.eclipse.ui.editors.tests/src/org/eclipse/ui/editors/tests/MarkerAnnotationOrderTest.java
@@ -53,7 +53,7 @@
protected void setUp() throws Exception {
//add the marker updater extension point
IExtensionRegistry registry= Platform.getExtensionRegistry();
- pointContributor= ContributorFactorySimple.createContributor(Long.toString(EditorTestPlugin.getDefault().getBundle().getBundleId()));
+ pointContributor= ContributorFactorySimple.createContributor(this);
try {
BufferedInputStream bis= new BufferedInputStream(getClass().getResourceAsStream("plugin.xml"));
@@ -66,7 +66,7 @@
registry.addContribution(bis, pointContributor, true, null, null, masterToken);
} catch (Exception ex) {
fail("update marker setup failed to execute");
- EditorTestPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, EditorTestPlugin.PLUGIN_ID, ex.getMessage()));
+ log(ex);
}
}
@@ -99,7 +99,7 @@
t1.updateMarker(d, null, position);
} catch (CoreException e) {
fail("update marker failed to execute");
- EditorTestPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, EditorTestPlugin.PLUGIN_ID, e.getMessage()));
+ log(e);
}
assertEquals("Wrong number of messages", 2, list.size());
@@ -131,4 +131,10 @@
}
+ private static void log(Exception ex) {
+ String PLUGIN_ID= "org.eclipse.jface.text"; //$NON-NLS-1$
+ ILog log= Platform.getLog(Platform.getBundle(PLUGIN_ID));
+ log.log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.OK, ex.getMessage(), ex));
+ }
+
}
