valgrind: Cleanup codebase.

* Make methods private.
* Remove unused methods.
* Removed redundant modifiers.
* Formatting and other issues spotted by Sonar.

Change-Id: I0de70e0a0ea9989bf911fecc66112512ea5e2885
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/24950
Tested-by: Hudson CI

56 files changed, 353 insertions, 661 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java
index 0cb0e1f969..42a8fe603a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLabelProvider.java
@@ -37,14 +37,13 @@ public class CachegrindLabelProvider extends CellLabelProvider {
 	protected CElementLabelProvider cLabelProvider = new CElementLabelProvider(CElementLabelProvider.SHOW_SMALL_ICONS | CElementLabelProvider.SHOW_PARAMETERS | CElementLabelProvider.SHOW_RETURN_TYPE) {
 		@Override
 		public int getTextFlags() {
-			int flags = super.getTextFlags();
-			return flags |= CElementBaseLabels.M_FULLY_QUALIFIED;
+			return super.getTextFlags() |CElementBaseLabels.M_FULLY_QUALIFIED;
 		}
 	};
 
 	protected DecimalFormat df = new DecimalFormat("#,##0"); //$NON-NLS-1$
 
-	protected static final Image FUNC_IMG = AbstractUIPlugin.imageDescriptorFromPlugin(CachegrindPlugin.PLUGIN_ID, "icons/function_obj.gif").createImage(); //$NON-NLS-1$
+	private static final Image FUNC_IMG = AbstractUIPlugin.imageDescriptorFromPlugin(CachegrindPlugin.PLUGIN_ID, "icons/function_obj.gif").createImage(); //$NON-NLS-1$
 
 	@Override
 	public void update(ViewerCell cell) {
@@ -58,42 +57,34 @@ public class CachegrindLabelProvider extends CellLabelProvider {
 				if (model != null) {
 					cell.setText(cLabelProvider.getText(model));
 					cell.setImage(cLabelProvider.getImage(model));
-				}
-				else { // Fall back
+				} else { // Fall back
 					String name = ((CachegrindFile) element).getName();
 					cell.setText(name);
 					cell.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE));
 				}
-			}
-			else if (element instanceof CachegrindFunction) {
+			} else if (element instanceof CachegrindFunction) {
 				// Try to use the CElementLabelProvider
 				IAdaptable model = ((CachegrindFunction) element).getModel();
 				if (model != null) {
 					cell.setText(cLabelProvider.getText(model));
 					cell.setImage(cLabelProvider.getImage(model));
-				}
-				else { // Fall back
+				} else { // Fall back
 					String name = ((CachegrindFunction) element).getName();
 					cell.setText(name);
 					cell.setImage(FUNC_IMG);
 				}
-			}
-			else if (element instanceof CachegrindLine) {
+			} else if (element instanceof CachegrindLine) {
 				cell.setText(NLS.bind(Messages.getString("CachegrindViewPart.line"), ((CachegrindLine) element).getLine())); //$NON-NLS-1$
 				cell.setImage(DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_INSTRUCTION_POINTER_TOP));
-			}
-			else if (element instanceof CachegrindOutput) {
+			} else if (element instanceof CachegrindOutput) {
 				cell.setText(NLS.bind(Messages.getString("CachegrindViewPart.Total_PID"), ((CachegrindOutput) element).getPid())); //$NON-NLS-1$
 				cell.setImage(DebugUITools.getImage(IDebugUIConstants.IMG_OBJS_REGISTER));
 			}
-		}
-		else if (element instanceof CachegrindFunction) {
+		} else if (element instanceof CachegrindFunction) {
 			cell.setText(df.format(((CachegrindFunction) element).getTotals()[index - 1]));
-		}
-		else if (element instanceof CachegrindLine) {
+		} else if (element instanceof CachegrindLine) {
 			cell.setText(df.format(((CachegrindLine) element).getValues()[index - 1]));
-		}
-		else if (element instanceof CachegrindOutput) {
+		} else if (element instanceof CachegrindOutput) {
 			cell.setText(df.format(((CachegrindOutput) element).getSummary()[index - 1]));
 		}
 	}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java
index f3b385ab02..b490c1b725 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindLaunchDelegate.java
@@ -63,7 +63,7 @@ public class CachegrindLaunchDelegate implements IValgrindLaunchDelegate {
 		}
 	}
 
