@Override annotations and redundant casts.

29 files changed, 180 insertions, 47 deletions

diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java
index d591d87aae8..9a49745bf0e 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CElementDecorator.java
@@ -23,6 +23,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator
 	/*
 	 * @see ILabelDecorator#decorateImage(Image, Object)
 	 */
+	@Override
 	public Image decorateImage(Image image, Object element) {
 		return null;
 	}
@@ -30,6 +31,7 @@ public class CElementDecorator extends LabelProvider implements ILabelDecorator
 	/*
 	 * @see ILabelDecorator#decorateText(String, Object)
 	 */
+	@Override
 	public String decorateText(String text, Object element) {
 		return text + "*"; //$NON-NLS-1$
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java
index 6469c67af6c..b0187dd30cf 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/CTestSetup.java
@@ -19,13 +19,16 @@ public class CTestSetup extends TestSetup {
 	 * @deprecated
 	 * Not needed anymore. No added value
 	 */
+	@Deprecated
 	public CTestSetup(Test test) {
 		super(test);
 	}	
 	
+	@Override
 	protected void setUp() throws Exception {
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 	}
 	
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java
index 5659d6210b1..59c20d53479 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/EditorTestHelper.java
@@ -72,6 +72,7 @@ import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
 import org.eclipse.ui.wizards.datatransfer.ImportOperation;
 
 import org.eclipse.cdt.core.CCorePlugin;
+import org.eclipse.cdt.core.dom.IPDOMManager;
 import org.eclipse.cdt.core.index.IIndexManager;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.testplugin.CProjectHelper;
@@ -91,6 +92,7 @@ import org.eclipse.cdt.internal.ui.text.CompositeReconcilingStrategy;
 public class EditorTestHelper {
 	
 	private static class ImportOverwriteQuery implements IOverwriteQuery {
+		@Override
 		public String queryOverwrite(String file) {
 			return ALL;
 		}	
@@ -414,6 +416,7 @@ public class EditorTestHelper {
 	
 	public static void closeAllPopUps(SourceViewer sourceViewer) {
 		IWidgetTokenKeeper tokenKeeper= new IWidgetTokenKeeper() {
+			@Override
 			public boolean requestWidgetToken(IWidgetTokenOwner owner) {
 				return true;
 			}
@@ -443,7 +446,7 @@ public class EditorTestHelper {
 	}
 
 	public static ICProject createCProject(String project, String externalSourceFolder, boolean linkSourceFolder, boolean useIndexer) throws CoreException {
-		ICProject cProject= CProjectHelper.createCCProject(project, "bin", useIndexer ? IIndexManager.ID_FAST_INDEXER : IIndexManager.ID_NO_INDEXER);
+		ICProject cProject= CProjectHelper.createCCProject(project, "bin", useIndexer ? IPDOMManager.ID_FAST_INDEXER : IPDOMManager.ID_NO_INDEXER);
 		IFolder folder;
 		if (linkSourceFolder) {
 			File file= FileTool.getFileInPlugin(CTestPlugin.getDefault(), new Path(externalSourceFolder));
@@ -466,6 +469,7 @@ public class EditorTestHelper {
 		final IWorkspace ws = ResourcesPlugin.getWorkspace();
 		final IProject newProject[] = new IProject[1];
 		ws.run(new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IWorkspaceRoot root = ws.getRoot();
 				IProject project = root.getProject(projectName);
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java
index cae4da2029a..3f0357206b5 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/Main.java
@@ -304,6 +304,7 @@ protected String searchForPlugins(String start) {
  */
 protected String searchForBoot(String start) {
 	FileFilter filter = new FileFilter() {
+		@Override
 		public boolean accept(File candidate) {
 			return candidate.getName().startsWith(PI_BOOT);
 		}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java
index d7678725cd6..4268e1dbb3f 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/AccessibilityTestPass.java
@@ -20,24 +20,28 @@ public class AccessibilityTestPass implements IDialogTestPass {
 	/**
 	 * @see IDialogTestPass#title()
 	 */
+	@Override
 	public String title() {
 		return "Test Pass: Accessibility";
 	}
 	/**
 	 * @see IDialogTestPass#description()
 	 */
+	@Override
 	public String description() {
 		return "Verify the accessibility of the dialogs.";
 	}
 	/**
 	 * @see IDialogTestPass#label()
 	 */
+	@Override
 	public String label() {
 		return "&Accessibility";
 	}	
 	/**
 	 * @see IDialogTestPass#checkListTexts()
 	 */
+	@Override
 	public ArrayList checkListTexts() {
 		ArrayList list = new ArrayList(CHECKLIST_SIZE);
 		list.add("&1) all widgets are accessible by tabbing.");
@@ -52,6 +56,7 @@ public class AccessibilityTestPass implements IDialogTestPass {
 	 * Size of the return array must be the same size as the checkListTexts'
 	 * ArrayList.
 	 */
+	@Override
 	public String[] failureTexts() {
 		String[] failureText = new String[CHECKLIST_SIZE];
 		failureText[0] = "Some widgets aren't accessible by tabbing.";
@@ -64,12 +69,14 @@ public class AccessibilityTestPass implements IDialogTestPass {
 	/**
 	 * @see IDialogTestPass#queryText()
 	 */
+	@Override
 	public String queryText() {
 		return "Is the accessibility of the dialog acceptable?";
 	}
 	/**
 	 * @see IDialogTestPass#getID()
 	 */
+	@Override
 	public int getID() {
 		return VerifyDialog.TEST_ACCESS;
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java
index 7f78aba9e2e..2208e88235e 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/ExpectedStringsTests.java
@@ -35,7 +35,8 @@ public class ExpectedStringsTests extends TestCase {
      * Example code test the packages in the project 
      *  "com.qnx.tools.ide.cdt.core"
      */
-    protected void setUp() {
+    @Override
+	protected void setUp() {
 
 
     }
@@ -45,7 +46,8 @@ public class ExpectedStringsTests extends TestCase {
      *
      * Called after every test case method.
      */
-    protected void tearDown() {
+    @Override
+	protected void tearDown() {
        // release resources here and clean-up
     }
     
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java
index f4535791cc4..67a02dbdb33 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FailureDialog.java
@@ -42,6 +42,7 @@ public class FailureDialog extends Dialog {
 	/* (non-Javadoc)
 	 * Method declared on Window.
 	 */
+	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		newShell.setText("Dialog Test Failed");
@@ -49,6 +50,7 @@ public class FailureDialog extends Dialog {
 	/* (non-Javadoc)
 	 * Method declared on Dialog.
 	 */
+	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		createButton(parent, IDialogConstants.OK_ID, "&OK", true);
 		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
@@ -56,6 +58,7 @@ public class FailureDialog extends Dialog {
 	/* (non-Javadoc)
 	 * Method declared on Dialog.
 	 */
+	@Override
 	protected Control createDialogArea(Composite parent) {
 		// page group
 		Composite composite = (Composite)super.createDialogArea(parent);
@@ -76,6 +79,7 @@ public class FailureDialog extends Dialog {
 	/* (non-Javadoc)
 	 * Method declared on Dialog.
 	 */
+	@Override
 	protected void okPressed() {		
 		_log = _text.getText();
 		super.okPressed();
@@ -103,6 +107,7 @@ public class FailureDialog extends Dialog {
 	 * Returns a string representation of this class which
 	 * the text contained in the input area of the dialog.
 	 */
+	@Override
 	public String toString() {
 		return getText();
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java
index 69c5aaaf12d..34aa982aba1 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/FocusTestPass.java
@@ -23,24 +23,28 @@ public class FocusTestPass implements IDialogTestPass {
 	/**
 	 * @see IDialogTestPass#title()
 	 */
+	@Override
 	public String title() {
 		return "Test Pass: Initial Focus";
 	}
 	/**
 	 * @see IDialogTestPass#description()
 	 */
+	@Override
 	public String description() {
 		return "Verify the initial focus of the dialogs.";
 	}
 	/**
 	 * @see IDialogTestPass#label()
 	 */
+	@Override
 	public String label() {
 		return "&Initial Focus";
 	}	
 	/**
 	 * @see IDialogTestPass#checkListTexts()
 	 */
+	@Override
 	public ArrayList checkListTexts() {
 		ArrayList list = new ArrayList(CHECKLIST_SIZE);
 		list.add("&1) the initial focus is appropriate.");
@@ -51,6 +55,7 @@ public class FocusTestPass implements IDialogTestPass {
 	 * Size of the return array must be the same size as the checkListTexts'
 	 * ArrayList.
 	 */
+	@Override
 	public String[] failureTexts() {
 		String[] failureText = new String[CHECKLIST_SIZE];
 		failureText[0] = "The initial focus is inappropriate.";
@@ -59,12 +64,14 @@ public class FocusTestPass implements IDialogTestPass {
 	/**
 	 * @see IDialogTestPass#queryText()
 	 */
+	@Override
 	public String queryText() {
 		return "Is the initial focus of the dialog correct?";
 	}
 	/**
 	 * @see IDialogTestPass#getID()
 	 */
+	@Override
 	public int getID() {
 		return VerifyDialog.TEST_FOCUS;
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java
index d295b6207da..1240774fb7f 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/SizingTestPass.java
@@ -22,24 +22,28 @@ class SizingTestPass implements IDialogTestPass {
 	/**
 	 * @see IDialogTestPass#title()
 	 */
+	@Override
 	public String title() {
 		return "Test Pass: Sizing and Display";
 	}
 	/**
 	 * @see IDialogTestPass#description()
 	 */
+	@Override
 	public String description() {
 		return "Verify the sizing and display of the dialogs and widgets.";
 	}
 	/**
 	 * @see IDialogTestPass#label()
 	 */
+	@Override
 	public String label() {
 		return "&Sizing and Display";
 	}	
 	/**
 	 * @see IDialogTestPass#checkListTexts()
 	 */
+	@Override
 	public ArrayList checkListTexts() {
 		ArrayList list = new ArrayList(CHECKLIST_SIZE);
 		list.add("&1) the correct dialog displays.");
@@ -54,6 +58,7 @@ class SizingTestPass implements IDialogTestPass {
 	 * Size of the return array must be the same size as the checkListTexts'
 	 * ArrayList.
 	 */
+	@Override
 	public String[] failureTexts() {
 		String[] failureText = new String[CHECKLIST_SIZE];
 		failureText[0] = "The wrong dialog displayed.";
@@ -66,12 +71,14 @@ class SizingTestPass implements IDialogTestPass {
 	/**
 	 * @see IDialogTestPass#queryText()
 	 */
+	@Override
 	public String queryText() {
 		return "Is the sizing and display of the dialog correct?";
 	}
 	/**
 	 * @see IDialogTestPass#getID()
 	 */
+	@Override
 	public int getID() {
 		return VerifyDialog.TEST_SIZING;
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java
index 22bbbc3faea..247809ad9a1 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/StringAsserts.java
@@ -118,12 +118,12 @@ abstract public class StringAsserts {
 		
 		if (n1 + n2 > 0) {
 			if (n1 == 1 && n2 == 1) {
-				assertEqualString((String) list1.get(0), (String) list2.get(0));
+				assertEqualString(list1.get(0), list2.get(0));
 			}
 			
 			StringBuffer buf= new StringBuffer();
 			for (int i= 0; i < n1; i++) {
-				String s1= (String) list1.get(i);
+				String s1= list1.get(i);
 				if (s1 != null) {
 					buf.append(s1);
 					buf.append("\n");
@@ -133,7 +133,7 @@ abstract public class StringAsserts {
 			
 			buf= new StringBuffer();
 			for (int i= 0; i < n2; i++) {
-				String s2= (String) list2.get(i);
+				String s2= list2.get(i);
 				if (s2 != null) {
 					buf.append(s2);
 					buf.append("\n");
@@ -161,12 +161,12 @@ abstract public class StringAsserts {
 		
 		if (n2 > 0) {
 			if (n1 == 1 && n2 == 1) {
-				assertEqualString((String) list1.get(0), (String) list2.get(0));
+				assertEqualString(list1.get(0), list2.get(0));
 			}
 			
 			StringBuffer buf= new StringBuffer();
 			for (int i= 0; i < n1; i++) {
-				String s1= (String) list1.get(i);
+				String s1= list1.get(i);
 				if (s1 != null) {
 					buf.append(s1);
 					buf.append("\n");
@@ -176,7 +176,7 @@ abstract public class StringAsserts {
 			
 			buf= new StringBuffer();
 			for (int i= 0; i < n2; i++) {
-				String s2= (String) list2.get(i);
+				String s2= list2.get(i);
 				if (s2 != null) {
 					buf.append(s2);
 					buf.append("\n");
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java
index 684a55d8fdc..2140ecbfd7c 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/testplugin/util/VerifyDialog.java
@@ -74,6 +74,7 @@ public class VerifyDialog extends TitleAreaDialog {
 	/* (non-Javadoc)
 	 * Method declared on Window.
 	 */
+	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
 		newShell.setText("Dialog Verification");
@@ -82,6 +83,7 @@ public class VerifyDialog extends TitleAreaDialog {
 	/* (non-Javadoc)
 	 * Method declared on Dialog.
 	 */
+	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		_yesButton = createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, true);
 		_noButton = createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, false);
@@ -89,6 +91,7 @@ public class VerifyDialog extends TitleAreaDialog {
 	/* (non-Javadoc)
 	 * Method declared on Dialog.
 	 */
+	@Override
 	protected void buttonPressed(int buttonId) {
 		if (IDialogConstants.YES_ID == buttonId) {
 			setReturnCode(IDialogConstants.YES_ID);
@@ -103,6 +106,7 @@ public class VerifyDialog extends TitleAreaDialog {
 	/* (non-Javadoc)
 	 * Method declared on Dialog.
 	 */
+	@Override
 	protected Control createDialogArea(Composite parent) {
 		// top level composite
 		Composite parentComposite = (Composite)super.createDialogArea(parent);
@@ -145,6 +149,7 @@ public class VerifyDialog extends TitleAreaDialog {
 			radio.setText( _dialogTests[i].label() );
 			final int testID = _dialogTests[i].getID();
 			radio.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					TEST_TYPE = testID;
 					initializeTest();
@@ -175,6 +180,7 @@ public class VerifyDialog extends TitleAreaDialog {
 		}
 		_checkList = new Button[checkListSize];
 		SelectionAdapter selectionAdapter = new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				checkYesEnable();
 			}
@@ -230,6 +236,7 @@ public class VerifyDialog extends TitleAreaDialog {
 	 * opening.  Should use open(Dialog) instead.
 	 * 
 	 */
+	@Override
 	public int open() {
 		_failureText = "Testing dialog is required, use VerifyDialog::open(Dialog)";
 		return IDialogConstants.NO_ID;
@@ -263,6 +270,7 @@ public class VerifyDialog extends TitleAreaDialog {
 		_testDialog.getShell().setLocation(getShell().getSize().x + 1, 0);
 		_testDialog.getShell().setSize(_testDialogSize);
 		_testDialog.getShell().addShellListener(new ShellAdapter() {
+			@Override
 			public void shellClosed(ShellEvent e) {				
 				e.doit = false;
 			}
@@ -307,6 +315,7 @@ public class VerifyDialog extends TitleAreaDialog {
 	 * In case the shell was closed by a means other than
 	 * the NO button.
 	 */
+	@Override
 	protected void handleShellCloseEvent() {
 		handleFailure();
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
index c196ea724b2..a97f0b189cf 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPPPopulateASTViewAction.java
@@ -93,7 +93,7 @@ public class CPPPopulateASTViewAction extends ASTGenericVisitor implements IPopu
             tree.setFiltersFlag(DOMASTNodeLeaf.FLAG_PROBLEM);
             
             if (node instanceof IASTProblemHolder)
-                astProblems = (IASTProblem[])ArrayUtil.append(IASTProblem.class, astProblems, ((IASTProblemHolder)node).getProblem());
+                astProblems = ArrayUtil.append(IASTProblem.class, astProblems, ((IASTProblemHolder)node).getProblem());
             else
                 astProblems = (IASTProblem[])ArrayUtil.append(IASTProblem.class, astProblems, node);
         }
@@ -131,6 +131,7 @@ public class CPPPopulateASTViewAction extends ASTGenericVisitor implements IPopu
 		return leaf;
 	}
 	
+	@Override
 	public DOMASTNodeLeaf[] mergePreprocessorStatements(IASTPreprocessorStatement[] statements) {
 		DOMASTNodeLeaf[] leaves = new DOMASTNodeLeaf[statements.length];
 		for(int i=0; i<statements.length; i++) {
@@ -143,6 +144,7 @@ public class CPPPopulateASTViewAction extends ASTGenericVisitor implements IPopu
 		return leaves;
 	}
 	
+	@Override
 	public void mergePreprocessorProblems(IASTProblem[] problems) {
 		for (IASTProblem problem : problems) {
 			if (monitor != null && monitor.isCanceled()) return;
@@ -152,10 +154,12 @@ public class CPPPopulateASTViewAction extends ASTGenericVisitor implements IPopu
 		}
 	}
 	
+	@Override
 	public DOMASTNodeParent getTree() {
 		return root;
 	}
 	
+	@Override
 	public void groupIncludes(DOMASTNodeLeaf[] treeIncludes) {
 		// loop through the includes and make sure that all of the nodes 
 		// that are children of the TU are in the proper include (based on offset)
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
index ecdbb86fca8..00fa52f8828 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/CPopulateASTViewAction.java
@@ -117,7 +117,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
             tree.setFiltersFlag(DOMASTNodeLeaf.FLAG_PROBLEM);
             
             if (node instanceof IASTProblemHolder)
-                astProblems = (IASTProblem[])ArrayUtil.append(IASTProblem.class, astProblems, ((IASTProblemHolder)node).getProblem());
+                astProblems = ArrayUtil.append(IASTProblem.class, astProblems, ((IASTProblemHolder)node).getProblem());
             else
                 astProblems = (IASTProblem[])ArrayUtil.append(IASTProblem.class, astProblems, node);
         }
@@ -132,6 +132,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processDeclaration(org.eclipse.cdt.core.dom.ast.IASTDeclaration)
 	 */
+	@Override
 	public int visit(IASTDeclaration declaration) {
 		DOMASTNodeLeaf temp = addRoot(declaration);
 		if (temp == null)
@@ -145,6 +146,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.CPPVisitor.CPPBaseVisitorAction#processDeclarator(org.eclipse.cdt.core.dom.ast.IASTDeclarator)
 	 */
+	@Override
 	public int visit(IASTDeclarator declarator) {
 		DOMASTNodeLeaf temp = addRoot(declarator);
 		
@@ -169,6 +171,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDesignator(org.eclipse.cdt.core.dom.ast.c.ICASTDesignator)
 	 */
+	@Override
 	public int visit(ICASTDesignator designator) {
 		DOMASTNodeLeaf temp = addRoot(designator);
 		if (temp == null)
@@ -182,6 +185,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processDeclSpecifier(org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier)
 	 */
+	@Override
 	public int visit(IASTDeclSpecifier declSpec) {
 		DOMASTNodeLeaf temp = addRoot(declSpec);
 		if (temp == null)
@@ -195,6 +199,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processEnumerator(org.eclipse.cdt.core.dom.ast.IASTEnumerationSpecifier.IASTEnumerator)
 	 */
+	@Override
 	public int visit(IASTEnumerator enumerator) {
 		DOMASTNodeLeaf temp = addRoot(enumerator);
 		if (temp == null)
@@ -208,6 +213,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processExpression(org.eclipse.cdt.core.dom.ast.IASTExpression)
 	 */
+	@Override
 	public int visit(IASTExpression expression) {
 		DOMASTNodeLeaf temp = addRoot(expression);
 		if (temp == null)
@@ -221,6 +227,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processInitializer(org.eclipse.cdt.core.dom.ast.IASTInitializer)
 	 */
+	@Override
 	public int visit(IASTInitializer initializer) {
 		DOMASTNodeLeaf temp = addRoot(initializer);
 		if (temp == null)
@@ -234,6 +241,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processName(org.eclipse.cdt.core.dom.ast.IASTName)
 	 */
+	@Override
 	public int visit(IASTName name) {
 		DOMASTNodeLeaf temp = null;
 		if ( name.toString() != null )
@@ -251,6 +259,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processParameterDeclaration(org.eclipse.cdt.core.dom.ast.IASTParameterDeclaration)
 	 */
+	@Override
 	public int visit(
 			IASTParameterDeclaration parameterDeclaration) {
 		DOMASTNodeLeaf temp = addRoot(parameterDeclaration);
@@ -265,6 +274,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processStatement(org.eclipse.cdt.core.dom.ast.IASTStatement)
 	 */
+	@Override
 	public int visit(IASTStatement statement) {
 		DOMASTNodeLeaf temp = addRoot(statement);
 		if (temp == null)
@@ -278,6 +288,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.c.CVisitor.CBaseVisitorAction#processTypeId(org.eclipse.cdt.core.dom.ast.IASTTypeId)
 	 */
+	@Override
 	public int visit(IASTTypeId typeId) {
 		DOMASTNodeLeaf temp = addRoot(typeId);
 		if (temp == null)
@@ -297,6 +308,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 		return temp;
 	}
 	
+	@Override
 	public DOMASTNodeLeaf[] mergePreprocessorStatements(IASTPreprocessorStatement[] statements) {
 		DOMASTNodeLeaf[] leaves = new DOMASTNodeLeaf[statements.length];
 		for(int i=0; i<statements.length; i++) {
@@ -309,6 +321,7 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 		return leaves;
 	}
 	
+	@Override
 	public void mergePreprocessorProblems(IASTProblem[] problems) {
 		for (IASTProblem problem : problems) {
 			if (monitor != null && monitor.isCanceled()) return;
@@ -318,10 +331,12 @@ public class CPopulateASTViewAction extends ASTVisitor implements IPopulateDOMAS
 		}
 	}
 	
+	@Override
 	public DOMASTNodeParent getTree() {
 		return root;
 	}
 	
+	@Override
 	public void groupIncludes(DOMASTNodeLeaf[] treeIncludes) {
 		// loop through the includes and make sure that all of the nodes 
 		// that are children of the TU are in the proper include (based on offset)
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
index 58de9958524..463fce68ab4 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMAST.java
@@ -211,10 +211,12 @@ public class DOMAST extends ViewPart {
       	return tu;
       }
 	  
-      public void dispose() {
+      @Override
+	public void dispose() {
       }
 
-      public Object[] getElements(Object parent) {
+      @Override
+	public Object[] getElements(Object parent) {
          if (parent.equals(getViewSite())) {
             if (invisibleRoot == null)
                initialize();
@@ -223,21 +225,24 @@ public class DOMAST extends ViewPart {
          return getChildren(parent);
       }
 
-      public Object getParent(Object child) {
+      @Override
+	public Object getParent(Object child) {
          if (child instanceof DOMASTNodeLeaf) {
             return ((DOMASTNodeLeaf) child).getParent();
          }
          return null;
       }
 
-      public Object[] getChildren(Object parent) {
+      @Override
+	public Object[] getChildren(Object parent) {
          if (parent instanceof DOMASTNodeParent) {
             return ((DOMASTNodeParent) parent).getChildren();
          }
          return new Object[0];
       }
 
-      public boolean hasChildren(Object parent) {
+      @Override
+	public boolean hasChildren(Object parent) {
          if (parent instanceof DOMASTNodeParent)
             return ((DOMASTNodeParent) parent).hasChildren();
          return false;
@@ -271,6 +276,7 @@ public class DOMAST extends ViewPart {
 	    	// if there are objects to expand then do so now
 	    	if (expanded != null) {
 	    		CTestPlugin.getStandardDisplay().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 			         	// set the expansion of the view based on the original snapshot (educated guess)
 			         	Tree tree = viewer.getTree();
@@ -464,6 +470,7 @@ public class DOMAST extends ViewPart {
 			/* (non-Javadoc)
 			 * @see java.lang.Runnable#run()
 			 */
+			@Override
 			public void run() {
 				if (view == null) return;
 				if (view.getTree().isDisposed())
@@ -483,6 +490,7 @@ public class DOMAST extends ViewPart {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
 		 */
+		@Override
 		public void inputChanged(Viewer aViewer, Object oldInput, Object newInput) {
 		}
 		
@@ -675,6 +683,7 @@ public void createPartControl(Composite parent) {
    
    private class UpdatePropertiesListener implements ISelectionChangedListener {
 
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		ISelection selection = viewer.getSelection();
 		IViewPart propertyPart = getSite().getPage().findView(PROPERTIES_VIEW);
@@ -760,7 +769,8 @@ public void createPartControl(Composite parent) {
 			  }
 		  }
 		  
-         public void menuAboutToShow(IMenuManager manager) {
+         @Override
+		public void menuAboutToShow(IMenuManager manager) {
             DOMAST.this.fillContextMenu(manager);
             hideMenuItems(manager);
          }
@@ -1070,7 +1080,8 @@ public void createPartControl(Composite parent) {
 
    private void hookSingleClickAction() {
       viewer.addSelectionChangedListener(new ISelectionChangedListener() {
-         public void selectionChanged(SelectionChangedEvent event) {
+         @Override
+		public void selectionChanged(SelectionChangedEvent event) {
             singleClickAction.run();
          }
       });
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java
index c892d5affae..a7cbf69d421 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeLeaf.java
@@ -149,7 +149,7 @@ public class DOMASTNodeLeaf implements IAdaptable {
 				}				
 			} 
 			if (!done) {
-				search.addAll(Arrays.asList((Class<?>[])clazz.getInterfaces()));
+				search.addAll(Arrays.asList(clazz.getInterfaces()));
 				final Class<?> superclass = clazz.getSuperclass();
 				if (superclass != null)
 					search.add(superclass);
@@ -325,6 +325,7 @@ public class DOMASTNodeLeaf implements IAdaptable {
 		return name;
 	}
 	
+	@Override
 	public Object getAdapter(@SuppressWarnings("rawtypes") Class key) {
 		if (key == IPropertySource.class)
 			return new ASTPropertySource(getNode());
@@ -404,9 +405,11 @@ public class DOMASTNodeLeaf implements IAdaptable {
 			this.node = node;
 		}
 		
+		@Override
 		public Object getEditableValue() {
 			return null;
 		}
+		@Override
 		public IPropertyDescriptor[] getPropertyDescriptors() {
             if (node instanceof IASTTranslationUnit) // skip the properties for the TU (too expensive)
                 return BLANK_DESCRIPTORS;
@@ -417,20 +420,20 @@ public class DOMASTNodeLeaf implements IAdaptable {
 				IPropertyDescriptor[] desc = getPropertyDescriptors(((IASTName)node).resolveBinding());
 				if (desc != null)
 					for (IPropertyDescriptor element : desc)
-						descriptors = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, descriptors, element);
+						descriptors = ArrayUtil.append(IPropertyDescriptor.class, descriptors, element);
 				desc = getPropertyDescriptors(node);
 				if (desc != null)
 					for (IPropertyDescriptor element : desc)
-						descriptors = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, descriptors, element);
+						descriptors = ArrayUtil.append(IPropertyDescriptor.class, descriptors, element);
 				
 			} else {
 				IPropertyDescriptor[] desc = getPropertyDescriptors(node);
 				if (desc != null)
 					for (IPropertyDescriptor element : desc)
-						descriptors = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, descriptors, element);
+						descriptors = ArrayUtil.append(IPropertyDescriptor.class, descriptors, element);
 			}
 			
-			return (IPropertyDescriptor[])ArrayUtil.trim(IPropertyDescriptor.class, descriptors);
+			return ArrayUtil.trim(IPropertyDescriptor.class, descriptors);
 		}
 		
 		private IPropertyDescriptor[] getPropertyDescriptors(Object obj) {
@@ -460,12 +463,12 @@ public class DOMASTNodeLeaf implements IAdaptable {
 							text.setCategory(IBINDING_TAG + ((IASTName)node).resolveBinding().getClass().getName().substring(((IASTName)node).resolveBinding().getClass().getName().lastIndexOf(PERIOD) + 1) + COLON_SEPARATOR + getValueString(((IASTName)node).resolveBinding()));
 						else
 							text.setCategory(objClass.getName().substring(objClass.getName().lastIndexOf(PERIOD) + 1) + COLON_SEPARATOR + getValueString(node));
-						desc = (IPropertyDescriptor[])ArrayUtil.append(IPropertyDescriptor.class, desc, text);
+						desc = ArrayUtil.append(IPropertyDescriptor.class, desc, text);
 					}
 				}
 			}
 			
-			return (IPropertyDescriptor[])ArrayUtil.trim(IPropertyDescriptor.class, desc);
+			return ArrayUtil.trim(IPropertyDescriptor.class, desc);
 		}
 		
 		private boolean alreadyEncountered(Method method, IPropertyDescriptor[] desc) {
@@ -484,6 +487,7 @@ public class DOMASTNodeLeaf implements IAdaptable {
 			return false;
 		}
 		
+		@Override
 		public Object getPropertyValue(Object id) {
 			if (!(id instanceof String))
 				return BLANK_STRING;
@@ -654,11 +658,14 @@ public class DOMASTNodeLeaf implements IAdaptable {
 			return true;
 		}
 		
+		@Override
 		public boolean isPropertySet(Object id) {
 			return false;
 		}
+		@Override
 		public void resetPropertyValue(Object id) {
 		}
+		@Override
 		public void setPropertyValue(Object id, Object value) {
 		}
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java
index 0dd2a9c80f3..6a11f3cdbd6 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/DOMASTNodeParent.java
@@ -51,7 +51,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf {
         }
         
 		if (index==children.length) {
-			children = (DOMASTNodeLeaf[])ArrayUtil.append(DOMASTNodeLeaf.class, children, child);
+			children = ArrayUtil.append(DOMASTNodeLeaf.class, children, child);
 			index++;
 		} else {
 			children[index++] = child;
@@ -116,7 +116,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf {
 	
     public void cleanChildren() {
         // remove null elements
-        children = (DOMASTNodeLeaf[])ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children);
+        children = ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children);
         
         // sort the elements
 		//if (indexFirstPreproStmnt >= 0) { // TODO Devin what if it's ALL preprocessor statements ?
@@ -159,14 +159,14 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf {
 				}
 			}
 	//	}
-		children = (DOMASTNodeLeaf[])ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children);
+		children = ArrayUtil.removeNulls(DOMASTNodeLeaf.class, children);
         
         // need to also clean up the children's children, to make sure all nulls are removed (prevent expansion sign when there isn't one)
         for(int i=0; i<children.length; i++) {
             if (children[i] instanceof DOMASTNodeParent) {
                 DOMASTNodeLeaf[] kids = ((DOMASTNodeParent)children[i]).children;
                 // remove null elements
-                kids = (DOMASTNodeLeaf[])ArrayUtil.removeNulls(DOMASTNodeLeaf.class, kids);
+                kids = ArrayUtil.removeNulls(DOMASTNodeLeaf.class, kids);
                 ((DOMASTNodeParent)children[i]).setChildren(kids);
             }
         }
@@ -200,10 +200,10 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf {
         IASTNode[] nodeChain = new IASTNode[DEFAULT_NODE_CHAIN_SIZE];
         IASTNode topNode = node.getParent();
         ArrayUtil.append(IASTNode.class, nodeChain, node);
-        nodeChain = (IASTNode[])ArrayUtil.append(IASTNode.class, nodeChain, topNode);
+        nodeChain = ArrayUtil.append(IASTNode.class, nodeChain, topNode);
         while(topNode.getParent() != null && !(topNode.getParent() instanceof IASTTranslationUnit)) {
             topNode = topNode.getParent();
-            nodeChain = (IASTNode[])ArrayUtil.append(IASTNode.class, nodeChain, topNode);
+            nodeChain = ArrayUtil.append(IASTNode.class, nodeChain, topNode);
         }
         
         // loop through the chain of nodes and use it to only search the necessary children required to find the node
@@ -253,10 +253,10 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf {
 		IASTNode[] nodeChain = new IASTNode[DEFAULT_NODE_CHAIN_SIZE];
 		IASTNode topNode = node.getParent();
 		ArrayUtil.append(IASTNode.class, nodeChain, node);
-		nodeChain = (IASTNode[])ArrayUtil.append(IASTNode.class, nodeChain, topNode);
+		nodeChain = ArrayUtil.append(IASTNode.class, nodeChain, topNode);
 		while(topNode.getParent() != null && !(topNode.getParent() instanceof IASTTranslationUnit)) {
 			topNode = topNode.getParent();
-			nodeChain = (IASTNode[])ArrayUtil.append(IASTNode.class, nodeChain, topNode);
+			nodeChain = ArrayUtil.append(IASTNode.class, nodeChain, topNode);
 		}
 		
 		// loop through the chain of nodes and use it to only search the necessary children required to find the node
@@ -296,6 +296,7 @@ public class DOMASTNodeParent extends DOMASTNodeLeaf {
 		return null; // nothing found
 	}
 
+	@Override
 	public int relativeNodePosition( IASTNode n ){
 	    ASTNode astNode = (ASTNode) n;
 	    if( !cleanupedElements ){
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java
index d3f8e75735f..24bf0873936 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameDialog.java
@@ -75,6 +75,7 @@ class FindIASTNameDialog extends Dialog {
 		/*
 		 * @see ShellListener#shellActivated(ShellEvent)
 		 */
+		@Override
 		public void shellActivated(ShellEvent e) {
 			
 			String oldText= fFindField.getText(); // XXX workaround for 10766
@@ -125,6 +126,7 @@ class FindIASTNameDialog extends Dialog {
 		/*
 		 * @see ShellListener#shellDeactivated(ShellEvent)
 		 */
+		@Override
 		public void shellDeactivated(ShellEvent e) {
 			fGiveFocusToFindField= fFindField.isFocusControl();
 
@@ -153,11 +155,12 @@ class FindIASTNameDialog extends Dialog {
 		/*
 		 * @see ModifyListener#modifyText(ModifyEvent)
 		 */
+		@Override
 		public void modifyText(ModifyEvent e) {
 			searchTextChanged = true;
 			
 			if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked()) {
-				if (fFindField.getText().equals(BLANK_STRING) && fTarget != null) { //$NON-NLS-1$
+				if (fFindField.getText().equals(BLANK_STRING) && fTarget != null) { 
 					// empty selection at base location
 					int offset= fIncrementalBaseLocation.x;
 
@@ -165,7 +168,7 @@ class FindIASTNameDialog extends Dialog {
 						offset= offset + fIncrementalBaseLocation.y;
 
 					fNeedsInitialFindBeforeReplace= false;
-					findAndSelect(offset, BLANK_STRING, isForwardSearch(), isCaseSensitiveSearch(), isWholeWordSearch(), isRegExSearchAvailableAndChecked()); //$NON-NLS-1$
+					findAndSelect(offset, BLANK_STRING, isForwardSearch(), isCaseSensitiveSearch(), isWholeWordSearch(), isRegExSearchAvailableAndChecked()); 
 				} else {
 					performSearch(false);
 				}
@@ -270,6 +273,7 @@ class FindIASTNameDialog extends Dialog {
 	 * Returns this dialog's parent shell.
 	 * @return the dialog's parent shell
 	 */
+	@Override
 	public Shell getParentShell() {
 		return super.getParentShell();
 	}
@@ -288,6 +292,7 @@ class FindIASTNameDialog extends Dialog {
 	/*
 	 * @see org.eclipse.jface.window.Window#create()
 	 */
+	@Override
 	public void create() {
 		
 		super.create();
@@ -330,7 +335,8 @@ class FindIASTNameDialog extends Dialog {
 		layout.numColumns= 1;
 		panel.setLayout(layout);
 		
-		fFindNextButton= makeButton(panel, FIND_NEXT_LABEL, 102, true, new SelectionAdapter() { //$NON-NLS-1$
+		fFindNextButton= makeButton(panel, FIND_NEXT_LABEL, 102, true, new SelectionAdapter() { 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (fTarget instanceof FindIASTNameTarget && searchTextChanged) {
 					((FindIASTNameTarget)fTarget).clearMatchingNames();
@@ -379,6 +385,7 @@ class FindIASTNameDialog extends Dialog {
 	/*
 	 * @see org.eclipse.jface.window.Window#createContents(org.eclipse.swt.widgets.Composite)
 	 */
+	@Override
 	protected Control createContents(Composite parent) {
 
 		Composite panel= new Composite(parent, SWT.NULL);
@@ -428,11 +435,13 @@ class FindIASTNameDialog extends Dialog {
 		group.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		SelectionListener selectionListener= new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (isIncrementalSearch() && !isRegExSearchAvailableAndChecked())
 					initIncrementalBaseLocation();
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		};
@@ -530,7 +539,7 @@ class FindIASTNameDialog extends Dialog {
 		panel.setLayout(layout);
 
 		Group group= new Group(panel, SWT.SHADOW_NONE);
-		group.setText(OPTIONS_LABEL); //$NON-NLS-1$
+		group.setText(OPTIONS_LABEL); 
 		GridLayout groupLayout= new GridLayout();
 		groupLayout.numColumns= 2;
 		groupLayout.makeColumnsEqualWidth= true;		
@@ -538,28 +547,30 @@ class FindIASTNameDialog extends Dialog {
 		group.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		SelectionListener selectionListener= new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				storeSettings();
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		};
 
 		fCaseCheckBox= new Button(group, SWT.CHECK | SWT.LEFT);
-		fCaseCheckBox.setText(CASE_SENSITIVE_LABEL); //$NON-NLS-1$
+		fCaseCheckBox.setText(CASE_SENSITIVE_LABEL); 
 		setGridData(fCaseCheckBox, GridData.BEGINNING, false, GridData.CENTER, false);
 		fCaseCheckBox.setSelection(fCaseInit);
 		fCaseCheckBox.addSelectionListener(selectionListener);
 
 		fWholeWordCheckBox= new Button(group, SWT.CHECK | SWT.LEFT);
-		fWholeWordCheckBox.setText(WHOLE_WORD_LABEL); //$NON-NLS-1$
+		fWholeWordCheckBox.setText(WHOLE_WORD_LABEL); 
 		setGridData(fWholeWordCheckBox, GridData.BEGINNING, false, GridData.CENTER, false);
 		fWholeWordCheckBox.setSelection(fWholeWordInit);
 		fWholeWordCheckBox.addSelectionListener(selectionListener);
 
 		fIsRegExCheckBox= new Button(group, SWT.CHECK | SWT.LEFT);
-		fIsRegExCheckBox.setText(REGULAR_EXPRESSIONS_LABEL); //$NON-NLS-1$
+		fIsRegExCheckBox.setText(REGULAR_EXPRESSIONS_LABEL); 
 		setGridData(fIsRegExCheckBox, GridData.BEGINNING, false, GridData.CENTER, false);
 		((GridData)fIsRegExCheckBox.getLayoutData()).horizontalSpan= 2;
 		fIsRegExCheckBox.setSelection(fIsRegExInit);
@@ -567,6 +578,7 @@ class FindIASTNameDialog extends Dialog {
 			/*
 			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
 			 */
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				boolean newState= fIsRegExCheckBox.getSelection();
 				if (fTarget instanceof FindIASTNameTarget)
@@ -581,6 +593,7 @@ class FindIASTNameDialog extends Dialog {
 			/*
 			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
 			 */
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (fTarget instanceof FindIASTNameTarget)
 					((FindIASTNameTarget)fTarget).clearMatchingNames();
@@ -619,6 +632,7 @@ class FindIASTNameDialog extends Dialog {
 	/*
 	 * @see Dialog#buttonPressed
 	 */
+	@Override
 	protected void buttonPressed(int buttonID) {
 		if (buttonID == 101)
 			close();
@@ -778,7 +792,7 @@ class FindIASTNameDialog extends Dialog {
 		if (okToUse(fFindField)) {
 			return fFindField.getText();
 		}
-		return BLANK_STRING; //$NON-NLS-1$
+		return BLANK_STRING; 
 	}
 	
 	// ------- init / close ---------------------------------------
@@ -802,6 +816,7 @@ class FindIASTNameDialog extends Dialog {
 	/**
 	 * @see org.eclipse.jface.window.Window#close()
 	 */
+	@Override
 	public boolean close() {
 		handleDialogClose();
 		return super.close();
@@ -845,7 +860,7 @@ class FindIASTNameDialog extends Dialog {
 			return;
 		String selection= fTarget.getSelectionText();
 		if (selection == null)
-			selection= BLANK_STRING; //$NON-NLS-1$
+			selection= BLANK_STRING; 
 
 		IDialogSettings s= getDialogSettings();
 		s.put("selection", selection); //$NON-NLS-1$
@@ -885,11 +900,11 @@ class FindIASTNameDialog extends Dialog {
 					fUseSelectedLines= true;
 				}
 			} else {
-				if (BLANK_STRING.equals(fFindField.getText())) { //$NON-NLS-1$
+				if (BLANK_STRING.equals(fFindField.getText())) { 
 					if (fFindHistory.size() > 0)
 						fFindField.setText((String) fFindHistory.get(0));
 					else
-						fFindField.setText(BLANK_STRING); //$NON-NLS-1$				
+						fFindField.setText(BLANK_STRING); 
 				}
 			}
 			fFindField.setSelection(new Point(0, fFindField.getText().length()));
@@ -1104,9 +1119,9 @@ class FindIASTNameDialog extends Dialog {
 			try {
 				boolean somethingFound= findNext(findString, isForwardSearch(), isCaseSensitiveSearch(), isWrapSearch(), isWholeWordSearch(), isIncrementalSearch() && !isRegExSearchAvailableAndChecked(), isRegExSearchAvailableAndChecked());
 				if (somethingFound) {
-					statusMessage(BLANK_STRING); //$NON-NLS-1$
+					statusMessage(BLANK_STRING); 
 				} else {
-					statusMessage(NAME_NOT_FOUND); //$NON-NLS-1$
+					statusMessage(NAME_NOT_FOUND); 
 				}
 			} catch (PatternSyntaxException ex) {
 				statusError(ex.getLocalizedMessage());
@@ -1264,6 +1279,7 @@ class FindIASTNameDialog extends Dialog {
 	 *
 	 * @param shell the new parent shell
 	 */
+	@Override
 	public void setParentShell(Shell shell) {
 		if (shell != fParentShell) {
 			
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java
index e08838075d6..99f9170fb1b 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/FindIASTNameTarget.java
@@ -266,6 +266,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTarget#canPerformFind()
 	 */
+	@Override
 	public boolean canPerformFind() {
 		return true;
 	}
@@ -340,6 +341,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTarget#findAndSelect(int, java.lang.String, boolean, boolean, boolean)
 	 */
+	@Override
 	public int findAndSelect(int widgetOffset, String findString,
 			boolean searchForward, boolean caseSensitive, boolean wholeWord) {
 		return findAndSelect(widgetOffset, findString, searchForward, caseSensitive, wholeWord, false);
@@ -348,6 +350,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTarget#getSelection()
 	 */
+	@Override
 	public Point getSelection() {
 		IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
 		
@@ -361,6 +364,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTarget#getSelectionText()
 	 */
+	@Override
 	public String getSelectionText() {
 		// TODO Auto-generated method stub
 		return null;
@@ -369,6 +373,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTarget#isEditable()
 	 */
+	@Override
 	public boolean isEditable() {
 		// TODO Auto-generated method stub
 		return false;
@@ -377,6 +382,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTarget#replaceSelection(java.lang.String)
 	 */
+	@Override
 	public void replaceSelection(String text) {
 		// TODO Auto-generated method stub
 
@@ -390,6 +396,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#findAndSelect(int, java.lang.String, boolean, boolean, boolean, boolean)
 	 */
+	@Override
 	public int findAndSelect(int offset, String findString, boolean searchForward, boolean caseSensitive, boolean wholeWord, boolean regExSearch) {
 		// find the next name in the list of names
 		IASTName foundName = null;
@@ -433,6 +440,7 @@ public class FindIASTNameTarget implements IFindReplaceTarget, IFindReplaceTarge
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.IFindReplaceTargetExtension3#replaceSelection(java.lang.String, boolean)
 	 */
+	@Override
 	public void replaceSelection(String text, boolean regExReplace) {
 		// TODO Auto-generated method stub
 		
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java
index 8a2c82a1d2b..4bbff49483e 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/IncludeStatementFilter.java
@@ -23,6 +23,7 @@ public class IncludeStatementFilter extends ViewerFilter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
 	 */
+	@Override
 	public boolean select(Viewer viewer, Object parentElement, Object element) {
 		if (element instanceof DOMASTNodeLeaf) {
 			int flag = ((DOMASTNodeLeaf)element).getFiltersFlag() & DOMASTNodeLeaf.FLAG_INCLUDE_STATEMENTS;
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java
index be547a3e020..bdffe1d6f25 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/OpenDOMViewAction.java
@@ -39,6 +39,7 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
 	 */
+	@Override
 	public void init(IViewPart view) {
 		this.viewPart = view;
 		
@@ -48,6 +49,7 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void run(IAction action) {
 		// TODO Auto-generated method stub
 	
@@ -89,6 +91,7 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		this.selection = selection;
 	}
@@ -96,12 +99,14 @@ public class OpenDOMViewAction implements IViewActionDelegate, IEditorActionDele
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
 	 */
+	@Override
 	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
 	 */
+	@Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 	}
 	
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java
index d3f5e16a091..e61d7855ed8 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/PreprocessorFilter.java
@@ -22,6 +22,7 @@ public class PreprocessorFilter extends ViewerFilter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
 	 */
+	@Override
 	public boolean select(Viewer viewer, Object parentElement, Object element) {
 		if (element instanceof DOMASTNodeLeaf) {
 			int flag = ((DOMASTNodeLeaf)element).getFiltersFlag() & DOMASTNodeLeaf.FLAG_PREPROCESSOR;
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java
index b698acd12e4..c288e870c70 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ProblemHolderFilter.java
@@ -24,6 +24,7 @@ public class ProblemHolderFilter extends ViewerFilter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
 	 */
+	@Override
 	public boolean select(Viewer viewer, Object parentElement, Object element) {
 		if (element instanceof DOMASTNodeLeaf) {
 			int flag = ((DOMASTNodeLeaf)element).getFiltersFlag() & DOMASTNodeLeaf.FLAG_PROBLEM;
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java
index 403442511f1..c935c4741b4 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/DOMAST/ShowInDOMViewAction.java
@@ -53,6 +53,7 @@ public class ShowInDOMViewAction extends ActionDelegate implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
 	 */
+	@Override
 	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
 		if (targetEditor instanceof CEditor)
 			editor = (CEditor)targetEditor;
@@ -61,6 +62,7 @@ public class ShowInDOMViewAction extends ActionDelegate implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.actions.ActionDelegate#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
 	 */
+	@Override
 	public void runWithEvent(IAction action, Event event) {
 		TextSelection selection = null;
 		
@@ -169,6 +171,7 @@ public class ShowInDOMViewAction extends ActionDelegate implements
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.action.Action#run()
 		 */
+		@Override
 		public void run() {
 			if (view instanceof DOMAST) {
 				IContentProvider provider = ((DOMAST)view).getContentProvider();
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java
index 6be562644ac..a5f1c04287c 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestExtraPagesProvider.java
@@ -32,6 +32,7 @@ import org.eclipse.cdt.ui.templateengine.IWizardDataPage;
 public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvider {
 	IWizardDataPage[] pages;
 	
+	@Override
 	public IWizardDataPage[] createAdditionalPages(IWorkbenchWizard wizard,
 			IWorkbench workbench, IStructuredSelection selection) {
 		pages= new IWizardDataPage[3];
@@ -41,6 +42,7 @@ public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvi
 		return pages;
 	}
 
+	@Override
 	public IWizardDataPage[] getCreatedPages(IWorkbenchWizard wizard) {
 		return pages;
 	}
@@ -59,10 +61,12 @@ public class TestExtraPagesProvider implements IPagesAfterTemplateSelectionProvi
 			this.dataValue= dataValue;
 		}
 		
+		@Override
 		public Map<String, String> getPageData() {
 			return Collections.singletonMap(dataKey, dataValue);
 		}
 
+		@Override
 		public void createControl(Composite parent) {
 			Label l= new Label(parent, SWT.NONE);
 			l.setText(labelText);
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java
index 2879e691361..39492baa7a2 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestProcesses.java
@@ -38,6 +38,7 @@ public class TestProcesses extends BaseTestCase {
 
 	private static final String PROJECT_TYPE = "org.eclipse.cdt.core.tests.projectType"; //$NON-NLS-1$
 
+	@Override
 	protected void setUp() throws Exception {
 		TemplateEngineTestsHelper.turnOffAutoBuild();
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java
index 0f41d57bfab..583bbf1d1f4 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestSharedDefaults.java
@@ -27,6 +27,7 @@ public class TestSharedDefaults extends BaseTestCase {
 	/*
 	 * @see TestCase#setUp()
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		sharedDefaults = SharedDefaults.getInstance();
 	}
@@ -34,6 +35,7 @@ public class TestSharedDefaults extends BaseTestCase {
 	/*
 	 * @see TestCase#tearDown()
 	 */
+	@Override
 	protected void tearDown(){
 		sharedDefaults = null;
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java
index c4b53a0ef7c..3159e702d8b 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateCore.java
@@ -20,7 +20,8 @@ public class TestTemplateCore extends BaseTestCase {
 
     public TemplateCore[] templates = null;
     
-    protected void setUp() throws Exception {
+    @Override
+	protected void setUp() throws Exception {
 		super.setUp();
 		templates = TemplateEngineTestsHelper.getTestTemplates();
 	}
@@ -28,6 +29,7 @@ public class TestTemplateCore extends BaseTestCase {
 	/*
 	 * @see TestCase#tearDown()
 	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java
index 85cbaab95b0..43145e4ffbd 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestTemplateEngine.java
@@ -22,6 +22,7 @@ public class TestTemplateEngine extends BaseTestCase {
 	/*
 	 * @see TestCase#setUp()
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		templateEngine = TemplateEngine.getDefault();
@@ -30,6 +31,7 @@ public class TestTemplateEngine extends BaseTestCase {
 	/*
 	 * @see TestCase#tearDown()
 	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 	}
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java
index e8f220d178a..d98a4c2db1f 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/templateengine/TestValueStore.java
@@ -24,6 +24,7 @@ public class TestValueStore extends BaseTestCase {
 	/**
 	 * setUp is called before execution of test method.
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 	}
@@ -31,6 +32,7 @@ public class TestValueStore extends BaseTestCase {
 	/**
 	 * release resources held.
 	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 	}