Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2012-04-02 11:58:06 -0400
committerAlexander Kurtakov2012-04-02 12:02:57 -0400
commit87673ccaf69c11832269d1129e4a8a599c2f39b7 (patch)
treef5d6e4baafdd4789b7763d9e90f8ae7cde8e7f8a /valgrind
parentef935efeb68084ade5082e409cced3919c4dd9d2 (diff)
downloadorg.eclipse.linuxtools-87673ccaf69c11832269d1129e4a8a599c2f39b7.tar.gz
org.eclipse.linuxtools-87673ccaf69c11832269d1129e4a8a599c2f39b7.tar.xz
org.eclipse.linuxtools-87673ccaf69c11832269d1129e4a8a599c2f39b7.zip
Make valgrind tests fragments.
Activators removed as they were not needed except for accessing the bundle which can be achieved by using FrameworkUtil.
Diffstat (limited to 'valgrind')
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF15
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java3
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java60
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF15
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/build.properties2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/AbstractHelgrindTest.java3
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/DoubleClickTest.java4
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/HelgrindTestsPlugin.java60
-rwxr-xr-xvalgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF1
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF23
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java3
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java5
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java1
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java60
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF2
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF30
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AbstractMemcheckTest.java3
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/MemcheckTestsPlugin.java57
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF1
20 files changed, 19 insertions, 331 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
index 0e8b113bb1..0859ce7dfe 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/META-INF/MANIFEST.MF
@@ -3,32 +3,21 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.cachegrind.tests
Bundle-Version: 0.11.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.cachegrind.tests.CachegrindTestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
org.junit;bundle-version="4.7.0",
- org.eclipse.ui.ide.application,
org.eclipse.cdt.managedbuilder.gnu.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Import-Package: org.eclipse.cdt.core.model,
- org.eclipse.cdt.ui,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
+Fragment-Host: org.eclipse.linuxtools.valgrind.cachegrind
+Import-Package:
org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.jface.text,
- org.eclipse.linuxtools.internal.valgrind.cachegrind,
- org.eclipse.linuxtools.internal.valgrind.cachegrind.model,
org.eclipse.linuxtools.internal.valgrind.core,
org.eclipse.linuxtools.internal.valgrind.launch,
org.eclipse.linuxtools.internal.valgrind.tests,
org.eclipse.linuxtools.internal.valgrind.ui,
org.eclipse.linuxtools.profiling.tests,
- org.eclipse.linuxtools.valgrind.launch,
org.eclipse.linuxtools.valgrind.ui,
org.eclipse.ui,
org.eclipse.ui.texteditor
-Export-Package: org.eclipse.linuxtools.internal.valgrind.cachegrind.tests
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java
index 5a8d4b8b8f..0bf5061020 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/AbstractCachegrindTest.java
@@ -16,12 +16,13 @@ import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindFunct
import org.eclipse.linuxtools.internal.valgrind.cachegrind.model.CachegrindOutput;
import org.eclipse.linuxtools.internal.valgrind.tests.AbstractValgrindTest;
import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
public abstract class AbstractCachegrindTest extends AbstractValgrindTest {
@Override
protected Bundle getBundle() {
- return CachegrindTestsPlugin.getDefault().getBundle();
+ return FrameworkUtil.getBundle(AbstractCachegrindTest.class);
}
@Override
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java
deleted file mode 100644
index 65e5581344..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind.tests/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/tests/CachegrindTestsPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
- * 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:
- * Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.cachegrind.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class CachegrindTestsPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.cachegrind.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static CachegrindTestsPlugin plugin;
-
- /**
- * The constructor
- */
- public CachegrindTestsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static CachegrindTestsPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
index 4a191a647d..c63be9a469 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/META-INF/MANIFEST.MF
@@ -24,5 +24,3 @@ Import-Package: org.eclipse.cdt.core.dom.ast,
org.eclipse.linuxtools.valgrind.core,
org.eclipse.linuxtools.valgrind.launch,
org.eclipse.linuxtools.valgrind.ui
-Export-Package: org.eclipse.linuxtools.internal.valgrind.cachegrind,
- org.eclipse.linuxtools.internal.valgrind.cachegrind.model
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF
index 8965842c3b..a1c55ca0c3 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/META-INF/MANIFEST.MF
@@ -3,32 +3,21 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.helgrind.tests
Bundle-Version: 0.11.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.helgrind.tests.HelgrindTestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="4.7.0",
- org.eclipse.ui.ide.application,
+Require-Bundle: org.junit;bundle-version="4.7.0",
org.eclipse.cdt.managedbuilder.gnu.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
+Fragment-Host: org.eclipse.linuxtools.valgrind.helgrind
Import-Package: org.eclipse.cdt.core.model,
- org.eclipse.cdt.ui,
org.eclipse.core.resources,
- org.eclipse.debug.core,
org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
org.eclipse.jface.text,
org.eclipse.linuxtools.internal.valgrind.core,
- org.eclipse.linuxtools.internal.valgrind.helgrind,
org.eclipse.linuxtools.internal.valgrind.launch,
org.eclipse.linuxtools.internal.valgrind.tests,
org.eclipse.linuxtools.internal.valgrind.ui,
org.eclipse.linuxtools.profiling.tests,
org.eclipse.linuxtools.valgrind.core,
- org.eclipse.linuxtools.valgrind.launch,
- org.eclipse.linuxtools.valgrind.ui,
- org.eclipse.ui,
org.eclipse.ui.texteditor
-Export-Package: org.eclipse.linuxtools.internal.valgrind.helgrind.tests
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/build.properties b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/build.properties
index 32f7cc1a11..969e22ba7f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/build.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/build.properties
@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
plugin.properties,\
resources/,\
about.html,\
- valgrindFiles
+ valgrindFiles/
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/AbstractHelgrindTest.java b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/AbstractHelgrindTest.java
index ab801584b1..6d6992712c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/AbstractHelgrindTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/AbstractHelgrindTest.java
@@ -14,12 +14,13 @@ package org.eclipse.linuxtools.internal.valgrind.helgrind.tests;
import org.eclipse.linuxtools.internal.valgrind.helgrind.HelgrindPlugin;
import org.eclipse.linuxtools.internal.valgrind.tests.AbstractValgrindTest;
import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
public abstract class AbstractHelgrindTest extends AbstractValgrindTest {
@Override
protected Bundle getBundle() {
- return HelgrindTestsPlugin.getDefault().getBundle();
+ return FrameworkUtil.getBundle(AbstractHelgrindTest.class);
}
@Override
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/DoubleClickTest.java b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/DoubleClickTest.java
index f65c7dc3fb..1a84357627 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/DoubleClickTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/DoubleClickTest.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.valgrind.helgrind.tests;
-import java.io.File;
-
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -27,9 +25,7 @@ import org.eclipse.linuxtools.internal.valgrind.ui.CoreMessagesViewer;
import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindViewPart;
import org.eclipse.linuxtools.valgrind.core.IValgrindMessage;
-import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/HelgrindTestsPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/HelgrindTestsPlugin.java
deleted file mode 100644
index 60d03e29b0..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/helgrind/tests/HelgrindTestsPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation
- * 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:
- * Daniel H Barboza <danielhb@br.ibm.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.helgrind.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class HelgrindTestsPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.helgrind.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static HelgrindTestsPlugin plugin;
-
- /**
- * The constructor
- */
- public HelgrindTestsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static HelgrindTestsPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF
index 0dfed09489..d4d8c9c16d 100755
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/META-INF/MANIFEST.MF
@@ -14,4 +14,3 @@ Import-Package: org.eclipse.debug.core,
org.eclipse.linuxtools.valgrind.launch,
org.eclipse.linuxtools.valgrind.ui
Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.linuxtools.internal.valgrind.helgrind;x-friends:="org.eclipse.linuxtools.valgrind.helgrind.tests"
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
index bb2e40a4e5..a637496b2f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/META-INF/MANIFEST.MF
@@ -3,34 +3,17 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.massif.tests
Bundle-Version: 0.11.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.massif.tests.MassifTestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="4.7.0",
- org.eclipse.ui.ide.application,
+Require-Bundle: org.junit;bundle-version="4.7.0",
org.eclipse.cdt.managedbuilder.gnu.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
+Fragment-Host: org.eclipse.linuxtools.valgrind.massif
Import-Package: org.eclipse.cdt.core.model,
- org.eclipse.cdt.debug.core,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jface.text,
org.eclipse.linuxtools.internal.valgrind.core,
org.eclipse.linuxtools.internal.valgrind.launch,
- org.eclipse.linuxtools.internal.valgrind.massif,
- org.eclipse.linuxtools.internal.valgrind.massif.charting,
org.eclipse.linuxtools.internal.valgrind.tests,
org.eclipse.linuxtools.internal.valgrind.ui,
org.eclipse.linuxtools.profiling.tests,
- org.eclipse.linuxtools.valgrind.launch,
- org.eclipse.ui,
- org.eclipse.ui.texteditor,
- org.swtchart
-Export-Package: org.eclipse.linuxtools.internal.valgrind.massif.tests
+ org.eclipse.ui.texteditor
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java
index ff17c22a15..cadae213e5 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/AbstractMassifTest.java
@@ -25,13 +25,14 @@ import org.eclipse.ui.IFileEditorInput;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.ITextEditor;
import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
public abstract class AbstractMassifTest extends AbstractValgrindTest {
@Override
protected Bundle getBundle() {
- return MassifTestsPlugin.getDefault().getBundle();
+ return FrameworkUtil.getBundle(AbstractMassifTest.class);
}
@Override
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
index e2f78d0065..82f02f45ef 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ChartTests.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.linuxtools.internal.valgrind.massif.tests;
-import java.util.Arrays;
-
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
@@ -20,7 +18,6 @@ import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.linuxtools.internal.valgrind.massif.MassifHeapTreeNode;
import org.eclipse.linuxtools.internal.valgrind.massif.MassifLaunchConstants;
import org.eclipse.linuxtools.internal.valgrind.massif.MassifSnapshot;
@@ -33,9 +30,7 @@ import org.eclipse.linuxtools.internal.valgrind.massif.charting.Messages;
import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindUIPlugin;
import org.eclipse.linuxtools.internal.valgrind.ui.ValgrindViewPart;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewPart;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java
index e0363e3d91..0a89e7dd1f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/ExportWizardTest.java
@@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.valgrind.massif.tests;
import java.io.File;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java
deleted file mode 100644
index c917c7d811..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/internal/valgrind/massif/tests/MassifTestsPlugin.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Red Hat, Inc.
- * 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:
- * Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.massif.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class MassifTestsPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.massif.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static MassifTestsPlugin plugin;
-
- /**
- * The constructor
- */
- public MassifTestsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static MassifTestsPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
index 6dcce84e73..6386a0ea63 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
@@ -28,5 +28,3 @@ Import-Package: org.eclipse.cdt.debug.core,
org.eclipse.linuxtools.valgrind.ui,
org.eclipse.ui,
org.swtchart
-Export-Package: org.eclipse.linuxtools.internal.valgrind.massif,
- org.eclipse.linuxtools.internal.valgrind.massif.charting;uses:="org.eclipse.swt.events,org.eclipse.swt.widgets"
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
index 0a16b028d4..887f58b3b2 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/META-INF/MANIFEST.MF
@@ -3,44 +3,20 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.linuxtools.valgrind.memcheck.tests;singleton:=true
Bundle-Version: 0.11.0.qualifier
-Bundle-Activator: org.eclipse.linuxtools.internal.valgrind.memcheck.tests.MemcheckTestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
org.junit;bundle-version="4.7.0",
- org.eclipse.ui.ide.application,
org.eclipse.cdt.managedbuilder.gnu.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Import-Package: org.eclipse.cdt.core,
- org.eclipse.cdt.core.model,
- org.eclipse.cdt.core.resources,
- org.eclipse.cdt.core.testplugin,
- org.eclipse.cdt.debug.core,
- org.eclipse.cdt.debug.ui,
- org.eclipse.cdt.launch,
- org.eclipse.core.resources,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.console,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jface.text,
+Fragment-Host: org.eclipse.linuxtools.valgrind.memcheck
+Import-Package: org.eclipse.cdt.core.model,
org.eclipse.linuxtools.internal.valgrind.core,
org.eclipse.linuxtools.internal.valgrind.launch,
- org.eclipse.linuxtools.internal.valgrind.memcheck,
org.eclipse.linuxtools.internal.valgrind.tests,
org.eclipse.linuxtools.internal.valgrind.ui,
org.eclipse.linuxtools.profiling.launch,
org.eclipse.linuxtools.profiling.tests,
org.eclipse.linuxtools.valgrind.core,
- org.eclipse.linuxtools.valgrind.launch,
- org.eclipse.linuxtools.valgrind.ui,
- org.eclipse.ui,
- org.eclipse.ui.actions,
- org.eclipse.ui.console,
- org.eclipse.ui.ide,
- org.eclipse.ui.texteditor,
- org.eclipse.ui.wizards.datatransfer
-Export-Package: org.eclipse.linuxtools.internal.valgrind.memcheck.tests
+ org.eclipse.ui
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AbstractMemcheckTest.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AbstractMemcheckTest.java
index b70e5c7b03..28d4627c1d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AbstractMemcheckTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AbstractMemcheckTest.java
@@ -13,12 +13,13 @@ package org.eclipse.linuxtools.internal.valgrind.memcheck.tests;
import org.eclipse.linuxtools.internal.valgrind.memcheck.MemcheckPlugin;
import org.eclipse.linuxtools.internal.valgrind.tests.AbstractValgrindTest;
import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
public abstract class AbstractMemcheckTest extends AbstractValgrindTest {
@Override
public Bundle getBundle() {
- return MemcheckTestsPlugin.getDefault().getBundle();
+ return FrameworkUtil.getBundle(AbstractMemcheckTest.class);
}
public String getToolID() {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/MemcheckTestsPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/MemcheckTestsPlugin.java
deleted file mode 100644
index 897be70ebe..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/MemcheckTestsPlugin.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
- * 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:
- * Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.memcheck.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public class MemcheckTestsPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.linuxtools.valgrind.memcheck.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static MemcheckTestsPlugin plugin;
-
- /**
- * The constructor
- */
- public MemcheckTestsPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static MemcheckTestsPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
index a7fdadecef..af6542bc79 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF
@@ -24,4 +24,3 @@ Import-Package: org.eclipse.cdt.debug.core,
org.eclipse.ui.ide,
org.eclipse.ui.texteditor
Bundle-Localization: plugin
-Export-Package: org.eclipse.linuxtools.internal.valgrind.memcheck

Back to the top