aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Pontes2011-09-28 12:50:09 (EDT)
committerOtavio Pontes2011-11-09 13:58:54 (EST)
commit0513f1fc6a3ff095d33d47984e6ff1577d11a830 (patch)
tree1b65b1040d3695012a855eaca6eeacb2c30c69f5
parent6c7ad8886d30f36f38c2b86bca4e9cbddc3d3782 (diff)
downloadorg.eclipse.linuxtools-0513f1fc6a3ff095d33d47984e6ff1577d11a830.zip
org.eclipse.linuxtools-0513f1fc6a3ff095d33d47984e6ff1577d11a830.tar.gz
org.eclipse.linuxtools-0513f1fc6a3ff095d33d47984e6ff1577d11a830.tar.bz2
Removing valgrind preference page (bug #353056)
This page is not longer needed because we will be able to set the linuxtools PATH environment variable in Project Properties. ChangeLog: * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java: Removing dependency for ValgrindPreferencePage * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java: Removing dependency for ValgrindPreferencePage * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java: Removing this preference page. This page is not longer needed because we will be able to set the linuxtools PATH environment variable in Project Properties. * src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java: Removing dependency for ValgrindPreferencePage * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java: Removing dependency for ValgrindPreferencePage * src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java: Removing dependency for ValgrindPreferencePage * src/org/eclipse/linuxtools/internal/valgrind/tests/AbstractValgrindTest.java: Removing dependency for ValgrindPreferencePage * src/org/eclipse/linuxtools/internal/valgrind/tests/ValgrindStubCommand.java: Removing dependency for ValgrindPreferencePage
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog11
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java29
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java16
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java197
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog8
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java31
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog8
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java1
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java42
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog10
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/AbstractValgrindTest.java6
-rw-r--r--valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/ValgrindStubCommand.java3
12 files changed, 46 insertions, 316 deletions
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
index 9672234..8dead12 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-28 Otavio Pontes <obusatto@br.ibm.com>
+
+ Related to bug #353056
+ * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java:
+ Removing dependency for ValgrindPreferencePage
+ * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java:
+ Removing dependency for ValgrindPreferencePage
+ * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java:
+ Removing this preference page. This page is not longer needed because we will be
+ able to set the linuxtools PATH environment variable in Project Properties.
+
2011-10-18 Jeff Johnston <jjohnstn@redhat.com>
* META-INF/MANIFEST.MF: Hide internal package except from other Valgrind plug-ins.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
index 599b07f..727ab1e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java
@@ -27,30 +27,11 @@ public class ValgrindCommand {
public String whichValgrind() throws IOException {
String ret;
- // Valgrind binary location in preferences overrides default location
- String valgrindPreferedPath = ValgrindPlugin.getDefault().getPreferenceStore().getString(ValgrindPreferencePage.VALGRIND_PATH);
- if (valgrindPreferedPath.equals("")) { //$NON-NLS-1$
- // No preference, check Valgrind exists in the user's PATH
- StringBuffer out = new StringBuffer();
- Process p = Runtime.getRuntime().exec(WHICH_CMD + " " + VALGRIND_CMD); //$NON-NLS-1$
- // Throws IOException if which command is unsuccessful
- readIntoBuffer(out, p);
- ret = out.toString().trim();
- }
- else {
- ret = valgrindPreferedPath;
- }
- return ret;
- }
-
- /**
- * Returns whether Valgrind integration is enabled
- * @since 0.8
- */
- public boolean isEnabled() {
- // Check preference page for Valgrind enablement
- boolean enabled = ValgrindPlugin.getDefault().getPreferenceStore().getBoolean(ValgrindPreferencePage.VALGRIND_ENABLE);
- return enabled;
+ StringBuffer out = new StringBuffer();
+ Process p = Runtime.getRuntime().exec(WHICH_CMD + " " + VALGRIND_CMD); //$NON-NLS-1$
+ // Throws IOException if which command is unsuccessful
+ readIntoBuffer(out, p);
+ return out.toString().trim();
}
public String whichVersion(String whichValgrind) throws IOException {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java
index e9b5b79..45f91a8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPlugin.java
@@ -56,21 +56,5 @@ public class ValgrindPlugin extends AbstractUIPlugin {
public static ValgrindPlugin getDefault() {
return plugin;
}
-
-
- @Override
- protected void initializeDefaultPreferences(IPreferenceStore store) {
- ValgrindCommand valCommand = new ValgrindCommand();
- try {
- store.setDefault(ValgrindPreferencePage.VALGRIND_ENABLE, true);
- if(System.getProperty("os.name").toLowerCase().startsWith("windows")) //$NON-NLS-1$ //$NON-NLS-2$
- store.setDefault(ValgrindPreferencePage.VALGRIND_PATH, "");
- else
- store.setDefault(ValgrindPreferencePage.VALGRIND_PATH, valCommand.whichValgrind());
- } catch (IOException e) {
- // No Valgrind installed, make disabled by default
- store.setDefault(ValgrindPreferencePage.VALGRIND_ENABLE, false);
- }
- }
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java
deleted file mode 100644
index 667543e..0000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindPreferencePage.java
+++ /dev/null
@@ -1,197 +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:
- * Red Hat - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.core;
-
-import java.io.File;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * The Valgrind Preference Page can be found by going to Windows -> Preferences
- * from the Eclipse top menu bar. This can hold all non-launch specific
- * configuration settings or user preferences.
- */
-public class ValgrindPreferencePage extends PreferencePage implements
- IWorkbenchPreferencePage {
-
- /**
- * Boolean to allow user to disable Valgrind integration
- * @since 0.8
- */
- public static final String VALGRIND_ENABLE = "VALGRIND_ENABLE"; //$NON-NLS-1$
- public static final String VALGRIND_PATH = "VALGRIND_PATH"; //$NON-NLS-1$
- private Text binText;
- private Button browseButton;
- private IPreferenceStore store;
- private Button enableButton;
-
- @Override
- protected Control createContents(Composite parent) {
- Composite enableTop = new Composite(parent, SWT.NONE);
- enableTop.setLayout(new GridLayout());
- GridData enableData = new GridData(SWT.FILL, SWT.FILL, true, true);
- enableTop.setLayoutData(enableData);
-
- enableButton = new Button(enableTop, SWT.CHECK);
- enableButton.setText(Messages.getString("ValgrindPreferencePage.Button_Enable_Valgrind")); //$NON-NLS-1$
- enableButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent e) {
- checkValgrindEnablement();
- updateApplyButton();
- }
-
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
-
- Composite locationTop = new Composite(enableTop, SWT.NONE);
-
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.marginTop = 0;
- locationTop.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = SWT.FILL;
- data.horizontalAlignment = SWT.FILL;
- data.grabExcessHorizontalSpace = true;
- data.grabExcessVerticalSpace = true;
- locationTop.setLayoutData(data);
-
- // Path Label
- Label pathLabel = new Label(locationTop, SWT.NONE);
- pathLabel.setText(Messages
- .getString("ValgrindPreferencePage.Binary_path")); //$NON-NLS-1$
-
- // Path Text Field
- binText = new Text(locationTop, SWT.SINGLE | SWT.BORDER);
- GridData binTextData = new GridData();
- binTextData.horizontalAlignment = SWT.FILL;
- binTextData.grabExcessHorizontalSpace = true;
- binText.setLayoutData(binTextData);
- binText.addModifyListener(new ModifyListener() {
-
- public void modifyText(ModifyEvent e) {
- updateApplyButton();
- }
- });
-
- // Button
- browseButton = new Button(locationTop, SWT.PUSH);
- browseButton.setText(Messages
- .getString("ValgrindPreferencePage.Browse_button")); //$NON-NLS-1$
- browseButton.addSelectionListener(new SelectionListener() {
-
- public void widgetDefaultSelected(SelectionEvent e) {
- // TODO Auto-generated method stub
- }
-
- public void widgetSelected(SelectionEvent e) {
- Shell shell = new Shell();
- FileDialog dialog = new FileDialog(shell);
- String path = dialog.open();
- if (path != null) {
- binText.setText(path);
- }
- }
- });
-
- loadPreferences();
- return parent;
- }
-
- private void checkValgrindEnablement() {
- boolean enabled = enableButton.getSelection();
- binText.setEnabled(enabled);
- browseButton.setEnabled(enabled);
- }
-
- // Loading preferences into controls
- private void loadPreferences() {
- enableButton.setSelection(store.getBoolean(VALGRIND_ENABLE));
- binText.setText(store.getString(VALGRIND_PATH));
- checkValgrindEnablement();
- }
-
- // Get the PreferenceStore for this Plugin
- @Override
- protected IPreferenceStore doGetPreferenceStore() {
- return ValgrindPlugin.getDefault().getPreferenceStore();
- }
-
- // Initialization (Before Creating Widgets)
- public void init(IWorkbench workbench) {
- store = getPreferenceStore();
- }
-
- @Override
- protected void performDefaults() {
- store.setValue(VALGRIND_ENABLE, store.getDefaultBoolean(VALGRIND_ENABLE));
- enableButton.setSelection(store.getDefaultBoolean(VALGRIND_ENABLE));
-
- store.setValue(VALGRIND_PATH, store.getDefaultString(VALGRIND_PATH));
- binText.setText(store.getDefaultString(VALGRIND_PATH));
- super.performDefaults();
- }
-
- @Override
- public boolean performOk() {
- if (isValid()) {
- boolean enabled = enableButton.getSelection();
- store.setValue(VALGRIND_ENABLE, enabled);
- // Only store path if enabled
- if (enabled) {
- store.setValue(VALGRIND_PATH, binText.getText());
- }
- ValgrindPlugin.getDefault().savePluginPreferences();
- return true;
- }
- else {
- return false;
- }
- }
-
- @Override
- public boolean isValid() {
- setErrorMessage(null);
- // Disregard the location if disabled
- if (enableButton.getSelection()) {
- // Check the Binary Path is valid
- String path = binText.getText();
- File file = new File(path);
- // Can be more strict if necessary
- if (!file.exists() || file.isDirectory()) {
- setErrorMessage(Messages.getString("ValgrindPreferencePage.Error_invalid_message")); //$NON-NLS-1$
- return false;
- }
- }
- return true;
- }
-
-} \ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
index 4ff3821..458d92c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-28 Otavio Pontes <obusatto@br.ibm.com>
+
+ Related to bug #353056
+ * src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java:
+ Removing dependency for ValgrindPreferencePage
+
2011-10-12 Jeff Johnston <jjohnstn@redhat.com>
Bug #360085 - apply Martin Oberhuber's patch and add remove marker capability.
@@ -300,4 +306,4 @@
2009-01-05 Elliott Baron <ebaron@redhat.com>
* META-INF/MANIFEST.MF: Changed version to 0.1.0.
- * build.properties: Include about.html and icons. \ No newline at end of file
+ * build.properties: Include about.html and icons.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
index d20576d..9b4a0ad 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchPlugin.java
@@ -33,7 +33,6 @@ import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.linuxtools.internal.valgrind.core.PluginConstants;
import org.eclipse.linuxtools.internal.valgrind.core.ValgrindCommand;
import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPlugin;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPreferencePage;
import org.eclipse.linuxtools.valgrind.launch.IValgrindLaunchDelegate;
import org.eclipse.linuxtools.valgrind.launch.IValgrindOutputDirectoryProvider;
import org.eclipse.linuxtools.valgrind.launch.IValgrindToolPage;
@@ -42,7 +41,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Version;
-public class ValgrindLaunchPlugin extends AbstractUIPlugin implements IPropertyChangeListener {
+public class ValgrindLaunchPlugin extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = PluginConstants.LAUNCH_PLUGIN_ID;
@@ -94,9 +93,6 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin implements IPropertyC
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
-
- // Register as listener for changes to the property page
- ValgrindPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(this);
}
/*
@@ -145,16 +141,10 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin implements IPropertyC
}
private void findValgrindLocation() throws CoreException {
- if (getValgrindCommand().isEnabled()) {
- try {
- valgrindLocation = Path.fromOSString(getValgrindCommand().whichValgrind());
- } catch (IOException e) {
- IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, Messages.getString("ValgrindLaunchPlugin.Please_ensure_Valgrind"), e); //$NON-NLS-1$
- throw new CoreException(status);
- }
- }
- else {
- IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, Messages.getString("ValgrindLaunchPlugin.Error_Valgrind_Disabled")); //$NON-NLS-1$
+ try {
+ valgrindLocation = Path.fromOSString(getValgrindCommand().whichValgrind());
+ } catch (IOException e) {
+ IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, Messages.getString("ValgrindLaunchPlugin.Please_ensure_Valgrind"), e); //$NON-NLS-1$
throw new CoreException(status);
}
}
@@ -319,15 +309,4 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin implements IPropertyC
}
return toolMap;
}
-
- public void propertyChange(PropertyChangeEvent event) {
- String prop = event.getProperty();
- if (prop.equals(ValgrindPreferencePage.VALGRIND_PATH)
- || prop.equals(ValgrindPreferencePage.VALGRIND_ENABLE)) {
- // Reset Valgrind location and version
- valgrindLocation = null;
- valgrindVersion = null;
- }
- }
-
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
index 60bf2cf..929838c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-28 Otavio Pontes <obusatto@br.ibm.com>
+
+ Related to bug #353056
+ * src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCommand.java:
+ Removing dependency for ValgrindPreferencePage
+ * src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java:
+ Removing dependency for ValgrindPreferencePage
+
2011-03-29 Andrew Overholt <overholt@redhat.com>
* META-INF/MANIFEST.MF: Add requirements on
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
index 244abcb..0f77b38 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/AllTests.java
@@ -32,7 +32,6 @@ public class AllTests {
suite.addTestSuite(ShortcutTest.class);
suite.addTestSuite(SignalTest.class);
suite.addTestSuite(MinVersionTest.class);
- suite.addTestSuite(LocationPreferenceTest.class);
// $JUnit-END$
return suite;
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java
deleted file mode 100644
index c5a6421..0000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/internal/valgrind/memcheck/tests/LocationPreferenceTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Elliott Baron
- * 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@fedoraproject.org> - initial API and implementation
- *******************************************************************************/
-package org.eclipse.linuxtools.internal.valgrind.memcheck.tests;
-
-import java.io.IOException;
-
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindCommand;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPlugin;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPreferencePage;
-import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchPlugin;
-
-
-public class LocationPreferenceTest extends AbstractMemcheckTest {
-
- private ValgrindCommand command = new ValgrindCommand() {
- protected void readIntoBuffer(StringBuffer out, Process p) throws IOException {
- // Simulate not finding Valgrind in the user's PATH
- throw new IOException();
- }
- };
-
- /**
- * Tests Bug #315890 - Valgrind location cannot be overridden unless Valgrind is present in PATH
- * @throws Exception
- */
- public void testManualLocationNoPATH() throws Exception {
- // Set a preference for a manual location
- ValgrindPlugin.getDefault().getPreferenceStore().setValue(ValgrindPreferencePage.VALGRIND_PATH, "/path/to/valgrind");
-
- ValgrindLaunchPlugin.getDefault().setValgrindCommand(command);
-
- ValgrindLaunchPlugin.getDefault().getValgrindLocation();
- }
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
index bb80a78..c14f942 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-28 Otavio Pontes <obusatto@br.ibm.com>
+
+ Related to bug #353056
+ * src/org/eclipse/linuxtools/internal/valgrind/tests/AbstractValgrindTest.java:
+ Removing dependency for ValgrindPreferencePage
+ * src/org/eclipse/linuxtools/internal/valgrind/tests/ValgrindStubCommand.java:
+ Removing dependency for ValgrindPreferencePage
+
2010-07-26 Elliott Baron <ebaron@fedoraproject.org>
* META-INF/MANIFEST.MF: Bump version to 0.7.0.
@@ -177,4 +185,4 @@
* test.xml: Likewise.
* plugin.properties: Likewise.
* about.html: Likewise.
- * META-INF/MANIFEST.MF: Likewise. \ No newline at end of file
+ * META-INF/MANIFEST.MF: Likewise.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/AbstractValgrindTest.java b/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/AbstractValgrindTest.java
index 53d2a13..03452b2 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/AbstractValgrindTest.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/AbstractValgrindTest.java
@@ -39,7 +39,6 @@ import org.eclipse.debug.ui.ILaunchConfigurationTab;
import org.eclipse.linuxtools.internal.valgrind.core.LaunchConfigurationConstants;
import org.eclipse.linuxtools.internal.valgrind.core.ValgrindCommand;
import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPlugin;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPreferencePage;
import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindLaunchPlugin;
import org.eclipse.linuxtools.internal.valgrind.launch.ValgrindOptionsTab;
import org.eclipse.linuxtools.profiling.tests.AbstractTest;
@@ -70,10 +69,7 @@ public abstract class AbstractValgrindTest extends AbstractTest {
// Substitute Valgrind command line interaction
ValgrindLaunchPlugin.getDefault().setValgrindCommand(getValgrindCommand());
-
- // Ensure Valgrind is enabled
- ValgrindPlugin.getDefault().getPreferenceStore().setValue(ValgrindPreferencePage.VALGRIND_ENABLE, true);
-
+
super.setUp();
}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/ValgrindStubCommand.java b/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/ValgrindStubCommand.java
index 888bea6..ec24a04 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/ValgrindStubCommand.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/internal/valgrind/tests/ValgrindStubCommand.java
@@ -14,8 +14,6 @@ import java.io.File;
import java.io.IOException;
import org.eclipse.linuxtools.internal.valgrind.core.ValgrindCommand;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPlugin;
-import org.eclipse.linuxtools.internal.valgrind.core.ValgrindPreferencePage;
public class ValgrindStubCommand extends ValgrindCommand {
protected static final String VERSION_FILE = ".version"; //$NON-NLS-1$
@@ -42,5 +40,4 @@ public class ValgrindStubCommand extends ValgrindCommand {
public Process getProcess() {
return null;
}
-
}