-	protected void parseOutput(File[] cachegrindOutputs, IProgressMonitor monitor) throws IOException {
+	private void parseOutput(File[] cachegrindOutputs, IProgressMonitor monitor) throws IOException {
 		outputs = new CachegrindOutput[cachegrindOutputs.length];
 		
 		for (int i = 0; i < cachegrindOutputs.length; i++) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindParser.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindParser.java
index 90f1bfb7c0..7e0b185ff7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindParser.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindParser.java
@@ -38,7 +38,7 @@ public class CachegrindParser {
 
 	protected static CachegrindParser instance;
 
-	protected CachegrindParser() {
+	private CachegrindParser() {
 	}
 
 	public static CachegrindParser getParser() {
@@ -58,28 +58,22 @@ public class CachegrindParser {
 			while ((line = br.readLine()) != null) {		
 				if (line.startsWith(EVENTS + COLON)) {
 					output.setEvents(ValgrindParserUtils.parseStrValue(line, COLON + SPACE).split(SPACE));
-				}
-				else if (line.startsWith(CMD + COLON)) {
-					output.setCommand(ValgrindParserUtils.parseStrValue(line, COLON + SPACE));
-				}
-				else if (line.startsWith(DESC + COLON)) {
+				} else if (line.startsWith(CMD + COLON)) {
+					//continue
+				} else if (line.startsWith(DESC + COLON)) {
 					CachegrindDescription description = parseDescription(line);
 					output.addDescription(description);
-				}
-				else if (line.startsWith(FL + EQUALS)) {
+				} else if (line.startsWith(FL + EQUALS)) {
 					curFl = new CachegrindFile(output, ValgrindParserUtils.parseStrValue(line, EQUALS));
 					output.addFile(curFl);
-				}
-				else if (line.startsWith(FN + EQUALS)) {				
+				} else if (line.startsWith(FN + EQUALS)) {				
 					if (curFl != null) {
 						curFn = new CachegrindFunction(curFl, ValgrindParserUtils.parseStrValue(line, EQUALS));
 						curFl.addFunction(curFn);
-					}
-					else {
+					} else {
 						ValgrindParserUtils.fail(line);
 					}
-				}
-				else if (line.startsWith(SUMMARY + COLON)) {
+				} else if (line.startsWith(SUMMARY + COLON)) {
 					long[] summary = parseData(line, ValgrindParserUtils.parseStrValue(line, COLON + SPACE).split(SPACE));
 					output.setSummary(summary);
 				}
@@ -91,12 +85,10 @@ public class CachegrindParser {
 						long[] data = parseData(line, tokens[1].split(SPACE));
 						if (curFn != null) {
 							curFn.addLine(new CachegrindLine(curFn, lineNo, data));
-						}
-						else {
+						} else {
 							ValgrindParserUtils.fail(line);
 						}
-					}
-					else {
+					} else {
 						ValgrindParserUtils.fail(line);
 					}
 				}
@@ -122,13 +114,11 @@ public class CachegrindParser {
 			String name = tokens[1];
 			tokens = tokens[2].split(COMMA + SPACE);
 			if (tokens.length == 3) {
-				desc = new CachegrindDescription(name, tokens[0], tokens[1], tokens[2]);
-			}
-			else {
+				desc = new CachegrindDescription(name);
+			} else {
 				ValgrindParserUtils.fail(line);
 			}
-		}
-		else {
+		} else {
 			ValgrindParserUtils.fail(line);
 		}
 		return desc;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindToolPage.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindToolPage.java
index f9f9ef8a20..7720fb56e4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindToolPage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindToolPage.java
@@ -33,36 +33,33 @@ import org.osgi.framework.Version;
 
 public class CachegrindToolPage extends AbstractLaunchConfigurationTab
 		implements IValgrindToolPage {
-	public static final String CACHEGRIND = "cachegrind"; //$NON-NLS-1$
-	public static final String PLUGIN_ID = CachegrindPlugin.PLUGIN_ID;
-	
 	// Cachegrind controls
-	protected Button cacheButton;
-	protected Button branchButton;
-	protected Composite i1Top;
-	protected Spinner i1SizeSpinner;
-	protected Spinner i1AssocSpinner;
-	protected Spinner i1LineSizeSpinner;
-	protected Button i1Button;
-	protected Composite d1Top;
-	protected Spinner d1SizeSpinner;
-	protected Spinner d1AssocSpinner;
-	protected Spinner d1LineSizeSpinner;
-	protected Button d1Button;
-	protected Composite l2Top;
-	protected Spinner l2SizeSpinner;
-	protected Spinner l2AssocSpinner;
-	protected Spinner l2LineSizeSpinner;
-	protected Button l2Button;
-		
-	protected boolean isInitializing = false;
-	protected SelectionListener selectListener = new SelectionAdapter() {
+	private Button cacheButton;
+	private Button branchButton;
+	private Composite i1Top;
+	private Spinner i1SizeSpinner;
+	private Spinner i1AssocSpinner;
+	private Spinner i1LineSizeSpinner;
+	private Button i1Button;
+	private Composite d1Top;
+	private Spinner d1SizeSpinner;
+	private Spinner d1AssocSpinner;
+	private Spinner d1LineSizeSpinner;
+	private Button d1Button;
+	private Composite l2Top;
+	private Spinner l2SizeSpinner;
+	private Spinner l2AssocSpinner;
+	private Spinner l2LineSizeSpinner;
+	private Button l2Button;
+		
+	private boolean isInitializing = false;
+	private SelectionListener selectListener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			updateLaunchConfigurationDialog();
 		}
 	};
-	protected ModifyListener modifyListener = new ModifyListener() {
+	private ModifyListener modifyListener = new ModifyListener() {
 		@Override
 		public void modifyText(ModifyEvent e) {
 			updateLaunchConfigurationDialog();	
@@ -305,13 +302,6 @@ public class CachegrindToolPage extends AbstractLaunchConfigurationTab
 		// Not used
 	}
 
-	protected void createHorizontalSpacer(Composite comp, int numlines) {
-		Label lbl = new Label(comp, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = numlines;
-		lbl.setLayoutData(gd);
-	}
-	
 	@Override
 	protected void updateLaunchConfigurationDialog() {
 		if (!isInitializing) {
@@ -319,21 +309,21 @@ public class CachegrindToolPage extends AbstractLaunchConfigurationTab
 		}
 	}
 
-	protected void checkI1Enablement() {
+	private void checkI1Enablement() {
 		boolean checked = i1Button.getSelection();
 		i1SizeSpinner.setEnabled(checked);
 		i1AssocSpinner.setEnabled(checked);
 		i1LineSizeSpinner.setEnabled(checked);
 	}
 	
-	protected void checkD1Enablement() {
+	private void checkD1Enablement() {
 		boolean checked = d1Button.getSelection();
 		d1SizeSpinner.setEnabled(checked);
 		d1AssocSpinner.setEnabled(checked);
 		d1LineSizeSpinner.setEnabled(checked);
 	}
 	
-	protected void checkL2Enablement() {
+	private void checkL2Enablement() {
 		boolean checked = l2Button.getSelection();
 		l2SizeSpinner.setEnabled(checked);
 		l2AssocSpinner.setEnabled(checked);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindViewPart.java
index c0fb1e9a32..66b924d5be 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CachegrindViewPart.java
@@ -52,32 +52,32 @@ import org.eclipse.ui.part.ViewPart;
 
 public class CachegrindViewPart extends ViewPart implements IValgrindToolView {
 
-	protected CachegrindOutput[] outputs;
-	protected TreeViewer viewer;
+	private CachegrindOutput[] outputs;
+	private TreeViewer viewer;
 
-	protected static final int COLUMN_SIZE = 75;
-	protected CachegrindLabelProvider labelProvider;
-	protected CachegrindTreeContentProvider contentProvider;
-	protected IDoubleClickListener doubleClickListener;
-	protected ExpandAction expandAction;
-	protected CollapseAction collapseAction;
+	private static final int COLUMN_SIZE = 75;
+	private CachegrindLabelProvider labelProvider;
+	private CachegrindTreeContentProvider contentProvider;
+	private IDoubleClickListener doubleClickListener;
+	private ExpandAction expandAction;
+	private CollapseAction collapseAction;
 	
 	// Events - Cache
-	protected static final String IR = "Ir"; //$NON-NLS-1$
-	protected static final String I1MR = "I1mr"; //$NON-NLS-1$
-	protected static final String I2MR = "I2mr"; //$NON-NLS-1$
-	protected static final String DR = "Dr"; //$NON-NLS-1$
-	protected static final String D1MR = "D1mr"; //$NON-NLS-1$
-	protected static final String D2MR = "D2mr"; //$NON-NLS-1$
-	protected static final String DW = "Dw"; //$NON-NLS-1$
-	protected static final String D1MW = "D1mw"; //$NON-NLS-1$
-	protected static final String D2MW = "D2mw"; //$NON-NLS-1$
+	private static final String IR = "Ir"; //$NON-NLS-1$
+	private static final String I1MR = "I1mr"; //$NON-NLS-1$
+	private static final String I2MR = "I2mr"; //$NON-NLS-1$
+	private static final String DR = "Dr"; //$NON-NLS-1$
+	private static final String D1MR = "D1mr"; //$NON-NLS-1$
+	private static final String D2MR = "D2mr"; //$NON-NLS-1$
+	private static final String DW = "Dw"; //$NON-NLS-1$
+	private static final String D1MW = "D1mw"; //$NON-NLS-1$
+	private static final String D2MW = "D2mw"; //$NON-NLS-1$
 	
 	// Events - Branch
-	protected static final String BC = "Bc"; //$NON-NLS-1$
-	protected static final String BCM = "Bcm"; //$NON-NLS-1$
-	protected static final String BI = "Bi"; //$NON-NLS-1$
-	protected static final String BIM = "Bim"; //$NON-NLS-1$
+	private static final String BC = "Bc"; //$NON-NLS-1$
+	private static final String BCM = "Bcm"; //$NON-NLS-1$
+	private static final String BI = "Bi"; //$NON-NLS-1$
+	private static final String BIM = "Bim"; //$NON-NLS-1$
 	
 	@Override
 	public void createPartControl(Composite parent) {
@@ -286,41 +286,29 @@ public class CachegrindViewPart extends ViewPart implements IValgrindToolView {
 		String result = event;
 		if (event.equals(IR)) {
 			result = Messages.getString("CachegrindViewPart.Ir_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(I1MR)) {
+		} else if (event.equals(I1MR)) {
 			result = Messages.getString("CachegrindViewPart.I1mr_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(I2MR)) {
+		} else if (event.equals(I2MR)) {
 			result = Messages.getString("CachegrindViewPart.I2mr_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(DR)) {
+		} else if (event.equals(DR)) {
 			result = Messages.getString("CachegrindViewPart.Dr_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(D1MR)) {
+		} else if (event.equals(D1MR)) {
 			result = Messages.getString("CachegrindViewPart.D1mr_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(D2MR)) {
+		} else if (event.equals(D2MR)) {
 			result = Messages.getString("CachegrindViewPart.D2mr_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(DW)) {
+		} else if (event.equals(DW)) {
 			result = Messages.getString("CachegrindViewPart.Dw_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(D1MW)) {
+		} else if (event.equals(D1MW)) {
 			result = Messages.getString("CachegrindViewPart.D1mw_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(D2MW)) {
+		} else if (event.equals(D2MW)) {
 			result = Messages.getString("CachegrindViewPart.D2mw_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(BC)) {
+		} else if (event.equals(BC)) {
 			result = Messages.getString("CachegrindViewPart.Bc_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(BCM)) {
+		} else if (event.equals(BCM)) {
 			result = Messages.getString("CachegrindViewPart.Bcm_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(BI)) {
+		} else if (event.equals(BI)) {
 			result = Messages.getString("CachegrindViewPart.Bi_long"); //$NON-NLS-1$
-		}
-		else if (event.equals(BIM)) {
+		} else if (event.equals(BIM)) {
 			result = Messages.getString("CachegrindViewPart.Bim_long"); //$NON-NLS-1$
 		}
 		return result;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CollapseAction.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CollapseAction.java
index 8180e82807..b1b4e591d3 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CollapseAction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/CollapseAction.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 
 public class CollapseAction extends Action {
 
-	protected TreeViewer viewer;
+	private TreeViewer viewer;
 
 	public CollapseAction(TreeViewer viewer) {
 		super(Messages.getString("CollapseAction.Text")); //$NON-NLS-1$
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/ExpandAction.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/ExpandAction.java
index 63477f073a..9dd666e7f7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/ExpandAction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/ExpandAction.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 
 public class ExpandAction extends Action {
 	
-	protected TreeViewer viewer;
+	private TreeViewer viewer;
 
 	public ExpandAction(TreeViewer viewer) {
 		super(Messages.getString("ExpandAction.Text")); //$NON-NLS-1$
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindDescription.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindDescription.java
index 2570614795..c5bea07793 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindDescription.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindDescription.java
@@ -11,16 +11,10 @@
 package org.eclipse.linuxtools.internal.valgrind.cachegrind.model;
 
 public class CachegrindDescription {
-	protected String name;
-	protected String size;
-	protected String lineSize;
-	protected String assoc;
+	private String name;
 	
-	public CachegrindDescription(String name, String size, String lineSize, String assoc) {
+	public CachegrindDescription(String name) {
 		this.name = name;
-		this.size = size;
-		this.lineSize = lineSize;
-		this.assoc = assoc;
 	}
 	
 	@Override
@@ -36,16 +30,4 @@ public class CachegrindDescription {
 	public String getName() {
 		return name;
 	}
-	
-	public String getSize() {
-		return size;
-	}
-	
-	public String getLineSize() {
-		return lineSize;
-	}
-	
-	public String getAssoc() {
-		return assoc;
-	}
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFile.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFile.java
index 02d9b85634..78f56bc09c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFile.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFile.java
@@ -23,11 +23,11 @@ public class CachegrindFile implements ICachegrindElement {
 	private static final String UNKNOWN_FILE = "???"; //$NON-NLS-1$
 
 
-	protected CachegrindOutput parent;
-	protected String path;
-	protected List<CachegrindFunction> functions;
+	private CachegrindOutput parent;
+	private String path;
+	private List<CachegrindFunction> functions;
 
-	protected IAdaptable model;
+	private IAdaptable model;
 
 	public CachegrindFile(CachegrindOutput parent, String path) {
 		this.parent = parent;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFunction.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFunction.java
index 31a641058a..06361d9296 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFunction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindFunction.java
@@ -24,14 +24,14 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
 
 public class CachegrindFunction implements ICachegrindElement {
-	protected CachegrindFile parent;
-	protected String name;
-	protected List<CachegrindLine> lines;
-	protected long[] totals;
+	private CachegrindFile parent;
+	private String name;
+	private List<CachegrindLine> lines;
+	private long[] totals;
 
-	protected IAdaptable model;
+	private IAdaptable model;
 
-	private static String SCOPE_RESOLUTION = "::"; //$NON-NLS-1$
+	private static final String SCOPE_RESOLUTION = "::"; //$NON-NLS-1$
 
 	public CachegrindFunction(CachegrindFile parent, String name) {
 		this.parent = parent;
@@ -44,7 +44,7 @@ public class CachegrindFunction implements ICachegrindElement {
 			try {
 				if (element instanceof ITranslationUnit) {
 					// Cachegrind labels parameter types for C++ methods
-					int paramIndex = name.indexOf("("); //$NON-NLS-1$
+					int paramIndex = name.indexOf('(');
 					if (paramIndex >= 0) {
 						name = name.substring(0, paramIndex);
 					}
@@ -75,7 +75,7 @@ public class CachegrindFunction implements ICachegrindElement {
 		}
 	}
 
-	protected ICElement findElement(String name, IParent parent)
+	private ICElement findElement(String name, IParent parent)
 	throws CModelException {
 		ICElement element = null;
 		List<ICElement> dom = parent.getChildrenOfType(ICElement.C_FUNCTION);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindLine.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindLine.java
index 39455129ed..32d6999bc8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindLine.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindLine.java
@@ -14,9 +14,9 @@ import org.eclipse.core.runtime.IAdaptable;
 
 
 public class CachegrindLine implements ICachegrindElement {
-	protected CachegrindFunction parent;
-	protected int line;
-	protected long[] values;
+	private CachegrindFunction parent;
+	private int line;
+	private long[] values;
 	
 	public CachegrindLine(CachegrindFunction parent, int line, long[] values) {
 		this.parent = parent;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindOutput.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindOutput.java
index 9a594afda4..7ad55ad5f7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindOutput.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/CachegrindOutput.java
@@ -16,12 +16,11 @@ import java.util.List;
 import org.eclipse.core.runtime.IAdaptable;
 
 public class CachegrindOutput implements ICachegrindElement {
-	protected List<CachegrindDescription> descriptions;
-	protected List<CachegrindFile> files;
-	protected Integer pid;
-	protected String cmd;
-	protected String[] events;
-	protected long[] summary;
+	private List<CachegrindDescription> descriptions;
+	private List<CachegrindFile> files;
+	private Integer pid;
+	private String[] events;
+	private long[] summary;
 	
 	public CachegrindOutput() {
 		descriptions = new ArrayList<>();
@@ -36,10 +35,6 @@ public class CachegrindOutput implements ICachegrindElement {
 		files.add(file);
 	}
 	
-	public void setCommand(String cmd) {
-		this.cmd = cmd;
-	}
-	
 	public void setEvents(String[] events) {
 		this.events = events;
 	}
@@ -52,14 +47,6 @@ public class CachegrindOutput implements ICachegrindElement {
 		this.pid = pid;
 	}
 	
-	public String getCmd() {
-		return cmd;
-	}
-	
-	public CachegrindDescription[] getDescriptions() {
-		return descriptions.toArray(new CachegrindDescription[descriptions.size()]);
-	}
-	
 	public String[] getEvents() {
 		return events;
 	}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/ICachegrindElement.java b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/ICachegrindElement.java
index 3292b5ed1a..9208fdbdec 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/ICachegrindElement.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.cachegrind/src/org/eclipse/linuxtools/internal/valgrind/cachegrind/model/ICachegrindElement.java
@@ -14,10 +14,8 @@ import org.eclipse.core.runtime.IAdaptable;
 
 public interface ICachegrindElement extends Comparable<ICachegrindElement> {
 	
-	public ICachegrindElement getParent();
-	
-	public ICachegrindElement[] getChildren();
-	
-	public IAdaptable getModel();
+	ICachegrindElement getParent();
+	ICachegrindElement[] getChildren();
+	IAdaptable getModel();
 		
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/AbstractValgrindMessage.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/AbstractValgrindMessage.java
index e17177c0a8..7f6ca2ef2d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/AbstractValgrindMessage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/AbstractValgrindMessage.java
@@ -17,10 +17,10 @@ import org.eclipse.linuxtools.valgrind.core.IValgrindMessage;
 
 public class AbstractValgrindMessage implements IValgrindMessage {
 
-	protected IValgrindMessage parent;
-	protected ILaunch launch;
-	protected ArrayList<IValgrindMessage> children;
-	protected String text;
+	private IValgrindMessage parent;
+	private ILaunch launch;
+	private ArrayList<IValgrindMessage> children;
+	private String text;
 
 	public AbstractValgrindMessage(IValgrindMessage parent, String text, ILaunch launch) {
 		children = new ArrayList<>();
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 0fc706c612..fdc87c524c 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
@@ -48,8 +48,7 @@ public class ValgrindCommand {
 		args = commandArray;
 		try {
 			process = startProcess(commandArray, env, wd, exeFile, usePty, project);
-		}
-		catch (IOException e) {
+		} catch (IOException e) {
 			if (process != null) {
 				process.destroy();
 			}
@@ -64,24 +63,23 @@ public class ValgrindCommand {
 	public String getCommandLine() {
 		StringBuffer ret = new StringBuffer();
 		for (String arg : args) {
-			ret.append(arg + " "); //$NON-NLS-1$
+			ret.append(arg).append(" "); //$NON-NLS-1$
 		}
 		return ret.toString().trim();
 	}
 	
-	protected Process startProcess(String[] commandArray, Object env, File workDir, String binPath, boolean usePty, IProject project) throws IOException {
+	private Process startProcess(String[] commandArray, Object env, File workDir, String binPath, boolean usePty, IProject project) throws IOException {
 		if (workDir == null) {
 			return CdtSpawnerProcessFactory.getFactory().exec(commandArray, (String[]) env, project);
 		}
 		if (PTY.isSupported() && usePty) {
 			return CdtSpawnerProcessFactory.getFactory().exec(commandArray, (String[]) env, workDir, new PTY(), project);
-		}
-		else {
+		} else {
 			return CdtSpawnerProcessFactory.getFactory().exec(commandArray, (String[]) env, workDir, project);
 		}
 	}
 
-	protected void readIntoBuffer(StringBuffer out, Process p) throws IOException {
+	private void readIntoBuffer(StringBuffer out, Process p) throws IOException {
 		boolean success;
 		InputStream in, err, input;
 		if (p  == null ) {
@@ -93,8 +91,7 @@ public class ValgrindCommand {
 			err =  p.getErrorStream();
 			if (success = (p.waitFor() == 0)) {
 				in = input;
-			}
-			else {
+			} else {
 				in = err;
 			}
 			int ch;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCoreParser.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCoreParser.java
index 0e35af3e23..7717d7becb 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCoreParser.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindCoreParser.java
@@ -27,9 +27,9 @@ public class ValgrindCoreParser {
 	private static final String AT = "at"; //$NON-NLS-1$
 	private static final String BY = "by"; //$NON-NLS-1$
 
-	protected List<IValgrindMessage> messages;
-	protected int pid;
-	protected ILaunch launch;
+	private List<IValgrindMessage> messages;
+	private int pid;
+	private ILaunch launch;
 
 	public ValgrindCoreParser(File inputFile, ILaunch launch) throws IOException {
 		this.launch = launch;
@@ -97,7 +97,7 @@ public class ValgrindCoreParser {
 		}
 	}
 
-	protected IValgrindMessage getMessage(IValgrindMessage message, String line) {
+	private IValgrindMessage getMessage(IValgrindMessage message, String line) {
 		if (line.startsWith(AT) || line.startsWith(BY)) {
 			Object[] parsed = ValgrindParserUtils.parseFilename(line);
 			String filename = (String) parsed[0];
@@ -110,14 +110,4 @@ public class ValgrindCoreParser {
 	public IValgrindMessage[] getMessages() {
 		return messages.toArray(new IValgrindMessage[messages.size()]);
 	}
-	
-	public void printMessages(IValgrindMessage m, int indent) {
-		for (int i = 0; i < indent; i++) {
-			System.out.print(" "); //$NON-NLS-1$
-		}
-		System.out.println(m.getText());
-		for (IValgrindMessage child : m.getChildren()) {
-			printMessages(child, indent + 1);
-		}
-	}
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindError.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindError.java
index f4c546b60d..fcd33df24d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindError.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindError.java
@@ -22,10 +22,6 @@ public class ValgrindError extends AbstractValgrindMessage {
 		this.pid = pid;
 	}
 	
-	public int getPid() {
-		return pid;
-	}
-	
 	@Override
 	public String getText() {
 		return super.getText() + " [PID: " + pid + "]"; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindStackFrame.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindStackFrame.java
index e639f0b67f..56f1bca42a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindStackFrame.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/internal/valgrind/core/ValgrindStackFrame.java
@@ -23,11 +23,6 @@ public class ValgrindStackFrame extends AbstractValgrindMessage {
 		this.line = line;
 	}
 	
-	@Override
-	public ILaunch getLaunch() {
-		return launch;
-	}
-	
 	public String getFile() {
 		return file;
 	}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/IValgrindMessage.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/IValgrindMessage.java
index 088db324c3..5ac9a694e8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/IValgrindMessage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/IValgrindMessage.java
@@ -14,14 +14,14 @@ import org.eclipse.debug.core.ILaunch;
 
 public interface IValgrindMessage {
 
-	public abstract IValgrindMessage getParent();
+	IValgrindMessage getParent();
 
-	public abstract IValgrindMessage[] getChildren();
+	IValgrindMessage[] getChildren();
 
-	public abstract String getText();
+	String getText();
 	
-	public abstract ILaunch getLaunch();
+	ILaunch getLaunch();
 
-	public abstract void addChild(IValgrindMessage child);
+	void addChild(IValgrindMessage child);
 
 }
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindParserUtils.java b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindParserUtils.java
index c717e3e5d9..f0f5da6fac 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindParserUtils.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.core/src/org/eclipse/linuxtools/valgrind/core/ValgrindParserUtils.java
@@ -37,8 +37,7 @@ public final class ValgrindParserUtils {
 		String[] parts = line.split(delim, 2);
 		if (parts.length > 1 && isNumber(parts[1])) {
 			result = Long.parseLong(parts[1]);
-		}
-		else {
+		} else {
 			fail(line);
 		}
 		return result;
@@ -58,8 +57,7 @@ public final class ValgrindParserUtils {
 		String[] parts = line.split(delim, 2);
 		if (parts.length > 1) {
 			result = parts[1];
-		}
-		else {
+		} else {
 			fail(line);
 		}
 		return result;
@@ -75,9 +73,8 @@ public final class ValgrindParserUtils {
 	public static Integer parsePID(String filename, String prefix) throws IOException {
 		String pidstr = filename.substring(prefix.length(), filename.lastIndexOf(DOT));
 		if (isNumber(pidstr)) {
-			return new Integer(pidstr);
-		}
-		else {
+			return Integer.valueOf(pidstr);
+		} else {
 			throw new IOException("Cannot parse PID from output file"); //$NON-NLS-1$
 		}
 	}
@@ -117,18 +114,18 @@ public final class ValgrindParserUtils {
 		String filename = null;
 		int lineNo = 0;
 	
-		int ix = line.lastIndexOf("("); //$NON-NLS-1$
+		int ix = line.lastIndexOf('(');
 		if (ix >= 0) {
 			String part = line.substring(ix, line.length());
 			part = part.substring(1, part.length() - 1); // remove leading and trailing parentheses
-			if ((ix = part.lastIndexOf(":")) >= 0) { //$NON-NLS-1$		
+			if ((ix = part.lastIndexOf(':')) >= 0) {
 				String strLineNo = part.substring(ix + 1);
 				if (isNumber(strLineNo)) {
 					lineNo = Integer.parseInt(strLineNo);
 					filename = part.substring(0, ix);
 				} else {
 					// handle format: (FILE:LINE MODULE)
-					int ix1 = strLineNo.indexOf(" "); //$NON-NLS-1$
+					int ix1 = strLineNo.indexOf(' ');
 					if (ix1 > 0) {
 						strLineNo = strLineNo.substring(0, ix1);
 						if (isNumber(strLineNo)) {
@@ -137,8 +134,7 @@ public final class ValgrindParserUtils {
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				// check for "in " token (lib, with symbol)
 				part = part.replaceFirst("^in ", EMPTY_STRING); //$NON-NLS-1$
 				// check for "within " token (lib, without symbol)
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/src/org/eclipse/linuxtools/internal/valgrind/helgrind/HelgrindToolPage.java b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/src/org/eclipse/linuxtools/internal/valgrind/helgrind/HelgrindToolPage.java
index f7897d9409..a66aea9ec7 100755
--- a/valgrind/org.eclipse.linuxtools.valgrind.helgrind/src/org/eclipse/linuxtools/internal/valgrind/helgrind/HelgrindToolPage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.helgrind/src/org/eclipse/linuxtools/internal/valgrind/helgrind/HelgrindToolPage.java
@@ -34,26 +34,21 @@ import org.eclipse.swt.widgets.Spinner;
 import org.osgi.framework.Version;
 
 public class HelgrindToolPage extends AbstractLaunchConfigurationTab implements IValgrindToolPage {
-	public static final String HELGRIND = "helgrind"; //$NON-NLS-1$
-	public static final String PLUGIN_ID = HelgrindPlugin.PLUGIN_ID;
-	
 	// HELGRIND controls
-	protected Button lockordersButton;
-	protected Combo historyCombo;
-	protected Spinner cacheSizeSpinner;
+	private Button lockordersButton;
+	private Combo historyCombo;
+	private Spinner cacheSizeSpinner;
 	
 	
-	protected boolean isInitializing = false;
-	protected Version valgrindVersion;
-	protected CoreException ex = null;
+	private boolean isInitializing = false;
 	
-	protected SelectionListener selectListener = new SelectionAdapter() {
+	private SelectionListener selectListener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			updateLaunchConfigurationDialog();
 		}
 	};
-	protected ModifyListener modifyListener = new ModifyListener() {
+	private ModifyListener modifyListener = new ModifyListener() {
 		@Override
 		public void modifyText(ModifyEvent e) {
 			updateLaunchConfigurationDialog();
@@ -107,7 +102,6 @@ public class HelgrindToolPage extends AbstractLaunchConfigurationTab implements
 			historyCombo.setText(configuration.getAttribute(HelgrindLaunchConstants.ATTR_HELGRIND_HISTORYLEVEL, HelgrindLaunchConstants.DEFAULT_HELGRIND_HISTORYLEVEL));
 			cacheSizeSpinner.setSelection(configuration.getAttribute(HelgrindLaunchConstants.ATTR_HELGRIND_CACHESIZE, HelgrindLaunchConstants.DEFAULT_HELGRIND_CACHESIZE));
 		} catch (CoreException e) {
-			ex = e;
 		}
 		isInitializing = false;
 	}
@@ -123,11 +117,7 @@ public class HelgrindToolPage extends AbstractLaunchConfigurationTab implements
 	public boolean isValid(ILaunchConfiguration launchConfig) {
 		setErrorMessage(null);
 		
-		/*
-		 * Don't have any constraints at this time
-		 */
-		boolean result = true;
-		return result;
+		return true;
 	}
 	
 	@Override
@@ -140,7 +130,7 @@ public class HelgrindToolPage extends AbstractLaunchConfigurationTab implements
 		
 	@Override
 	public void setValgrindVersion(Version ver) {
-		valgrindVersion = ver;
+		// no constraints
 	}
 
 	protected void createHorizontalSpacer(Composite comp, int numlines) {
@@ -161,25 +151,11 @@ public class HelgrindToolPage extends AbstractLaunchConfigurationTab implements
 		return lockordersButton;
 	}
 
-	public void setLockordersButton(Button lockordersButton) {
-		this.lockordersButton = lockordersButton;
-	}
-
 	public Spinner getCacheSizeSpinner() {
 		return cacheSizeSpinner;
 	}
 
-	public void setCacheSizeSpinner(Spinner cacheSizeSpinner) {
-		this.cacheSizeSpinner = cacheSizeSpinner;
-	}
-	
 	public Combo getHistoryCombo() {
 		return historyCombo;
 	}
-
-	public void setHistoryCombo(Combo historyCombo) {
-		this.historyCombo = historyCombo;
-	}
-
-
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ProjectBuildListener.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ProjectBuildListener.java
index e6991f3393..93771e8419 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ProjectBuildListener.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ProjectBuildListener.java
@@ -61,7 +61,7 @@ public class ProjectBuildListener implements IResourceChangeListener {
 	 * @param project IProject project to compare against
 	 * @return boolean true if IResourceDelta is a project and equals the
 	 */
-	public boolean isProjectDelta(IResourceDelta delta, IProject project){
+	private boolean isProjectDelta(IResourceDelta delta, IProject project){
 		if(delta != null){
 			IResource resource = delta.getResource();
 			return delta.getKind() == IResourceDelta.CHANGED
@@ -79,7 +79,7 @@ public class ProjectBuildListener implements IResourceChangeListener {
 	 * @return boolean true if IResourceChangeEvent is a post-build event, false
 	 *         otherwise
 	 */
-	public boolean isPostBuildEvent(IResourceChangeEvent event) {
+	private boolean isPostBuildEvent(IResourceChangeEvent event) {
 		if(event != null){
 			int buildKind = event.getBuildKind();
 			return  event.getType() == IResourceChangeEvent.POST_BUILD
@@ -95,7 +95,7 @@ public class ProjectBuildListener implements IResourceChangeListener {
 	 *
 	 * @param project IProject project to clear markers from
 	 */
-	protected void clearProjectMarkers(IProject project) {
+	private void clearProjectMarkers(IProject project) {
 		try {
 
 			// remove project markers
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizard.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizard.java
index b557769edd..e97e07d1a7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizard.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizard.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.progress.IProgressService;
 
 public class ValgrindExportWizard extends Wizard implements IExportWizard {
 
-	protected ValgrindExportWizardPage exportPage;
+	private ValgrindExportWizardPage exportPage;
 
 	@Override
 	public boolean performFinish() {
@@ -92,7 +92,7 @@ public class ValgrindExportWizard extends Wizard implements IExportWizard {
 		addPage(exportPage);
 	}
 
-	protected ValgrindExportWizardPage getWizardPage() {
+	private ValgrindExportWizardPage getWizardPage() {
 		return new ValgrindExportWizardPage(Messages.getString("ValgrindExportWizard.Page_name"), ExportWizardConstants.WIZARD_TITLE, null); //$NON-NLS-1$
 	}
 
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizardPage.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizardPage.java
index 21dbee7898..d11aae08ca 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizardPage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindExportWizardPage.java
@@ -43,15 +43,11 @@ import org.eclipse.ui.PlatformUI;
 
 public class ValgrindExportWizardPage extends WizardPage {
 
-	protected IPath outputPath;
-	protected CheckboxTableViewer viewer;
-	protected Text destText;
-	protected Button selectAllButton;
-	protected Button deselectAllButton;
-
-	protected ValgrindExportWizardPage(String pageName) {
-		super(pageName);
-	}
+	private IPath outputPath;
+	private CheckboxTableViewer viewer;
+	private Text destText;
+	private Button selectAllButton;
+	private Button deselectAllButton;
 
 	protected ValgrindExportWizardPage(String pageName, String title, ImageDescriptor titleImage) {
 		super(pageName, title, titleImage);
@@ -186,7 +182,7 @@ public class ValgrindExportWizardPage extends WizardPage {
 		});
 	}
 
-	protected boolean isValid() {
+	private boolean isValid() {
 		boolean valid = false;
 		int length = -1;
 
@@ -221,7 +217,7 @@ public class ValgrindExportWizardPage extends WizardPage {
 		return valid;
 	}
 
-	protected ValgrindLaunchPlugin getPlugin() {
+	private ValgrindLaunchPlugin getPlugin() {
 		return ValgrindLaunchPlugin.getDefault();
 	}
 
@@ -232,13 +228,4 @@ public class ValgrindExportWizardPage extends WizardPage {
 	public Text getDestText() {
 		return destText;
 	}
-
-	public Button getSelectAllButton() {
-		return selectAllButton;
-	}
-
-	public Button getDeselectAllButton() {
-		return deselectAllButton;
-	}
-
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
index 2ba5e5a27c..334dcacdb1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindLaunchConfigurationDelegate.java
@@ -62,13 +62,12 @@ import org.osgi.framework.Version;
 
 public class ValgrindLaunchConfigurationDelegate extends ProfileLaunchConfigurationDelegate {
 
-	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	protected static final String NO = "no"; //$NON-NLS-1$
-	protected static final String YES = "yes"; //$NON-NLS-1$
-	protected static final String EQUALS = "="; //$NON-NLS-1$
+	private static final String NO = "no"; //$NON-NLS-1$
+	private static final String YES = "yes"; //$NON-NLS-1$
+	private static final String EQUALS = "="; //$NON-NLS-1$
 
-	protected static final String LOG_FILE = CommandLineConstants.LOG_PREFIX + "%p.txt"; //$NON-NLS-1$
-	protected static final FileFilter LOG_FILTER = new FileFilter() {
+	private static final String LOG_FILE = CommandLineConstants.LOG_PREFIX + "%p.txt"; //$NON-NLS-1$
+	private static final FileFilter LOG_FILTER = new FileFilter() {
 		@Override
 		public boolean accept(File pathname) {
 			return pathname.getName().startsWith(CommandLineConstants.LOG_PREFIX);
@@ -224,7 +223,7 @@ public class ValgrindLaunchConfigurationDelegate extends ProfileLaunchConfigurat
 		return messages.toArray(new IValgrindMessage[messages.size()]);
 	}
 
-	protected void createMarkers(IValgrindMessage[] messages) throws CoreException {
+	private void createMarkers(IValgrindMessage[] messages) throws CoreException {
 		// find the topmost stack frame within the workspace to annotate with marker
 		// traverse nested errors as well
 		Stack<IValgrindMessage> messageStack = new Stack<>();
@@ -290,7 +289,7 @@ public class ValgrindLaunchConfigurationDelegate extends ProfileLaunchConfigurat
 		return getPlugin().getToolDelegate(toolID);
 	}
 
-	protected IPath verifyOutputPath(ILaunchConfiguration config) throws CoreException {
+	private IPath verifyOutputPath(ILaunchConfiguration config) throws CoreException {
 		IPath result = null;
 		String strPath = config.getAttribute(LaunchConfigurationConstants.ATTR_INTERNAL_OUTPUT_DIR, (String) null);
 		if (strPath != null) {
@@ -318,13 +317,12 @@ public class ValgrindLaunchConfigurationDelegate extends ProfileLaunchConfigurat
 					throw new IOException(NLS.bind(Messages.getString("ValgrindOutputDirectory.Couldnt_delete"), outputFile.getAbsolutePath())); //$NON-NLS-1$
 				}
 			}
-		}
-		else if (!outputDir.mkdir()) {
+		} else if (!outputDir.mkdir()) {
 			throw new IOException(NLS.bind(Messages.getString("ValgrindOutputDirectory.Couldnt_create"), outputDir.getAbsolutePath())); //$NON-NLS-1$
 		}
 	}
 
-	protected String createLaunchStr() {
+	private String createLaunchStr() {
 		return config.getName() + " [" + getPlugin().getToolName(toolID) + "] " + process.getLabel(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
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 8495a40296..6c9c78e827 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
@@ -115,10 +115,9 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 			if (verString.indexOf(VERSION_DELIMITER) > 0) {
 				verString = verString.substring(0, verString.indexOf(VERSION_DELIMITER));
 			}
-			if (verString.length() > 0) {
+			if (!verString.isEmpty()) {
 				valgrindVersion = Version.parseVersion(verString);
-			}
-			else {
+			} else {
 				throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, Messages.getString("ValgrindLaunchPlugin.Couldn't_determine_version"))); //$NON-NLS-1$
 			}
 		} catch (IOException e) {
@@ -251,7 +250,7 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 		return path;
 	}
 
-	protected void initializeToolMap() {
+	private void initializeToolMap() {
 		toolMap = new HashMap<>();
 		IExtensionPoint extPoint = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, ValgrindLaunchPlugin.TOOL_EXT_ID);
 		IConfigurationElement[] configs = extPoint.getConfigurationElements();
@@ -267,7 +266,7 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 		}
 	}
 
-	protected HashMap<String, IConfigurationElement> getToolMap() {
+	private HashMap<String, IConfigurationElement> getToolMap() {
 		if (toolMap == null) {
 			initializeToolMap();
 		}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
index 2cc580c6c9..af4ab22454 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOptionsTab.java
@@ -112,31 +112,13 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 		this.checkVersion = checkVersion;
 	}
 
-	/**
-	 * Set the version of Valgrind that the Launch UI shall use.
-	 * Since the valgrind version affects existence or non-existence of UI controls, the
-	 * version can only be changed while no version-dependent Tab is being displayed.
-	 * @param v the valgrind version, or <code>null</code> is no version is known (typically, all UI features enabled).
-	 */
-	public void setValgrindVersion(Version v) {
-		valgrindVersion = v;
-	}
-
-	/**
-	 * Return the version of Valgrind that the Launch UI is being configured against
-	 * @return the valgrind version, or <code>null</code> if no version has been detected or set.
-	 */
-	public Version getValgrindVersion() {
-		return valgrindVersion;
-	}
-
-	protected SelectionListener selectListener = new SelectionAdapter() {
+	private SelectionListener selectListener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			updateLaunchConfigurationDialog();
 		}
 	};
-	protected ModifyListener modifyListener = new ModifyListener() {
+	private ModifyListener modifyListener = new ModifyListener() {
 		@Override
 		public void modifyText(ModifyEvent e) {
 			updateLaunchConfigurationDialog();
@@ -212,7 +194,7 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 		updateLaunchConfigurationDialog();
 	}
 
-	protected void recomputeSize() {
+	private void recomputeSize() {
 		Point point = top.computeSize(SWT.DEFAULT, SWT.DEFAULT);
 		top.setSize(point);
 		scrollTop.setMinSize(point);
@@ -257,7 +239,7 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 		return str;
 	}
 
-	protected void createBasicOptions(Composite top) {
+	private void createBasicOptions(Composite top) {
 		Group basicGroup = new Group(top, SWT.NONE);
 		basicGroup.setLayout(new GridLayout());
 		basicGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -285,7 +267,7 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 		runFreeresButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 	}
 
-	protected void createErrorOptions(Composite top) {
+	private void createErrorOptions(Composite top) {
 		Group errorGroup = new Group(top, SWT.NONE);
 		errorGroup.setLayout(new GridLayout());
 		errorGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -368,7 +350,7 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 			dSymUtilButton.setVisible(false);
 	}
 
-	protected void createSuppressionsOption(Composite top) {
+	private void createSuppressionsOption(Composite top) {
 		Composite browseTop = new Composite(top, SWT.BORDER);
 		browseTop.setLayout(new GridLayout(2, false));
 		GridData browseData = new GridData(GridData.FILL_BOTH);
@@ -432,7 +414,7 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 		});
 	}
 
-	protected void handleToolChanged() {
+	private void handleToolChanged() {
 		try {
 			// create dynamicTab
 			loadDynamicArea();
@@ -488,7 +470,7 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 		return dynamicTab;
 	}
 
-	protected ValgrindLaunchPlugin getPlugin() {
+	private ValgrindLaunchPlugin getPlugin() {
 		return ValgrindLaunchPlugin.getDefault();
 	}
 
@@ -677,13 +659,6 @@ public class ValgrindOptionsTab extends AbstractLaunchConfigurationTab {
 		super.dispose();
 	}
 
-	protected void createHorizontalSpacer(Composite comp, int numlines) {
-		Label lbl = new Label(comp, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = numlines;
-		lbl.setLayoutData(gd);
-	}
-
 	@Override
 	protected void updateLaunchConfigurationDialog() {
 		if (!isInitializing) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOutputDirectoryProvider.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOutputDirectoryProvider.java
index 4fccc9ce6b..4d54f7dee4 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOutputDirectoryProvider.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindOutputDirectoryProvider.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.linuxtools.valgrind.launch.IValgrindOutputDirectoryProvider;
 
 public class ValgrindOutputDirectoryProvider implements IValgrindOutputDirectoryProvider {
-	protected IPath outputPath;
+	private IPath outputPath;
 
 	public ValgrindOutputDirectoryProvider() {
 		outputPath = ValgrindLaunchPlugin.getDefault().getStateLocation();
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindRemoteProxyLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindRemoteProxyLaunchDelegate.java
index 416589061d..ae57dbec6a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindRemoteProxyLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/internal/valgrind/launch/ValgrindRemoteProxyLaunchDelegate.java
@@ -90,7 +90,7 @@ public class ValgrindRemoteProxyLaunchDelegate extends ValgrindLaunchConfigurati
 		Version valgrindVersion;
 		String verString = whichVersion(project);
 
-		if (verString == null || verString.equals(EMPTY_STRING)){
+		if (verString == null || verString.isEmpty()){
 			throw new CoreException(new Status(IStatus.ERROR, ValgrindLaunchPlugin.PLUGIN_ID, Messages.getString("ValgrindLaunchPlugin.Couldn't_determine_version"))); //$NON-NLS-1$
 		}
 
@@ -301,7 +301,7 @@ public class ValgrindRemoteProxyLaunchDelegate extends ValgrindLaunchConfigurati
 		}
 	}
 
-	protected String createLaunchStr(IPath valgrindPath) throws CoreException {
+	private String createLaunchStr(IPath valgrindPath) throws CoreException {
 		String projectName = configUtils.getProjectName();
 		IProject project = ConfigUtils.getProject(projectName);
 		URI projectURI = project.getLocationURI();
@@ -330,8 +330,4 @@ public class ValgrindRemoteProxyLaunchDelegate extends ValgrindLaunchConfigurati
 	protected String getPluginID() {
 		return ValgrindLaunchPlugin.PLUGIN_ID;
 	}
-
-	public void onError(Throwable t) {
-		// for now do nothing
-	}
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindLaunchDelegate.java
index e441678af0..e0a30dd4f9 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindLaunchDelegate.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.linuxtools.valgrind.launch;
 
 import org.eclipse.core.runtime.CoreException;
@@ -35,8 +35,8 @@ public interface IValgrindLaunchDelegate {
 	 * @param monitor - to report progress
 	 * @throws CoreException - if this method fails
 	 */
-	public void handleLaunch(ILaunchConfiguration config, ILaunch launch, IPath logDir, IProgressMonitor monitor) throws CoreException;
-	
+	void handleLaunch(ILaunchConfiguration config, ILaunch launch, IPath logDir, IProgressMonitor monitor) throws CoreException;
+
 	/**
 	 * Called after handleLaunch returns control to the main Valgrind launch
 	 * delegate, and initializes the Valgrind view. This method is responsible
@@ -47,7 +47,7 @@ public interface IValgrindLaunchDelegate {
 	 * @param monitor - to report progress
 	 * @throws CoreException - if this method fails
 	 */
-	public void initializeView(IValgrindToolView view, String contentDescription, IProgressMonitor monitor) throws CoreException;
+	void initializeView(IValgrindToolView view, String contentDescription, IProgressMonitor monitor) throws CoreException;
 
 	/**
 	 * Parses attributes of an <code>ILaunchConfiguration</code> into an array
@@ -58,6 +58,6 @@ public interface IValgrindLaunchDelegate {
 	 * @return an array of arguments that can appended to a <code>valgrind</code> command
 	 * @throws CoreException - retrieving attributes from config failed
 	 */
-	public String[] getCommandArray(ILaunchConfiguration config, Version ver, IPath logDir) throws CoreException;
-	
+	String[] getCommandArray(ILaunchConfiguration config, Version ver, IPath logDir) throws CoreException;
+
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindOutputDirectoryProvider.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindOutputDirectoryProvider.java
index a967a74b6e..eee39955e7 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindOutputDirectoryProvider.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindOutputDirectoryProvider.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.linuxtools.valgrind.launch;
 
 import java.io.IOException;
@@ -24,6 +24,6 @@ public interface IValgrindOutputDirectoryProvider {
 	 * Obtains a directory to store Valgrind output files.
 	 * @return the absolute path to this directory
 	 */
-	public abstract IPath getOutputPath() throws IOException;
+	IPath getOutputPath() throws IOException;
 
 }
\ No newline at end of file
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindToolPage.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindToolPage.java
index bdf0c36d5b..3613246c1a 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindToolPage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/IValgrindToolPage.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.linuxtools.valgrind.launch;
 
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
@@ -18,7 +18,7 @@ import org.osgi.framework.Version;
  * into this plugin.
  */
 public interface IValgrindToolPage extends ILaunchConfigurationTab {
-	
+
 	/**
 	 * To be called before createControl. This method is used to inform extenders
 	 * which version of Valgrind is available. The extender may then perform
@@ -26,6 +26,6 @@ public interface IValgrindToolPage extends ILaunchConfigurationTab {
 	 * checking should not be performed.
 	 * @param ver - the version of Valgrind, or null
 	 */
-	public void setValgrindVersion(Version ver);
-	
+	void setValgrindVersion(Version ver);
+
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/CollapseAction.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/CollapseAction.java
index 72183736aa..cca83254de 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/CollapseAction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/CollapseAction.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 
 public class CollapseAction extends Action {
 
-	protected TreeViewer viewer;
+	private TreeViewer viewer;
 
 	public CollapseAction(TreeViewer viewer) {
 		super(Messages.getString("CollapseAction.Text")); //$NON-NLS-1$
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/ExpandAction.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/ExpandAction.java
index 13269c1f63..08f5373d8e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/ExpandAction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/ExpandAction.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 
 public class ExpandAction extends Action {
 	
-	protected TreeViewer viewer;
+	private TreeViewer viewer;
 
 	public ExpandAction(TreeViewer viewer) {
 		super(Messages.getString("ExpandAction.Text")); //$NON-NLS-1$
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java
index e26cd580d5..e602f4bc34 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifLaunchDelegate.java
@@ -32,7 +32,7 @@ import org.osgi.framework.Version;
 public class MassifLaunchDelegate implements IValgrindLaunchDelegate {
 	protected static final String OUT_PREFIX = "massif_";	 //$NON-NLS-1$
 	protected static final String OUT_FILE = OUT_PREFIX + "%p.txt"; //$NON-NLS-1$
-	protected static final FileFilter MASSIF_FILTER = new FileFilter() {
+	private static final FileFilter MASSIF_FILTER = new FileFilter() {
 		@Override
 		public boolean accept(File pathname) {
 			return pathname.getName().startsWith(OUT_PREFIX);
@@ -45,12 +45,11 @@ public class MassifLaunchDelegate implements IValgrindLaunchDelegate {
 	private static final Version VER_3_6_0 = new Version(3, 6, 0);
 
 
-	protected MassifOutput output;
+	private MassifOutput output;
 
 	@Override
 	public void handleLaunch(ILaunchConfiguration config, ILaunch launch, IPath outDir, IProgressMonitor monitor)
 	throws CoreException {
-		MassifPlugin.getDefault().setConfig(config);
 		MassifPlugin.getDefault().setSourceLocator(launch.getSourceLocator());
 		try {
 			monitor.beginTask(Messages.getString("MassifLaunchDelegate.Parsing_Massif_Output"), 3); //$NON-NLS-1$
@@ -68,7 +67,7 @@ public class MassifLaunchDelegate implements IValgrindLaunchDelegate {
 		}
 	}
 
-	protected void parseOutput(File[] massifOutputs, IProgressMonitor monitor) throws IOException {
+	private void parseOutput(File[] massifOutputs, IProgressMonitor monitor) throws IOException {
 		output = new MassifOutput();
 		for (File file : massifOutputs) {
 			MassifParser parser = new MassifParser(file);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java
index 9617b385a8..f1499b83fa 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifParser.java
@@ -42,8 +42,8 @@ public class MassifParser {
 	private static final String DETAILED = "detailed"; //$NON-NLS-1$
 	private static final String EMPTY = "empty"; //$NON-NLS-1$
 
-	protected Integer pid;
-	protected MassifSnapshot[] snapshots;
+	private Integer pid;
+	private MassifSnapshot[] snapshots;
 
 	public MassifParser(File inputFile) throws IOException {
 		ArrayList<MassifSnapshot> list = new ArrayList<>();
@@ -62,11 +62,9 @@ public class MassifParser {
 			while ((line = br.readLine()) != null) {
 				if (line.startsWith(CMD + COLON)){
 					cmd = ValgrindParserUtils.parseStrValue(line, COLON + SPACE);
-				}
-				else if (line.startsWith(TIME_UNIT + COLON)) {
+				} else if (line.startsWith(TIME_UNIT + COLON)) {
 					unit = parseTimeUnit(line);
-				}			
-				else if (line.startsWith(SNAPSHOT)) {
+				} else if (line.startsWith(SNAPSHOT)) {
 					if (snapshot != null) {
 						// this snapshot finished parsing
 						list.add(snapshot);
@@ -75,20 +73,15 @@ public class MassifParser {
 					snapshot = new MassifSnapshot(n);
 					snapshot.setCmd(cmd);
 					snapshot.setUnit(unit);
-				}
-				else if (line.startsWith(TIME + EQUALS)) {
+				} else if (line.startsWith(TIME + EQUALS)) {
 					snapshot.setTime(ValgrindParserUtils.parseLongValue(line, EQUALS));
-				}
-				else if (line.startsWith(MEM_HEAP_B + EQUALS)) {
+				} else if (line.startsWith(MEM_HEAP_B + EQUALS)) {
 					snapshot.setHeapBytes(ValgrindParserUtils.parseLongValue(line, EQUALS));
-				}
-				else if (line.startsWith(MEM_HEAP_EXTRA_B + EQUALS)) {
+				} else if (line.startsWith(MEM_HEAP_EXTRA_B + EQUALS)) {
 					snapshot.setHeapExtra(ValgrindParserUtils.parseLongValue(line, EQUALS));
-				}
-				else if (line.startsWith(MEM_STACKS_B + EQUALS)) {
+				} else if (line.startsWith(MEM_STACKS_B + EQUALS)) {
 					snapshot.setStacks(ValgrindParserUtils.parseLongValue(line, EQUALS));
-				}
-				else if (line.startsWith(HEAP_TREE + EQUALS)) {
+				} else if (line.startsWith(HEAP_TREE + EQUALS)) {
 					SnapshotType type = parseSnapshotType(line);
 					snapshot.setType(type);
 					switch (type) {
@@ -133,8 +126,7 @@ public class MassifParser {
 		double percentage;
 		if (numBytes.intValue() == 0) {
 			percentage = 0;
-		}
-		else {
+		} else {
 			percentage = numBytes.doubleValue() / snapshot.getTotal() * 100;
 		}
 
@@ -159,8 +151,7 @@ public class MassifParser {
 			lineNo = (Integer) subparts[1];
 			
 			node = new MassifHeapTreeNode(parent, percentage, numBytes, address, function, filename, lineNo);
-		}
-		else {
+		} else {
 			// concatenate the rest
 			StringBuffer text = new StringBuffer();
 			for (int i = 2; i < parts.length; i++) {
@@ -180,7 +171,7 @@ public class MassifParser {
 
 	private String parseFunction(String start, String line) throws IOException {
 		String function = null;
-		int ix = line.lastIndexOf("("); //$NON-NLS-1$
+		int ix = line.lastIndexOf('(');
 		if (ix >= 0) {
 			function = line.substring(line.indexOf(start), ix);
 		}
@@ -227,7 +218,7 @@ public class MassifParser {
 		return snapshots;
 	}
 
-	protected SnapshotType parseSnapshotType(String line) throws IOException {
+	private SnapshotType parseSnapshotType(String line) throws IOException {
 		SnapshotType result = null;
 		String[] parts = line.split(EQUALS);
 		if (parts.length > 1) {
@@ -248,7 +239,7 @@ public class MassifParser {
 		return result;
 	}
 	
-	protected TimeUnit parseTimeUnit(String line) throws IOException {
+	private TimeUnit parseTimeUnit(String line) throws IOException {
 		TimeUnit result = null;
 		String[] parts = line.split(COLON + SPACE);
 		if (parts.length > 1) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPidMenuAction.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPidMenuAction.java
index 6cbdf3f170..7012f6cdeb 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPidMenuAction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPidMenuAction.java
@@ -23,9 +23,9 @@ import org.eclipse.swt.widgets.MenuItem;
 
 public class MassifPidMenuAction extends Action implements IMenuCreator {
 
-	protected Menu menu;
-	protected MassifViewPart view;
-	protected Integer[] pids;
+	private Menu menu;
+	private MassifViewPart view;
+	private Integer[] pids;
 
 	public MassifPidMenuAction(MassifViewPart view) {
 		super(Messages.getString("MassifPidMenuAction.Select_Process_ID"), IAction.AS_DROP_DOWN_MENU); //$NON-NLS-1$
@@ -50,7 +50,7 @@ public class MassifPidMenuAction extends Action implements IMenuCreator {
 				menu = new Menu(parent);
 				for (int i = 0; i < pids.length; i++) {
 					final Integer pid = pids[i];
-					ActionContributionItem item = new ActionContributionItem(new Action("PID " + String.valueOf(pids[i]), IAction.AS_RADIO_BUTTON) { //$NON-NLS-1$
+					ActionContributionItem item = new ActionContributionItem(new Action("PID " + pids[i], IAction.AS_RADIO_BUTTON) { //$NON-NLS-1$
 						@Override
 						public void run() {
 							MenuItem[] items = menu.getItems();
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPlugin.java
index 763544af8a..49b1b23643 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifPlugin.java
@@ -12,7 +12,6 @@ package org.eclipse.linuxtools.internal.valgrind.massif;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IStorage;
-import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.ISourceLocator;
 import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
 import org.eclipse.jface.text.BadLocationException;
@@ -33,11 +32,9 @@ public class MassifPlugin extends AbstractUIPlugin {
 	// The shared instance
 	private static MassifPlugin plugin;
 	
-	protected ILaunchConfiguration config;
-	
 	// Needed for source lookup on massif output, since massif only supplies filenames
 	// and not full paths
-	protected ISourceLocator locator;
+	private ISourceLocator locator;
 
 	public static final String TOOL_ID = "org.eclipse.linuxtools.valgrind.launch.massif"; //$NON-NLS-1$
 	
@@ -77,10 +74,9 @@ public class MassifPlugin extends AbstractUIPlugin {
 	
 	public void openEditorForNode(MassifHeapTreeNode element) {
 		// do source lookup
-		ISourceLocator sourceLocator = MassifPlugin.getDefault().getSourceLocator();
-		if (sourceLocator instanceof ISourceLookupDirector) {
-			Object obj = ((ISourceLookupDirector) sourceLocator).getSourceElement(element.getFilename());
-			if (obj != null && obj instanceof IStorage){
+		if (locator instanceof ISourceLookupDirector) {
+			Object obj = ((ISourceLookupDirector) locator).getSourceElement(element.getFilename());
+			if (obj instanceof IStorage){
 				try {
 					// Most likely a remote project
 					if (obj instanceof IFile) {
@@ -90,31 +86,17 @@ public class MassifPlugin extends AbstractUIPlugin {
 						String fullFilePath = ((IStorage) obj).getFullPath().toOSString();
 						ProfileUIUtils.openEditorAndSelect(fullFilePath, element.getLine());
 					}
-				} catch (PartInitException e) {
-					e.printStackTrace();
-				} catch (BadLocationException e) {
+				} catch (PartInitException|BadLocationException e) {
 					e.printStackTrace();
 				}
 			}
 		}
 	}
 	
-	public ISourceLocator getSourceLocator() {
-		return locator;
-	}
-	
 	protected void setSourceLocator(ISourceLocator locator) {
 		this.locator = locator;
 	}
 	
-	public ILaunchConfiguration getConfig() {
-		return config;
-	}
-	
-	public void setConfig(ILaunchConfiguration config) {
-		this.config = config;
-	}
-
 	/**
 	 * Returns the shared instance
 	 *
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifToolPage.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifToolPage.java
index 89ed2f6b48..bfaaaa5baf 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifToolPage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifToolPage.java
@@ -48,33 +48,33 @@ public class MassifToolPage extends AbstractLaunchConfigurationTab
 	private static final Version VER_3_6_0 = new Version(3, 6, 0);
 		
 	// Massif controls
-	protected Button heapButton;
-	protected Spinner heapAdminSpinner;
-	protected Button stacksButton;
-	protected Spinner depthSpinner;
-	protected List allocFnList;
-	protected List ignoreFnList;
-	protected Spinner thresholdSpinner;
-	protected Spinner peakInaccuracySpinner;
-	protected Combo timeUnitCombo;
-	protected Spinner detailedFreqSpinner;
-	protected Spinner maxSnapshotsSpinner;
-	protected Button alignmentButton;
-	protected Spinner alignmentSpinner;
+	private Button heapButton;
+	private Spinner heapAdminSpinner;
+	private Button stacksButton;
+	private Spinner depthSpinner;
+	private List allocFnList;
+	private List ignoreFnList;
+	private Spinner thresholdSpinner;
+	private Spinner peakInaccuracySpinner;
+	private Combo timeUnitCombo;
+	private Spinner detailedFreqSpinner;
+	private Spinner maxSnapshotsSpinner;
+	private Button alignmentButton;
+	private Spinner alignmentSpinner;
 	
 	// VG >= 3.6.0
-	protected Button pagesasheapButton;
+	private Button pagesasheapButton;
 	
-	protected boolean isInitializing = false;
-	protected Version valgrindVersion;
+	private boolean isInitializing = false;
+	private Version valgrindVersion;
 	
-	protected SelectionListener selectListener = new SelectionAdapter() {
+	private SelectionListener selectListener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			updateLaunchConfigurationDialog();
 		}
 	};
-	protected ModifyListener modifyListener = new ModifyListener() {
+	private ModifyListener modifyListener = new ModifyListener() {
 		@Override
 		public void modifyText(ModifyEvent e) {
 			updateLaunchConfigurationDialog();	
@@ -306,7 +306,7 @@ public class MassifToolPage extends AbstractLaunchConfigurationTab
 		});
 	}
 
-	protected void handleAllocNewButtonPressed() {
+	private void handleAllocNewButtonPressed() {
 		InputDialog dialog = new InputDialog(getShell(), Messages.getString("MassifToolPage.New_Allocation_Function"), Messages.getString("MassifToolPage.Function_name"), "", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		if (dialog.open() == Window.OK) {
 			String function = dialog.getValue();
@@ -316,12 +316,12 @@ public class MassifToolPage extends AbstractLaunchConfigurationTab
 		}
 	}
 
-	protected void handleAllocRemoveButtonPressed() {
+	private void handleAllocRemoveButtonPressed() {
 		 int[] selections = allocFnList.getSelectionIndices();
 		 allocFnList.remove(selections);
 	}
 
-	protected void handleIgnoreNewButtonPressed() {
+	private void handleIgnoreNewButtonPressed() {
 		InputDialog dialog = new InputDialog(getShell(), Messages.getString("MassifToolPage.New_Ignore_Function"), Messages.getString("MassifToolPage.Function_name"), "", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		if (dialog.open() == Window.OK) {
 			String function = dialog.getValue();
@@ -331,7 +331,7 @@ public class MassifToolPage extends AbstractLaunchConfigurationTab
 		}
 	}
 
-	protected void handleIgnoreRemoveButtonPressed() {
+	private void handleIgnoreRemoveButtonPressed() {
 		 int[] selections = ignoreFnList.getSelectionIndices();
 		 ignoreFnList.remove(selections);
 	}
@@ -359,11 +359,9 @@ public class MassifToolPage extends AbstractLaunchConfigurationTab
 			String timeUnit = configuration.getAttribute(MassifLaunchConstants.ATTR_MASSIF_TIMEUNIT, MassifLaunchConstants.DEFAULT_MASSIF_TIMEUNIT);
 			if (timeUnit.equals(MassifLaunchConstants.TIME_I)) {
 				timeUnitCombo.select(0);
-			}
-			else if (timeUnit.equals(MassifLaunchConstants.TIME_MS)) {
+			} else if (timeUnit.equals(MassifLaunchConstants.TIME_MS)) {
 				timeUnitCombo.select(1);
-			}
-			else {
+			} else {
 				timeUnitCombo.select(2);
 			}
 			
@@ -398,11 +396,9 @@ public class MassifToolPage extends AbstractLaunchConfigurationTab
 		String value;
 		if (ix == 0) {
 			value = MassifLaunchConstants.TIME_I;
-		}
-		else if (ix == 1) {
+		} else if (ix == 1) {
 			value = MassifLaunchConstants.TIME_MS;
-		}
-		else {
+		} else {
 			value = MassifLaunchConstants.TIME_B;
 		}
 		configuration.setAttribute(MassifLaunchConstants.ATTR_MASSIF_TIMEUNIT, value);
@@ -462,13 +458,6 @@ public class MassifToolPage extends AbstractLaunchConfigurationTab
 		valgrindVersion = ver;
 	}
 
-	protected void createHorizontalSpacer(Composite comp, int numlines) {
-		Label lbl = new Label(comp, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = numlines;
-		lbl.setLayoutData(gd);
-	}
-	
 	@Override
 	protected void updateLaunchConfigurationDialog() {
 		if (!isInitializing) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java
index b021a36baa..0cad3fb691 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifTreeViewer.java
@@ -27,10 +27,10 @@ import org.eclipse.swt.widgets.Menu;
 
 public class MassifTreeViewer {
 
-	protected IDoubleClickListener doubleClickListener;
-	protected ITreeContentProvider contentProvider;
-	protected Action expandAction;
-	protected Action collapseAction;
+	private IDoubleClickListener doubleClickListener;
+	private ITreeContentProvider contentProvider;
+	private Action expandAction;
+	private Action collapseAction;
 
 	private TreeViewer viewer;
 	
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
index d243acc9ba..2f45f9636d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/MassifViewPart.java
@@ -61,19 +61,19 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 public class MassifViewPart extends ViewPart implements IValgrindToolView {
 
-	protected static final String TITLE_STACKS = Messages
+	private static final String TITLE_STACKS = Messages
 	.getString("MassifViewPart.Stacks"); //$NON-NLS-1$
-	protected static final String TITLE_EXTRA = Messages
+	private static final String TITLE_EXTRA = Messages
 	.getString("MassifViewPart.Extra_Heap"); //$NON-NLS-1$
-	protected static final String TITLE_USEFUL = Messages
+	private static final String TITLE_USEFUL = Messages
 	.getString("MassifViewPart.Useful_Heap"); //$NON-NLS-1$
-	protected static final String TITLE_TOTAL = Messages
+	private static final String TITLE_TOTAL = Messages
 	.getString("MassifViewPart.Total"); //$NON-NLS-1$
-	protected static final String TITLE_TIME = Messages
+	private static final String TITLE_TIME = Messages
 	.getString("MassifViewPart.Time"); //$NON-NLS-1$
-	protected static final String TITLE_NUMBER = Messages
+	private static final String TITLE_NUMBER = Messages
 	.getString("MassifViewPart.Snapshot"); //$NON-NLS-1$
-	protected static final String TREE_ACTION = MassifPlugin.PLUGIN_ID
+	private static final String TREE_ACTION = MassifPlugin.PLUGIN_ID
 	+ ".treeAction"; //$NON-NLS-1$
 	public static final String CHART_ACTION = MassifPlugin.PLUGIN_ID
 	+ ".chartAction"; //$NON-NLS-1$
@@ -82,24 +82,24 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 	public static final String SAVE_CHART_ACTION = MassifPlugin.PLUGIN_ID
 	+ ".saveChartAction"; //$NON-NLS-1$
 
-	protected MassifOutput output;
-	protected Integer pid;
+	private MassifOutput output;
+	private Integer pid;
 
-	protected Composite top;
-	protected StackLayout stackLayout;
-	protected TableViewer viewer;
-	protected MassifTreeViewer treeViewer;
-	protected MassifHeapTreeNode[] nodes;
-	protected String chartName;
+	private Composite top;
+	private StackLayout stackLayout;
+	private TableViewer viewer;
+	private MassifTreeViewer treeViewer;
+	private MassifHeapTreeNode[] nodes;
+	private String chartName;
 
-	protected static final int COLUMN_SIZE = 125;
+	private static final int COLUMN_SIZE = 125;
 
-	protected Action treeAction;
-	protected Action chartAction;
-	protected MassifPidMenuAction pidAction;
-	protected Action saveChartAction;
+	private Action treeAction;
+	private Action chartAction;
+	private MassifPidMenuAction pidAction;
+	private Action saveChartAction;
 
-	protected List<ChartEditorInput> chartInputs;
+	private List<ChartEditorInput> chartInputs;
 
 	@Override
 	public void createPartControl(Composite parent) {
@@ -285,7 +285,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 		return new IAction[] { pidAction, chartAction, saveChartAction, treeAction };
 	}
 	
-	protected String getChartSavePath(String defaultName) {
+	private 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$
@@ -296,7 +296,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 		return dialog.open();
 	}
 
-	protected void createChart(MassifSnapshot[] snapshots) {
+	private void createChart(MassifSnapshot[] snapshots) {
 		String title = chartName + " [PID: " + pid + "]";  //$NON-NLS-1$//$NON-NLS-2$
 		HeapChart chart = new HeapChart(snapshots, title);
 
@@ -308,7 +308,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 		displayChart(input);
 	}
 
-	protected void displayChart(final ChartEditorInput chartInput) {
+	private void displayChart(final ChartEditorInput chartInput) {
 		Display.getDefault().syncExec(new Runnable() {
 			@Override
 			public void run() {
@@ -323,7 +323,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 		});
 	}
 
-	protected String getInputName(String description) {
+	private String getInputName(String description) {
 		String launchName;
 		try {
 			launchName = description.substring(0, description
@@ -424,7 +424,7 @@ public class MassifViewPart extends ViewPart implements IValgrindToolView {
 		return treeViewer;
 	}
 
-	protected static class MassifLabelProvider extends LabelProvider implements
+	private static class MassifLabelProvider extends LabelProvider implements
 	ITableLabelProvider, IFontProvider {
 
 		@Override
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java
index df6f3243c3..d95e30d483 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditor.java
@@ -44,7 +44,7 @@ import org.swtchart.LineStyle;
 import org.swtchart.Range;
 
 public class ChartEditor extends EditorPart {
-	protected Chart control;
+	private Chart control;
 
 	@Override
 	public void doSave(IProgressMonitor monitor) {
@@ -85,11 +85,11 @@ public class ChartEditor extends EditorPart {
 		heapChart.setChartControl(control);
 
 		final Color LIGHTYELLOW = new Color(Display.getDefault(), 255, 255, 225);
-		final Color WHITE = new Color(Display.getDefault(), 255, 255, 255);
-		final Color BLACK = new Color(Display.getDefault(), 0, 0, 0);
-		final Color RED = new Color(Display.getDefault(), 255, 0, 0);
+		final Color WHITE = Display.getDefault().getSystemColor(SWT.COLOR_WHITE);
+		final Color BLACK = Display.getDefault().getSystemColor(SWT.COLOR_BLACK);
+		final Color RED = Display.getDefault().getSystemColor(SWT.COLOR_RED);
 		final Color ORANGE = new Color(Display.getDefault(), 255, 165, 0);
-		final Color GREEN = new Color(Display.getDefault(), 0, 255, 0);
+		final Color GREEN = Display.getDefault().getSystemColor(SWT.COLOR_GREEN);
 		final Color DARK_BLUE = new Color(Display.getDefault(), 64, 128, 128);
 		final int TICK_GAP = 40;
 
@@ -129,7 +129,7 @@ public class ChartEditor extends EditorPart {
 
 		// data
 		final ILineSeries lsUseful = (ILineSeries) control.getSeriesSet().
-				createSeries(SeriesType.LINE, Messages.getString("HeapChart.Useful_Heap")); //$NON-NLS-1$);
+				createSeries(SeriesType.LINE, Messages.getString("HeapChart.Useful_Heap")); //$NON-NLS-1$;
 		lsUseful.setXSeries(heapChart.time);
 		lsUseful.setYSeries(heapChart.dataUseful);
 		lsUseful.setSymbolType(PlotSymbolType.DIAMOND);
@@ -137,7 +137,7 @@ public class ChartEditor extends EditorPart {
 		lsUseful.setLineColor(RED);
 
 		final ILineSeries lsExtra = (ILineSeries) control.getSeriesSet().
-				createSeries(SeriesType.LINE, Messages.getString("HeapChart.Extra_Heap")); //$NON-NLS-1$);
+				createSeries(SeriesType.LINE, Messages.getString("HeapChart.Extra_Heap")); //$NON-NLS-1$;
 		lsExtra.setXSeries(heapChart.time);
 		lsExtra.setYSeries(heapChart.dataExtra);
 		lsExtra.setSymbolType(PlotSymbolType.DIAMOND);
@@ -146,7 +146,7 @@ public class ChartEditor extends EditorPart {
 
 		if (heapChart.dataStacks != null){
 			final ILineSeries lsStack = (ILineSeries) control.getSeriesSet().
-					createSeries(SeriesType.LINE, Messages.getString("HeapChart.Stacks")); //$NON-NLS-1$);
+					createSeries(SeriesType.LINE, Messages.getString("HeapChart.Stacks")); //$NON-NLS-1$;
 			lsStack.setXSeries(heapChart.time);
 			lsStack.setYSeries(heapChart.dataStacks);
 			lsStack.setSymbolType(PlotSymbolType.DIAMOND);
@@ -155,7 +155,7 @@ public class ChartEditor extends EditorPart {
 		}
 
 		final ILineSeries lsTotal = (ILineSeries) control.getSeriesSet().
-				createSeries(SeriesType.LINE, Messages.getString("HeapChart.Total_Heap")); //$NON-NLS-1$);
+				createSeries(SeriesType.LINE, Messages.getString("HeapChart.Total_Heap")); //$NON-NLS-1$;
 		lsTotal.setXSeries(heapChart.time);
 		lsTotal.setYSeries(heapChart.dataTotal);
 		lsTotal.setSymbolType(PlotSymbolType.DIAMOND);
@@ -240,7 +240,7 @@ public class ChartEditor extends EditorPart {
     /**
      * Shows the Valgrind view in the active page and gives it focus.
      */
-    public void showView() {
+    private void showView() {
             Display.getDefault().syncExec(new Runnable() {
                     @Override
 					public void run() {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java
index d369c65524..7dfa54a0ad 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartEditorInput.java
@@ -20,10 +20,10 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 public class ChartEditorInput implements IEditorInput {
 	
-	protected HeapChart chart;
-	protected MassifViewPart view;
-	protected String name;
-	protected Integer pid;
+	private HeapChart chart;
+	private MassifViewPart view;
+	private String name;
+	private Integer pid;
 
 	public ChartEditorInput(HeapChart chart, MassifViewPart view, String name, Integer pid) {
 		this.chart = chart;
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartLocationsDialog.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartLocationsDialog.java
index fbb63d1b15..fa10a62e2f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartLocationsDialog.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartLocationsDialog.java
@@ -23,7 +23,7 @@ import org.eclipse.ui.dialogs.ListDialog;
 
 public class ChartLocationsDialog extends ListDialog {
 
-	protected List<MassifHeapTreeNode> allocs;
+	private List<MassifHeapTreeNode> allocs;
 
 	public ChartLocationsDialog(Shell parent) {
 		super(parent);
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartPNG.java b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartPNG.java
index 44ba9c5ee8..9cd7d802e1 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartPNG.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/internal/valgrind/massif/charting/ChartPNG.java
@@ -12,7 +12,6 @@
 package org.eclipse.linuxtools.internal.valgrind.massif.charting;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.linuxtools.valgrind.ui.ValgrindUIConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
@@ -20,13 +19,10 @@ import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
 
 public class ChartPNG {
 
-	protected HeapChart cm = null;
+	private HeapChart cm = null;
 	
 	public ChartPNG(HeapChart chart) {
 		cm = chart;
@@ -43,36 +39,4 @@ public class ChartPNG {
 		imageLoader.data = new ImageData[] {img.getImageData()};
 		imageLoader.save(pngPath.toOSString(), SWT.IMAGE_PNG);
 	}
-
-	public HeapChart getDesignTimeModel() {
-		return cm;
-	}
-
-	public Object peerInstance() {
-		return this;
-	}
-
-	public void regenerateChart() {
-	}
-
-	public void repaintChart() {
-	}
-	
-	/**
-	 * Shows the Valgrind view in the active page and gives it focus.
-	 */
-	public void showView() {
-		Display.getDefault().syncExec(new Runnable() {
-			@Override
-			public void run() {
-				try {
-					IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-					activePage.showView(ValgrindUIConstants.VIEW_ID);
-				} catch (PartInitException e) {
-					e.printStackTrace();
-				}
-			}			
-		});
-	}
-	
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/internal/valgrind/memcheck/MemcheckToolPage.java b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/internal/valgrind/memcheck/MemcheckToolPage.java
index e110624c28..afef8888e9 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/internal/valgrind/memcheck/MemcheckToolPage.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/internal/valgrind/memcheck/MemcheckToolPage.java
@@ -41,44 +41,42 @@ import org.eclipse.swt.widgets.Text;
 import org.osgi.framework.Version;
 
 public class MemcheckToolPage extends AbstractLaunchConfigurationTab implements IValgrindToolPage {
-	public static final String MEMCHECK = "memcheck"; //$NON-NLS-1$
-	public static final String PLUGIN_ID = MemcheckPlugin.PLUGIN_ID;
 	private static final Version VER_3_4_0 = new Version(3, 4, 0);
 	private static final Version VER_3_6_0 = new Version(3, 6, 0);
 	
 	// MEMCHECK controls
-	protected Button leakCheckButton;
-	protected Combo leakResCombo;
-	protected Button showReachableButton;
-	protected Spinner freelistSpinner;
-	protected Button partialLoadsButton;
-	protected Button undefValueButton;
-	protected Button gccWorkaroundButton;
-	protected Button alignmentButton;
-	protected Spinner alignmentSpinner;
-	protected Button mallocFillButton;
-	protected Text mallocFillText;
-	protected Button freeFillButton;
-	protected Text freeFillText;
-	protected List ignoreRangesList;
+	private Button leakCheckButton;
+	private Combo leakResCombo;
+	private Button showReachableButton;
+	private Spinner freelistSpinner;
+	private Button partialLoadsButton;
+	private Button undefValueButton;
+	private Button gccWorkaroundButton;
+	private Button alignmentButton;
+	private Spinner alignmentSpinner;
+	private Button mallocFillButton;
+	private Text mallocFillText;
+	private Button freeFillButton;
+	private Text freeFillText;
+	private List ignoreRangesList;
 	
 	// VG >= 3.4.0
-	protected Button trackOriginsButton;
+	private Button trackOriginsButton;
 	
 	// VG >= 3.6.0
-	protected Button showPossiblyLostButton;
+	private Button showPossiblyLostButton;
 	
-	protected boolean isInitializing = false;
-	protected Version valgrindVersion;
-	protected CoreException ex = null;
+	private boolean isInitializing = false;
+	private Version valgrindVersion;
+	private CoreException ex = null;
 	
-	protected SelectionListener selectListener = new SelectionAdapter() {
+	private SelectionListener selectListener = new SelectionAdapter() {
 		@Override
 		public void widgetSelected(SelectionEvent e) {
 			updateLaunchConfigurationDialog();
 		}
 	};
-	protected ModifyListener modifyListener = new ModifyListener() {
+	private ModifyListener modifyListener = new ModifyListener() {
 		@Override
 		public void modifyText(ModifyEvent e) {
 			updateLaunchConfigurationDialog();	
@@ -260,7 +258,7 @@ public class MemcheckToolPage extends AbstractLaunchConfigurationTab implements
 		
 	}
 		
-	protected void handleIgnoreNewButtonPressed() {
+	private void handleIgnoreNewButtonPressed() {
 		InputDialog dialog = new InputDialog(getShell(), Messages.getString("MemcheckToolPage.Ignore_Ranges"), Messages.getString("MemcheckToolPage.Range"), "", null); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		if (dialog.open() == Window.OK) {
 			String function = dialog.getValue();
@@ -270,7 +268,7 @@ public class MemcheckToolPage extends AbstractLaunchConfigurationTab implements
 		}
 	}
 
-	protected void handleIgnoreRemoveButtonPressed() {
+	private void handleIgnoreRemoveButtonPressed() {
 		int[] selections = ignoreRangesList.getSelectionIndices();
 		ignoreRangesList.remove(selections);
 	}
@@ -429,83 +427,50 @@ public class MemcheckToolPage extends AbstractLaunchConfigurationTab implements
 		valgrindVersion = ver;
 	}
 
-	protected void createHorizontalSpacer(Composite comp, int numlines) {
-		Label lbl = new Label(comp, SWT.NONE);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = numlines;
-		lbl.setLayoutData(gd);
-	}
-	
 	@Override
-	protected void updateLaunchConfigurationDialog() {
+	public void updateLaunchConfigurationDialog() {
 		if (!isInitializing) {
 			super.updateLaunchConfigurationDialog();
 		}
 	}
 
-
 	public Button getLeakCheckButton() {
 		return leakCheckButton;
 	}
 	
-	
 	public Combo getLeakResCombo() {
 		return leakResCombo;
 	}
 
-
 	public Button getShowReachableButton() {
 		return showReachableButton;
 	}
 
-
 	public Spinner getFreelistSpinner() {
 		return freelistSpinner;
 	}
 
-
 	public Button getPartialLoadsButton() {
 		return partialLoadsButton;
 	}
 
-
 	public Button getUndefValueButton() {
 		return undefValueButton;
 	}
 
-
 	public Button getGccWorkaroundButton() {
 		return gccWorkaroundButton;
 	}
 
-	
 	public Button getAlignmentButton() {
 		return alignmentButton;
 	}
-
 	
 	public Spinner getAlignmentSpinner() {
 		return alignmentSpinner;
 	}
 
-
 	public Button getTrackOriginsButton() {
 		return trackOriginsButton;
 	}
-
-	public Button getShowPossiblyLostButton() {
-		return showPossiblyLostButton;
-	}
-	
-	public Text getMallocFillText() {
-		return mallocFillText;
-	}
-	
-	public Text getFreeFillText() {
-		return freeFillText;
-	}
-	
-	public List getIgnoreRangesList() {
-		return ignoreRangesList;
-	}
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/ISuppressionsColorConstants.java b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/ISuppressionsColorConstants.java
index 9933b124f8..b99dc2e27d 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/ISuppressionsColorConstants.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/ISuppressionsColorConstants.java
@@ -15,9 +15,9 @@ package org.eclipse.linuxtools.internal.valgrind.ui.editor;
 import org.eclipse.swt.graphics.RGB;
 
 public interface ISuppressionsColorConstants {
-	public static final RGB DEFAULT = new RGB(0, 0, 0);
-	public static final RGB TOOL = new RGB(153, 122, 0);
-	public static final RGB SUPP_TYPE = new RGB(0, 153, 122);
-	public static final RGB CONTEXT = new RGB(122, 0, 153);
-	public static final RGB COMMENT = new RGB(0, 99, 166);
+	RGB DEFAULT = new RGB(0, 0, 0);
+	RGB TOOL = new RGB(153, 122, 0);
+	RGB SUPP_TYPE = new RGB(0, 153, 122);
+	RGB CONTEXT = new RGB(122, 0, 153);
+	RGB COMMENT = new RGB(0, 99, 166);
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsConfiguration.java b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsConfiguration.java
index 5d4b3f5bd1..4bf4e0c095 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsConfiguration.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsConfiguration.java
@@ -65,8 +65,7 @@ public class SuppressionsConfiguration extends SourceViewerConfiguration {
 	@Override
 	public IReconciler getReconciler(ISourceViewer sourceViewer) {
 		SuppressionsReconcilingStrategy strategy = new SuppressionsReconcilingStrategy(editor);      
-        MonoReconciler reconciler = new MonoReconciler(strategy, false);        
-        return reconciler;
+        return new MonoReconciler(strategy, false);        
 	}
 	
 	@Override
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsEditor.java b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsEditor.java
index 59d785111e..2248d4da63 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsEditor.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsEditor.java
@@ -28,7 +28,6 @@ import org.eclipse.ui.editors.text.TextEditor;
 public class SuppressionsEditor extends TextEditor {
 	
 	private ColorManager colorManager;
-	private ProjectionSupport projectionSupport;
 	private ProjectionAnnotationModel annotationModel;
 	private Annotation[] oldAnnotations;
 	
@@ -43,7 +42,7 @@ public class SuppressionsEditor extends TextEditor {
 	public void createPartControl(Composite parent) {
 		super.createPartControl(parent);
 		ProjectionViewer viewer =(ProjectionViewer)getSourceViewer();
-	    projectionSupport = new ProjectionSupport(viewer, getAnnotationAccess(), getSharedColors());
+		ProjectionSupport projectionSupport = new ProjectionSupport(viewer, getAnnotationAccess(), getSharedColors());
 	    projectionSupport.install();
 	    viewer.doOperation(ProjectionViewer.TOGGLE);
 	    annotationModel = viewer.getProjectionAnnotationModel();
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsElementScanner.java b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsElementScanner.java
index 03466f6101..322124dd8c 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsElementScanner.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui.editor/src/org/eclipse/linuxtools/internal/valgrind/ui/editor/SuppressionsElementScanner.java
@@ -59,36 +59,12 @@ public class SuppressionsElementScanner extends BufferedRuleBasedScanner {
 		IToken commentToken = new Token(new TextAttribute(colorManager
 				.getColor(ISuppressionsColorConstants.COMMENT)));
 		
-		// Handle keywords				
-//		WordRule keywordsRule = new WordRule(new IWordDetector() {
-//
-//			public boolean isWordPart(char c) {
-//				return Character.isJavaIdentifierPart(c);
-//			}
-//
-//			public boolean isWordStart(char c) {
-//				return Character.isJavaIdentifierStart(c);
-//			}
-//
-//		}, defaultToken);
-		
-//		for (String tool : TOOLS) {
-//			keywordsRule.addWord(tool, toolToken);
-//		}
-//		for (String keyword : SUPP_TYPES) {
-//			keywordsRule.addWord(keyword, suppTypeToken);
-//		}
-//		for (String context : CONTEXTS) {
-//			keywordsRule.addWord(context, contextToken);
-//		}
-
 		setDefaultReturnToken(defaultToken);
 		setRules(new IRule[] {
 				new EndOfLineRule("#", commentToken), //$NON-NLS-1$
 				new SuppressionToolRule(tools, toolToken),
 				new SuppressionKindRule(kinds, suppKindToken),
 				new SuppressionToolRule(CONTEXTS, contextToken),
-//				keywordsRule,
 				new WhitespaceRule(new IWhitespaceDetector() {
 					@Override
 					public boolean isWhitespace(char c) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CollapseAction.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CollapseAction.java
index 1f3cfc8d8a..3d966f5565 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CollapseAction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/CollapseAction.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.linuxtools.internal.valgrind.ui;
 
 import org.eclipse.jface.action.Action;
@@ -17,18 +17,18 @@ import org.eclipse.jface.viewers.TreeViewer;
 
 public class CollapseAction extends Action {
 
-	protected TreeViewer viewer;
+	private TreeViewer viewer;
 
 	public CollapseAction(TreeViewer viewer) {
 		super(Messages.getString("CollapseAction.Text")); //$NON-NLS-1$
 		this.viewer = viewer;
 	}
-	
+
 	@Override
 	public void run() {
 		ITreeSelection selection = (ITreeSelection) viewer.getSelection();
 		Object element = selection.getFirstElement();
 		viewer.collapseToLevel(element, AbstractTreeViewer.ALL_LEVELS);
 	}
-	
+
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ExpandAction.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ExpandAction.java
index 924e3913b3..b2f97d9c0f 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ExpandAction.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ExpandAction.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.linuxtools.internal.valgrind.ui;
 
 import org.eclipse.jface.action.Action;
@@ -16,19 +16,19 @@ import org.eclipse.jface.viewers.ITreeSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 
 public class ExpandAction extends Action {
-	
-	protected TreeViewer viewer;
+
+	private TreeViewer viewer;
 
 	public ExpandAction(TreeViewer viewer) {
 		super(Messages.getString("ExpandAction.Text")); //$NON-NLS-1$
 		this.viewer = viewer;
 	}
-	
+
 	@Override
 	public void run() {
 		ITreeSelection selection = (ITreeSelection) viewer.getSelection();
 		Object element = selection.getFirstElement();
 		viewer.expandToLevel(element, AbstractTreeViewer.ALL_LEVELS);
 	}
-	
+
 }
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindUIPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindUIPlugin.java
index 1268f56b5a..393f64b34e 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindUIPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindUIPlugin.java
@@ -40,14 +40,14 @@ public class ValgrindUIPlugin extends AbstractUIPlugin {
 	protected static final String EXT_ATTR_ID = "definitionId"; //$NON-NLS-1$
 	protected static final String EXT_ATTR_CLASS = "class"; //$NON-NLS-1$
 
-	protected HashMap<String, IConfigurationElement> toolMap;
+	private HashMap<String, IConfigurationElement> toolMap;
 
 	// The shared instance
 	private static ValgrindUIPlugin plugin;
 
-	protected ValgrindViewPart view;
+	private ValgrindViewPart view;
 	// The page containing the created Valgrind view
-	protected IWorkbenchPage activePage;
+	private IWorkbenchPage activePage;
 
 	/*
 	 * (non-Javadoc)
@@ -92,8 +92,6 @@ public class ValgrindUIPlugin extends AbstractUIPlugin {
 					view.createDynamicContent(contentDescription, toolID);
 
 					view.refreshView();
-				} catch (PartInitException e) {
-					e.printStackTrace();
 				} catch (CoreException e) {
 					e.printStackTrace();
 				}
@@ -160,7 +158,7 @@ public class ValgrindUIPlugin extends AbstractUIPlugin {
 		return view;
 	}
 
-	protected void initializeToolMap() {
+	private void initializeToolMap() {
 		toolMap = new HashMap<>();
 		IExtensionPoint extPoint = Platform.getExtensionRegistry().getExtensionPoint(PLUGIN_ID, VIEW_EXT_ID);
 		IConfigurationElement[] configs = extPoint.getConfigurationElements();
@@ -174,7 +172,7 @@ public class ValgrindUIPlugin extends AbstractUIPlugin {
 		}
 	}
 
-	protected HashMap<String, IConfigurationElement> getToolMap() {
+	private HashMap<String, IConfigurationElement> getToolMap() {
 		if (toolMap == null) {
 			initializeToolMap();
 		}
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java
index b7f824351f..d15935db60 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/ValgrindViewPart.java
@@ -33,15 +33,15 @@ import org.eclipse.ui.part.ViewPart;
 
 public class ValgrindViewPart extends ViewPart {
 
-	protected PageBook pageBook;
-	protected Composite dynamicViewHolder;
-	protected IValgrindToolView dynamicView;
-	protected ActionContributionItem[] dynamicActions;
-	protected IValgrindMessage[] messages;
-	protected CoreMessagesViewer messagesViewer;
-	protected Action showCoreAction;
-	protected Action showToolAction;
-	protected boolean hasDynamicContent = false;
+	private PageBook pageBook;
+	private Composite dynamicViewHolder;
+	private IValgrindToolView dynamicView;
+	private ActionContributionItem[] dynamicActions;
+	private IValgrindMessage[] messages;
+	private CoreMessagesViewer messagesViewer;
+	private Action showCoreAction;
+	private Action showToolAction;
+	private boolean hasDynamicContent = false;
 
 	@Override
 	public void createPartControl(Composite parent) {
@@ -120,8 +120,7 @@ public class ValgrindViewPart extends ViewPart {
 					toolbar.appendToGroup(ValgrindUIPlugin.TOOLBAR_LOC_GROUP_ID, dynamicActions[i]);
 				}
 			}
-		}
-		else {
+		} else {
 			dynamicView = null;
 		}
 
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/AbstractValgrindMarkerResolution.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/AbstractValgrindMarkerResolution.java
index ab45cbb89e..4a4ef0ac65 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/AbstractValgrindMarkerResolution.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/internal/valgrind/ui/quickfixes/AbstractValgrindMarkerResolution.java
@@ -52,7 +52,7 @@ public abstract class AbstractValgrindMarkerResolution extends AbstractCodanCMar
 	 * @param marker The {@link IMarker} from which the {@link IASTTranslationUnit} will be obtained
 	 * @return {@link IASTTranslationUnit} containing the marker
 	 */
-	protected IASTTranslationUnit getASTTranslationUnit(IMarker marker){
+	private IASTTranslationUnit getASTTranslationUnit(IMarker marker){
 		ITranslationUnit tu = getTranslationUnitViaEditor(marker);
 		try {
 			return tu.getAST();
@@ -67,7 +67,7 @@ public abstract class AbstractValgrindMarkerResolution extends AbstractCodanCMar
 	 * @param marker {@link IMarker} from which the length will be obtained
 	 * @return length of the code enclosed in the {@link IMarker}
 	 */
-	protected int getLength(IMarker marker, IDocument document) {
+	private int getLength(IMarker marker, IDocument document) {
 		int charStart = marker.getAttribute(IMarker.CHAR_START, -1);
 		int charEnd = marker.getAttribute(IMarker.CHAR_END, -1);
 		if (charEnd != -1 && charStart != -1) {
diff --git a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/valgrind/ui/IValgrindToolView.java b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/valgrind/ui/IValgrindToolView.java
index a202ea0658..79e7e54c65 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/valgrind/ui/IValgrindToolView.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.ui/src/org/eclipse/linuxtools/valgrind/ui/IValgrindToolView.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Elliott Baron <ebaron@redhat.com> - initial API and implementation
- *******************************************************************************/ 
+ *******************************************************************************/
 package org.eclipse.linuxtools.valgrind.ui;
 
 import org.eclipse.jface.action.IAction;
@@ -17,16 +17,16 @@ import org.eclipse.ui.IViewPart;
  * Provides an interface for including controls in the Valgrind view.
  */
 public interface IValgrindToolView extends IViewPart {
-		
+
 	/**
 	 * Provides a mechanism to add actions to the Valgrind view's toolbar
 	 * @return an array of actions to add to the toolbar
 	 */
-	public IAction[] getToolbarActions();
-	
+	IAction[] getToolbarActions();
+
 	/**
 	 * Refreshes the controls within this view
 	 */
-	public void refreshView();
+	void refreshView();
 
 }