Revert last commit.

22 files changed, 26 insertions, 364 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
index 3e768522fa..c70658d906 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/ChangeLog
@@ -1,10 +1,3 @@
-2009-06-22  Elliott Baron  <ebaron@redhat.com>
-
-	* messages.properties: New key.
-	* ValgrindLaunchConfigurationDelegate.java (launch): Perform version check.
-	* ValgrindLaunchPlugin.java (getValgrindVersion): Compare installed Valgrind
-	version to minimum supported version.
-
 2009-05-28  Elliott Baron  <ebaron@redhat.com>
 
 	* ValgrindLaunchPlugin.java (findValgrindVersion): Call findValgrindLocation first if necessary.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
index d6986be439..e21c78f23f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
@@ -104,8 +104,6 @@ public class ValgrindLaunchConfigurationDelegate extends AbstractCLaunchDelegate
 			
 			// find Valgrind binary if not already done
 			IPath valgrindLocation = getPlugin().getValgrindLocation();
-			// also ensure Valgrind version is usable
-			getPlugin().getValgrindVersion();
 
 			monitor.worked(1);
 			IPath exePath = verifyProgramPath(config);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
index 3ebba66bde..376cbb600a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
@@ -56,7 +56,6 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 	public static final Version VER_3_3_1 = new Version(3, 3, 1);
 	public static final Version VER_3_4_0 = new Version(3, 4, 0);
 	public static final Version VER_3_4_1 = new Version(3, 4, 1);
-	private static final Version MIN_VER = VER_3_3_0;
 	private static final String VERSION_PREFIX = "valgrind-"; //$NON-NLS-1$
 	private static final char VERSION_DELIMITER = '-';
 	
@@ -118,10 +117,6 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 		if (valgrindVersion == null) {
 			findValgrindVersion();
 		}
-		// check for minimum supported version
-		if (valgrindVersion.compareTo(MIN_VER) < 0) {
-			throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, NLS.bind(Messages.getString("ValgrindLaunchPlugin.Error_min_version"), valgrindVersion.toString(), MIN_VER.toString()))); //$NON-NLS-1$
-		}
 		return valgrindVersion;
 	}
 	
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/messages.properties b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/messages.properties
index 4a9c1e2e0e..1505c49f7f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/messages.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/messages.properties
@@ -26,7 +26,6 @@ ValgrindLaunchPlugin.Cannot_retrieve_delegate=Cannot retrieve delegate from exte
 ValgrindLaunchPlugin.Cannot_retrieve_page=Cannot retrieve page from extension
 ValgrindLaunchPlugin.Please_ensure_Valgrind=Please ensure Valgrind is installed and in your path.
 ValgrindLaunchPlugin.Couldn't_determine_version=Couldn't determine version of Valgrind located at {0}.
-ValgrindLaunchPlugin.Error_min_version=The installed Valgrind ({0}) is older than the minimum supported version ({1}).
 ValgrindOptionsTab.Basic_Options=Basic Options
 ValgrindOptionsTab.child_silent=Child silent after fork
 ValgrindOptionsTab.demangle=Demangle C++ names
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
index 9e4df1629c..fdbf074f6b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/ChangeLog
@@ -1,9 +1,3 @@
-2009-06-22  Elliott Baron  <ebaron@redhat.com>
-
-	* ChartExportTest.java: New file.
-	* META-INF/MANIFEST.MF: New deps.
-	* AllTests.java (suite): Added ChartExportTest.
-
 2009-04-30  Elliott Baron  <ebaron@redhat.com>
 
 	* MultiProcessTest.java: Delete referenced project.
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 dac565276c..0c1ff83a61 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
@@ -21,8 +21,6 @@ Import-Package: org.eclipse.birt.chart.computation,
  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.profiling.tests,
  org.eclipse.linuxtools.valgrind.core,
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/valgrind/massif/tests/AllTests.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/valgrind/massif/tests/AllTests.java
index 92d5ee17a5..47c3bbf7a6 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/valgrind/massif/tests/AllTests.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/valgrind/massif/tests/AllTests.java
@@ -28,7 +28,6 @@ public class AllTests {
 		suite.addTestSuite(MultiProcessTest.class);
 		suite.addTestSuite(ExpandCollapseTest.class);
 		suite.addTestSuite(SortTest.class);
-		suite.addTestSuite(ChartExportTest.class);
 		//$JUnit-END$
 		return suite;
 	}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/valgrind/massif/tests/ChartExportTest.java b/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/valgrind/massif/tests/ChartExportTest.java
deleted file mode 100644
index 50af8b1052..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif.tests/src/org/eclipse/linuxtools/valgrind/massif/tests/ChartExportTest.java
+++ /dev/null
@@ -1,66 +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.valgrind.massif.tests;
-
-import java.io.File;
-
-import org.eclipse.birt.chart.model.Chart;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.linuxtools.valgrind.massif.birt.ChartEditorInput;
-import org.eclipse.linuxtools.valgrind.massif.birt.ChartSVG;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PlatformUI;
-
-public class ChartExportTest extends AbstractMassifTest {
-	private IPath svgPath;
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		proj = createProjectAndBuild("alloctest"); //$NON-NLS-1$
-		
-		svgPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-		assertNotNull(svgPath);
-		svgPath = svgPath.append("alloctest").append("chart.svg"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		File chartFile = svgPath.toFile();
-		if (chartFile.exists()) {
-			chartFile.delete();
-		}
-		
-		deleteProject(proj);
-		super.tearDown();
-	}
-	
-	public void testNumSnapshots() throws Exception {
-		ILaunchConfiguration config = createConfiguration(proj.getProject());
-		doLaunch(config, "testDefaults"); //$NON-NLS-1$
-		
-		IEditorInput input = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorInput();
-		if (input instanceof ChartEditorInput) {
-			Chart chart = ((ChartEditorInput) input).getChart();
-			
-			ChartSVG svg = new ChartSVG(chart);
-			svg.renderSVG(svgPath);
-			
-			File chartFile = svgPath.toFile();
-			assertTrue(chartFile.exists());
-			assertTrue(chartFile.length() > 0);
-		} else {
-			fail();
-		}
-	}
-	
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
index 16543822fb..a1f7349a3e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/ChangeLog
@@ -1,15 +1,3 @@
-2009-06-22  Elliott Baron  <ebaron@redhat.com>
-
-	* icons/chart-save.png: New file.
-	* src/org/eclipse/linuxtools/valgrind/massif/birt/ChartSVG.java: New file.
-	* META-INF/MANIFEST.MF: New deps.
-	* birt/ChartControl.java (paintControl): Fix comment typo.
-	* birt/HeapChart.java (HeapChart): Remove suppress warnings for unchecked casts,
-	fixed with BIRT 2.5.
-	* MassifLaunchDelegate.java: Cleanup unused code.
-	* MassifViewPart.java: Add action for chart export.
-	* messages.properties: New key.
-
 2009-06-04  Elliott Baron  <ebaron@redhat.com>
 
 	* META-INF/MANIFEST.MF: Removing birt.chart plugin from dependencies.
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 8b41b8778c..550aa1113f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
@@ -10,8 +10,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.birt.chart.device.swt;bundle-version="2.3.1",
  org.eclipse.birt.chart.device.extension;bundle-version="2.3.1",
  org.eclipse.birt.chart.engine;bundle-version="2.3.1",
- org.eclipse.birt.chart.engine.extension;bundle-version="2.3.1",
- org.eclipse.birt.chart.device.svg;bundle-version="2.3.1"
+ org.eclipse.birt.chart.engine.extension;bundle-version="2.3.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/icons/chart-save.png b/valgrind/org.eclipse.linuxtools.valgrind.massif/icons/chart-save.png
deleted file mode 100644
index 358429abcc..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/icons/chart-save.png
+++ /dev/null
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java
index 7c3c4468fc..24212355cc 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java
@@ -104,4 +104,26 @@ implements IValgrindLaunchDelegate {
 
 		return opts.toArray(new String[opts.size()]);
 	}
+
+//	public void restoreState(HistoryEntry entry) throws CoreException {
+//		try {
+//			Map<?, ?> config = entry.getAttributes();
+//			MassifPlugin.getDefault().setConfig(config);
+//			
+//			// retrieve or create sourceLocator
+//			ILaunch launch = new Launch(config, ILaunchManager.PROFILE_MODE, null);
+//			setDefaultSourceLocator(launch, config);			
+//			MassifPlugin.getDefault().setSourceLocator(launch.getSourceLocator());
+//			
+//			File[] massifOutputs = entry.getDatadir().listFiles(MASSIF_FILTER);
+//			parseOutput(massifOutputs);
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//			abort(Messages.getString("MassifLaunchDelegate.Error_parsing_output"), e, ICDTLaunchConfigurationConstants.ERR_INTERNAL_ERROR); //$NON-NLS-1$
+//		}
+//	}
+//
+//	public void saveState(HistoryEntry entry) throws CoreException {
+//	}
+
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifViewPart.java
index a6ce319b9b..0ea30dd45e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifViewPart.java
@@ -14,7 +14,6 @@ import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.Path;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.JFaceResources;
@@ -33,7 +32,6 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.linuxtools.valgrind.massif.MassifSnapshot.SnapshotType;
 import org.eclipse.linuxtools.valgrind.massif.birt.ChartEditorInput;
-import org.eclipse.linuxtools.valgrind.massif.birt.ChartSVG;
 import org.eclipse.linuxtools.valgrind.massif.birt.HeapChart;
 import org.eclipse.linuxtools.valgrind.ui.IValgrindToolView;
 import org.eclipse.linuxtools.valgrind.ui.ValgrindUIPlugin;
@@ -48,8 +46,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IEditorInput;
@@ -79,8 +75,6 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 	+ ".chartAction"; //$NON-NLS-1$
 	public static final String PID_ACTION = MassifPlugin.PLUGIN_ID
 	+ ".pidAction"; //$NON-NLS-1$
-	public static final String SAVE_CHART_ACTION = MassifPlugin.PLUGIN_ID
-	+ ".saveChartAction"; //$NON-NLS-1$
 
 	protected MassifOutput output;
 	protected Integer pid;
@@ -96,7 +90,6 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 	protected Action treeAction;
 	protected Action chartAction;
 	protected MassifPidMenuAction pidAction;
-	protected Action saveChartAction;
 
 	protected List<ChartEditorInput> chartInputs;
 
@@ -244,22 +237,6 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 		chartAction.setToolTipText(Messages
 				.getString("MassifViewPart.Display_Heap_Allocation")); //$NON-NLS-1$
 
-		saveChartAction = new Action(Messages.getString("MassifViewPart.Save_Chart"), IAction.AS_PUSH_BUTTON) { //$NON-NLS-1$
-			@Override
-			public void run() {
-				ChartEditorInput currentInput = getChartInput(pid);
-				String path = getChartSavePath(currentInput.getName());
-				if (path != null) {
-					ChartSVG renderer = new ChartSVG(currentInput.getChart());
-					renderer.renderSVG(Path.fromOSString(path));
-				}
-			}
-		};
-		saveChartAction.setId(SAVE_CHART_ACTION);
-		saveChartAction.setImageDescriptor(MassifPlugin.imageDescriptorFromPlugin(
-				MassifPlugin.PLUGIN_ID, "icons/chart-save.png")); //$NON-NLS-1$
-		saveChartAction.setToolTipText(Messages.getString("MassifViewPart.Save_Chart")); //$NON-NLS-1$
-		
 		treeAction = new Action(
 				Messages.getString("MassifViewPart.Show_Heap_Tree"), IAction.AS_CHECK_BOX) { //$NON-NLS-1$
 			@Override
@@ -279,18 +256,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 		treeAction.setToolTipText(Messages
 				.getString("MassifViewPart.Show_Heap_Tree")); //$NON-NLS-1$
 
-		return new IAction[] { pidAction, chartAction, saveChartAction, treeAction };
-	}
-	
-	protected String getChartSavePath(String defaultName) {
-		Shell parent = new Shell(Display.getDefault());
-		FileDialog dialog = new FileDialog(parent, SWT.SAVE);
-		dialog.setText(Messages.getString("MassifViewPart.Save_chart_dialog_title")); //$NON-NLS-1$
-		dialog.setOverwrite(true);
-		dialog.setFilterExtensions(new String[] { ".svg" }); //$NON-NLS-1$
-		dialog.setFileName(defaultName);
-
-		return dialog.open();
+		return new IAction[] { pidAction, chartAction, treeAction };
 	}
 
 	protected void createChart(MassifSnapshot[] snapshots) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/ChartControl.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/ChartControl.java
index 6c6ef2d3ab..30812ed60b 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/ChartControl.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/ChartControl.java
@@ -174,7 +174,7 @@ public class ChartControl extends Canvas implements PaintListener, ControlListen
 
 			GC gcImage = new GC(buffer);
 
-			// fill default background as white.
+			// fill default backgournd as white.
 			gcImage.setForeground(Display.getDefault().getSystemColor(
 					SWT.COLOR_WHITE));
 			gcImage.fillRectangle(buffer.getBounds());
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/ChartSVG.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/ChartSVG.java
deleted file mode 100644
index fb68a10ade..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/ChartSVG.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2004, 2005 Actuate 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:
- * Actuate Corporation - initial API and implementation
- * Elliott Baron <ebaron@redhat.com> - Modified implementation
- ***********************************************************************/
-package org.eclipse.linuxtools.valgrind.massif.birt;
-
-import org.eclipse.birt.chart.computation.DataPointHints;
-import org.eclipse.birt.chart.device.ICallBackNotifier;
-import org.eclipse.birt.chart.device.IDeviceRenderer;
-import org.eclipse.birt.chart.event.WrappedStructureSource;
-import org.eclipse.birt.chart.exception.ChartException;
-import org.eclipse.birt.chart.factory.GeneratedChartState;
-import org.eclipse.birt.chart.factory.Generator;
-import org.eclipse.birt.chart.factory.RunTimeContext;
-import org.eclipse.birt.chart.model.Chart;
-import org.eclipse.birt.chart.model.attribute.Bounds;
-import org.eclipse.birt.chart.model.attribute.CallBackValue;
-import org.eclipse.birt.chart.model.attribute.impl.BoundsImpl;
-import org.eclipse.birt.chart.util.PluginSettings;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.linuxtools.valgrind.massif.MassifSnapshot;
-import org.eclipse.linuxtools.valgrind.massif.MassifViewPart;
-import org.eclipse.linuxtools.valgrind.ui.ValgrindUIPlugin;
-import org.eclipse.swt.events.MouseEvent;
-
-public class ChartSVG implements ICallBackNotifier {
-
-	protected Chart cm = null;
-
-	protected GeneratedChartState state = null;
-
-	protected IDeviceRenderer deviceRenderer = null;
-
-	public ChartSVG(Chart chart) {
-		cm = chart;
-	}
-
-	public void renderSVG(IPath svgPath) {
-		try {
-			RunTimeContext rtc = new RunTimeContext();
-			
-			deviceRenderer = PluginSettings.instance().getDevice("dv.SVG"); //$NON-NLS-1$
-			Generator gr = Generator.instance();
-			Bounds bo = BoundsImpl.create(0, 0, 800, 600);
-			state = gr.build(deviceRenderer.getDisplayServer(), cm, bo, null,
-					rtc, null);
-			deviceRenderer.setProperty(IDeviceRenderer.FILE_IDENTIFIER, svgPath
-					.toOSString());
-			deviceRenderer.setProperty(IDeviceRenderer.UPDATE_NOTIFIER, this);
-
-			gr.render(deviceRenderer, state);
-		} catch (ChartException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void callback(Object event, Object source, CallBackValue value) {
-		// give Valgrind view focus
-		ValgrindUIPlugin.getDefault().showView();
-		MouseEvent mEvent = (MouseEvent) event;
-		
-		DataPointHints point = ((DataPointHints)((WrappedStructureSource)source).getSource());
-		MassifViewPart view = (MassifViewPart) ValgrindUIPlugin.getDefault().getView().getDynamicView();
-		// select the corresponding snapshot in the TableViewer
-		TableViewer viewer = view.getTableViewer();
-		view.setTopControl(viewer.getControl());
-		
-		MassifSnapshot snapshot = (MassifSnapshot) viewer.getElementAt(point.getIndex());
-		
-		switch (mEvent.count) {
-		case 1: // single click
-			viewer.setSelection(new StructuredSelection(snapshot));
-			break;
-		case 2: // double click
-//			if (snapshot.isDetailed()) {
-//				ChartLocationsDialog dialog = new ChartLocationsDialog(getShell());
-//				dialog.setInput(snapshot);
-//				
-//				if (dialog.open() == Window.OK) {
-//					dialog.openEditorForResult();
-//				}				
-//			}
-		}
-	}
-
-	public Chart getDesignTimeModel() {
-		return cm;
-	}
-
-	public Chart getRunTimeModel() {
-		return state.getChartModel();
-	}
-
-	public Object peerInstance() {
-		return this;
-	}
-
-	public void regenerateChart() {
-	}
-
-	public void repaintChart() {
-	}
-	
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/HeapChart.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/HeapChart.java
index 4f8dbc1358..be0364da3a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/HeapChart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/birt/HeapChart.java
@@ -79,6 +79,7 @@ public class HeapChart extends ChartWithAxesImpl {
 	protected String xUnits;
 	protected String yUnits;
 
+	@SuppressWarnings("unchecked")
 	public HeapChart(MassifSnapshot[] snapshots) {
 		TimeUnit timeUnit = snapshots[0].getUnit();
 		long xScaling = getXScaling(snapshots, timeUnit);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/messages.properties b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/messages.properties
index 4589ec5ea3..23e70a488c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/messages.properties
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/messages.properties
@@ -28,8 +28,6 @@ MassifToolPage.Remove=Rem&ove
 MassifToolPage.time_unit=time unit:
 MassifViewPart.Display_Heap_Allocation=Display Heap Allocation Graph
 MassifViewPart.Extra_Heap=Extra Heap (B)
-MassifViewPart.Save_Chart=Save Chart As SVG
-MassifViewPart.Save_chart_dialog_title=Save Chart
 MassifViewPart.Show_Heap_Tree=Show Heap Tree
 MassifViewPart.Snapshot=Snapshot
 MassifViewPart.Stacks=Stacks (B)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
index 8c30315f84..5876a4bf42 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/ChangeLog
@@ -1,8 +1,3 @@
-2009-06-22  Elliott Baron  <ebaron@redhat.com>
-
-	* MinVersionTest.java: New file.
-	* AllTests.java (suite): Added MinVersionTest.
-
 2009-05-27  Elliott Baron  <ebaron@redhat.com>
 
 	* LaunchConfigTabTest.java: Changed for restructuring of findValgrindVersion.
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/valgrind/memcheck/tests/AllTests.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/valgrind/memcheck/tests/AllTests.java
index 4cade48e79..b80336a526 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/valgrind/memcheck/tests/AllTests.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/valgrind/memcheck/tests/AllTests.java
@@ -29,7 +29,6 @@ public class AllTests {
 		suite.addTestSuite(ExpandCollapseTest.class);
 		suite.addTestSuite(ShortcutTest.class);
 		suite.addTestSuite(SignalTest.class);
-		suite.addTestSuite(MinVersionTest.class);
 		// $JUnit-END$
 		return suite;
 	}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/valgrind/memcheck/tests/MinVersionTest.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/valgrind/memcheck/tests/MinVersionTest.java
deleted file mode 100644
index 053074185b..0000000000
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck.tests/src/org/eclipse/linuxtools/valgrind/memcheck/tests/MinVersionTest.java
+++ /dev/null
@@ -1,74 +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.valgrind.memcheck.tests;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.linuxtools.valgrind.tests.ValgrindTestOptionsTab;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.osgi.framework.Version;
-
-public class MinVersionTest extends AbstractMemcheckTest {
-	private static final Version VER_3_2_1 = new Version(3, 2, 1);
-	private Version verSave;
-	
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		proj = createProjectAndBuild("basicTest"); //$NON-NLS-1$
-		
-		verSave = getPlugin().getValgrindVersion();
-		getPlugin().setValgrindVersion(VER_3_2_1);
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		getPlugin().setValgrindVersion(verSave);
-		
-		deleteProject(proj);
-		super.tearDown();
-	}
-	
-	public void testLaunchBadVersion() throws Exception {
-		ILaunchConfiguration config = createConfiguration(proj.getProject());
-		CoreException ce = null;
-		
-		try {
-			doLaunch(config, "testDefaults"); //$NON-NLS-1$
-		} catch (CoreException e) {
-			ce = e;
-		}
-		
-		assertNotNull(ce);
-	}
-	
-	public void testTabsBadVersion() throws Exception {
-		Shell testShell = new Shell(Display.getDefault());
-		testShell.setLayout(new GridLayout());
-		ValgrindTestOptionsTab tab = new ValgrindTestOptionsTab();
-		
-		ILaunchConfiguration config = createConfiguration(proj.getProject());
-		ILaunchConfigurationWorkingCopy wc = config.getWorkingCopy();
-		tab.setDefaults(wc);
-		tab.createControl(testShell);
-		tab.initializeFrom(config);
-		tab.performApply(wc);
-		
-		assertFalse(tab.isValid(config));
-		assertNotNull(tab.getErrorMessage());
-		
-		testShell.dispose();
-	}
-
-}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
index 44047c688f..54e6c43932 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/ChangeLog
@@ -1,10 +1,3 @@
-2009-06-22  Elliott Baron  <ebaron@redhat.com>
-
-	* ValgrindTestLaunchPlugin.java	(setValgrindLocation): Act as proxy for real plugin. 
-	(getValgrindLocation): Likewise.
-	(setValgrindVersion): Likewise.
-	(getValgrindVersion): Likewise.
-
 2009-05-27  Elliott Baron  <ebaron@redhat.com>
 
 	* AbstractValgrindTest.java (setUp): Retrieve stub location and version and explicitly
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/valgrind/tests/ValgrindTestLaunchPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/valgrind/tests/ValgrindTestLaunchPlugin.java
index 0ce47fb070..714a7eee70 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/valgrind/tests/ValgrindTestLaunchPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.tests/src/org/eclipse/linuxtools/valgrind/tests/ValgrindTestLaunchPlugin.java
@@ -11,14 +11,12 @@
 package org.eclipse.linuxtools.valgrind.tests;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.linuxtools.valgrind.core.ValgrindCommand;
 import org.eclipse.linuxtools.valgrind.launch.IValgrindToolPage;
 import org.eclipse.linuxtools.valgrind.launch.ValgrindLaunchPlugin;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
 
 public class ValgrindTestLaunchPlugin extends ValgrindLaunchPlugin {
 
@@ -71,26 +69,6 @@ public class ValgrindTestLaunchPlugin extends ValgrindLaunchPlugin {
 	}
 	
 	@Override
-	public IPath getValgrindLocation() throws CoreException {
-		return ValgrindLaunchPlugin.getDefault().getValgrindLocation();
-	}
-	
-	@Override
-	public void setValgrindLocation(IPath valgrindLocation) {
-		ValgrindLaunchPlugin.getDefault().setValgrindLocation(valgrindLocation);
-	}
-	
-	@Override
-	public Version getValgrindVersion() throws CoreException {
-		return ValgrindLaunchPlugin.getDefault().getValgrindVersion();
-	}
-	
-	@Override
-	public void setValgrindVersion(Version valgrindVersion) {
-		ValgrindLaunchPlugin.getDefault().setValgrindVersion(valgrindVersion);
-	}
-	
-	@Override
 	public IValgrindToolPage getToolPage(String id) throws CoreException {
 		return toolPage;
 	}