Bug 540373: Cleanup: Add missing annotations

This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Add missing Annotations - and selecting all three types:
 - @Override
 - @Override on interface methods
 - @Deprecated
and completing the wizard

Change-Id: I5d367dacb04327107f25e147edc08efc4eb1c2fe

202 files changed, 1311 insertions, 0 deletions

diff --git a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
index 3b6ce717f42..7e4a4de8804 100644
--- a/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
+++ b/build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/GCCToolChain.java
@@ -500,6 +500,7 @@ public class GCCToolChain extends PlatformObject implements IToolChain {
 		includePathReaderThread.start();
 
 		Thread macroReaderThread = new Thread("Macro reader") {
+			@Override
 			public void run() {
 				// Now the defines off the output stream
 				try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
diff --git a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/internal/Activator.java b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/internal/Activator.java
index b156b442104..5c3c5353de4 100644
--- a/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/internal/Activator.java
+++ b/build/org.eclipse.cdt.core.autotools.core/src/org/eclipse/cdt/core/autotools/core/internal/Activator.java
@@ -35,6 +35,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		Activator.context = bundleContext;
 	}
@@ -43,6 +44,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext bundleContext) throws Exception {
 		Activator.context = null;
 	}
diff --git a/build/org.eclipse.cdt.core.autotools.ui/src/org/eclipse/cdt/core/autotools/ui/internal/Activator.java b/build/org.eclipse.cdt.core.autotools.ui/src/org/eclipse/cdt/core/autotools/ui/internal/Activator.java
index 0e0b140bd41..81645a82a0b 100644
--- a/build/org.eclipse.cdt.core.autotools.ui/src/org/eclipse/cdt/core/autotools/ui/internal/Activator.java
+++ b/build/org.eclipse.cdt.core.autotools.ui/src/org/eclipse/cdt/core/autotools/ui/internal/Activator.java
@@ -38,6 +38,7 @@ public class Activator extends AbstractUIPlugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -47,6 +48,7 @@ public class Activator extends AbstractUIPlugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/Activator.java b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/Activator.java
index 1bd8ca402e0..ea07682189c 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/Activator.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/Activator.java
@@ -29,6 +29,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		Activator.context = bundleContext;
 	}
@@ -37,6 +38,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext bundleContext) throws Exception {
 		Activator.context = null;
 	}
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java
index 5c63f775344..6b4aa6b8f7c 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByConstReferenceQuickFix.java
@@ -30,6 +30,7 @@ public class CatchByConstReferenceQuickFix extends CatchByReferenceQuickFix {
 		return Messages.CatchByConstReferenceQuickFix_Message;
 	}
 
+	@Override
 	protected Optional<IASTDeclSpecifier> getNewDeclSpecifier(IASTSimpleDeclaration declaration) {
 		IASTDeclSpecifier declSpecifier = declaration.getDeclSpecifier();
 		IASTDeclSpecifier replacement = declSpecifier.copy(CopyStyle.withLocations);
diff --git a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java
index d7120defe8b..f5ac591c344 100644
--- a/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java
+++ b/codan/org.eclipse.cdt.codan.core.cxx/src/org/eclipse/cdt/codan/core/cxx/model/CodanMarkerGenerator.java
@@ -42,6 +42,7 @@ public class CodanMarkerGenerator implements IMarkerGenerator {
 		this.reporter = reporter;
 	}
 
+	@Override
 	@Deprecated
 	public void addMarker(IResource file, int lineNumber, String description, int severity, String variableName) {
 		addMarker(new ProblemMarkerInfo(file, lineNumber, description, severity, variableName));
diff --git a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java
index e49badb6579..978fd73055a 100644
--- a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java
@@ -157,6 +157,7 @@ public abstract class CodanFastCxxAstTestCase extends TestCase {
 	void runCodan(IASTTranslationUnit tu) {
 		IProblemReporter problemReporter = CodanRuntime.getInstance().getProblemReporter();
 		CodanRuntime.getInstance().setProblemReporter(new IProblemReporter() {
+			@Override
 			public void reportProblem(String problemId, IProblemLocation loc, Object... args) {
 				codanproblems.add(new ProblemInstance(problemId, loc, args));
 			}
diff --git a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanTestCase.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanTestCase.java
index 21f8e03fe79..626a90f518a 100644
--- a/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanTestCase.java
@@ -125,6 +125,7 @@ public class CodanTestCase extends BaseTestCase {
 			final String projectName = "CodanProjTest_" + System.currentTimeMillis();
 			final IWorkspace workspace = ResourcesPlugin.getWorkspace();
 			workspace.run(new IWorkspaceRunnable() {
+				@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
 					// Create the cproject
 					ICProject cproject = cpp
@@ -143,6 +144,7 @@ public class CodanTestCase extends BaseTestCase {
 	protected void indexFiles() throws CoreException, InterruptedException {
 		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		workspace.run(new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				cproject.getProject().refreshLocal(1, monitor);
 			}
diff --git a/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/GrepChecker.java b/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/GrepChecker.java
index 3536f973583..8b7956dad53 100644
--- a/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/GrepChecker.java
+++ b/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/GrepChecker.java
@@ -38,6 +38,7 @@ public class GrepChecker extends AbstractCheckerWithProblemPreferences {
 	public final static String ID = "org.eclipse.cdt.codan.examples.checkers.GrepCheckerProblemError";
 	private static final String PARAM_STRING_LIST = "searchlist";
 
+	@Override
 	public synchronized boolean processResource(IResource resource) {
 		if (!shouldProduceProblems(resource))
 			return false;
diff --git a/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionIIndexChecker.java b/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionIIndexChecker.java
index 7d8a8f006d5..bb35ea1921f 100644
--- a/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionIIndexChecker.java
+++ b/codan/org.eclipse.cdt.codan.examples/src/org/eclipse/cdt/codan/examples/checkers/NamingConventionFunctionIIndexChecker.java
@@ -43,10 +43,12 @@ public class NamingConventionFunctionIIndexChecker extends AbstractCIndexChecker
 	 * org.eclipse.cdt.codan.core.model.ICIndexChecker#processUnit(org.eclipse
 	 * .cdt.core.model.ITranslationUnit)
 	 */
+	@Override
 	public void processUnit(ITranslationUnit unit) {
 		final IProblem pt = getProblemById(ER_ID, getFile());
 		try {
 			unit.accept(new ICElementVisitor() {
+				@Override
 				public boolean visit(ICElement element) {
 					if (element.getElementType() == ICElement.C_FUNCTION) {
 						String parameter = (String) getPreference(pt, PARAM_KEY);
@@ -73,6 +75,7 @@ public class NamingConventionFunctionIIndexChecker extends AbstractCIndexChecker
 	 * org.eclipse.cdt.codan.core.model.ICheckerWithPreferences#initParameters
 	 * (org.eclipse.cdt.codan.core.model.IProblemWorkingCopy)
 	 */
+	@Override
 	public void initPreferences(IProblemWorkingCopy problem) {
 		super.initPreferences(problem);
 		IProblemPreference info = new BasicProblemPreference(PARAM_KEY, "Name Pattern");
diff --git a/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessInfo.java b/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessInfo.java
index cc0d6cbb945..982d062035a 100644
--- a/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessInfo.java
+++ b/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessInfo.java
@@ -44,6 +44,7 @@ public class ProcessInfo implements IProcessInfo {
 	/**
 	 * @see org.eclipse.cdt.core.IProcessInfo#getName()
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -51,6 +52,7 @@ public class ProcessInfo implements IProcessInfo {
 	/**
 	 * @see org.eclipse.cdt.core.IProcessInfo#getPid()
 	 */
+	@Override
 	public int getPid() {
 		return pid;
 	}
diff --git a/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessList.java b/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessList.java
index 9270e0ba266..30d044d908d 100644
--- a/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessList.java
+++ b/core/org.eclipse.cdt.core.linux/src/org/eclipse/cdt/internal/core/linux/ProcessList.java
@@ -36,6 +36,7 @@ public class ProcessList implements IProcessList {
 	 * Insert the method's description here.
 	 * @see IProcessList#getProcessList
 	 */
+	@Override
 	public IProcessInfo[] getProcessList() {
 		File proc = new File("/proc"); //$NON-NLS-1$
 		File[] pidFiles = null;
@@ -43,6 +44,7 @@ public class ProcessList implements IProcessList {
 		// We are only interrested in the pid so filter the rest out.
 		try {
 			FilenameFilter filter = new FilenameFilter() {
+				@Override
 				public boolean accept(File dir, String name) {
 					boolean isPID = false;
 					try {
diff --git a/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessInfo.java b/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessInfo.java
index 2bc20d3936d..a513bb47f9d 100644
--- a/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessInfo.java
+++ b/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessInfo.java
@@ -44,6 +44,7 @@ public class ProcessInfo implements IProcessInfo {
 	/**
 	 * @see org.eclipse.cdt.core.IProcessInfo#getName()
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -51,6 +52,7 @@ public class ProcessInfo implements IProcessInfo {
 	/**
 	 * @see org.eclipse.cdt.core.IProcessInfo#getPid()
 	 */
+	@Override
 	public int getPid() {
 		return pid;
 	}
diff --git a/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessList.java b/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessList.java
index 487c73dfeca..9b79097e25b 100644
--- a/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessList.java
+++ b/core/org.eclipse.cdt.core.macosx/src/org/eclipse/cdt/internal/core/macosx/ProcessList.java
@@ -36,6 +36,7 @@ public class ProcessList implements IProcessList {
 	 * Insert the method's description here.
 	 * @see IProcessList#getProcessList
 	 */
+	@Override
 	public IProcessInfo[] getProcessList() {
 		Process ps;
 		BufferedReader psOutput;
diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryEFSExtensionProvider.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryEFSExtensionProvider.java
index 069bd36670b..7a498b7e49c 100644
--- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryEFSExtensionProvider.java
+++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/internal/tests/filesystem/ram/MemoryEFSExtensionProvider.java
@@ -23,6 +23,7 @@ import org.eclipse.cdt.core.EFSExtensionProvider;
  */
 public class MemoryEFSExtensionProvider extends EFSExtensionProvider {
 
+	@Override
 	public String getMappedPath(URI locationURI) {
 
 		String path = locationURI.getPath();
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPAttributeTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPAttributeTests.java
index d64b48a1a45..48be53ec17e 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPAttributeTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/core/parser/tests/ast2/AST2CPPAttributeTests.java
@@ -119,6 +119,7 @@ public class AST2CPPAttributeTests extends AST2TestBase {
 			return specifiers;
 		}
 
+		@Override
 		public int visit(IASTAttributeSpecifier specifier) {
 			specifiers.add(specifier);
 			return PROCESS_CONTINUE;
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java
index 33f9f48629e..3e7e5f923ba 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/ClassMemberVisibilityTests.java
@@ -33,6 +33,7 @@ public class ClassMemberVisibilityTests extends PDOMInlineCodeTestBase {
 		return suite(ClassMemberVisibilityTests.class);
 	}
 
+	@Override
 	public void setUp() throws Exception {
 		super.setUp();
 		setUpSections(1);
diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMInlineCodeTestBase.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMInlineCodeTestBase.java
index 3cefbc2835d..3ee93704c41 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMInlineCodeTestBase.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMInlineCodeTestBase.java
@@ -35,6 +35,7 @@ public class PDOMInlineCodeTestBase extends PDOMTestBase {
 	protected PDOM pdom;
 	protected ICProject cproject;
 
+	@Override
 	public void setUp() throws Exception {
 		cproject = CProjectHelper.createCCProject("classTemplateTests" + System.currentTimeMillis(), "bin",
 				IPDOMManager.ID_NO_INDEXER);
diff --git a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java
index f48baeeeae4..3d5ca50c19a 100644
--- a/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java
+++ b/core/org.eclipse.cdt.core.tests/suite/org/eclipse/cdt/core/testplugin/ResourceHelper.java
@@ -700,6 +700,7 @@ public class ResourceHelper {
 	 *
 	 * @deprecated Use {@link #cleanUp(String)} instead so test name can be printed in diagnostics
 	 */
+	@Deprecated
 	public static void cleanUp() throws CoreException, IOException {
 		cleanUp("<unknown>");
 	}
diff --git a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java
index 37117562199..71f7a61f776 100644
--- a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java
+++ b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessInfo.java
@@ -44,6 +44,7 @@ public class ProcessInfo implements IProcessInfo {
 	/**
 	 * @see org.eclipse.cdt.core.IProcessInfo#getName()
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -51,6 +52,7 @@ public class ProcessInfo implements IProcessInfo {
 	/**
 	 * @see org.eclipse.cdt.core.IProcessInfo#getPid()
 	 */
+	@Override
 	public int getPid() {
 		return pid;
 	}
diff --git a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
index b538d2b66e8..b96aff4047e 100644
--- a/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
+++ b/core/org.eclipse.cdt.core.win32/src/org/eclipse/cdt/internal/core/win32/ProcessList.java
@@ -42,6 +42,7 @@ public class ProcessList implements IProcessList {
 
 	private IProcessInfo[] NOPROCESS = new IProcessInfo[0];
 
+	@Override
 	public IProcessInfo[] getProcessList() {
 		Process p = null;
 		String command = null;
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java
index bb18826035a..bbbf5faed0c 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractconstant/ExtractConstantRefactoringTest.java
@@ -51,6 +51,7 @@ public class ExtractConstantRefactoringTest extends RefactoringTestBase {
 		return suite(ExtractConstantRefactoringTest.class);
 	}
 
+	@Override
 	@Before
 	public void setUp() throws Exception {
 		extractedConstantName = "EXTRACTED";
diff --git a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/Activator.java b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/Activator.java
index 0077d5491bc..93bb347db8b 100755
--- a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/Activator.java
+++ b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/Activator.java
@@ -40,6 +40,7 @@ public class Activator extends Plugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -49,6 +50,7 @@ public class Activator extends Plugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java
index 0e6f07afa57..6846033b1c4 100644
--- a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java
+++ b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/CrossEnvironmentVariableSupplier.java
@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.Platform;
 
 public class CrossEnvironmentVariableSupplier implements IConfigurationEnvironmentVariableSupplier {
 
+	@Override
 	public IBuildEnvironmentVariable getVariable(String variableName, IConfiguration configuration,
 			IEnvironmentVariableProvider provider) {
 		if (PathEnvironmentVariable.isVar(variableName))
@@ -33,6 +34,7 @@ public class CrossEnvironmentVariableSupplier implements IConfigurationEnvironme
 			return null;
 	}
 
+	@Override
 	public IBuildEnvironmentVariable[] getVariables(IConfiguration configuration,
 			IEnvironmentVariableProvider provider) {
 		IBuildEnvironmentVariable path = PathEnvironmentVariable.create(configuration);
@@ -66,18 +68,22 @@ public class CrossEnvironmentVariableSupplier implements IConfigurationEnvironme
 					: name.equals(PathEnvironmentVariable.name);
 		}
 
+		@Override
 		public String getDelimiter() {
 			return Platform.getOS().equals(Platform.OS_WIN32) ? ";" : ":"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public int getOperation() {
 			return IBuildEnvironmentVariable.ENVVAR_PREPEND;
 		}
 
+		@Override
 		public String getValue() {
 			return path.getPath();
 		}
diff --git a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandOperation.java b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandOperation.java
index 2f156a08e7f..ab6eda4317a 100644
--- a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandOperation.java
+++ b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandOperation.java
@@ -36,6 +36,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress;
  */
 public class SetCrossCommandOperation implements IRunnableWithProgress {
 
+	@Override
 	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 
 		String projectName = (String) MBSCustomPageManager.getPageProperty(SetCrossCommandWizardPage.PAGE_ID,
diff --git a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java
index 4eb0caa46ba..a2a19c0ea8e 100644
--- a/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java
+++ b/cross/org.eclipse.cdt.build.crossgcc/src/org/eclipse/cdt/internal/build/crossgcc/SetCrossCommandWizardPage.java
@@ -71,10 +71,12 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
 		return finish;
 	}
 
+	@Override
 	public String getName() {
 		return Messages.SetCrossCommandWizardPage_name;
 	}
 
+	@Override
 	public void createControl(Composite parent) {
 		composite = new Composite(parent, SWT.NULL);
 
@@ -95,6 +97,7 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
 		}
 		prefixTxt.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				updatePrefixProperty();
 			}
@@ -113,6 +116,7 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
 		pathTxt.setLayoutData(layoutData);
 		pathTxt.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				updatePathProperty();
 			}
@@ -122,9 +126,11 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
 		button.setText(Messages.SetCrossCommandWizardPage_browse);
 		button.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				DirectoryDialog dirDialog = new DirectoryDialog(composite.getShell(), SWT.APPLICATION_MODAL);
 				String browsedDirectory = dirDialog.open();
@@ -137,42 +143,53 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
 		button.setLayoutData(layoutData);
 	}
 
+	@Override
 	public Control getControl() {
 		return composite;
 	}
 
+	@Override
 	public String getDescription() {
 		return Messages.SetCrossCommandWizardPage_description;
 	}
 
+	@Override
 	public String getErrorMessage() {
 		return null;
 	}
 
+	@Override
 	public Image getImage() {
 		return wizard.getDefaultPageImage();
 	}
 
+	@Override
 	public String getMessage() {
 		return null;
 	}
 
+	@Override
 	public String getTitle() {
 		return Messages.SetCrossCommandWizardPage_title;
 	}
 
+	@Override
 	public void performHelp() {
 	}
 
+	@Override
 	public void setDescription(String description) {
 	}
 
+	@Override
 	public void setImageDescriptor(ImageDescriptor image) {
 	}
 
+	@Override
 	public void setTitle(String title) {
 	}
 
+	@Override
 	public void setVisible(boolean visible) {
 		if (visible) {
 			finish = true;
@@ -180,6 +197,7 @@ public class SetCrossCommandWizardPage extends MBSCustomPage {
 		composite.setVisible(visible);
 	}
 
+	@Override
 	public void dispose() {
 	}
 
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
index 03bc479aec0..687a582885c 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/launching/RemoteGdbLaunchDelegate.java
@@ -110,6 +110,7 @@ public class RemoteGdbLaunchDelegate extends GdbLaunchDelegate {
 							if (session != null) {
 								try {
 									session.getExecutor().execute(new DsfRunnable() {
+										@Override
 										public void run() {
 											DsfServicesTracker tracker = new DsfServicesTracker(
 													Activator.getBundleContext(), session.getId());
@@ -166,6 +167,7 @@ public class RemoteGdbLaunchDelegate extends GdbLaunchDelegate {
 							// partially started already.
 							try {
 								l.getSession().getExecutor().execute(new DsfRunnable() {
+									@Override
 									public void run() {
 										l.shutdownSession(new ImmediateRequestMonitor());
 									}
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
index 3aa6f8fb17c..97abd6828bc 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
@@ -118,6 +118,7 @@ public class RemoteCDSFMainTab extends CMainTab {
 		/* If the local binary path changes, modify the remote binary location */
 		fProgText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				setLocalPathForRemotePath();
 			}
@@ -194,6 +195,7 @@ public class RemoteCDSFMainTab extends CMainTab {
 		connectionCombo.setLayoutData(gd);
 		connectionCombo.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent e) {
 				useDefaultsFromConnection();
 				updateConnectionButtons();
@@ -260,6 +262,7 @@ public class RemoteCDSFMainTab extends CMainTab {
 		remoteProgText.setLayoutData(gd);
 		remoteProgText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -288,6 +291,7 @@ public class RemoteCDSFMainTab extends CMainTab {
 		preRunText.setLayoutData(gd);
 		preRunText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
index 7e246000249..c626617bc42 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteDSFGDBDebuggerPage.java
@@ -172,6 +172,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage {
 		fGDBServerCommandText.setLayoutData(data);
 		fGDBServerCommandText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -186,6 +187,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage {
 		fGDBServerPortNumberText.setLayoutData(data);
 		fGDBServerPortNumberText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -200,6 +202,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage {
 		fGDBServerOptionsText.setLayoutData(data);
 		fGDBServerOptionsText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -224,6 +227,7 @@ public class RemoteDSFGDBDebuggerPage extends GdbDebuggerPage {
 		fRemoteTimeoutValueText.setToolTipText(Messages.Remotetimeout_tooltip);
 		fRemoteTimeoutValueText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugStringVariableSubstitutor.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugStringVariableSubstitutor.java
index 17c8db6bab7..15dcb1ba66a 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugStringVariableSubstitutor.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/DebugStringVariableSubstitutor.java
@@ -106,6 +106,7 @@ public class DebugStringVariableSubstitutor implements IStringVariableManager {
 				: ResourcesPlugin.getWorkspace().getRoot().getProject(projectName));
 	}
 
+	@Override
 	public IStringVariable[] getVariables() {
 		IStringVariable[] variables = variableManager.getVariables();
 		for (int i = 0; i < variables.length; i++) {
@@ -116,14 +117,17 @@ public class DebugStringVariableSubstitutor implements IStringVariableManager {
 		return variables;
 	}
 
+	@Override
 	public IValueVariable[] getValueVariables() {
 		return variableManager.getValueVariables();
 	}
 
+	@Override
 	public IValueVariable getValueVariable(String name) {
 		return variableManager.getValueVariable(name);
 	}
 
+	@Override
 	public IDynamicVariable[] getDynamicVariables() {
 		IDynamicVariable[] variables = variableManager.getDynamicVariables();
 		for (int i = 0; i < variables.length; i++) {
@@ -132,6 +136,7 @@ public class DebugStringVariableSubstitutor implements IStringVariableManager {
 		return variables;
 	}
 
+	@Override
 	public IDynamicVariable getDynamicVariable(String name) {
 		IDynamicVariable var = variableManager.getDynamicVariable(name);
 		if (var == null)
@@ -147,47 +152,58 @@ public class DebugStringVariableSubstitutor implements IStringVariableManager {
 		return var;
 	}
 
+	@Override
 	public String getContributingPluginId(IStringVariable variable) {
 		return variableManager.getContributingPluginId(variable);
 	}
 
+	@Override
 	public String performStringSubstitution(String expression) throws CoreException {
 		return performStringSubstitution(expression, true);
 	}
 
+	@Override
 	public String performStringSubstitution(String expression, boolean reportUndefinedVariables) throws CoreException {
 		return new StringSubstitutionEngine().performStringSubstitution(expression, reportUndefinedVariables, true,
 				this);
 	}
 
+	@Override
 	public void validateStringVariables(String expression) throws CoreException {
 		new StringSubstitutionEngine().validateStringVariables(expression, this);
 	}
 
+	@Override
 	public IValueVariable newValueVariable(String name, String description) {
 		return variableManager.newValueVariable(name, description);
 	}
 
+	@Override
 	public IValueVariable newValueVariable(String name, String description, boolean readOnly, String value) {
 		return variableManager.newValueVariable(name, description, readOnly, value);
 	}
 
+	@Override
 	public void addVariables(IValueVariable[] variables) throws CoreException {
 		variableManager.addVariables(variables);
 	}
 
+	@Override
 	public void removeVariables(IValueVariable[] variables) {
 		variableManager.removeVariables(variables);
 	}
 
+	@Override
 	public void addValueVariableListener(IValueVariableListener listener) {
 		variableManager.addValueVariableListener(listener);
 	}
 
+	@Override
 	public void removeValueVariableListener(IValueVariableListener listener) {
 		variableManager.removeValueVariableListener(listener);
 	}
 
+	@Override
 	public String generateVariableExpression(String varName, String arg) {
 		return variableManager.generateVariableExpression(varName, arg);
 	}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java
index 44a9e59278d..c693540852d 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/ICWatchpointTarget.java
@@ -17,6 +17,7 @@ package org.eclipse.cdt.debug.internal.core;
  * @deprecated This interface has been moved to a public package.  Use
  * {@link org.eclipse.cdt.debug.core.ICWatchpointTarget} instead.
  */
+@Deprecated
 public interface ICWatchpointTarget extends org.eclipse.cdt.debug.core.ICWatchpointTarget {
 
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractDynamicPrintf.java
index f6a59ff194d..1b9dfedcc57 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractDynamicPrintf.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/AbstractDynamicPrintf.java
@@ -48,6 +48,7 @@ public abstract class AbstractDynamicPrintf extends AbstractLineBreakpoint imple
 	 * (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.core.ICDynamicPrintf#setPrintfString(String)
 	 */
+	@Override
 	public void setPrintfString(String str) throws CoreException {
 		setAttribute(PRINTF_STRING, str);
 		setAttribute(IMarker.MESSAGE, getMarkerMessage());
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java
index ed0b8daedf8..02456506e84 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressBreakpoint.java
@@ -43,6 +43,7 @@ public class CAddressBreakpoint extends AbstractLineBreakpoint implements ICAddr
 	/**
 	 * Returns the type of marker associated with this type of breakpoints
 	 */
+	@Override
 	public String getMarkerType() {
 		return C_ADDRESS_BREAKPOINT_MARKER;
 	}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java
index 71d2f044e0c..93f60912e10 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressDynamicPrintf.java
@@ -40,6 +40,7 @@ public class CAddressDynamicPrintf extends AbstractDynamicPrintf implements ICAd
 	/**
 	 * Returns the type of marker associated with this type of breakpoints
 	 */
+	@Override
 	public String getMarkerType() {
 		return C_ADDRESS_DYNAMICPRINTF_MARKER;
 	}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java
index cab6b8c49ff..b018cc4f35c 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CAddressTracepoint.java
@@ -46,6 +46,7 @@ public class CAddressTracepoint extends AbstractTracepoint implements ICAddressB
 	/**
 	 * Returns the type of marker associated with this type of breakpoints
 	 */
+	@Override
 	public String getMarkerType() {
 		return C_ADDRESS_TRACEPOINT_MARKER;
 	}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointImportParticipant.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointImportParticipant.java
index eb98688a85b..ba677df428d 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointImportParticipant.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CBreakpointImportParticipant.java
@@ -34,6 +34,7 @@ public class CBreakpointImportParticipant implements IBreakpointImportParticipan
 	 * org.eclipse.debug.core.model.IBreakpointImportParticipant#matches(java
 	 * .util.Map, org.eclipse.debug.core.model.IBreakpoint)
 	 */
+	@Override
 	public boolean matches(Map<String, Object> attributes, IBreakpoint breakpoint) throws CoreException {
 		if (attributes == null || breakpoint == null) {
 			return false;
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java
index 998f018c0d1..84e379fb7ed 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionBreakpoint.java
@@ -43,6 +43,7 @@ public class CFunctionBreakpoint extends AbstractLineBreakpoint implements ICFun
 	/**
 	 * Returns the type of marker associated with this type of breakpoints
 	 */
+	@Override
 	public String getMarkerType() {
 		return C_FUNCTION_BREAKPOINT_MARKER;
 	}
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java
index 9c5fc8d1403..2f3742a9dde 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionDynamicPrintf.java
@@ -40,6 +40,7 @@ public class CFunctionDynamicPrintf extends AbstractDynamicPrintf implements ICF
 	/**
 	 * Returns the type of marker associated with this type of breakpoints
 	 */
+	@Override
 	public String getMarkerType() {
 		return C_FUNCTION_DYNAMICPRINTF_MARKER;
 	}
@@ -47,6 +48,7 @@ public class CFunctionDynamicPrintf extends AbstractDynamicPrintf implements ICF
 	/*(non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.core.breakpoints.CBreakpoint#getMarkerMessage()
 	 */
+	@Override
 	protected String getMarkerMessage() throws CoreException {
 		return MessageFormat.format(BreakpointMessages.getString("CFunctionDynamicPrintf.0"), //$NON-NLS-1$
 				(Object[]) new String[] { CDebugUtils.getBreakpointText(this, false) });
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java
index e0017fd0be1..f76d0ba9b36 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/breakpoints/CFunctionTracepoint.java
@@ -46,6 +46,7 @@ public class CFunctionTracepoint extends AbstractTracepoint implements ICFunctio
 	/**
 	 * Returns the type of marker associated with this type of breakpoints
 	 */
+	@Override
 	public String getMarkerType() {
 		return C_FUNCTION_TRACEPOINT_MARKER;
 	}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java
index 4952956f273..73502f46f39 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDebugUIUtils.java
@@ -493,6 +493,7 @@ public class CDebugUIUtils {
 	 * exposed via getEditorId. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=516470
 	 * @deprecated Deprecated on creation as this is waiting for Bug 516470 to be resolved
 	 */
+	@Deprecated
 	private static IUnassociatedEditorStrategy getUnassociatedEditorStrategy(boolean allowInteractive) {
 		String preferedStrategy = IDEWorkbenchPlugin.getDefault().getPreferenceStore()
 				.getString(IDE.UNASSOCIATED_EDITOR_STRATEGY_PREFERENCE_KEY);
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java
index 7be886e7dde..cfdfaed62ea 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/AddWatchpointOnVariableActionDelegate.java
@@ -20,6 +20,7 @@ package org.eclipse.cdt.debug.internal.ui.actions;
  * @deprecated Use the {@link org.eclipse.cdt.debug.ui.breakpoints.AddWatchpointOnVariableActionDelegate}
  * class instead.
  */
+@Deprecated
 public class AddWatchpointOnVariableActionDelegate
 		extends org.eclipse.cdt.debug.ui.breakpoints.AddWatchpointOnVariableActionDelegate {
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerAction.java
index ecef41f3ec2..65280ff691a 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerAction.java
@@ -56,6 +56,7 @@ public class CAddBreakpointInteractiveRulerAction extends Action implements IUpd
 	private IDocument fDocument;
 	private IVerticalRulerInfo fRulerInfo;
 	private IToggleBreakpointsTargetManagerListener fListener = new IToggleBreakpointsTargetManagerListener() {
+		@Override
 		public void preferredTargetsChanged() {
 			update();
 		}
@@ -86,6 +87,7 @@ public class CAddBreakpointInteractiveRulerAction extends Action implements IUpd
 	 *  (non-Javadoc)
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		IDocument document = getDocument();
 		if (document == null) {
@@ -167,6 +169,7 @@ public class CAddBreakpointInteractiveRulerAction extends Action implements IUpd
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.IUpdate#update()
 	 */
+	@Override
 	public void update() {
 		IDocument document = getDocument();
 		if (document != null) {
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerActionDelegate.java
index e835f79017e..162c43e49f7 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddBreakpointInteractiveRulerActionDelegate.java
@@ -63,6 +63,7 @@ public class CAddBreakpointInteractiveRulerActionDelegate extends AbstractRulerA
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
 	 */
+	@Override
 	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
 		fDelegate = new CAddBreakpointInteractiveRulerAction(editor, null, rulerInfo);
 		return fDelegate;
@@ -71,6 +72,7 @@ public class CAddBreakpointInteractiveRulerActionDelegate extends AbstractRulerA
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
 	 */
+	@Override
 	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
 		if (fEditor != null) {
 			if (fDelegate != null) {
@@ -85,12 +87,14 @@ public class CAddBreakpointInteractiveRulerActionDelegate extends AbstractRulerA
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void init(IAction action) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#dispose()
 	 */
+	@Override
 	public void dispose() {
 		if (fDelegate != null) {
 			fDelegate.dispose();
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerAction.java
index 792997a6a75..3089c8a99a4 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerAction.java
@@ -82,6 +82,7 @@ public class CAddDynamicPrintfInteractiveRulerAction extends Action implements I
 	 *  (non-Javadoc)
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		IDocument document = getDocument();
 		if (document == null) {
@@ -159,6 +160,7 @@ public class CAddDynamicPrintfInteractiveRulerAction extends Action implements I
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.IUpdate#update()
 	 */
+	@Override
 	public void update() {
 		IDocument document = getDocument();
 		if (document != null) {
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerActionDelegate.java
index 1922f8398d3..feea500c7bc 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CAddDynamicPrintfInteractiveRulerActionDelegate.java
@@ -64,6 +64,7 @@ public class CAddDynamicPrintfInteractiveRulerActionDelegate extends AbstractRul
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
 	 */
+	@Override
 	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
 		fDelegate = new CAddDynamicPrintfInteractiveRulerAction(editor, null, rulerInfo);
 		return fDelegate;
@@ -72,6 +73,7 @@ public class CAddDynamicPrintfInteractiveRulerActionDelegate extends AbstractRul
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
 	 */
+	@Override
 	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
 		if (fEditor != null) {
 			if (fDelegate != null) {
@@ -86,12 +88,14 @@ public class CAddDynamicPrintfInteractiveRulerActionDelegate extends AbstractRul
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void init(IAction action) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#dispose()
 	 */
+	@Override
 	public void dispose() {
 		if (fDelegate != null) {
 			fDelegate.dispose();
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerEnableDisableBreakpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerEnableDisableBreakpointActionDelegate.java
index 70bd16deb25..2e318e6605d 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerEnableDisableBreakpointActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerEnableDisableBreakpointActionDelegate.java
@@ -30,6 +30,7 @@ public class CRulerEnableDisableBreakpointActionDelegate extends AbstractRulerAc
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
 	 */
+	@Override
 	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
 		return new EnableDisableBreakpointRulerAction(editor, rulerInfo);
 	}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerToggleBreakpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerToggleBreakpointActionDelegate.java
index 395f258b009..59c57529ef3 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerToggleBreakpointActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CRulerToggleBreakpointActionDelegate.java
@@ -38,6 +38,7 @@ public class CRulerToggleBreakpointActionDelegate extends AbstractRulerActionDel
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.AbstractRulerActionDelegate#createAction(org.eclipse.ui.texteditor.ITextEditor, org.eclipse.jface.text.source.IVerticalRulerInfo)
 	 */
+	@Override
 	protected IAction createAction(ITextEditor editor, IVerticalRulerInfo rulerInfo) {
 		fDelegate = new ToggleBreakpointAction(editor, null, rulerInfo);
 		fDelegate.setText(ActionMessages.getString("CRulerToggleBreakpointActionDelegate_label")); //$NON-NLS-1$
@@ -48,6 +49,7 @@ public class CRulerToggleBreakpointActionDelegate extends AbstractRulerActionDel
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction, org.eclipse.ui.IEditorPart)
 	 */
+	@Override
 	public void setActiveEditor(IAction callerAction, IEditorPart targetEditor) {
 		if (fEditor != null) {
 			if (fDelegate != null) {
@@ -62,12 +64,14 @@ public class CRulerToggleBreakpointActionDelegate extends AbstractRulerActionDel
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void init(IAction action) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#dispose()
 	 */
+	@Override
 	public void dispose() {
 		if (fDelegate != null) {
 			fDelegate.dispose();
@@ -79,6 +83,7 @@ public class CRulerToggleBreakpointActionDelegate extends AbstractRulerActionDel
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
 	 */
+	@Override
 	public void runWithEvent(IAction action, Event event) {
 		if (fDelegate != null) {
 			fDelegate.runWithEvent(event);
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleBreakpointObjectActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleBreakpointObjectActionDelegate.java
index 5544037c830..e9405ea250c 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleBreakpointObjectActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleBreakpointObjectActionDelegate.java
@@ -43,14 +43,17 @@ public abstract class CToggleBreakpointObjectActionDelegate implements IObjectAc
 	private IWorkbenchPart fPart;
 	private IStructuredSelection fSelection;
 
+	@Override
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
 		fPart = targetPart;
 	}
 
+	@Override
 	public void run(IAction action) {
 		runWithEvent(action, null);
 	}
 
+	@Override
 	public void runWithEvent(IAction action, Event event) {
 		IToggleBreakpointsTarget target = DebugUITools.getToggleBreakpointsTargetManager()
 				.getToggleBreakpointsTarget(fPart, fSelection);
@@ -86,6 +89,7 @@ public abstract class CToggleBreakpointObjectActionDelegate implements IObjectAc
 	protected abstract boolean canPerformAction(IToggleBreakpointsTarget target, IWorkbenchPart part,
 			ISelection selection);
 
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		boolean enabled = false;
 		if (selection instanceof IStructuredSelection) {
@@ -102,9 +106,11 @@ public abstract class CToggleBreakpointObjectActionDelegate implements IObjectAc
 		action.setEnabled(enabled);
 	}
 
+	@Override
 	public void init(IAction action) {
 	}
 
+	@Override
 	public void dispose() {
 		fSelection = null;
 		fPart = null;
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleMethodBreakpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleMethodBreakpointActionDelegate.java
index f85556d6f1c..9df3575311e 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleMethodBreakpointActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleMethodBreakpointActionDelegate.java
@@ -36,6 +36,7 @@ import org.eclipse.ui.IWorkbenchPart;
  */
 public class CToggleMethodBreakpointActionDelegate extends CToggleBreakpointObjectActionDelegate {
 
+	@Override
 	protected void performAction(IToggleBreakpointsTarget target, IWorkbenchPart part, ISelection selection,
 			Event event) throws CoreException {
 		if ((event.stateMask & SWT.MOD1) != 0 && target instanceof IToggleBreakpointsTargetCExtension
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleWatchpointActionDelegate.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleWatchpointActionDelegate.java
index b4556a18afd..48b0784cc58 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleWatchpointActionDelegate.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/CToggleWatchpointActionDelegate.java
@@ -36,6 +36,7 @@ import org.eclipse.ui.IWorkbenchPart;
  */
 public class CToggleWatchpointActionDelegate extends CToggleBreakpointObjectActionDelegate {
 
+	@Override
 	protected void performAction(IToggleBreakpointsTarget target, IWorkbenchPart part, ISelection selection,
 			Event event) throws CoreException {
 		if ((event.stateMask & SWT.MOD1) != 0 && target instanceof IToggleBreakpointsTargetCExtension
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/ToggleTracepointAdapter.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/ToggleTracepointAdapter.java
index 350ec2f652c..afa715c2f8b 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/ToggleTracepointAdapter.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/actions/breakpoints/ToggleTracepointAdapter.java
@@ -85,6 +85,7 @@ public class ToggleTracepointAdapter extends AbstractToggleBreakpointAdapter {
 		return false;
 	}
 
+	@Override
 	protected void createWatchpoint(boolean interactive, IWorkbenchPart part, String sourceHandle, IResource resource,
 			int charStart, int charEnd, int lineNumber, String expression, String memorySpace, String range)
 			throws CoreException {
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointContext.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointContext.java
index 6e7d6f0791f..65dfd80d2c3 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointContext.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointContext.java
@@ -119,16 +119,20 @@ public class CBreakpointContext extends PlatformObject implements ICBreakpointCo
 	 * (non-Javadoc)
 	 * @see org.eclipse.debug.ui.contexts.IDebugContextProvider implementation
 	 */
+	@Override
 	public IWorkbenchPart getPart() {
 		return null;
 	}
 
+	@Override
 	public void addDebugContextListener(IDebugContextListener listener) {
 	}
 
+	@Override
 	public void removeDebugContextListener(IDebugContextListener listener) {
 	}
 
+	@Override
 	public ISelection getActiveContext() {
 		return fDebugContext;
 	}
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPreferenceStore.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPreferenceStore.java
index 9893a79e6eb..cf6e3541f5d 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPreferenceStore.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/breakpoints/CBreakpointPreferenceStore.java
@@ -105,6 +105,7 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		fIsCanceled = canceled;
 	}
 
+	@Override
 	public void save() throws IOException {
 		if (!fIsCanceled && fContext != null && fContext.getBreakpoint() != null) {
 			ICBreakpoint bp = fContext.getBreakpoint();
@@ -181,6 +182,7 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		}
 		if (!changedProperties.isEmpty()) {
 			IWorkspaceRunnable wr = new IWorkspaceRunnable() {
+				@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
 					Iterator<String> changed = changedProperties.iterator();
 					while (changed.hasNext()) {
@@ -261,22 +263,27 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 	///////////////////////////////////////////////////////////////////////
 	// IPreferenceStore
 
+	@Override
 	public boolean needsSaving() {
 		return fIsDirty && !fIsCanceled;
 	}
 
+	@Override
 	public boolean contains(String name) {
 		return fProperties.containsKey(name);
 	}
 
+	@Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
 		fListeners.add(listener);
 	}
 
+	@Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 		fListeners.remove(listener);
 	}
 
+	@Override
 	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
 		Object[] listeners = fListeners.getListeners();
 		// Do we need to fire an event.
@@ -289,6 +296,7 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		}
 	}
 
+	@Override
 	public boolean getBoolean(String name) {
 		boolean retVal = false;
 		Object o = fProperties.get(name);
@@ -298,6 +306,7 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		return retVal;
 	}
 
+	@Override
 	public int getInt(String name) {
 		int retVal = 0;
 		Object o = fProperties.get(name);
@@ -307,6 +316,7 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		return retVal;
 	}
 
+	@Override
 	public String getString(String name) {
 		String retVal = ""; //$NON-NLS-1$
 		Object o = fProperties.get(name);
@@ -316,46 +326,57 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		return retVal;
 	}
 
+	@Override
 	public double getDouble(String name) {
 		return 0;
 	}
 
+	@Override
 	public float getFloat(String name) {
 		return 0;
 	}
 
+	@Override
 	public long getLong(String name) {
 		return 0;
 	}
 
+	@Override
 	public boolean isDefault(String name) {
 		return false;
 	}
 
+	@Override
 	public boolean getDefaultBoolean(String name) {
 		return false;
 	}
 
+	@Override
 	public double getDefaultDouble(String name) {
 		return 0;
 	}
 
+	@Override
 	public float getDefaultFloat(String name) {
 		return 0;
 	}
 
+	@Override
 	public int getDefaultInt(String name) {
 		return 0;
 	}
 
+	@Override
 	public long getDefaultLong(String name) {
 		return 0;
 	}
 
+	@Override
 	public String getDefaultString(String name) {
 		return null;
 	}
 
+	@Override
 	public void putValue(String name, String value) {
 		Object oldValue = fProperties.get(name);
 		if (oldValue == null || !oldValue.equals(value)) {
@@ -364,27 +385,35 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		}
 	}
 
+	@Override
 	public void setDefault(String name, double value) {
 	}
 
+	@Override
 	public void setDefault(String name, float value) {
 	}
 
+	@Override
 	public void setDefault(String name, int value) {
 	}
 
+	@Override
 	public void setDefault(String name, long value) {
 	}
 
+	@Override
 	public void setDefault(String name, String defaultObject) {
 	}
 
+	@Override
 	public void setDefault(String name, boolean value) {
 	}
 
+	@Override
 	public void setToDefault(String name) {
 	}
 
+	@Override
 	public void setValue(String name, boolean value) {
 		boolean oldValue = getBoolean(name);
 		if (oldValue != value) {
@@ -394,6 +423,7 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		}
 	}
 
+	@Override
 	public void setValue(String name, int value) {
 		int oldValue = getInt(name);
 		if (oldValue != value) {
@@ -403,6 +433,7 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		}
 	}
 
+	@Override
 	public void setValue(String name, String value) {
 		Object oldValue = fProperties.get(name);
 		if ((oldValue == null && value != null) || (oldValue != null && !oldValue.equals(value))) {
@@ -412,12 +443,15 @@ public class CBreakpointPreferenceStore implements IPersistentPreferenceStore {
 		}
 	}
 
+	@Override
 	public void setValue(String name, float value) {
 	}
 
+	@Override
 	public void setValue(String name, double value) {
 	}
 
+	@Override
 	public void setValue(String name, long value) {
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java
index 3cc96e5d78b..57011d971ca 100644
--- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java
+++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CBreakpointPropertyDialogAction.java
@@ -140,6 +140,7 @@ public class CBreakpointPropertyDialogAction extends SelectionProviderAction {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		CBreakpointContext bpContext = getCBreakpointContext();
 		if (bpContext != null) {
@@ -206,6 +207,7 @@ public class CBreakpointPropertyDialogAction extends SelectionProviderAction {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.actions.SelectionProviderAction#selectionChanged(org.eclipse.jface.viewers.IStructuredSelection)
 	 */
+	@Override
 	public void selectionChanged(IStructuredSelection selection) {
 		setEnabled(!selection.isEmpty());
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAAdapterFactory.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAAdapterFactory.java
index ab925100b7a..a5d0c705a91 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAAdapterFactory.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAAdapterFactory.java
@@ -36,6 +36,7 @@ import org.eclipse.debug.ui.contexts.ISuspendTrigger;
 @SuppressWarnings({ "restriction" })
 public class PDAAdapterFactory implements IAdapterFactory {
 	// This IAdapterFactory method returns adapters for the PDA launch object only.
+	@Override
 	@SuppressWarnings("unchecked") // IAdapterFactory is Java 1.3
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (!(adaptableObject instanceof PDALaunch))
@@ -66,6 +67,7 @@ public class PDAAdapterFactory implements IAdapterFactory {
 			return null;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked") // IAdapterFactory is Java 1.3
 	public Class[] getAdapterList() {
 		return new Class[] { IElementContentProvider.class, IModelProxyFactory.class, ISuspendTrigger.class };
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDASuspendTrigger.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDASuspendTrigger.java
index ecc8aeb5bff..7cb1f8d3217 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDASuspendTrigger.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDASuspendTrigger.java
@@ -39,6 +39,7 @@ public class PDASuspendTrigger extends DsfSuspendTrigger {
 	protected void getLaunchTopContainers(final DataRequestMonitor<IContainerDMContext[]> rm) {
 		try {
 			getSession().getExecutor().execute(new DsfRunnable() {
+				@Override
 				public void run() {
 					PDACommandControl control = getServicesTracker().getService(PDACommandControl.class);
 					if (control != null) {
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAUIPlugin.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAUIPlugin.java
index 3c264326424..5bc21b14b4c 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAUIPlugin.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAUIPlugin.java
@@ -218,6 +218,7 @@ public class PDAUIPlugin extends AbstractUIPlugin implements ILaunchesListener2
 		}
 	}
 
+	@Override
 	public void launchesRemoved(ILaunch[] launches) {
 		// Dispose the set of adapters for a launch only after the launch is
 		// removed from the view.  If the launch is terminated, the adapters
@@ -229,12 +230,15 @@ public class PDAUIPlugin extends AbstractUIPlugin implements ILaunchesListener2
 		}
 	}
 
+	@Override
 	public void launchesTerminated(ILaunch[] launches) {
 	}
 
+	@Override
 	public void launchesAdded(ILaunch[] launches) {
 	}
 
+	@Override
 	public void launchesChanged(ILaunch[] launches) {
 	}
 
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/SessionAdapterSet.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/SessionAdapterSet.java
index 48a4dfba1a4..3393064eff8 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/SessionAdapterSet.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/SessionAdapterSet.java
@@ -103,6 +103,7 @@ class SessionAdapterSet {
 
 		// Initialize debug model provider
 		fDebugModelProvider = new IDebugModelProvider() {
+			@Override
 			public String[] getModelIdentifiers() {
 				return new String[] { PDAPlugin.ID_PDA_DEBUG_MODEL };
 			}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/actions/PDATerminateCommand.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/actions/PDATerminateCommand.java
index 449eda6d08f..ffa39bce943 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/actions/PDATerminateCommand.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/actions/PDATerminateCommand.java
@@ -54,6 +54,7 @@ public class PDATerminateCommand implements ITerminateHandler {
 	}
 
 	// Run control may not be available after a connection is terminated and shut down.
+	@Override
 	public void canExecute(final IEnabledStateRequest request) {
 		// Terminate can only operate on a single element.
 		if (request.getElements().length != 1 || !(request.getElements()[0] instanceof IDMVMContext)) {
@@ -75,6 +76,7 @@ public class PDATerminateCommand implements ITerminateHandler {
 
 		try {
 			fSession.getExecutor().execute(new DsfRunnable() {
+				@Override
 				public void run() {
 					// Get the processes service and the exec context.
 					PDACommandControl commandControl = fTracker.getService(PDACommandControl.class);
@@ -99,12 +101,14 @@ public class PDATerminateCommand implements ITerminateHandler {
 		}
 	}
 
+	@Override
 	public boolean execute(final IDebugCommandRequest request) {
 		// Skip the checks and assume that this method is called only if the action
 		// was enabled.
 
 		try {
 			fSession.getExecutor().submit(new DsfRunnable() {
+				@Override
 				public void run() {
 					// If the command control service is available, attempt to terminate the program.
 					PDACommandControl commandControl = fTracker.getService(PDACommandControl.class);
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDABreakpointAdapter.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDABreakpointAdapter.java
index 26e89118a42..16827f8cece 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDABreakpointAdapter.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDABreakpointAdapter.java
@@ -44,6 +44,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleLineBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
 		ITextEditor textEditor = getEditor(part);
 		if (textEditor != null) {
@@ -71,6 +72,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleLineBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleLineBreakpoints(IWorkbenchPart part, ISelection selection) {
 		return getEditor(part) != null;
 	}
@@ -100,12 +102,14 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleMethodBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) {
 		return false;
 	}
@@ -113,6 +117,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#toggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleWatchpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
 		String[] variableAndFunctionName = getVariableAndFunctionName(part, selection);
 		if (variableAndFunctionName != null && part instanceof ITextEditor && selection instanceof ITextSelection) {
@@ -145,6 +150,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTarget#canToggleWatchpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection) {
 		return getVariableAndFunctionName(part, selection) != null;
 	}
@@ -217,6 +223,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#toggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public void toggleBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException {
 		if (canToggleWatchpoints(part, selection)) {
 			toggleWatchpoints(part, selection);
@@ -228,6 +235,7 @@ public class PDABreakpointAdapter implements IToggleBreakpointsTargetExtension {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension#canToggleBreakpoints(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
+	@Override
 	public boolean canToggleBreakpoints(IWorkbenchPart part, ISelection selection) {
 		return canToggleLineBreakpoints(part, selection) || canToggleWatchpoints(part, selection);
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAEditorAdapterFactory.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAEditorAdapterFactory.java
index 3825c25e1d0..705b24a4767 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAEditorAdapterFactory.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAEditorAdapterFactory.java
@@ -30,6 +30,7 @@ import org.eclipse.ui.texteditor.ITextEditor;
  */
 public class PDAEditorAdapterFactory implements IAdapterFactory {
 
+	@Override
 	@SuppressWarnings("unchecked") // IAdapterFactory is Java 1.3
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (adaptableObject instanceof PDAEditor) {
@@ -47,6 +48,7 @@ public class PDAEditorAdapterFactory implements IAdapterFactory {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked") // IAdapterFactory is Java 1.3
 	public Class[] getAdapterList() {
 		return new Class[] { IToggleBreakpointsTarget.class };
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAWatchpointFunctionFieldEditorFactory.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAWatchpointFunctionFieldEditorFactory.java
index 12845189e70..73c06abea1e 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAWatchpointFunctionFieldEditorFactory.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/breakpoints/PDAWatchpointFunctionFieldEditorFactory.java
@@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite;
  */
 public class PDAWatchpointFunctionFieldEditorFactory implements IFieldEditorFactory {
 
+	@Override
 	public FieldEditor createFieldEditor(String name, String labelText, Composite parent) {
 		return new StringFieldEditor(name, labelText, parent);
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/AnnotationHover.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/AnnotationHover.java
index 88840ca205c..bd46d0b4150 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/AnnotationHover.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/AnnotationHover.java
@@ -33,6 +33,7 @@ import org.eclipse.jface.text.source.ISourceViewer;
  */
 public class AnnotationHover implements IAnnotationHover {
 
+	@Override
 	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
 		IAnnotationModel annotationModel = sourceViewer.getAnnotationModel();
 		Iterator<?> iterator = annotationModel.getAnnotationIterator();
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistProcessor.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistProcessor.java
index daab38e1e3c..668e9174f1d 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistProcessor.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistProcessor.java
@@ -29,6 +29,7 @@ import org.eclipse.jface.text.contentassist.IContextInformationValidator;
 
 public class PDAContentAssistProcessor implements IContentAssistProcessor {
 
+	@Override
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
 		int index = offset - 1;
 		StringBuilder prefix = new StringBuilder();
@@ -72,6 +73,7 @@ public class PDAContentAssistProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
 	 */
+	@Override
 	public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) {
 		return null;
 	}
@@ -79,6 +81,7 @@ public class PDAContentAssistProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
 	 */
+	@Override
 	public char[] getCompletionProposalAutoActivationCharacters() {
 		return null;
 	}
@@ -86,6 +89,7 @@ public class PDAContentAssistProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
 	 */
+	@Override
 	public char[] getContextInformationAutoActivationCharacters() {
 		return null;
 	}
@@ -93,6 +97,7 @@ public class PDAContentAssistProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
 	 */
+	@Override
 	public String getErrorMessage() {
 		return null;
 	}
@@ -100,6 +105,7 @@ public class PDAContentAssistProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
 	 */
+	@Override
 	public IContextInformationValidator getContextInformationValidator() {
 		return null;
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistant.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistant.java
index 59ff54e8512..f76563bd494 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistant.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAContentAssistant.java
@@ -38,6 +38,7 @@ public class PDAContentAssistant extends ContentAssistant {
 
 	private IInformationControlCreator getInformationControlCreator() {
 		return new IInformationControlCreator() {
+			@Override
 			public IInformationControl createInformationControl(Shell parent) {
 				return new DefaultInformationControl(parent);
 			}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAEditor.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAEditor.java
index d0267ae877f..55a4cff63ef 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAEditor.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAEditor.java
@@ -40,6 +40,7 @@ public class PDAEditor extends AbstractDecoratedTextEditor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.texteditor.AbstractTextEditor#createActions()
 	 */
+	@Override
 	protected void createActions() {
 		super.createActions();
 		ResourceBundle bundle = ResourceBundle
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAScanner.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAScanner.java
index 193577cbc30..48bda448964 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAScanner.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDAScanner.java
@@ -42,6 +42,7 @@ public class PDAScanner extends BufferedRuleBasedScanner {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.text.rules.IWordDetector#isWordStart(char)
 		 */
+		@Override
 		public boolean isWordStart(char c) {
 			return Character.isLetter(c);
 		}
@@ -49,6 +50,7 @@ public class PDAScanner extends BufferedRuleBasedScanner {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.text.rules.IWordDetector#isWordPart(char)
 		 */
+		@Override
 		public boolean isWordPart(char c) {
 			return Character.isLetter(c) || c == '_';
 		}
@@ -62,6 +64,7 @@ public class PDAScanner extends BufferedRuleBasedScanner {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.text.rules.IWordDetector#isWordStart(char)
 		 */
+		@Override
 		public boolean isWordStart(char c) {
 			return c == ':';
 		}
@@ -69,6 +72,7 @@ public class PDAScanner extends BufferedRuleBasedScanner {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.text.rules.IWordDetector#isWordPart(char)
 		 */
+		@Override
 		public boolean isWordPart(char c) {
 			return super.isWordPart(c) || Character.isDigit(c);
 		}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDASourceViewerConfiguration.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDASourceViewerConfiguration.java
index 995e82c2ec2..c3651eb7134 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDASourceViewerConfiguration.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PDASourceViewerConfiguration.java
@@ -33,6 +33,7 @@ public class PDASourceViewerConfiguration extends TextSourceViewerConfiguration
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getTextHover(org.eclipse.jface.text.source.ISourceViewer, java.lang.String)
 	 */
+	@Override
 	public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) {
 		return new TextHover();
 	}
@@ -40,6 +41,7 @@ public class PDASourceViewerConfiguration extends TextSourceViewerConfiguration
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getAnnotationHover(org.eclipse.jface.text.source.ISourceViewer)
 	 */
+	@Override
 	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
 		return new AnnotationHover();
 	}
@@ -47,6 +49,7 @@ public class PDASourceViewerConfiguration extends TextSourceViewerConfiguration
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getPresentationReconciler(org.eclipse.jface.text.source.ISourceViewer)
 	 */
+	@Override
 	public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
 		PresentationReconciler reconciler = new PresentationReconciler();
 		reconciler.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
@@ -59,6 +62,7 @@ public class PDASourceViewerConfiguration extends TextSourceViewerConfiguration
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(org.eclipse.jface.text.source.ISourceViewer)
 	 */
+	@Override
 	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
 		return new PDAContentAssistant();
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PopFrameActionDelegate.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PopFrameActionDelegate.java
index dec43546770..93462dfcf91 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PopFrameActionDelegate.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/PopFrameActionDelegate.java
@@ -29,12 +29,14 @@ public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDel
 	/* (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) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void run(IAction action) {
 		/*
 		try {
@@ -46,6 +48,7 @@ public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDel
 	/* (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) {
 		/*	if (selection instanceof IStructuredSelection) {
 				IStructuredSelection ss = (IStructuredSelection) selection;
@@ -72,12 +75,14 @@ public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDel
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#init(org.eclipse.jface.action.IAction)
 	 */
+	@Override
 	public void init(IAction action) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#dispose()
 	 */
+	@Override
 	public void dispose() {
 		//fThread = null;
 	}
@@ -85,6 +90,7 @@ public class PopFrameActionDelegate implements IObjectActionDelegate, IActionDel
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IActionDelegate2#runWithEvent(org.eclipse.jface.action.IAction, org.eclipse.swt.widgets.Event)
 	 */
+	@Override
 	public void runWithEvent(IAction action, Event event) {
 		run(action);
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/TextHover.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/TextHover.java
index a9ae065aab5..4a28944ac9b 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/TextHover.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/editor/TextHover.java
@@ -27,6 +27,7 @@ public class TextHover implements ITextHover {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
 	 */
+	@Override
 	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
 		/*String varName = null;
 		try {
@@ -78,6 +79,7 @@ public class TextHover implements ITextHover {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer, int)
 	 */
+	@Override
 	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
 		return WordFinder.findWord(textViewer.getDocument(), offset);
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDAMainTab.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDAMainTab.java
index 969ec0f793c..dbcf7406957 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDAMainTab.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDAMainTab.java
@@ -57,6 +57,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+	@Override
 	public void createControl(Composite parent) {
 		Font font = parent.getFont();
 
@@ -81,6 +82,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 		fProgramText.setLayoutData(gd);
 		fProgramText.setFont(font);
 		fProgramText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				updateLaunchConfigurationDialog();
 			}
@@ -88,6 +90,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 
 		fProgramButton = createPushButton(comp, "&Browse...", null); //$NON-NLS-1$
 		fProgramButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				browsePDAFiles();
 			}
@@ -113,12 +116,14 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+	@Override
 	public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+	@Override
 	public void initializeFrom(ILaunchConfiguration configuration) {
 		//#ifdef ex1
 		//#		// TODO: Exercise 1 - retrieve the program path attribute from the launch configuration
@@ -142,6 +147,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
 	 */
+	@Override
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		String program = fProgramText.getText().trim();
 		if (program.length() == 0) {
@@ -158,6 +164,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()
 	 */
+	@Override
 	public String getName() {
 		return "Main";
 	}
@@ -165,6 +172,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#isValid(org.eclipse.debug.core.ILaunchConfiguration)
 	 */
+	@Override
 	public boolean isValid(ILaunchConfiguration launchConfig) {
 		setErrorMessage(null);
 		setMessage(null);
@@ -189,6 +197,7 @@ public class PDAMainTab extends AbstractLaunchConfigurationTab {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getImage()
 	 */
+	@Override
 	public Image getImage() {
 		return PDAUIPlugin.getDefault().getImageRegistry().get(PDAUIPlugin.IMG_OBJ_PDA);
 	}
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDATabGroup.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDATabGroup.java
index cce0d095b13..4a07ca1b2e1 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDATabGroup.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/launcher/PDATabGroup.java
@@ -32,6 +32,7 @@ public class PDATabGroup extends AbstractLaunchConfigurationTabGroup {
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse.debug.ui.ILaunchConfigurationDialog, java.lang.String)
 	 */
+	@Override
 	public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
 		//#ifdef ex1
 		//#		// TODO: Exercise 1 - add the PDA main tab, source lookup tab and common
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/PDAExpressionVMProvider.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/PDAExpressionVMProvider.java
index f1c66d0a546..cf09d97bf7d 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/PDAExpressionVMProvider.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/PDAExpressionVMProvider.java
@@ -43,6 +43,7 @@ public class PDAExpressionVMProvider extends ExpressionVMProvider implements IEl
 		super(adapter, context, session);
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void getActiveFormat(IPresentationContext context, IVMNode node, Object viewerInput, TreePath elementPath,
 			DataRequestMonitor<String> rm) {
@@ -82,6 +83,7 @@ public class PDAExpressionVMProvider extends ExpressionVMProvider implements IEl
 		return;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void setActiveFormat(IPresentationContext context, IVMNode[] node, Object viewerInput,
 			TreePath[] elementPath, String format) {
@@ -115,6 +117,7 @@ public class PDAExpressionVMProvider extends ExpressionVMProvider implements IEl
 		}
 	}
 
+	@Override
 	public boolean supportFormat(IVMContext context) {
 		if (context instanceof VariableVMNode.VariableExpressionVMC) {
 			return true;
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAThreadsVMNode.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAThreadsVMNode.java
index 975ddb212b3..952c35fd720 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAThreadsVMNode.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAThreadsVMNode.java
@@ -71,6 +71,7 @@ public class PDAThreadsVMNode extends AbstractThreadVMNode implements IElementLa
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#compareElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementCompareRequest[])
 	 */
+	@Override
 	public void compareElements(IElementCompareRequest[] requests) {
 		for (IElementCompareRequest request : requests) {
 			Object element = request.getElement();
@@ -93,6 +94,7 @@ public class PDAThreadsVMNode extends AbstractThreadVMNode implements IElementLa
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider#encodeElements(org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoRequest[])
 	 */
+	@Override
 	public void encodeElements(IElementMementoRequest[] requests) {
 		for (IElementMementoRequest request : requests) {
 			Object element = request.getElement();
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAVirtualMachineVMNode.java b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAVirtualMachineVMNode.java
index e56e163d47e..c9e83abaae3 100644
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAVirtualMachineVMNode.java
+++ b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/viewmodel/launch/PDAVirtualMachineVMNode.java
@@ -90,6 +90,7 @@ public class PDAVirtualMachineVMNode extends AbstractContainerVMNode implements
 
 	private final String MEMENTO_NAME = "PDAPROGRAM_MEMENTO_NAME"; //$NON-NLS-1$
 
+	@Override
 	public void compareElements(IElementCompareRequest[] requests) {
 
 		for (IElementCompareRequest request : requests) {
@@ -115,6 +116,7 @@ public class PDAVirtualMachineVMNode extends AbstractContainerVMNode implements
 		}
 	}
 
+	@Override
 	public void encodeElements(IElementMementoRequest[] requests) {
 
 		for (IElementMementoRequest request : requests) {
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/src/org/eclipse/cdt/debug/gdbjtag/core/tests/Activator.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/src/org/eclipse/cdt/debug/gdbjtag/core/tests/Activator.java
index 70a47eb1a88..87307374996 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/src/org/eclipse/cdt/debug/gdbjtag/core/tests/Activator.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core.tests/src/org/eclipse/cdt/debug/gdbjtag/core/tests/Activator.java
@@ -29,6 +29,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext bundleContext) throws Exception {
 		Activator.context = bundleContext;
 	}
@@ -37,6 +38,7 @@ public class Activator implements BundleActivator {
 	 * (non-Javadoc)
 	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext bundleContext) throws Exception {
 		Activator.context = null;
 	}
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
index cbd7cb4d25e..f5155865f27 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/GDBJtagDSFFinalLaunchSequence.java
@@ -225,6 +225,7 @@ public class GDBJtagDSFFinalLaunchSequence extends FinalLaunchSequence {
 	 * Rollback method for {@link #stepInitializeJTAGFinalLaunchSequence()}
 	 * @since 4.0
 	 */
+	@Override
 	@RollBack("stepInitializeJTAGFinalLaunchSequence")
 	public void rollBackInitializeFinalLaunchSequence(RequestMonitor rm) {
 		if (fTracker != null)
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java
index ba68e26b891..1e9f5ed1c35 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag.core/src/org/eclipse/cdt/debug/gdbjtag/core/IGDBJtagConstants.java
@@ -29,6 +29,7 @@ public interface IGDBJtagConstants {
 	public static final String ATTR_IP_ADDRESS = Activator.PLUGIN_ID + ".ipAddress"; //$NON-NLS-1$
 	public static final String ATTR_PORT_NUMBER = Activator.PLUGIN_ID + ".portNumber"; //$NON-NLS-1$
 	/** @deprecated Use {@link #ATTR_JTAG_DEVICE ID} instead */
+	@Deprecated
 	public static final String ATTR_JTAG_DEVICE = Activator.PLUGIN_ID + ".jtagDevice"; //$NON-NLS-1$
 	/** @since 9.2 */
 	public static final String ATTR_JTAG_DEVICE_ID = Activator.PLUGIN_ID + ".jtagDeviceId"; //$NON-NLS-1$
@@ -107,6 +108,7 @@ public interface IGDBJtagConstants {
 	 * @since 7.0
 	 * @deprecated Use either {@link #DEFAULT_JTAG_DEVICE_ID} or {@link #DEFAULT_JTAG_DEVICE_NAME}
 	 */
+	@Deprecated
 	public static final String DEFAULT_JTAG_DEVICE = ""; //$NON-NLS-1$
 
 }
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java
index 85ab18f8bb9..604550a8025 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/docker/launcher/DockerLaunchUIPlugin.java
@@ -48,6 +48,7 @@ public class DockerLaunchUIPlugin extends AbstractUIPlugin {
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
 	 * )
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -61,6 +62,7 @@ public class DockerLaunchUIPlugin extends AbstractUIPlugin {
 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
 	 * )
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
index da195573887..150c49a6dac 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ContainerTab.java
@@ -728,6 +728,7 @@ public class ContainerTab extends AbstractLaunchConfigurationTab
 		connectionSelector.addModifyListener(connectionModifyListener);
 	}
 
+	@Override
 	public void listChanged(IDockerConnection c, java.util.List<IDockerImage> list) {
 		setErrorMessage(null);
 		final IDockerImage[] finalList = list.toArray(new IDockerImage[0]);
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/RemoteDebuggerPage.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/RemoteDebuggerPage.java
index 9b6f3f70623..b3aa67627fe 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/RemoteDebuggerPage.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/RemoteDebuggerPage.java
@@ -148,6 +148,7 @@ public class RemoteDebuggerPage extends GdbDebuggerPage {
 		fGDBServerCommandText.setLayoutData(data);
 		fGDBServerCommandText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -162,6 +163,7 @@ public class RemoteDebuggerPage extends GdbDebuggerPage {
 		fGDBServerPortNumberText.setLayoutData(data);
 		fGDBServerPortNumberText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
@@ -186,6 +188,7 @@ public class RemoteDebuggerPage extends GdbDebuggerPage {
 		fRemoteTimeoutValueText.setToolTipText(Messages.Gdbserver_Settings_Remotetimeout_tooltip);
 		fRemoteTimeoutValueText.addModifyListener(new ModifyListener() {
 
+			@Override
 			public void modifyText(ModifyEvent evt) {
 				updateLaunchConfigurationDialog();
 			}
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/NewContainerTargetWizardPage.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/NewContainerTargetWizardPage.java
index 8c100684302..5cf77110ffd 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/NewContainerTargetWizardPage.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/launchbar/NewContainerTargetWizardPage.java
@@ -265,6 +265,7 @@ public class NewContainerTargetWizardPage extends WizardPage
 		connectionSelector.addModifyListener(connectionModifyListener);
 	}
 
+	@Override
 	public void listChanged(IDockerConnection c, java.util.List<IDockerImage> list) {
 		setErrorMessage(null);
 		final IDockerImage[] finalList = list.toArray(new IDockerImage[0]);
diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/preferences/DockerLaunchPreferencePage.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/preferences/DockerLaunchPreferencePage.java
index 9375b9fc8a8..93c7d44a4ae 100644
--- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/preferences/DockerLaunchPreferencePage.java
+++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/ui/preferences/DockerLaunchPreferencePage.java
@@ -37,6 +37,7 @@ public class DockerLaunchPreferencePage extends FieldEditorPreferencePage implem
 	 * GUI blocks needed to manipulate various types of preferences. Each field
 	 * editor knows how to save and restore itself.
 	 */
+	@Override
 	public void createFieldEditors() {
 		defaultImage = new StringFieldEditor(PreferenceConstants.DEFAULT_IMAGE, Messages.Default_Image,
 				getFieldEditorParent());
@@ -54,6 +55,7 @@ public class DockerLaunchPreferencePage extends FieldEditorPreferencePage implem
 	 * @see
 	 * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java
index c0ea9a4f09e..201d719d922 100644
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java
+++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunch.java
@@ -78,6 +78,7 @@ public class LLDBLaunch extends GdbLaunch {
 	 * TODO: GdbLaunch.getGDBPath() and setGDBPath() should reference each other
 	 * in the javadoc to make sure extenders override both.
 	 */
+	@Override
 	public IPath getGDBPath() {
 		String lldbPath = getAttribute(ILLDBLaunchConfigurationConstants.ATTR_DEBUG_NAME);
 		if (lldbPath != null) {
@@ -87,6 +88,7 @@ public class LLDBLaunch extends GdbLaunch {
 		return getLLDBPath(getLaunchConfiguration());
 	}
 
+	@Override
 	public void setGDBPath(String path) {
 		setAttribute(ILLDBLaunchConfigurationConstants.ATTR_DEBUG_NAME, path);
 	}
@@ -114,6 +116,7 @@ public class LLDBLaunch extends GdbLaunch {
 		return retVal;
 	}
 
+	@Override
 	protected String getDefaultGDBPath() {
 		return getDefaultLLDBPath();
 	}
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java
index 8790c796da3..54c27cb6c53 100644
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java
+++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/launching/LLDBLaunchDelegate.java
@@ -61,6 +61,7 @@ public class LLDBLaunchDelegate extends GdbLaunchDelegate {
 		return new LLDBServiceFactory(version, config);
 	}
 
+	@Override
 	protected GdbLaunch createGdbLaunch(ILaunchConfiguration configuration, String mode, ISourceLocator locator)
 			throws CoreException {
 		return new LLDBLaunch(configuration, mode, locator);
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBControl.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBControl.java
index 0c192c2db5c..15bc186d6a9 100644
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBControl.java
+++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBControl.java
@@ -45,6 +45,7 @@ public class LLDBControl extends GDBControl_7_4 {
 		super(session, config, factory);
 	}
 
+	@Override
 	protected Sequence getCompleteInitializationSequence(Map<String, Object> attributes,
 			RequestMonitorWithProgress rm) {
 		return new LLDBFinalLaunchSequence(getSession(), attributes, rm);
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBProcesses.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBProcesses.java
index 46c06512535..089014b3407 100644
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBProcesses.java
+++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/src/org/eclipse/cdt/llvm/dsf/lldb/core/internal/service/LLDBProcesses.java
@@ -166,6 +166,7 @@ public class LLDBProcesses extends GDBProcesses_7_4 {
 		}
 	}
 
+	@Override
 	@DsfServiceEventHandler
 	public void eventDispatched(IExitedDMEvent e) {
 		if (e.getDMContext() instanceof IMIContainerDMContext && getNumConnected() == 0) {
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/src/org/eclipse/cdt/llvm/dsf/lldb/ui/internal/LLDBLocalApplicationCDebuggerTab.java b/llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/src/org/eclipse/cdt/llvm/dsf/lldb/ui/internal/LLDBLocalApplicationCDebuggerTab.java
index 1df541f4ebb..afb95ee4bfc 100644
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/src/org/eclipse/cdt/llvm/dsf/lldb/ui/internal/LLDBLocalApplicationCDebuggerTab.java
+++ b/llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/src/org/eclipse/cdt/llvm/dsf/lldb/ui/internal/LLDBLocalApplicationCDebuggerTab.java
@@ -32,6 +32,7 @@ public class LLDBLocalApplicationCDebuggerTab extends LocalApplicationCDebuggerT
 
 	private final static String LOCAL_DEBUGGER_ID = "lldb-mi";//$NON-NLS-1$
 
+	@Override
 	protected void initDebuggerTypes(String selection) {
 		if (fAttachMode) {
 			setInitializeDefault(selection.isEmpty());
@@ -81,6 +82,7 @@ public class LLDBLocalApplicationCDebuggerTab extends LocalApplicationCDebuggerT
 		config.setAttribute(DEFAULTS_SET, true);
 	}
 
+	@Override
 	protected void loadDynamicDebugArea() {
 		Composite dynamicTabHolder = getDynamicTabHolder();
 		// Dispose of any current child widgets in the tab holder area
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java
index f3c1231aaca..b77ed8e2dc7 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99ExpressionParserprs.java
@@ -550,24 +550,29 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 51, SCOPE_UBOUND = 32, SCOPE_SIZE = 33, MAX_NAME_LENGTH = 38;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -578,42 +583,52 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -622,55 +637,68 @@ public class C99ExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, C9
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java
index 710a501d288..e879dd92b40 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99NoCastExpressionParserprs.java
@@ -544,24 +544,29 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 51, SCOPE_UBOUND = 31, SCOPE_SIZE = 32, MAX_NAME_LENGTH = 38;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -572,42 +577,52 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -616,55 +631,68 @@ public class C99NoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java
index f833f395e50..0b42f9d7c35 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99Parserprs.java
@@ -687,24 +687,29 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 24, SCOPE_UBOUND = 33, SCOPE_SIZE = 34, MAX_NAME_LENGTH = 38;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -715,42 +720,52 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -759,55 +774,68 @@ public class C99Parserprs implements lpg.lpgjavaruntime.ParseTable, C99Parsersym
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java
index d0d3ce97a62..59a29fd8082 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/c99/C99SizeofExpressionParserprs.java
@@ -546,24 +546,29 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 51, SCOPE_UBOUND = 31, SCOPE_SIZE = 32, MAX_NAME_LENGTH = 38;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -574,42 +579,52 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -618,55 +633,68 @@ public class C99SizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java
index 4dc675e6663..6d98f5df294 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPExpressionParserprs.java
@@ -1399,24 +1399,29 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 62, SCOPE_UBOUND = 121, SCOPE_SIZE = 122, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1427,42 +1432,52 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1471,55 +1486,68 @@ public class CPPExpressionParserprs implements lpg.lpgjavaruntime.ParseTable, CP
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java
index 0e6e124b5a6..2da2d68384b 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoCastExpressionParserprs.java
@@ -1395,24 +1395,29 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 62, SCOPE_UBOUND = 120, SCOPE_SIZE = 121, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1423,42 +1428,52 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1467,55 +1482,68 @@ public class CPPNoCastExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java
index d9273332873..4dfa4d7b048 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPNoFunctionDeclaratorParserprs.java
@@ -1390,24 +1390,29 @@ public class CPPNoFunctionDeclaratorParserprs
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 62, SCOPE_UBOUND = 121, SCOPE_SIZE = 122, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1418,42 +1423,52 @@ public class CPPNoFunctionDeclaratorParserprs
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1462,55 +1477,68 @@ public class CPPNoFunctionDeclaratorParserprs
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java
index 859f2e33c70..46d8e5b0d59 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPParserprs.java
@@ -1400,24 +1400,29 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 63, SCOPE_UBOUND = 121, SCOPE_SIZE = 122, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1428,42 +1433,52 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1472,55 +1487,68 @@ public class CPPParserprs implements lpg.lpgjavaruntime.ParseTable, CPPParsersym
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java
index b15b74c431f..acba6cae119 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPSizeofExpressionParserprs.java
@@ -1399,24 +1399,29 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 62, SCOPE_UBOUND = 119, SCOPE_SIZE = 120, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1427,42 +1432,52 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1471,55 +1486,68 @@ public class CPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java
index 2b63d3a982d..bc5b25577a2 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/cpp/CPPTemplateTypeParameterParserprs.java
@@ -1402,24 +1402,29 @@ public class CPPTemplateTypeParameterParserprs
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 62, SCOPE_UBOUND = 121, SCOPE_SIZE = 122, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1430,42 +1435,52 @@ public class CPPTemplateTypeParameterParserprs
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1474,55 +1489,68 @@ public class CPPTemplateTypeParameterParserprs
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java
index 3df73abd542..ee31f92de52 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCParserprs.java
@@ -879,24 +879,29 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 34, SCOPE_UBOUND = 91, SCOPE_SIZE = 92, MAX_NAME_LENGTH = 38;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -907,42 +912,52 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -951,55 +966,68 @@ public class GCCParserprs implements lpg.lpgjavaruntime.ParseTable, GCCParsersym
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java
index eb1fa4aa478..4d2e55ed99d 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gcc/GCCSizeofExpressionParserprs.java
@@ -833,24 +833,29 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 29, SCOPE_UBOUND = 88, SCOPE_SIZE = 89, MAX_NAME_LENGTH = 38;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -861,42 +866,52 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -905,55 +920,68 @@ public class GCCSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java
index ab13e5f113c..f333df722c5 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPParserprs.java
@@ -1733,24 +1733,29 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 71, SCOPE_UBOUND = 153, SCOPE_SIZE = 154, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1761,42 +1766,52 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1805,55 +1820,68 @@ public class GPPParserprs implements lpg.lpgjavaruntime.ParseTable, GPPParsersym
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java
index d7c6994852c..d82cd4817a9 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser/src/org/eclipse/cdt/internal/core/dom/lrparser/gpp/GPPSizeofExpressionParserprs.java
@@ -1694,24 +1694,29 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 69, SCOPE_UBOUND = 149, SCOPE_SIZE = 150, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1722,42 +1727,52 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1766,55 +1781,68 @@ public class GPPSizeofExpressionParserprs implements lpg.lpgjavaruntime.ParseTab
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/ClearExpressionsListAction.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/ClearExpressionsListAction.java
index 2e93e87a1be..d78d06cc20a 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/ClearExpressionsListAction.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/ClearExpressionsListAction.java
@@ -23,10 +23,12 @@ public class ClearExpressionsListAction implements IViewActionDelegate {
 
 	private IViewPart fView;
 
+	@Override
 	public void init(IViewPart view) {
 		fView = view;
 	}
 
+	@Override
 	public void run(IAction action) {
 		if (fView instanceof MemoryBrowser) {
 			MemoryBrowser browser = (MemoryBrowser) fView;
@@ -34,6 +36,7 @@ public class ClearExpressionsListAction implements IViewActionDelegate {
 		}
 	}
 
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 	}
 }
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java
index 4d352547ab0..27bd53d662d 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java
@@ -353,6 +353,7 @@ public class GoToAddressBarWidget {
 		 */
 		Combo combo = new Combo(parent, SWT.DROP_DOWN | SWT.BORDER);
 		combo.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				updateButtons();
 			}
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
index f73ab7a86bf..2631f91abf9 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/MemoryBrowser.java
@@ -429,6 +429,7 @@ public class MemoryBrowser extends ViewPart
 	/* (non-Javadoc)
 	 * @see org.eclipse.debug.core.IDebugEventSetListener#handleDebugEvents(org.eclipse.debug.core.DebugEvent[])
 	 */
+	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
 		for (DebugEvent event : events) {
 			Object source = event.getSource();
@@ -438,10 +439,12 @@ public class MemoryBrowser extends ViewPart
 		}
 	}
 
+	@Override
 	public IMemoryRenderingContainer getContainer(String id) {
 		return null;
 	}
 
+	@Override
 	public IMemoryRenderingContainer[] getMemoryRenderingContainers() {
 		IMemoryRenderingContainer[] containerList = new IMemoryRenderingContainer[fCurrentContainers.size()];
 		for (int idx = 0; idx < fCurrentContainers.size(); idx++) {
@@ -450,6 +453,7 @@ public class MemoryBrowser extends ViewPart
 		return containerList;
 	}
 
+	@Override
 	public IMemoryRenderingSynchronizationService getSynchronizationService() {
 		return null;
 	}
@@ -491,6 +495,7 @@ public class MemoryBrowser extends ViewPart
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.ui.memory.memorybrowser.api.IMemoryBrowser#getActiveRetrieval()
 	 */
+	@Override
 	public IMemoryBlockRetrieval getActiveRetrieval() {
 		final CTabFolder activeFolder = (CTabFolder) fStackLayout.topControl;
 		if (activeFolder == null)
@@ -571,6 +576,7 @@ public class MemoryBrowser extends ViewPart
 							}
 
 							runOnUIThread(new Runnable() {
+								@Override
 								public void run() {
 									CTabItem selection = activeFolder.getSelection();
 									selection.setData(KEY_EXPRESSION, expression);
@@ -582,6 +588,7 @@ public class MemoryBrowser extends ViewPart
 						} catch (final DebugException e1) {
 							// widgets update require Display
 							runOnUIThread(new Runnable() {
+								@Override
 								public void run() {
 									fGotoAddressBar.handleExpressionStatus(
 											new Status(Status.ERROR, MemoryBrowserPlugin.PLUGIN_ID,
@@ -694,6 +701,7 @@ public class MemoryBrowser extends ViewPart
 
 		// listener to dispose rendering resources for all tab items when view part is closed
 		folder.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				for (CTabItem tab : folder.getItems()) {
 					disposeTab(tab);
@@ -763,6 +771,7 @@ public class MemoryBrowser extends ViewPart
 		MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$
 		menuMgr.setRemoveAllWhenShown(true);
 		menuMgr.addMenuListener(new IMenuListener() {
+			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				MemoryBrowser.this.fillContextMenu(manager);
 			}
@@ -810,104 +819,131 @@ public class MemoryBrowser extends ViewPart
 
 	private IMemoryRenderingType[] getRenderingTypes() {
 		return MemoryRenderingManager.getDefault().getRenderingTypes(new IMemoryBlockExtension() {
+			@Override
 			public void connect(Object client) {
 			}
 
+			@Override
 			public void disconnect(Object client) {
 			}
 
+			@Override
 			public void dispose() throws DebugException {
 			}
 
+			@Override
 			public int getAddressSize() throws DebugException {
 				return 0;
 			}
 
+			@Override
 			public int getAddressableSize() throws DebugException {
 				return 0;
 			}
 
+			@Override
 			public BigInteger getBigBaseAddress() throws DebugException {
 				return null;
 			}
 
+			@Override
 			public BigInteger getBigLength() throws DebugException {
 				return null;
 			}
 
+			@Override
 			public MemoryByte[] getBytesFromAddress(BigInteger address, long units) throws DebugException {
 				return null;
 			}
 
+			@Override
 			public MemoryByte[] getBytesFromOffset(BigInteger unitOffset, long addressableUnits) throws DebugException {
 				return null;
 			}
 
+			@Override
 			public Object[] getConnections() {
 				return null;
 			}
 
+			@Override
 			public String getExpression() {
 				return null;
 			}
 
+			@Override
 			public BigInteger getMemoryBlockEndAddress() throws DebugException {
 				return null;
 			}
 
+			@Override
 			public IMemoryBlockRetrieval getMemoryBlockRetrieval() {
 				return null;
 			}
 
+			@Override
 			public BigInteger getMemoryBlockStartAddress() throws DebugException {
 				return null;
 			}
 
+			@Override
 			public void setBaseAddress(BigInteger address) throws DebugException {
 			}
 
+			@Override
 			public void setValue(BigInteger offset, byte[] bytes) throws DebugException {
 			}
 
+			@Override
 			public boolean supportBaseAddressModification() throws DebugException {
 				return false;
 			}
 
+			@Override
 			public boolean supportsChangeManagement() {
 				return false;
 			}
 
+			@Override
 			public byte[] getBytes() throws DebugException {
 				return null;
 			}
 
+			@Override
 			public long getLength() {
 				return 0;
 			}
 
+			@Override
 			public long getStartAddress() {
 				return 0;
 			}
 
+			@Override
 			public void setValue(long offset, byte[] bytes) throws DebugException {
 			}
 
+			@Override
 			public boolean supportsValueModification() {
 				return false;
 			}
 
+			@Override
 			public IDebugTarget getDebugTarget() {
 				return null;
 			}
 
+			@Override
 			public ILaunch getLaunch() {
 				return null;
 			}
 
+			@Override
 			public String getModelIdentifier() {
 				return null;
 			}
 
+			@Override
 			@SuppressWarnings({ "rawtypes", "unchecked" })
 			public Object getAdapter(Class adapter) {
 				return null;
@@ -920,6 +956,7 @@ public class MemoryBrowser extends ViewPart
 		getControl().setFocus();
 	}
 
+	@Override
 	public void debugContextChanged(DebugContextEvent event) {
 		handleDebugContextChanged(((StructuredSelection) event.getContext()).getFirstElement());
 	}
@@ -930,6 +967,7 @@ public class MemoryBrowser extends ViewPart
 		private MemoryBrowserRenderingContainer() {
 		}
 
+		@Override
 		public void addMemoryRendering(IMemoryRendering rendering) {
 			// do not allow duplicated objects
 			if (!renderings.contains(rendering)) {
@@ -937,27 +975,33 @@ public class MemoryBrowser extends ViewPart
 			}
 		}
 
+		@Override
 		public IMemoryRendering getActiveRendering() {
 			return renderings.isEmpty() ? null : renderings.get(renderings.size() - 1);
 		}
 
+		@Override
 		public String getId() {
 			return ID;
 		}
 
+		@Override
 		public String getLabel() {
 			IMemoryRendering rendering = getActiveRendering();
 			return rendering != null ? rendering.getLabel() : null;
 		}
 
+		@Override
 		public IMemoryRenderingSite getMemoryRenderingSite() {
 			return MemoryBrowser.this;
 		}
 
+		@Override
 		public IMemoryRendering[] getRenderings() {
 			return renderings.toArray(new IMemoryRendering[renderings.size()]);
 		}
 
+		@Override
 		public void removeMemoryRendering(IMemoryRendering rendering) {
 			renderings.remove(rendering);
 		}
@@ -972,6 +1016,7 @@ public class MemoryBrowser extends ViewPart
 			this.newRendering = newRendering;
 		}
 
+		@Override
 		public void propertyChange(final PropertyChangeEvent event) {
 			WorkbenchJob job = new WorkbenchJob("MemoryBrowser PropertyChanged") { //$NON-NLS-1$
 				@Override
@@ -993,10 +1038,12 @@ public class MemoryBrowser extends ViewPart
 			implements IMemorySpaceAwareMemoryBlockRetrieval.GetMemorySpacesRequest {
 		String[] fMemorySpaces;
 
+		@Override
 		public String[] getMemorySpaces() {
 			return fMemorySpaces;
 		}
 
+		@Override
 		public void setMemorySpaces(String[] memorySpaceIds) {
 			fMemorySpaces = memorySpaceIds;
 		}
@@ -1052,6 +1099,7 @@ public class MemoryBrowser extends ViewPart
 	private void updateTab(final IMemoryBlockRetrieval retrieval, final Object context, final String[] memorySpaces) {
 		// GUI activity must be on the main thread
 		runOnUIThread(new Runnable() {
+			@Override
 			public void run() {
 				if (fGotoAddressBarControl.isDisposed() || fGotoMemorySpaceControl.isDisposed()) {
 					return;
@@ -1074,9 +1122,11 @@ public class MemoryBrowser extends ViewPart
 				} else {
 					tabFolder = createTabFolder(fRenderingsComposite);
 					tabFolder.addSelectionListener(new SelectionListener() {
+						@Override
 						public void widgetDefaultSelected(SelectionEvent e) {
 						}
 
+						@Override
 						public void widgetSelected(SelectionEvent e) {
 							CTabItem tabItem = (CTabItem) e.item;
 							updateMemorySpaceControlSelection(tabItem);
@@ -1289,6 +1339,7 @@ public class MemoryBrowser extends ViewPart
 		final CTabFolder folder = fContextFolders.get(retrieval);
 		if (folder != null) {
 			Runnable run = new Runnable() {
+				@Override
 				public void run() {
 					for (CTabItem tab : folder.getItems()) {
 						disposeTab(tab);
@@ -1311,18 +1362,22 @@ public class MemoryBrowser extends ViewPart
 
 		ISelection theSelection = StructuredSelection.EMPTY;
 
+		@Override
 		public void addSelectionChangedListener(ISelectionChangedListener listener) {
 			listeners.add(listener);
 		}
 
+		@Override
 		public ISelection getSelection() {
 			return theSelection;
 		}
 
+		@Override
 		public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 			listeners.remove(listener);
 		}
 
+		@Override
 		public void setSelection(ISelection selection) {
 			theSelection = selection;
 			final SelectionChangedEvent e = new SelectionChangedEvent(this, selection);
@@ -1331,6 +1386,7 @@ public class MemoryBrowser extends ViewPart
 			for (int i = 0; i < listenersArray.length; i++) {
 				final ISelectionChangedListener l = (ISelectionChangedListener) listenersArray[i];
 				SafeRunner.run(new SafeRunnable() {
+					@Override
 					public void run() {
 						l.selectionChanged(e);
 					}
@@ -1417,6 +1473,7 @@ public class MemoryBrowser extends ViewPart
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.ui.memory.memorybrowser.api.IMemoryBrowser#go(java.lang.String, java.lang.String, boolean)
 	 */
+	@Override
 	public void go(String expression, String memorySpaceId, boolean inNewTab) throws CoreException {
 		if (expression == null) {
 			throw new IllegalArgumentException("expression cannot be null");
@@ -1455,6 +1512,7 @@ public class MemoryBrowser extends ViewPart
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.ui.memory.memorybrowser.api.IMemoryBrowser#getSelectedMemorySpace()
 	 */
+	@Override
 	public String getSelectedMemorySpace() {
 		if (!fGotoMemorySpaceControl.isDisposed() && fGotoMemorySpaceControl.isVisible()) {
 			String id = fGotoMemorySpaceControl.getText();
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java
index d81cab6afe6..c63e927156c 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindAction.java
@@ -40,11 +40,13 @@ public class FindAction implements IViewActionDelegate {
 		return fSearchDialogProperties;
 	}
 
+	@Override
 	public void init(IViewPart view) {
 		if (view instanceof IMemoryRenderingSite)
 			fView = (IMemoryRenderingSite) view;
 	}
 
+	@Override
 	public void run(IAction action) {
 		ISelection selection = fView.getSite().getSelectionProvider().getSelection();
 
@@ -89,6 +91,7 @@ public class FindAction implements IViewActionDelegate {
 
 	private static IAction fAction = null;
 
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 
 		if (action.getId().equals(FIND_NEXT_ID)) {
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java
index 3ac1d448135..d27e761d433 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceDialog.java
@@ -239,9 +239,11 @@ public class FindReplaceDialog extends SelectionDialog {
 
 		fFindButton = createButton(parent, 10, Messages.getString("FindReplaceDialog.ButtonFind"), true); //$NON-NLS-1$
 		fFindButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				performFind(getUserStart(), getUserEnd(), getSearchPhrase(), getIsDirectionForward(), null, false,
 						false);
@@ -251,9 +253,11 @@ public class FindReplaceDialog extends SelectionDialog {
 
 		fFindAllButton = createButton(parent, 10, Messages.getString("FindReplaceDialog.ButtonFindAll"), true); //$NON-NLS-1$
 		fFindAllButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				performFind(getUserStart(), getUserEnd(), getSearchPhrase(), getIsDirectionForward(), null, true,
 						false);
@@ -263,9 +267,11 @@ public class FindReplaceDialog extends SelectionDialog {
 
 		fReplaceFindButton = createButton(parent, 11, Messages.getString("FindReplaceDialog.ButtonReplaceFind"), false); //$NON-NLS-1$
 		fReplaceFindButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				performFind(getUserStart(), getUserEnd(), getSearchPhrase(), getIsDirectionForward(), getReplaceData(),
 						false, true);
@@ -275,9 +281,11 @@ public class FindReplaceDialog extends SelectionDialog {
 
 		fReplaceButton = createButton(parent, 12, Messages.getString("FindReplaceDialog.ButtonReplace"), false); //$NON-NLS-1$
 		fReplaceButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				performFind(getUserStart(), getUserEnd(), getSearchPhrase(), getIsDirectionForward(), getReplaceData(),
 						false, false);
@@ -287,9 +295,11 @@ public class FindReplaceDialog extends SelectionDialog {
 
 		fReplaceAllButton = createButton(parent, 13, Messages.getString("FindReplaceDialog.ButtonReplaceAll"), false); //$NON-NLS-1$
 		fReplaceAllButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				performFind(getUserStart(), getUserEnd(), getSearchPhrase(), getIsDirectionForward(), getReplaceData(),
 						true, false);
@@ -692,18 +702,22 @@ public class FindReplaceDialog extends SelectionDialog {
 				Boolean.parseBoolean(fProperties.getProperty(SEARCH_FORMAT_CASEINSENSTIVE, Boolean.FALSE.toString())));
 
 		fFormatAsciiButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				fCaseInSensitiveCheckbox.setEnabled(true);
 			}
 		});
 
 		SelectionListener nonAsciiListener = new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				fCaseInSensitiveCheckbox.setEnabled(false);
 				validate();
@@ -716,6 +730,7 @@ public class FindReplaceDialog extends SelectionDialog {
 		fFormatByteSequenceButton.addSelectionListener(nonAsciiListener);
 
 		fStartText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				boolean valid = true;
 				try {
@@ -733,6 +748,7 @@ public class FindReplaceDialog extends SelectionDialog {
 		});
 
 		fEndText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				try {
 					getEndAddress();
@@ -747,12 +763,14 @@ public class FindReplaceDialog extends SelectionDialog {
 		});
 
 		fFindText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				validate();
 			}
 		});
 
 		fReplaceText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				validate();
 			}
@@ -1025,18 +1043,22 @@ public class FindReplaceDialog extends SelectionDialog {
 		final ISearchQuery query = new IMemorySearchQuery() {
 			private ISearchResult fSearchResult = null;
 
+			@Override
 			public boolean canRerun() {
 				return false;
 			}
 
+			@Override
 			public boolean canRunInBackground() {
 				return true;
 			}
 
+			@Override
 			public String getLabel() {
 				return Messages.getString("FindReplaceDialog.SearchingMemoryFor") + searchPhrase; //$NON-NLS-1$
 			}
 
+			@Override
 			public ISearchResult getSearchResult() {
 				if (fSearchResult == null)
 					fSearchResult = new MemorySearchResult(this,
@@ -1044,6 +1066,7 @@ public class FindReplaceDialog extends SelectionDialog {
 				return fSearchResult;
 			}
 
+			@Override
 			public IStatus run(IProgressMonitor monitor) throws OperationCanceledException {
 
 				final BigInteger searchPhraseLength = BigInteger.valueOf(searchPhrase.getByteLength());
@@ -1116,6 +1139,7 @@ public class FindReplaceDialog extends SelectionDialog {
 								final BigInteger finalEnd = end;
 								Display.getDefault().asyncExec(new Runnable() {
 
+									@Override
 									public void run() {
 										IMemoryRenderingContainer containers[] = getMemoryView()
 												.getMemoryRenderingContainers();
@@ -1191,6 +1215,7 @@ public class FindReplaceDialog extends SelectionDialog {
 				return Status.OK_STATUS;
 			}
 
+			@Override
 			public IMemoryRenderingSite getMemoryView() {
 				return fMemoryView;
 			}
@@ -1198,6 +1223,7 @@ public class FindReplaceDialog extends SelectionDialog {
 
 		if (all && replaceData == null) {
 			Display.getDefault().asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					NewSearchUI.activateSearchResultView();
 					NewSearchUI.runQueryInBackground(query);
@@ -1220,6 +1246,7 @@ public class FindReplaceDialog extends SelectionDialog {
 
 		int getByteLength();
 
+		@Override
 		String toString();
 	}
 
@@ -1232,6 +1259,7 @@ public class FindReplaceDialog extends SelectionDialog {
 			fIsCaseInsensitive = isCaseInsensitive;
 		}
 
+		@Override
 		public int getByteLength() {
 			return fPhrase.length();
 		}
@@ -1241,6 +1269,7 @@ public class FindReplaceDialog extends SelectionDialog {
 			return fPhrase;
 		}
 
+		@Override
 		public boolean isMatch(MemoryByte[] bytes) {
 			byte[] targetBytes = new byte[bytes.length];
 			for (int i = 0; i < bytes.length; i++)
@@ -1265,6 +1294,7 @@ public class FindReplaceDialog extends SelectionDialog {
 			fBytes = parseByteSequence(phrase);
 		}
 
+		@Override
 		public int getByteLength() {
 			if (fBytes != null) {
 				return fBytes.length;
@@ -1283,6 +1313,7 @@ public class FindReplaceDialog extends SelectionDialog {
 			return buf.toString();
 		}
 
+		@Override
 		public boolean isMatch(MemoryByte[] bytes) {
 			if (fBytes == null)
 				return false;
@@ -1302,6 +1333,7 @@ public class FindReplaceDialog extends SelectionDialog {
 			fRadix = radix;
 		}
 
+		@Override
 		public int getByteLength() {
 			return removeZeroPrefixByte(fPhrase.toByteArray()).length;
 		}
@@ -1311,6 +1343,7 @@ public class FindReplaceDialog extends SelectionDialog {
 			return fPhrase.toString(fRadix);
 		}
 
+		@Override
 		public boolean isMatch(MemoryByte[] bytes) {
 			byte[] targetBytes = new byte[bytes.length + 1];
 			targetBytes[0] = 0;
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceHandler.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceHandler.java
index f4b2e59a9bd..e1366869ba1 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceHandler.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/FindReplaceHandler.java
@@ -29,6 +29,7 @@ import org.eclipse.ui.PlatformUI;
 
 public class FindReplaceHandler extends AbstractHandler implements IHandler {
 
+	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
 		if (part instanceof IMemoryRenderingSite) {
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java
index 835543ebd82..2953d3f8e89 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResult.java
@@ -36,19 +36,23 @@ public class MemorySearchResult implements ISearchResult {
 		fLabel = label;
 	}
 
+	@Override
 	public ImageDescriptor getImageDescriptor() {
 
 		return null;
 	}
 
+	@Override
 	public String getLabel() {
 		return fLabel;
 	}
 
+	@Override
 	public ISearchQuery getQuery() {
 		return fQuery;
 	}
 
+	@Override
 	public String getTooltip() {
 
 		return fLabel;
@@ -75,11 +79,13 @@ public class MemorySearchResult implements ISearchResult {
 		}
 	}
 
+	@Override
 	public void addListener(ISearchResultListener l) {
 		listeners.addElement(l);
 
 	}
 
+	@Override
 	public void removeListener(ISearchResultListener l) {
 		listeners.removeElement(l);
 	}
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java
index f993bc963d2..4dd16d83a3c 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.search/src/org/eclipse/cdt/debug/ui/memory/search/MemorySearchResultsPage.java
@@ -57,23 +57,29 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 
 	private ISearchResultViewPart fPart;
 
+	@Override
 	public void queryAdded(ISearchQuery query) {
 	}
 
+	@Override
 	public void queryFinished(ISearchQuery query) {
 	}
 
+	@Override
 	public void queryRemoved(ISearchQuery query) {
 	}
 
+	@Override
 	public void queryStarting(ISearchQuery query) {
 	}
 
+	@Override
 	public String getID() {
 
 		return MemorySearchPlugin.getUniqueIdentifier();
 	}
 
+	@Override
 	public String getLabel() {
 		if (fQuery == null)
 			return Messages.getString("MemorySearchResultsPage.LabelMemorySearch"); //$NON-NLS-1$
@@ -81,25 +87,32 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 			return fQuery.getLabel();
 	}
 
+	@Override
 	public Object getUIState() {
 
 		return fTreeViewer.getSelection();
 	}
 
+	@Override
 	public void restoreState(IMemento memento) {
 	}
 
+	@Override
 	public void saveState(IMemento memento) {
 	}
 
+	@Override
 	public void setID(String id) {
 	}
 
+	@Override
 	public void setInput(ISearchResult search, Object uiState) {
 		if (search instanceof MemorySearchResult) {
 			((MemorySearchResult) search).addListener(new ISearchResultListener() {
+				@Override
 				public void searchResultChanged(SearchResultEvent e) {
 					Display.getDefault().asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							fTreeViewer.refresh();
 						}
@@ -109,6 +122,7 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 		}
 	}
 
+	@Override
 	public void setViewPart(ISearchResultViewPart part) {
 		fPart = part;
 	}
@@ -124,25 +138,31 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 
 		fTreeViewer.setContentProvider(new ITreeContentProvider() {
 
+			@Override
 			public void dispose() {
 			}
 
+			@Override
 			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 				viewer.refresh();
 			}
 
+			@Override
 			public Object[] getChildren(Object parentElement) {
 				return new Object[0];
 			}
 
+			@Override
 			public Object getParent(Object element) {
 				return null;
 			}
 
+			@Override
 			public boolean hasChildren(Object element) {
 				return false;
 			}
 
+			@Override
 			public Object[] getElements(Object inputElement) {
 
 				if (fQuery == null)
@@ -156,6 +176,7 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 		fTreeViewer.setInput(new Object());
 		fTreeViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
+			@Override
 			public void selectionChanged(final SelectionChangedEvent event) {
 				if (event.getSelection() instanceof StructuredSelection) {
 					IMemoryRenderingContainer containers[] = ((IMemorySearchQuery) fQuery).getMemoryView()
@@ -193,6 +214,7 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 
 		fTreeViewer.setLabelProvider(new ILabelProvider() {
 
+			@Override
 			public String getText(Object element) {
 				if (element instanceof MemoryMatch)
 					return "0x" + ((MemoryMatch) element).getStartAddress().toString(16); //$NON-NLS-1$
@@ -200,20 +222,25 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 				return element.toString();
 			}
 
+			@Override
 			public Image getImage(Object element) {
 				return null;
 			}
 
+			@Override
 			public void addListener(ILabelProviderListener listener) {
 			}
 
+			@Override
 			public void dispose() {
 			}
 
+			@Override
 			public boolean isLabelProperty(Object element, String property) {
 				return false;
 			}
 
+			@Override
 			public void removeListener(ILabelProviderListener listener) {
 			}
 		});
@@ -227,17 +254,21 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 
 	private IQueryListener createQueryListener() {
 		return new IQueryListener() {
+			@Override
 			public void queryAdded(ISearchQuery query) {
 			}
 
+			@Override
 			public void queryRemoved(ISearchQuery query) {
 				queryStarting(query);
 			}
 
+			@Override
 			public void queryStarting(final ISearchQuery query) {
 				fQuery = query;
 
 				Display.getDefault().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						fPart.updateLabel();
 
@@ -247,6 +278,7 @@ public class MemorySearchResultsPage extends Page implements ISearchResultPage,
 				});
 			}
 
+			@Override
 			public void queryFinished(final ISearchQuery query) {
 			}
 		};
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java
index 576a9c11392..27906b65faa 100755
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/AbstractPane.java
@@ -71,6 +71,7 @@ public abstract class AbstractPane extends Canvas {
 	protected boolean fPaneVisible = true;
 
 	class AbstractPaneMouseListener implements MouseListener {
+		@Override
 		public void mouseUp(MouseEvent me) {
 			positionCaret(me.x, me.y);
 
@@ -83,6 +84,7 @@ public abstract class AbstractPane extends Canvas {
 			fSelectionInProgress = fSelectionStarted = false;
 		}
 
+		@Override
 		public void mouseDown(MouseEvent me) {
 			AbstractPane.this.forceFocus();
 
@@ -114,6 +116,7 @@ public abstract class AbstractPane extends Canvas {
 			}
 		}
 
+		@Override
 		public void mouseDoubleClick(MouseEvent me) {
 			handleMouseDoubleClick(me);
 		}
@@ -121,6 +124,7 @@ public abstract class AbstractPane extends Canvas {
 	}
 
 	class AbstractPaneMouseMoveListener implements MouseMoveListener {
+		@Override
 		public void mouseMove(MouseEvent me) {
 			if (fSelectionStarted) {
 				fSelectionInProgress = true;
@@ -130,6 +134,7 @@ public abstract class AbstractPane extends Canvas {
 	}
 
 	class AbstractPaneFocusListener implements FocusListener {
+		@Override
 		public void focusLost(FocusEvent fe) {
 			IPreferenceStore store = TraditionalRenderingPlugin.getDefault().getPreferenceStore();
 			if (TraditionalRenderingPreferenceConstants.MEM_EDIT_BUFFER_SAVE_ON_ENTER_ONLY
@@ -143,12 +148,14 @@ public abstract class AbstractPane extends Canvas {
 			AbstractPane.this.fSelectionStartAddress = null;
 		}
 
+		@Override
 		public void focusGained(FocusEvent fe) {
 		}
 
 	}
 
 	class AbstractPaneKeyListener implements KeyListener {
+		@Override
 		public void keyPressed(KeyEvent ke) {
 			fOldSubCellCaretPosition = fSubCellCaretPosition;
 			if ((ke.stateMask & SWT.SHIFT) != 0) {
@@ -226,12 +233,14 @@ public abstract class AbstractPane extends Canvas {
 			}
 		}
 
+		@Override
 		public void keyReleased(KeyEvent ke) {
 			// do nothing
 		}
 	}
 
 	class AbstractPanePaintListener implements PaintListener {
+		@Override
 		public void paintControl(PaintEvent pe) {
 			AbstractPane.this.paint(pe);
 		}
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
index bfe44e069a9..a3af958d28a 100755
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/Rendering.java
@@ -266,6 +266,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 		getVerticalBar().addSelectionListener(createVerticalBarSelectinListener());
 
 		this.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent pe) {
 				pe.gc.setBackground(Rendering.this.getTraditionalRendering().getColorBackground());
 				pe.gc.fillRectangle(0, 0, Rendering.this.getBounds().width, Rendering.this.getBounds().height);
@@ -275,9 +276,11 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 		setLayout();
 
 		this.addControlListener(new ControlListener() {
+			@Override
 			public void controlMoved(ControlEvent ce) {
 			}
 
+			@Override
 			public void controlResized(ControlEvent ce) {
 				packColumns();
 			}
@@ -369,10 +372,12 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 	protected SelectionListener createHorizontalBarSelectionListener() {
 		return new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent se) {
 				Rendering.this.layout();
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent se) {
 				// do nothing
 			}
@@ -381,6 +386,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 	protected SelectionListener createVerticalBarSelectinListener() {
 		return new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent se) {
 				switch (se.detail) {
 				case SWT.ARROW_DOWN:
@@ -421,6 +427,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent se) {
 				// do nothing
 			}
@@ -519,6 +526,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 	static int suspendCount = 0;
 
+	@Override
 	public void handleDebugEvents(DebugEvent[] events) {
 		if (this.isDisposed())
 			return;
@@ -562,6 +570,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 	protected void handleSuspend(boolean isBreakpointHit) {
 		if (getUpdateMode() == UPDATE_ALWAYS || (getUpdateMode() == UPDATE_ON_BREAKPOINT && isBreakpointHit)) {
 			Display.getDefault().asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					archiveDeltas();
 					refresh();
@@ -573,6 +582,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 	protected void handleChange() {
 		if (getUpdateMode() == UPDATE_ALWAYS) {
 			Display.getDefault().asyncExec(new Runnable() {
+				@Override
 				public void run() {
 					archiveDeltas();
 					refresh();
@@ -696,6 +706,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			start();
 		}
 
+		@Override
 		public void dispose() {
 			fDisposed = true;
 			synchronized (fQueue) {
@@ -712,6 +723,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			fHistoryCache = new MemoryUnit[fHistoryDepth];
 		}
 
+		@Override
 		public void refresh() {
 			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
 					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
@@ -721,6 +733,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			}
 		}
 
+		@Override
 		public void archiveDeltas() {
 			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
 					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
@@ -849,6 +862,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 				fCache.bytes = cachedBytesFinal;
 
 				Display.getDefault().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						// generate deltas
 						for (int historyIndex = 0; historyIndex < getHistoryDepth(); historyIndex++) {
@@ -897,6 +911,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 		}
 
 		// bytes will be fetched from cache
+		@Override
 		public TraditionalMemoryByte[] getBytes(BigInteger address, int bytesRequested) throws DebugException {
 			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
 					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
@@ -940,6 +955,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			return bytes;
 		}
 
+		@Override
 		public boolean containsEditedCell(BigInteger address) {
 			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
 					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
@@ -954,6 +970,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			return fEditBuffer.get(address);
 		}
 
+		@Override
 		public void clearEditBuffer() {
 			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
 					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
@@ -962,6 +979,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			Rendering.this.redrawPanes();
 		}
 
+		@Override
 		public void writeEditBuffer() {
 			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
 					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
@@ -992,6 +1010,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			clearEditBuffer();
 		}
 
+		@Override
 		public void setEditedValue(BigInteger address, TraditionalMemoryByte[] bytes) {
 			assert Thread.currentThread().equals(Display.getDefault().getThread()) : TraditionalRenderingMessages
 					.getString("TraditionalRendering.CALLED_ON_NON_DISPATCH_THREAD"); //$NON-NLS-1$
@@ -1043,15 +1062,18 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 		private BigInteger fEndHigh;
 		private BigInteger fEndLow;
 
+		@Override
 		public void clear() {
 			fEndHigh = fEndLow = fStartHigh = fStartLow = null;
 			redrawPanes();
 		}
 
+		@Override
 		public boolean hasSelection() {
 			return fStartHigh != null && fStartLow != null && fEndHigh != null && fEndLow != null;
 		}
 
+		@Override
 		public boolean isSelected(BigInteger address) {
 			// do we have valid start and end addresses
 			if (getEnd() == null || getStart() == null)
@@ -1071,6 +1093,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			return false;
 		}
 
+		@Override
 		public void setStart(BigInteger high, BigInteger low) {
 			if (high == null && low == null) {
 				if (fStartHigh != null && fStartLow != null) {
@@ -1098,6 +1121,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 				redrawPanes();
 		}
 
+		@Override
 		public void setEnd(BigInteger high, BigInteger low) {
 			if (high == null && low == null) {
 				if (fEndHigh != null && fEndLow != null) {
@@ -1125,6 +1149,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 				redrawPanes();
 		}
 
+		@Override
 		public BigInteger getHigh() {
 			if (!hasSelection())
 				return null;
@@ -1132,6 +1157,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			return getStart().max(getEnd());
 		}
 
+		@Override
 		public BigInteger getLow() {
 			if (!hasSelection())
 				return null;
@@ -1139,6 +1165,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 			return getStart().min(getEnd());
 		}
 
+		@Override
 		public BigInteger getStart() {
 			// if there is no start, return null
 			if (fStartHigh == null)
@@ -1162,10 +1189,12 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 				return fStartLow;
 		}
 
+		@Override
 		public BigInteger getStartLow() {
 			return fStartLow;
 		}
 
+		@Override
 		public BigInteger getEnd() {
 			// if there is no end, return null
 			if (fEndHigh == null)
@@ -1595,6 +1624,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 		fParent.setTargetMemoryLittleEndian(littleEndian);
 		fIsTargetLittleEndian = littleEndian;
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				fireSettingsChanged();
 				layoutPanes();
@@ -1614,6 +1644,7 @@ public class Rendering extends Composite implements IDebugEventSetListener {
 
 		fireSettingsChanged();
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (isShowCrossReferenceInfo()) {
 					resolveAddressInfoForCurrentSelection();
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/RenderingAddressInfo.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/RenderingAddressInfo.java
index 57524bf4ed1..4ca6e602509 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/RenderingAddressInfo.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/RenderingAddressInfo.java
@@ -128,6 +128,7 @@ public class RenderingAddressInfo extends Rendering implements IDebugContextList
 		resolveAddressInfoForCurrentSelection(contextService);
 	}
 
+	@Override
 	public void dispose() {
 
 		fSelectedContext = null;
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalMemoryByte.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalMemoryByte.java
index df18fb7ebb3..79140a1234b 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalMemoryByte.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalMemoryByte.java
@@ -32,10 +32,12 @@ public class TraditionalMemoryByte extends MemoryByte implements IMemoryByte {
 		super(byteValue, byteFlags);
 	}
 
+	@Override
 	public boolean isEdited() {
 		return isEdited;
 	}
 
+	@Override
 	public void setEdited(boolean edited) {
 		isEdited = edited;
 	}
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
index e96ffc2b344..c9767e28458 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRendering.java
@@ -125,10 +125,12 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 			implements IMemorySpaceAwareMemoryBlockRetrieval.GetMemorySpacesRequest {
 		String[] fMemorySpaces;
 
+		@Override
 		public String[] getMemorySpaces() {
 			return fMemorySpaces;
 		}
 
+		@Override
 		public void setMemorySpaces(String[] memorySpaceIds) {
 			fMemorySpaces = memorySpaceIds;
 		}
@@ -138,6 +140,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		super(id);
 
 		JFaceResources.getFontRegistry().addListener(new IPropertyChangeListener() {
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if (event.getProperty().equals(IInternalDebugUIConstants.FONT_NAME)) {
 					TraditionalRendering.this.fRendering
@@ -147,6 +150,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		});
 
 		this.addPropertyChangeListener(new IPropertyChangeListener() {
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				IMemoryRendering sourceRendering = (IMemoryRendering) event.getSource();
 				if (!sourceRendering.getMemoryBlock().equals(getMemoryBlock()))
@@ -163,6 +167,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 
 		TraditionalRenderingPlugin.getDefault().getPreferenceStore()
 				.addPropertyChangeListener(new IPropertyChangeListener() {
+					@Override
 					public void propertyChange(PropertyChangeEvent event) {
 						disposeColors();
 						allocateColors();
@@ -171,6 +176,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 				});
 
 		DebugUIPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(new IPropertyChangeListener() {
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 				if (event.getProperty().equals(IDebugUIConstants.PREF_PADDED_STR)) {
 					if (TraditionalRendering.this.fRendering != null) {
@@ -204,6 +210,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 	/*
 	 * @see org.eclipse.debug.internal.ui.viewers.model.provisional.IModelChangedListener#modelChanged(org.eclipse.debug.internal.ui.viewers.model.provisional.IModelDelta, org.eclipse.debug.internal.ui.viewers.model.provisional.IModelProxy)
 	 */
+	@Override
 	public void modelChanged(IModelDelta delta, IModelProxy proxy) {
 		/*
 		 * The event model in the traditional renderer is written to expect a suspend first
@@ -234,6 +241,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		 * dispose routine is always called in the UI dispatch thread. I am going to make sure.
 		 */
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				if (fModel != null) {
 					fModel.removeModelChangedListener(TraditionalRendering.this);
@@ -286,6 +294,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		final IModelProxyFactory factory = (IModelProxyFactory) DebugPlugin.getAdapter(block, IModelProxyFactory.class);
 		if (factory != null) {
 			Display.getDefault().asyncExec(new Runnable() {
+				@Override
 				public void run() {
 
 					/*
@@ -383,6 +392,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		return fAddressSize;
 	}
 
+	@Override
 	public Control createControl(Composite parent) {
 		allocateColors();
 
@@ -412,6 +422,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 
 			if (fGoToAddressHandler == null) {
 				fGoToAddressHandler = new AbstractHandler() {
+					@Override
 					public Object execute(ExecutionEvent event) throws ExecutionException {
 						// TODO
 						return null;
@@ -705,6 +716,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 	 * @since 1.4
 	 * @deprecated - use: {@link Rendering#isShowCrossReferenceInfo()}
 	 */
+	@Deprecated
 	public boolean isShowCrossRefInfoGlobalPref() {
 		IPreferenceStore store = TraditionalRenderingPlugin.getDefault().getPreferenceStore();
 		return store.getBoolean(TraditionalRenderingPreferenceConstants.MEM_CROSS_REFERENCE_INFO);
@@ -735,6 +747,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 			@Override
 			public void run() {
 				Display.getDefault().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						TraditionalRendering.this.fRendering
 								.gotoAddress(TraditionalRendering.this.fRendering.fBaseAddress);
@@ -750,6 +763,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 			@Override
 			public void run() {
 				Display.getDefault().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						// For compatibility with DSF update modes (hopefully this will either be replaced by an enhanced
 						// platform interface or the caching will move out of the data layer
@@ -1002,6 +1016,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 						"Please enter column count", //$NON-NLS-1$
 						"", //$NON-NLS-1$
 						new IInputValidator() {
+							@Override
 							public String isValid(String input) {
 								try {
 									int i = Integer.parseInt(input);
@@ -1067,6 +1082,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		};
 
 		getPopupMenuManager().addMenuListener(new IMenuListener() {
+			@Override
 			public void menuAboutToShow(IMenuManager manager) {
 				manager.add(new Separator());
 
@@ -1196,11 +1212,13 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 
 	}
 
+	@Override
 	public Control getControl() {
 		return this.fRendering;
 	}
 
 	// selection is terminology for caret position
+	@Override
 	public BigInteger getSelectedAddress() {
 		IMemorySelection selection = fRendering.getSelection();
 		if (selection == null || selection.getStart() == null)
@@ -1209,6 +1227,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		return selection.getStartLow();
 	}
 
+	@Override
 	public MemoryByte[] getSelectedAsBytes() {
 		try {
 			// default to the caret address and the cell count size
@@ -1239,8 +1258,10 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		}
 	}
 
+	@Override
 	public void goToAddress(final BigInteger address) throws DebugException {
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				fRendering.gotoAddress(address);
 			}
@@ -1267,18 +1288,22 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		if (adapter == IWorkbenchAdapter.class) {
 			if (this.fWorkbenchAdapter == null) {
 				this.fWorkbenchAdapter = new IWorkbenchAdapter() {
+					@Override
 					public Object[] getChildren(Object o) {
 						return new Object[0];
 					}
 
+					@Override
 					public ImageDescriptor getImageDescriptor(Object object) {
 						return null;
 					}
 
+					@Override
 					public String getLabel(Object o) {
 						return TraditionalRenderingMessages.getString("TraditionalRendering.RENDERING_NAME"); //$NON-NLS-1$
 					}
 
+					@Override
 					public Object getParent(Object o) {
 						return null;
 					}
@@ -1290,10 +1315,12 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		if (adapter == IMemoryBlockConnection.class) {
 			if (fConnection == null) {
 				fConnection = new IMemoryBlockConnection() {
+					@Override
 					public void update() {
 						// update UI asynchronously
 						Display display = TraditionalRenderingPlugin.getDefault().getWorkbench().getDisplay();
 						display.asyncExec(new Runnable() {
+							@Override
 							public void run() {
 								try {
 									if (fBigBaseAddress != TraditionalRendering.this.fRendering.getMemoryBlock()
@@ -1316,6 +1343,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 		return super.getAdapter(adapter);
 	}
 
+	@Override
 	public void resetRendering() throws DebugException {
 		fRendering.gotoAddress(fRendering.fBaseAddress);
 	}
@@ -1323,6 +1351,7 @@ public class TraditionalRendering extends AbstractMemoryRendering implements IRe
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.debug.internal.core.model.provisional.IMemoryRenderingViewportProvider#getViewportAddress()
 	 */
+	@Override
 	public BigInteger getViewportAddress() {
 		return fRendering.getViewportStartAddress();
 	}
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java
index fd2ceffa8ed..48a38b6b211 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferenceAction.java
@@ -36,11 +36,13 @@ public class TraditionalRenderingPreferenceAction extends ActionDelegate impleme
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart)
 	 */
+	@Override
 	public void init(IViewPart view) {
 	}
 
 	protected void showPreferencePage(String id, IPreferencePage page) {
 		BusyIndicator.showWhile(TraditionalRenderingPlugin.getStandardDisplay(), new Runnable() {
+			@Override
 			public void run() {
 				PreferencesUtil
 						.createPreferenceDialogOn(TraditionalRenderingPlugin.getShell(), id, new String[] { id }, null)
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java
index 48b11cf7929..fcccce84916 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingPreferencePage.java
@@ -137,6 +137,7 @@ public class TraditionalRenderingPreferencePage extends FieldEditorPreferencePag
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingTypeDelegate.java b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingTypeDelegate.java
index 55aa34974eb..9a51c6eb7d5 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingTypeDelegate.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.traditional/src/org/eclipse/cdt/debug/ui/memory/traditional/TraditionalRenderingTypeDelegate.java
@@ -20,6 +20,7 @@ import org.eclipse.debug.ui.memory.IMemoryRenderingTypeDelegate;
 
 public class TraditionalRenderingTypeDelegate implements IMemoryRenderingTypeDelegate {
 
+	@Override
 	public IMemoryRendering createRendering(String id) throws CoreException {
 		return new TraditionalRendering(id);
 	}
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java
index c138928fafc..7b6a391acd2 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextExporter.java
@@ -62,6 +62,7 @@ public class PlainTextExporter implements IMemoryExporter {
 
 	private IDialogSettings fProperties;
 
+	@Override
 	public Control createControl(final Composite parent, IMemoryBlock memBlock, IDialogSettings properties,
 			ExportMemoryDialog parentDialog) {
 		fMemoryBlock = memBlock;
@@ -213,6 +214,7 @@ public class PlainTextExporter implements IMemoryExporter {
 		});
 
 		fStartText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -246,11 +248,13 @@ public class PlainTextExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 		});
 
 		fEndText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -284,12 +288,14 @@ public class PlainTextExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 
 		});
 
 		fLengthText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -337,16 +343,19 @@ public class PlainTextExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 
 			}
 		});
 
 		fFileText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 		});
@@ -362,6 +371,7 @@ public class PlainTextExporter implements IMemoryExporter {
 		 *  speed of the draw of the dialog.
 		 */
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				validate();
 			}
@@ -436,14 +446,17 @@ public class PlainTextExporter implements IMemoryExporter {
 		fParentDialog.setValid(isValid);
 	}
 
+	@Override
 	public String getId() {
 		return "PlainTextExporter"; //$NON-NLS-1$
 	}
 
+	@Override
 	public String getName() {
 		return Messages.getString("PlainTextExporter.Name"); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exportMemory() {
 		Job job = new Job("Memory Export to Plain Text File") { //$NON-NLS-1$
 			@Override
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java
index 0732225a24f..e7d72651edc 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/PlainTextImporter.java
@@ -66,6 +66,7 @@ public class PlainTextImporter implements IMemoryImporter {
 
 	private static final int BUFFER_LENGTH = 64 * 1024;
 
+	@Override
 	public Control createControl(final Composite parent, IMemoryBlock memBlock, IDialogSettings properties,
 			ImportMemoryDialog parentDialog) {
 		fMemoryBlock = memBlock;
@@ -151,11 +152,13 @@ public class PlainTextImporter implements IMemoryImporter {
 
 		fileButton.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// TODO Auto-generated method stub
 
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				FileDialog dialog = new FileDialog(parent.getShell(), SWT.SAVE);
 				dialog.setText(Messages.getString("PlainTextImporter.ChooseFile")); //$NON-NLS-1$
@@ -175,6 +178,7 @@ public class PlainTextImporter implements IMemoryImporter {
 		});
 
 		fStartText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				boolean valid = true;
 				try {
@@ -193,6 +197,7 @@ public class PlainTextImporter implements IMemoryImporter {
 
 		});
 		fFileText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				validate();
 			}
@@ -210,6 +215,7 @@ public class PlainTextImporter implements IMemoryImporter {
 		parent.pack();
 
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				validate();
 			}
@@ -254,14 +260,17 @@ public class PlainTextImporter implements IMemoryImporter {
 		return new File(fFileText.getText().trim());
 	}
 
+	@Override
 	public String getId() {
 		return "PlainTextImporter"; //$NON-NLS-1$
 	}
 
+	@Override
 	public String getName() {
 		return Messages.getString("PlainTextImporter.Name"); //$NON-NLS-1$
 	}
 
+	@Override
 	public void importMemory() {
 		Job job = new Job("Memory Import from Plain Text File") { //$NON-NLS-1$
 
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java
index 850611fcee1..135ea674c9d 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryExporter.java
@@ -61,6 +61,7 @@ public class RAWBinaryExporter implements IMemoryExporter {
 
 	private IDialogSettings fProperties;
 
+	@Override
 	public Control createControl(final Composite parent, IMemoryBlock memBlock, IDialogSettings properties,
 			ExportMemoryDialog parentDialog) {
 		fMemoryBlock = memBlock;
@@ -191,9 +192,11 @@ public class RAWBinaryExporter implements IMemoryExporter {
 
 		fileButton.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				FileDialog dialog = new FileDialog(parent.getShell(), SWT.SAVE);
 				dialog.setText(Messages.getString("RAWBinaryExporter.ChooseFile")); //$NON-NLS-1$
@@ -213,6 +216,7 @@ public class RAWBinaryExporter implements IMemoryExporter {
 		});
 
 		fStartText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -246,11 +250,13 @@ public class RAWBinaryExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 		});
 
 		fEndText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -284,12 +290,14 @@ public class RAWBinaryExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 
 		});
 
 		fLengthText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -337,16 +345,19 @@ public class RAWBinaryExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 
 			}
 		});
 
 		fFileText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 		});
@@ -363,6 +374,7 @@ public class RAWBinaryExporter implements IMemoryExporter {
 		 *  speed of the draw of the dialog.
 		 */
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				validate();
 			}
@@ -437,14 +449,17 @@ public class RAWBinaryExporter implements IMemoryExporter {
 		fParentDialog.setValid(isValid);
 	}
 
+	@Override
 	public String getId() {
 		return "rawbinary"; //$NON-NLS-1$
 	}
 
+	@Override
 	public String getName() {
 		return Messages.getString("RAWBinaryExporter.Name"); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exportMemory() {
 		Job job = new Job("Memory Export to RAW Binary File") { //$NON-NLS-1$
 			@Override
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java
index 7a87b052d05..eb2d4c1687a 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/RAWBinaryImporter.java
@@ -63,6 +63,7 @@ public class RAWBinaryImporter implements IMemoryImporter {
 
 	private static final int BUFFER_LENGTH = 64 * 1024;
 
+	@Override
 	public Control createControl(final Composite parent, IMemoryBlock memBlock, IDialogSettings properties,
 			ImportMemoryDialog parentDialog) {
 		fMemoryBlock = memBlock;
@@ -133,9 +134,11 @@ public class RAWBinaryImporter implements IMemoryImporter {
 
 		fileButton.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				FileDialog dialog = new FileDialog(parent.getShell(), SWT.SAVE);
 				dialog.setText(Messages.getString("RAWBinaryImporter.ChooseFile")); //$NON-NLS-1$
@@ -155,6 +158,7 @@ public class RAWBinaryImporter implements IMemoryImporter {
 		});
 
 		fStartText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				boolean valid = true;
 				try {
@@ -173,6 +177,7 @@ public class RAWBinaryImporter implements IMemoryImporter {
 
 		});
 		fFileText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				validate();
 			}
@@ -190,6 +195,7 @@ public class RAWBinaryImporter implements IMemoryImporter {
 		parent.pack();
 
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				validate();
 			}
@@ -234,14 +240,17 @@ public class RAWBinaryImporter implements IMemoryImporter {
 		return new File(fFileText.getText().trim());
 	}
 
+	@Override
 	public String getId() {
 		return "rawbinary"; //$NON-NLS-1$
 	}
 
+	@Override
 	public String getName() {
 		return Messages.getString("RAWBinaryImporter.Name"); //$NON-NLS-1$
 	}
 
+	@Override
 	public void importMemory() {
 		Job job = new Job("Memory Import from RAW Binary File") { //$NON-NLS-1$
 
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java
index d3bc18374ec..0ec3254f294 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordExporter.java
@@ -61,6 +61,7 @@ public class SRecordExporter implements IMemoryExporter {
 
 	private IDialogSettings fProperties;
 
+	@Override
 	public Control createControl(final Composite parent, IMemoryBlock memBlock, IDialogSettings properties,
 			ExportMemoryDialog parentDialog) {
 		fMemoryBlock = memBlock;
@@ -68,6 +69,7 @@ public class SRecordExporter implements IMemoryExporter {
 		fProperties = properties;
 
 		Composite composite = new Composite(parent, SWT.NONE) {
+			@Override
 			public void dispose() {
 				fProperties.put(TRANSFER_FILE, fFileText.getText().trim());
 				fProperties.put(TRANSFER_START, fStartText.getText().trim());
@@ -208,11 +210,13 @@ public class SRecordExporter implements IMemoryExporter {
 
 		fileButton.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// TODO Auto-generated method stub
 
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				FileDialog dialog = new FileDialog(parent.getShell(), SWT.SAVE);
 				dialog.setText(Messages.getString("SRecordExporter.ChooseFile")); //$NON-NLS-1$
@@ -232,6 +236,7 @@ public class SRecordExporter implements IMemoryExporter {
 		});
 
 		fStartText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -265,11 +270,13 @@ public class SRecordExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 		});
 
 		fEndText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -303,12 +310,14 @@ public class SRecordExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 
 		});
 
 		fLengthText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -356,16 +365,19 @@ public class SRecordExporter implements IMemoryExporter {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 
 			}
 		});
 
 		fFileText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				validate();
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 
 			}
@@ -383,6 +395,7 @@ public class SRecordExporter implements IMemoryExporter {
 		 *  speed of the draw of the dialog.
 		 */
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				validate();
 			}
@@ -465,16 +478,20 @@ public class SRecordExporter implements IMemoryExporter {
 		fParentDialog.setValid(isValid);
 	}
 
+	@Override
 	public String getId() {
 		return "srecord"; //$NON-NLS-1$
 	}
 
+	@Override
 	public String getName() {
 		return Messages.getString("SRecordExporter.Name"); //$NON-NLS-1$
 	}
 
+	@Override
 	public void exportMemory() {
 		Job job = new Job("Memory Export to S-Record File") { //$NON-NLS-1$
+			@Override
 			public IStatus run(IProgressMonitor monitor) {
 				try {
 					// FIXME 4 byte default
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java
index 7e94121b485..0b2923002e1 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/SRecordImporter.java
@@ -70,6 +70,7 @@ public class SRecordImporter implements IMemoryImporter {
 
 	private static final int BUFFER_LENGTH = 64 * 1024;
 
+	@Override
 	public Control createControl(final Composite parent, IMemoryBlock memBlock, IDialogSettings properties,
 			ImportMemoryDialog parentDialog) {
 		fMemoryBlock = memBlock;
@@ -77,6 +78,7 @@ public class SRecordImporter implements IMemoryImporter {
 		fProperties = properties;
 
 		Composite composite = new Composite(parent, SWT.NONE) {
+			@Override
 			public void dispose() {
 				fProperties.put(TRANSFER_FILE, fFileText.getText().trim());
 				fProperties.put(TRANSFER_START, fStartText.getText().trim());
@@ -126,9 +128,11 @@ public class SRecordImporter implements IMemoryImporter {
 
 		fComboRestoreToFileAddress.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				validate();
 			}
@@ -136,9 +140,11 @@ public class SRecordImporter implements IMemoryImporter {
 
 		fComboRestoreToThisAddress.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				try {
 					fStartText.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -182,11 +188,13 @@ public class SRecordImporter implements IMemoryImporter {
 
 		fileButton.addSelectionListener(new SelectionListener() {
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// TODO Auto-generated method stub
 
 			}
 
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				FileDialog dialog = new FileDialog(parent.getShell(), SWT.SAVE);
 				dialog.setText(Messages.getString("SRecordImporter.ChooseFile")); //$NON-NLS-1$
@@ -206,6 +214,7 @@ public class SRecordImporter implements IMemoryImporter {
 		});
 
 		fStartText.addKeyListener(new KeyListener() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				try {
 					boolean restoreToAddress = fComboRestoreToThisAddress.getSelection();
@@ -227,11 +236,13 @@ public class SRecordImporter implements IMemoryImporter {
 				}
 			}
 
+			@Override
 			public void keyPressed(KeyEvent e) {
 			}
 		});
 
 		fFileText.addModifyListener(new ModifyListener() {
+			@Override
 			public void modifyText(ModifyEvent e) {
 				validate();
 			}
@@ -267,6 +278,7 @@ public class SRecordImporter implements IMemoryImporter {
 		parent.pack();
 
 		Display.getDefault().asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				validate();
 			}
@@ -318,17 +330,21 @@ public class SRecordImporter implements IMemoryImporter {
 		return new File(fFileText.getText().trim());
 	}
 
+	@Override
 	public String getId() {
 		return "srecord"; //$NON-NLS-1$
 	}
 
+	@Override
 	public String getName() {
 		return Messages.getString("SRecordImporter.Name"); //$NON-NLS-1$
 	}
 
+	@Override
 	public void importMemory() {
 		Job job = new Job("Memory Import from S-Record File") { //$NON-NLS-1$
 
+			@Override
 			public IStatus run(IProgressMonitor monitor) {
 
 				try {
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java
index c3a282bf37a..ac692deb4a3 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ExportMemoryAction.java
@@ -37,6 +37,7 @@ public class ExportMemoryAction implements IViewActionDelegate {
 
 	private IMemoryRenderingSite fView;
 
+	@Override
 	public void init(IViewPart view) {
 		if (view instanceof IMemoryRenderingSite)
 			fView = (IMemoryRenderingSite) view;
@@ -109,6 +110,7 @@ public class ExportMemoryAction implements IViewActionDelegate {
 		return new BlockAndAddress(memBlock, initialStartAddr);
 	}
 
+	@Override
 	public void run(IAction action) {
 
 		ISelection selection = fView.getSite().getSelectionProvider().getSelection();
@@ -122,6 +124,7 @@ public class ExportMemoryAction implements IViewActionDelegate {
 		dialog.getResult();
 	}
 
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		action.setEnabled(getMemoryBlockAndInitialStartAddress(selection).block != null);
 	}
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ImportMemoryAction.java b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ImportMemoryAction.java
index e8c56d0b4fe..ce12c9fb1cd 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ImportMemoryAction.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.transport/src/org/eclipse/cdt/debug/ui/memory/transport/actions/ImportMemoryAction.java
@@ -29,11 +29,13 @@ public class ImportMemoryAction implements IViewActionDelegate {
 
 	private IMemoryRenderingSite fView;
 
+	@Override
 	public void init(IViewPart view) {
 		if (view instanceof IMemoryRenderingSite)
 			fView = (IMemoryRenderingSite) view;
 	}
 
+	@Override
 	public void run(IAction action) {
 
 		ISelection selection = fView.getSite().getSelectionProvider().getSelection();
@@ -51,6 +53,7 @@ public class ImportMemoryAction implements IViewActionDelegate {
 		dialog.getResult();
 	}
 
+	@Override
 	public void selectionChanged(IAction action, ISelection selection) {
 		// use utility function in export code
 		action.setEnabled(ExportMemoryAction.getMemoryBlockAndInitialStartAddress(selection).block != null);
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/IQtBuildConfiguration.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/IQtBuildConfiguration.java
index 3ff41d245be..a1e7d0d3bb3 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/IQtBuildConfiguration.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/IQtBuildConfiguration.java
@@ -34,6 +34,7 @@ public interface IQtBuildConfiguration extends ICBuildConfiguration {
 	@Deprecated
 	Path getProgramPath() throws CoreException;
 
+	@Override
 	String getLaunchMode();
 
 	IQtInstall getQtInstall();
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/LinkedProperties.java b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/LinkedProperties.java
index 589246419a4..af181dbc2ae 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/LinkedProperties.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.core/src/org/eclipse/cdt/arduino/core/internal/LinkedProperties.java
@@ -26,10 +26,12 @@ public class LinkedProperties extends Properties {
 		return Collections.list(keys());
 	}
 
+	@Override
 	public Enumeration<Object> keys() {
 		return Collections.<Object>enumeration(keys);
 	}
 
+	@Override
 	public Object put(Object key, Object value) {
 		keys.add(key);
 		return super.put(key, value);
diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java
index 0a4ef649362..4b658de93dd 100644
--- a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java
+++ b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/src/org/eclipse/cdt/managedbuilder/bupc/ui/UPCWizardsPlugin.java
@@ -41,6 +41,7 @@ public class UPCWizardsPlugin extends AbstractUIPlugin {
 	/**
 	 * This method is called upon plug-in activation
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 	}
@@ -48,6 +49,7 @@ public class UPCWizardsPlugin extends AbstractUIPlugin {
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
 		plugin = null;
diff --git a/visualizer/org.eclipse.cdt.visualizer.core/src/org/eclipse/cdt/visualizer/core/plugin/CDTVisualizerCorePlugin.java b/visualizer/org.eclipse.cdt.visualizer.core/src/org/eclipse/cdt/visualizer/core/plugin/CDTVisualizerCorePlugin.java
index 5a38244499b..b696de4dc26 100755
--- a/visualizer/org.eclipse.cdt.visualizer.core/src/org/eclipse/cdt/visualizer/core/plugin/CDTVisualizerCorePlugin.java
+++ b/visualizer/org.eclipse.cdt.visualizer.core/src/org/eclipse/cdt/visualizer/core/plugin/CDTVisualizerCorePlugin.java
@@ -57,6 +57,7 @@ public class CDTVisualizerCorePlugin extends AbstractUIPlugin {
 	// --- plugin startup/shutdown methods ---
 
 	/** Invoked when plugin is loaded. */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		s_plugin = this;
@@ -70,6 +71,7 @@ public class CDTVisualizerCorePlugin extends AbstractUIPlugin {
 	}
 
 	/** Invoked when plugin is stopped. */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		// clean up resource management
 		cleanupPluginResources();
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/IVisualizer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/IVisualizer.java
index 7e504c87523..f329d775d8e 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/IVisualizer.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/IVisualizer.java
@@ -151,15 +151,19 @@ public interface IVisualizer extends ISelectionProvider {
 	// --- selection changed event handling ---
 
 	/** Adds external listener for selection change events. */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener);
 
 	/** Removes external listener for selection change events. */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener);
 
 	/** Gets current externally-visible selection. */
+	@Override
 	public ISelection getSelection();
 
 	/** Sets current externally-visible selection. */
+	@Override
 	public void setSelection(ISelection selection);
 
 }
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java
index d7e820eaca3..ee4ff98a914 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/Visualizer.java
@@ -86,12 +86,14 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	/** Invoked when visualizer is created, to permit any initialization.
 	 *  Intended to be overridden. Default implementation does nothing.
 	 */
+	@Override
 	public void initializeVisualizer() {
 	}
 
 	/** Invoked when visualizer is disposed, to permit any cleanup.
 	 *  Intended to be overridden. Default implementation calls dispose().
 	 */
+	@Override
 	public void disposeVisualizer() {
 		dispose();
 	}
@@ -99,31 +101,37 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	// --- accessors ---
 
 	/** Sets non-localized name. */
+	@Override
 	public void setName(String name) {
 		m_name = name;
 	}
 
 	/** Gets non-localized name. */
+	@Override
 	public String getName() {
 		return m_name;
 	}
 
 	/** Sets localized display name. */
+	@Override
 	public void setDisplayName(String displayName) {
 		m_displayName = displayName;
 	}
 
 	/** Gets localized display name. */
+	@Override
 	public String getDisplayName() {
 		return m_displayName;
 	}
 
 	/** Sets localized description string. */
+	@Override
 	public void setDescription(String description) {
 		m_description = description;
 	}
 
 	/** Gets localized description string. */
+	@Override
 	public String getDescription() {
 		return m_description;
 	}
@@ -131,11 +139,13 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	// --- viewer management ---
 
 	/** Sets viewer we're associated with. */
+	@Override
 	public void setViewer(IVisualizerViewer viewer) {
 		m_viewer = viewer;
 	}
 
 	/** Gets viewer we're associated with. */
+	@Override
 	public IVisualizerViewer getViewer() {
 		return m_viewer;
 	}
@@ -143,16 +153,19 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	// --- visualizer selection management ---
 
 	/** Invoked when visualizer has been selected. */
+	@Override
 	public void visualizerSelected() {
 	};
 
 	/** Invoked when another visualizer has been selected, hiding this one. */
+	@Override
 	public void visualizerDeselected() {
 	};
 
 	// --- control management ---
 
 	/** Creates and returns visualizer's UI control on specified parent control. */
+	@Override
 	abstract public Control createControl(Composite parent);
 
 	/** Invoked when visualizer control should be disposed. */
@@ -169,6 +182,7 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	/** Gets visualizer control.
 	 *  Returns null if createControl() has not yet been called.
 	 */
+	@Override
 	public Control getControl() {
 		return m_control;
 	}
@@ -176,16 +190,19 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	// --- menu/toolbar management ---
 
 	/** Invoked by VisualizerViewer when toolbar needs to be populated. */
+	@Override
 	public void populateToolBar(IToolBarManager toolBarManager) {
 	}
 
 	/** Invoked by VisualizerViewer when toolbar menu needs to be populated. */
+	@Override
 	public void populateMenu(IMenuManager menuManager) {
 	}
 
 	// --- context menu handling ---
 
 	/** Invoked by VisualizerViewer when context menu needs to be populated. */
+	@Override
 	public void populateContextMenu(IMenuManager menuManager) {
 	}
 
@@ -195,6 +212,7 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	 * Tests whether if the IVisualizer can display the selection
 	 * (or something reachable from it).
 	 */
+	@Override
 	public int handlesSelection(ISelection selection) {
 		// Default implementation doesn't know how to display anything.
 		return 0;
@@ -203,6 +221,7 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	/**
 	 * Invoked by VisualizerViewer when workbench selection changes.
 	 */
+	@Override
 	public void workbenchSelectionChanged(ISelection selection) {
 		// Default implementation does nothing.
 	}
@@ -212,11 +231,13 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	// Delegate to selection manager.
 
 	/** Adds external listener for selection change events. */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		m_selectionManager.addSelectionChangedListener(listener);
 	}
 
 	/** Removes external listener for selection change events. */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		m_selectionManager.removeSelectionChangedListener(listener);
 	}
@@ -227,11 +248,13 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	}
 
 	/** Gets current externally-visible selection. */
+	@Override
 	public ISelection getSelection() {
 		return m_selectionManager.getSelection();
 	}
 
 	/** Sets externally-visible selection. */
+	@Override
 	public void setSelection(ISelection selection) {
 		m_selectionManager.setSelection(selection);
 	}
@@ -253,6 +276,7 @@ abstract public class Visualizer implements IVisualizer, ISelectionProvider, ISe
 	 * Sets control selection as its own selection,
 	 * and raises selection changed event for any listeners.
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		setSelection(event.getSelection());
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java
index 5b3edb8af1f..acfe3611efb 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerAction.java
@@ -71,12 +71,14 @@ public class VisualizerAction extends Action {
 	// --- methods ---
 
 	/** Invoked when action is triggered. */
+	@Override
 	public void run() {
 	}
 
 	/** Invoked when action is triggered,
 	 *  with the event that caused it.
 	 */
+	@Override
 	public void runWithEvent(Event event) {
 		run();
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java
index fe84287e3f1..4ee16d00197 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerView.java
@@ -95,6 +95,7 @@ public class VisualizerView extends ViewPart implements IVisualizerViewerListene
 	}
 
 	/** Dispose method */
+	@Override
 	public void dispose() {
 		super.dispose();
 		setViewer(null);
@@ -143,6 +144,7 @@ public class VisualizerView extends ViewPart implements IVisualizerViewerListene
 	// these controls have been created.
 
 	/** Invoked when UI controls need to be created */
+	@Override
 	public void createPartControl(Composite parent) {
 		m_parentControl = parent;
 
@@ -172,6 +174,7 @@ public class VisualizerView extends ViewPart implements IVisualizerViewerListene
 	 *  (for example, when loading views from workspace memento information),
 	 *  in which case it should silently do nothing.
 	 */
+	@Override
 	public void setFocus() {
 		if (m_viewer != null)
 			m_viewer.setFocus();
@@ -247,6 +250,7 @@ public class VisualizerView extends ViewPart implements IVisualizerViewerListene
 	/** Invoked by WorkbenchSelectionAdapter when selection changes,
 	 *  and by viewer when visualizer selection changes.
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		Object source = event.getSource();
 		if (source instanceof SelectionProviderAdapter) {
@@ -300,6 +304,7 @@ public class VisualizerView extends ViewPart implements IVisualizerViewerListene
 	// --- IVisulizerViewerListener implementation ---
 
 	/** Invoked when visualizer in view has changed. */
+	@Override
 	public void visualizerEvent(IVisualizerViewer source, VisualizerViewerEvent event) {
 		switch (event.getType()) {
 		case VisualizerViewerEvent.VISUALIZER_CHANGED:
@@ -371,10 +376,12 @@ public class VisualizerView extends ViewPart implements IVisualizerViewerListene
 	protected void initializeMenu() {
 		IMenuManager menuManager = getViewMenuManager();
 		menuManager.addMenuListener(new IMenuListener2() {
+			@Override
 			public void menuAboutToShow(IMenuManager m) {
 				viewMenuShow(m);
 			}
 
+			@Override
 			public void menuAboutToHide(IMenuManager m) {
 				viewMenuHide(m);
 			}
@@ -408,10 +415,12 @@ public class VisualizerView extends ViewPart implements IVisualizerViewerListene
 	protected void initializeContextMenu() {
 		m_contextMenuManager = new MenuManager();
 		m_contextMenuManager.addMenuListener(new IMenuListener2() {
+			@Override
 			public void menuAboutToShow(IMenuManager m) {
 				VisualizerView.this.contextMenuShow(m);
 			}
 
+			@Override
 			public void menuAboutToHide(IMenuManager m) {
 				VisualizerView.this.contextMenuHide(m);
 			}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerViewer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerViewer.java
index 5e9958bce43..5d548bd7a95 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerViewer.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/VisualizerViewer.java
@@ -109,12 +109,14 @@ public class VisualizerViewer extends PageBook
 	}
 
 	/** Dispose method. */
+	@Override
 	public void dispose() {
 		cleanupVisualizerViewer();
 		super.dispose();
 	}
 
 	/** Overridden to permit subclassing of SWT component */
+	@Override
 	protected void checkSubclass() {
 		// Do nothing.
 		// (Superclass implementation throws "Subclassing not allowed" exception.)
@@ -129,6 +131,7 @@ public class VisualizerViewer extends PageBook
 
 		// Event listener support
 		m_listeners = new ListenerList(this, "VisualizerViewer event listeners") {
+			@Override
 			public void raise(Object listener, Object event) {
 				if (listener instanceof IVisualizerViewerListener && event instanceof VisualizerViewerEvent) {
 					IVisualizerViewerListener typedListener = (IVisualizerViewerListener) listener;
@@ -148,6 +151,7 @@ public class VisualizerViewer extends PageBook
 
 		// Listen to paint event to draw "No visualizers" warning if needed.
 		this.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				VisualizerViewer.this.paint(e.gc);
 			}
@@ -170,11 +174,13 @@ public class VisualizerViewer extends PageBook
 	// --- accessors ---
 
 	/** Gets containing view. */
+	@Override
 	public VisualizerView getView() {
 		return m_view;
 	}
 
 	/** Returns non-localized unique name for selected visualizer. */
+	@Override
 	public String getVisualizerName() {
 		String result = "visualizer";
 		if (m_currentVisualizer != null)
@@ -183,6 +189,7 @@ public class VisualizerViewer extends PageBook
 	}
 
 	/** Returns localized name to display for selected visualizer. */
+	@Override
 	public String getVisualizerDisplayName() {
 		String result = "Visualizer";
 		if (m_currentVisualizer != null)
@@ -191,6 +198,7 @@ public class VisualizerViewer extends PageBook
 	}
 
 	/** Returns localized tooltip text to display for selected visualizer. */
+	@Override
 	public String getVisualizerDescription() {
 		String result = "Visualizer";
 		if (m_currentVisualizer != null)
@@ -201,6 +209,7 @@ public class VisualizerViewer extends PageBook
 	// --- control management ---
 
 	/** Gets viewer control. */
+	@Override
 	public Control getControl() {
 		return this;
 	}
@@ -211,6 +220,7 @@ public class VisualizerViewer extends PageBook
 	 * Invoked by VisualizerView when currently selected presentation,
 	 * if any, should take the focus.
 	 */
+	@Override
 	public boolean setFocus() {
 		boolean result = false;
 		if (m_currentVisualizer != null) {
@@ -226,11 +236,13 @@ public class VisualizerViewer extends PageBook
 	// --- viewer events ---
 
 	/** Adds listener for viewer events. */
+	@Override
 	public void addVisualizerViewerListener(IVisualizerViewerListener listener) {
 		m_listeners.addListener(listener);
 	}
 
 	/** Removes listener for viewer events. */
+	@Override
 	public void removeVisualizerViewerListener(IVisualizerViewerListener listener) {
 		m_listeners.removeListener(listener);
 	}
@@ -352,12 +364,14 @@ public class VisualizerViewer extends PageBook
 	// --- menu/toolbar management ---
 
 	/** Invoked when visualizer is selected, to populate the toolbar. */
+	@Override
 	public void populateToolBar(IToolBarManager toolBarManager) {
 		if (m_currentVisualizer != null)
 			m_currentVisualizer.populateToolBar(toolBarManager);
 	}
 
 	/** Invoked when visualizer is selected, to populate the toolbar's menu. */
+	@Override
 	public void populateMenu(IMenuManager menuManager) {
 		if (m_currentVisualizer != null)
 			m_currentVisualizer.populateMenu(menuManager);
@@ -368,12 +382,14 @@ public class VisualizerViewer extends PageBook
 	/** Invoked when context menu gesture happens on current
 	 *  visualizer control.
 	 */
+	@Override
 	public void menuDetected(MenuDetectEvent e) {
 		// raise event to allow view to show context menu
 		raiseContextMenuEvent(e.x, e.y);
 	}
 
 	/** Invoked when context menu is about to be shown. */
+	@Override
 	public void populateContextMenu(IMenuManager m) {
 		if (m_currentVisualizer != null) {
 			m_currentVisualizer.populateContextMenu(m);
@@ -381,6 +397,7 @@ public class VisualizerViewer extends PageBook
 	}
 
 	/** Gets context menu location. */
+	@Override
 	public Point getContextMenuLocation() {
 		return m_view.getContextMenuLocation();
 	}
@@ -405,11 +422,13 @@ public class VisualizerViewer extends PageBook
 	// Delegate to selection manager.
 
 	/** Adds external listener for selection change events. */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		m_selectionManager.addSelectionChangedListener(listener);
 	}
 
 	/** Removes external listener for selection change events. */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		if (m_selectionManager != null) {
 			m_selectionManager.removeSelectionChangedListener(listener);
@@ -422,11 +441,13 @@ public class VisualizerViewer extends PageBook
 	}
 
 	/** Gets current externally-visible selection. */
+	@Override
 	public ISelection getSelection() {
 		return m_selectionManager.getSelection();
 	}
 
 	/** Sets externally-visible selection. */
+	@Override
 	public void setSelection(ISelection selection) {
 		m_selectionManager.setSelection(selection);
 	}
@@ -452,6 +473,7 @@ public class VisualizerViewer extends PageBook
 	 * selection. Also invokes workbenchSelectionChanged() on visualizer
 	 * so it can update itself accordingly.
 	 */
+	@Override
 	public void workbenchSelectionChanged(ISelection selection) {
 		// See if we need to change visualizers to handle selection type.
 		IVisualizer handles = null;
@@ -511,6 +533,7 @@ public class VisualizerViewer extends PageBook
 	}
 
 	/** Invoked when visualizer's selection changes. */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		// Publish changed visualizer selection to any listeners.
 		setSelection(event.getSelection());
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/BufferedCanvas.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/BufferedCanvas.java
index 9ce04c690e3..7264a15c8f4 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/BufferedCanvas.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/BufferedCanvas.java
@@ -52,6 +52,7 @@ public class BufferedCanvas extends Canvas implements PaintListener, ControlList
 	}
 
 	/** Dispose method. */
+	@Override
 	public void dispose() {
 		super.dispose();
 		cleanupBufferedCanvas();
@@ -80,11 +81,13 @@ public class BufferedCanvas extends Canvas implements PaintListener, ControlList
 	// --- event handlers ---
 
 	/** Invoked when control is moved/resized */
+	@Override
 	public void controlMoved(ControlEvent e) {
 		// do nothing, we don't care
 	}
 
 	/** Invoked when control is resized */
+	@Override
 	public void controlResized(ControlEvent e) {
 		resized(getBounds());
 	}
@@ -124,6 +127,7 @@ public class BufferedCanvas extends Canvas implements PaintListener, ControlList
 	// --- paint methods ---
 
 	/** Invoked when control needs to be repainted */
+	@Override
 	public void paintControl(PaintEvent e) {
 		// Handle last paint event of a cluster.
 		if (e.count <= 1) {
@@ -184,6 +188,7 @@ public class BufferedCanvas extends Canvas implements PaintListener, ControlList
 	// --- update methods ---
 
 	/** Redraws control */
+	@Override
 	public void update() {
 		// guard against update events that happen
 		// after app has shut down
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvas.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvas.java
index b23b9f3d64e..1dd1559e419 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvas.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvas.java
@@ -48,6 +48,7 @@ public class GraphicCanvas extends BufferedCanvas {
 		super(parent);
 		m_objects = new ArrayList<IGraphicObject>();
 		Listener mouseListener = new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				switch (event.type) {
 				case SWT.MouseEnter:
@@ -66,6 +67,7 @@ public class GraphicCanvas extends BufferedCanvas {
 	}
 
 	/** Dispose method. */
+	@Override
 	public void dispose() {
 		if (m_objects != null) {
 			m_objects.clear();
@@ -113,6 +115,7 @@ public class GraphicCanvas extends BufferedCanvas {
 	// --- painting methods ---
 
 	/** Paints elements on canvas. */
+	@Override
 	public void paintCanvas(GC gc) {
 		// paint background first
 		clearCanvas(gc);
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvasVisualizer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvasVisualizer.java
index 8eedd081c73..3ab811ea204 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvasVisualizer.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicCanvasVisualizer.java
@@ -49,6 +49,7 @@ public class GraphicCanvasVisualizer extends Visualizer {
 	}
 
 	/** Dispose method. */
+	@Override
 	public void dispose() {
 		super.dispose();
 	}
@@ -56,6 +57,7 @@ public class GraphicCanvasVisualizer extends Visualizer {
 	// --- control management ---
 
 	/** Creates and returns visualizer control on specified parent. */
+	@Override
 	public Control createControl(Composite parent) {
 		if (m_control == null) {
 			GraphicCanvas canvas = createCanvas(parent);
@@ -67,6 +69,7 @@ public class GraphicCanvasVisualizer extends Visualizer {
 	}
 
 	/** Invoked when visualizer control should be disposed. */
+	@Override
 	public void disposeControl() {
 		if (m_control != null) {
 			disposeCanvas();
@@ -101,16 +104,19 @@ public class GraphicCanvasVisualizer extends Visualizer {
 	// --- menu/toolbar management ---
 
 	/** Invoked when visualizer is selected, to populate the toolbar. */
+	@Override
 	public void populateToolBar(IToolBarManager toolBarManager) {
 	}
 
 	/** Invoked when visualizer is selected, to populate the toolbar's menu. */
+	@Override
 	public void populateMenu(IMenuManager menuManager) {
 	}
 
 	// --- context menu handling ---
 
 	/** Invoked when visualizer view's context menu is invoked, to populate it. */
+	@Override
 	public void populateContextMenu(IMenuManager menuManager) {
 	}
 
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicObject.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicObject.java
index 41f822dfa8c..eb466698966 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicObject.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/canvas/GraphicObject.java
@@ -139,11 +139,13 @@ public class GraphicObject implements IGraphicObject, ITooltipProvider {
 	// --- accessors ---
 
 	/** Gets data object associated with this view element. */
+	@Override
 	public Object getData() {
 		return m_data;
 	}
 
 	/** Sets data object associated with this view element. */
+	@Override
 	public void setData(Object data) {
 		m_data = data;
 	}
@@ -222,11 +224,13 @@ public class GraphicObject implements IGraphicObject, ITooltipProvider {
 	}
 
 	/** Returns true if element bounds contains point. */
+	@Override
 	public boolean contains(int x, int y) {
 		return m_bounds.contains(x, y);
 	}
 
 	/** Returns true if element bounds are within specified rectangle. */
+	@Override
 	public boolean isWithin(Rectangle region) {
 		return (region.x <= m_bounds.x && region.y <= m_bounds.y
 				&& region.x + region.width >= m_bounds.x + m_bounds.width
@@ -276,6 +280,7 @@ public class GraphicObject implements IGraphicObject, ITooltipProvider {
 	// --- methods ---
 
 	/** Invoked to allow element to paint itself on the viewer canvas */
+	@Override
 	public void paint(GC gc, boolean decorations) {
 		if (isVisible()) {
 			// Set GC to reflect object properties, if set.
@@ -329,6 +334,7 @@ public class GraphicObject implements IGraphicObject, ITooltipProvider {
 	}
 
 	/** Returns true if object has decorations to paint. */
+	@Override
 	public boolean hasDecorations() {
 		return false;
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/events/VisualizerViewerEvent.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/events/VisualizerViewerEvent.java
index 5554c8c8baf..60264332124 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/events/VisualizerViewerEvent.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/events/VisualizerViewerEvent.java
@@ -56,6 +56,7 @@ public class VisualizerViewerEvent extends Event {
 	}
 
 	/** Dispose method. */
+	@Override
 	public void dispose() {
 		super.dispose();
 	}
@@ -63,6 +64,7 @@ public class VisualizerViewerEvent extends Event {
 	// --- Object methods ---
 
 	/** Converts event type to string */
+	@Override
 	public String typeToString(int type) {
 		String result = "";
 		switch (type) {
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/plugin/CDTVisualizerUIPlugin.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/plugin/CDTVisualizerUIPlugin.java
index 4f867be9d45..cdac0456c95 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/plugin/CDTVisualizerUIPlugin.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/plugin/CDTVisualizerUIPlugin.java
@@ -67,6 +67,7 @@ public class CDTVisualizerUIPlugin extends AbstractUIPlugin {
 	// --- plugin startup/shutdown methods ---
 
 	/** Invoked when plugin is loaded. */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		s_plugin = this;
@@ -80,6 +81,7 @@ public class CDTVisualizerUIPlugin extends AbstractUIPlugin {
 	}
 
 	/** Invoked when plugin is stopped. */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		// clean up resource management
 		cleanupPluginResources();
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvas.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvas.java
index 40a83e2d751..d6e3e273943 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvas.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvas.java
@@ -40,6 +40,7 @@ public class TestCanvas extends GraphicCanvas {
 	}
 
 	/** Dispose method. */
+	@Override
 	public void dispose() {
 		cleanupDefaultCanvas();
 		super.dispose();
@@ -68,6 +69,7 @@ public class TestCanvas extends GraphicCanvas {
 	/** Invoked when canvas repaint event is raised.
 	 *  Default implementation clears canvas to background color.
 	 */
+	@Override
 	public void paintCanvas(GC gc) {
 		super.paintCanvas(gc);
 
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java
index 2a0a5aa2fd1..e6b68efd022 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/test/TestCanvasVisualizer.java
@@ -53,29 +53,34 @@ public class TestCanvasVisualizer extends GraphicCanvasVisualizer {
 	// --- IVisualizer implementation ---
 
 	/** Returns non-localized unique name for this visualizer. */
+	@Override
 	public String getName() {
 		return "default";
 	}
 
 	/** Returns localized name to display for this visualizer. */
+	@Override
 	public String getDisplayName() {
 		// TODO: use a string resource here.
 		return "Test Visualizer";
 	}
 
 	/** Returns localized tooltip text to display for this visualizer. */
+	@Override
 	public String getDescription() {
 		// TODO: use a string resource here.
 		return "Test visualizer (for debugging only).";
 	}
 
 	/** Creates and returns visualizer canvas control. */
+	@Override
 	public GraphicCanvas createCanvas(Composite parent) {
 		m_canvas = new TestCanvas(parent);
 		return m_canvas;
 	}
 
 	/** Invoked after visualizer control creation, */
+	@Override
 	protected void initializeCanvas(GraphicCanvas canvas) {
 		m_canvas.setBackground(canvas.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		m_canvas.setForeground(canvas.getDisplay().getSystemColor(SWT.COLOR_BLACK));
@@ -87,6 +92,7 @@ public class TestCanvasVisualizer extends GraphicCanvasVisualizer {
 	 * Tests whether if the IVisualizer can display the selection
 	 * (or something reachable from it).
 	 */
+	@Override
 	public int handlesSelection(ISelection selection) {
 		// By default, we don't support anything.
 		// Changing this to return 1 enables the test canvas.
@@ -96,6 +102,7 @@ public class TestCanvasVisualizer extends GraphicCanvasVisualizer {
 	/**
 	 * Invoked by VisualizerViewer when workbench selection changes.
 	 */
+	@Override
 	public void workbenchSelectionChanged(ISelection selection) {
 		String text = SelectionUtils.toString(selection);
 		m_canvas.setText(text);
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Event.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Event.java
index 6a89719e462..f13e0973b63 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Event.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Event.java
@@ -57,6 +57,7 @@ public class Event {
 	// --- Object methods ---
 
 	/** Returns string representation of event */
+	@Override
 	public String toString() {
 		StringBuilder result = new StringBuilder();
 		result.append(getClass().getSimpleName());
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/MouseMonitor.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/MouseMonitor.java
index 81b85d19181..46fe2038571 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/MouseMonitor.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/MouseMonitor.java
@@ -108,32 +108,39 @@ public class MouseMonitor {
 	protected void attach(Control control) {
 		detach(m_control);
 		control.addMouseListener(m_mouseButtonListener = new MouseListener() {
+			@Override
 			public void mouseDown(MouseEvent e) {
 				mouseDownHandler(e.button, e.x, e.y, e.stateMask);
 			}
 
+			@Override
 			public void mouseUp(MouseEvent e) {
 				mouseUpHandler(e.button, e.x, e.y, e.stateMask);
 			}
 
+			@Override
 			public void mouseDoubleClick(MouseEvent e) {
 				mouseDoubleClickHandler(e.button, e.x, e.y, e.stateMask);
 			}
 		});
 		control.addMouseMoveListener(m_mouseMoveListener = new MouseMoveListener() {
+			@Override
 			public void mouseMove(MouseEvent e) {
 				mouseMoveHandler(e.x, e.y, e.stateMask);
 			}
 		});
 		control.addMouseTrackListener(m_mouseTrackListener = new MouseTrackListener() {
+			@Override
 			public void mouseEnter(MouseEvent e) {
 				mouseEnterHandler(e.x, e.y);
 			}
 
+			@Override
 			public void mouseExit(MouseEvent e) {
 				mouseExitHandler(e.x, e.y);
 			}
 
+			@Override
 			public void mouseHover(MouseEvent e) {
 				mouseHoverHandler(e.x, e.y);
 			}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/RunnableWithResult.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/RunnableWithResult.java
index ffe5165c52b..67b7bff1371 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/RunnableWithResult.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/RunnableWithResult.java
@@ -81,6 +81,7 @@ public class RunnableWithResult<V> implements Runnable, Callable<V> {
 	/** Run method.
 	 *  Derived types should override call() rather than this method.
 	 */
+	@Override
 	public void run() {
 		m_done = false;
 		setResult(call());
@@ -95,6 +96,7 @@ public class RunnableWithResult<V> implements Runnable, Callable<V> {
 	/** Method that returns the value.
 	 *  Default implementation returns null.
 	 */
+	@Override
 	public V call() {
 		return null;
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/ScrollPanel.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/ScrollPanel.java
index 6424fd5f7ff..64c6264c9d7 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/ScrollPanel.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/ScrollPanel.java
@@ -46,12 +46,14 @@ public class ScrollPanel extends ScrolledComposite {
 	}
 
 	/** Dispose method. */
+	@Override
 	public void dispose() {
 		cleanupScrollPanel();
 		super.dispose();
 	}
 
 	/** Overridden to permit subclassing */
+	@Override
 	protected void checkSubclass() {
 		// do nothing -- superclass implementation throws a "Subclassing not allowed" exception
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionManager.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionManager.java
index 55b406d64e1..8dcf478f26e 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionManager.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionManager.java
@@ -51,6 +51,7 @@ public class SelectionManager implements ISelectionProvider {
 		m_source = (source == null) ? this : source;
 		m_label = label;
 		m_selectionListeners = new ListenerList(this, label + ", listener list") {
+			@Override
 			public void raise(Object listener, Object event) {
 				if (listener instanceof ISelectionChangedListener && event instanceof SelectionChangedEvent) {
 					ISelectionChangedListener typedListener = (ISelectionChangedListener) listener;
@@ -76,6 +77,7 @@ public class SelectionManager implements ISelectionProvider {
 	// --- ISelectionProvider implementation ---
 
 	/** Adds selection changed listener. */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		if (listener == null)
 			return;
@@ -85,6 +87,7 @@ public class SelectionManager implements ISelectionProvider {
 	}
 
 	/** Removes selection changed listener. */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		if (listener == null)
 			return;
@@ -92,11 +95,13 @@ public class SelectionManager implements ISelectionProvider {
 	}
 
 	/** Returns current selection. */
+	@Override
 	public ISelection getSelection() {
 		return m_selection;
 	}
 
 	/** Sets selection, and raises change event. */
+	@Override
 	public void setSelection(ISelection selection) {
 		setSelection(selection, true);
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionProviderAdapter.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionProviderAdapter.java
index 020999fbc01..f516f443db0 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionProviderAdapter.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionProviderAdapter.java
@@ -64,6 +64,7 @@ public class SelectionProviderAdapter implements ISelectionProvider {
 	/** Adds selection change listener.
 	 *  Default implementation does nothing.
 	 */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		m_selectionManager.addSelectionChangedListener(listener);
 	}
@@ -71,6 +72,7 @@ public class SelectionProviderAdapter implements ISelectionProvider {
 	/** Removes selection change listener.
 	 *  Default implementation does nothing.
 	 */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		m_selectionManager.removeSelectionChangedListener(listener);
 	}
@@ -78,6 +80,7 @@ public class SelectionProviderAdapter implements ISelectionProvider {
 	/** Gets selection.
 	 *  Default implementation does nothing.
 	 */
+	@Override
 	public ISelection getSelection() {
 		return m_selectionManager.getSelection();
 	}
@@ -85,6 +88,7 @@ public class SelectionProviderAdapter implements ISelectionProvider {
 	/** Sets selection.
 	 *  Default implementation does nothing.
 	 */
+	@Override
 	public void setSelection(ISelection selection) {
 		m_selectionManager.setSelection(selection);
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionUtils.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionUtils.java
index 4c4d48e11c1..f84b3a29436 100644
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionUtils.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/SelectionUtils.java
@@ -42,26 +42,32 @@ public class SelectionUtils {
 
 	/** "Empty" or undefined selection. */
 	public static class EmptySelection implements ISelection, IStructuredSelection {
+		@Override
 		public boolean isEmpty() {
 			return true;
 		}
 
+		@Override
 		public Iterator<Object> iterator() {
 			return new ArrayList<Object>().iterator();
 		}
 
+		@Override
 		public List<Object> toList() {
 			return new ArrayList<Object>();
 		}
 
+		@Override
 		public int size() {
 			return 0;
 		}
 
+		@Override
 		public Object getFirstElement() {
 			return null;
 		}
 
+		@Override
 		public Object[] toArray() {
 			return new Object[0];
 		}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Timer.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Timer.java
index 76c1d529e8e..cbd06119ccb 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Timer.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/Timer.java
@@ -88,11 +88,13 @@ public class Timer implements ActionListener, Runnable {
 	 * Invoked each time the timer fires.
 	 * Default implementation invokes the run() method on the UI thread.
 	 */
+	@Override
 	public void actionPerformed(ActionEvent e) {
 		GUIUtils.exec(this);
 	}
 
 	/** Invoked each time the timer fires. */
+	@Override
 	public void run() {
 	}
 
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/UIResourceManager.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/UIResourceManager.java
index f271c888d49..8a3b2eacc15 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/UIResourceManager.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/UIResourceManager.java
@@ -75,6 +75,7 @@ public class UIResourceManager extends ResourceManager {
 	}
 
 	/** Dispose method */
+	@Override
 	public void dispose() {
 		disposeImageRegistry();
 		disposeFontRegistry();
@@ -84,6 +85,7 @@ public class UIResourceManager extends ResourceManager {
 	// --- parent manager management ---
 
 	/** Sets parent resource manager, if any */
+	@Override
 	public void setParentManager(ResourceManager parentManager) {
 		super.setParentManager(parentManager);
 		if (parentManager instanceof UIResourceManager) {
@@ -94,6 +96,7 @@ public class UIResourceManager extends ResourceManager {
 	}
 
 	/** Gets parent UI resource manager, if any */
+	@Override
 	public UIResourceManager getParentManager() {
 		return m_parentUIManager;
 	}
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/WorkbenchSelectionAdapter.java b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/WorkbenchSelectionAdapter.java
index 4e3f72181dd..8f557ee171d 100755
--- a/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/WorkbenchSelectionAdapter.java
+++ b/visualizer/org.eclipse.cdt.visualizer.ui/src/org/eclipse/cdt/visualizer/ui/util/WorkbenchSelectionAdapter.java
@@ -57,6 +57,7 @@ public class WorkbenchSelectionAdapter implements ISelectionListener, ISelection
 		m_selectionListeners = new ListenerList(view,
 				"WorkbenchSelectionAdapter for view " + view.getClass().getSimpleName()) {
 			/** Dispatches event to listeners */
+			@Override
 			public void raise(Object listener, Object event) {
 				if (listener instanceof ISelectionChangedListener && event instanceof SelectionChangedEvent) {
 					ISelectionChangedListener typedListener = (ISelectionChangedListener) listener;
@@ -106,6 +107,7 @@ public class WorkbenchSelectionAdapter implements ISelectionListener, ISelection
 	// --- ISelectionListener implementation ---
 
 	/** Invoked when selection changes externally. */
+	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 		// ignore selection change events that came from us
 		if (part == m_view)
@@ -139,11 +141,13 @@ public class WorkbenchSelectionAdapter implements ISelectionListener, ISelection
 	// --- ISelectionProvider implementation ---
 
 	/** Gets current selection. */
+	@Override
 	public ISelection getSelection() {
 		return m_selection;
 	}
 
 	/** Sets current selection, and raises selection changed event. */
+	@Override
 	public void setSelection(ISelection selection) {
 		// for some reason, SelectionChangedEvent can't stand a null selection
 		if (selection == null)
@@ -171,11 +175,13 @@ public class WorkbenchSelectionAdapter implements ISelectionListener, ISelection
 	}
 
 	/** Adds external listener for selection change events. */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		m_selectionListeners.addListener(listener);
 	}
 
 	/** Removes external listener for selection change events. */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		m_selectionListeners.removeListener(listener);
 	}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
index 67dc1949236..fcd4370da94 100644
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
+++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/Activator.java
@@ -34,6 +34,7 @@ public class Activator extends Plugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
@@ -43,6 +44,7 @@ public class Activator extends Plugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
index 91eff6d1e54..9d43eda9ebe 100644
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
+++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinDiscoveredPathInfo.java
@@ -53,18 +53,22 @@ public class WinDiscoveredPathInfo implements IDiscoveredPathInfo {
 		symbols.put("__int64", "long long");
 	}
 
+	@Override
 	public IPath[] getIncludePaths() {
 		return paths;
 	}
 
+	@Override
 	public IProject getProject() {
 		return null;
 	}
 
+	@Override
 	public IDiscoveredScannerInfoSerializable getSerializable() {
 		return null;
 	}
 
+	@Override
 	public Map<String, String> getSymbols() {
 		return symbols;
 	}
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
index 551d8866201..13863cadca2 100644
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
+++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java
@@ -48,18 +48,22 @@ public class WinEnvironmentVariableSupplier
 			this.operation = operation;
 		}
 
+		@Override
 		public String getDelimiter() {
 			return ";";
 		}
 
+		@Override
 		public String getName() {
 			return name;
 		}
 
+		@Override
 		public String getValue() {
 			return value;
 		}
 
+		@Override
 		public int getOperation() {
 			return operation;
 		}
@@ -70,20 +74,24 @@ public class WinEnvironmentVariableSupplier
 		initvars();
 	}
 
+	@Override
 	public IBuildEnvironmentVariable getVariable(String variableName, IManagedProject project,
 			IEnvironmentVariableProvider provider) {
 		return envvars.get(variableName);
 	}
 
+	@Override
 	public IBuildEnvironmentVariable getVariable(String variableName, IConfiguration configuration,
 			IEnvironmentVariableProvider provider) {
 		return envvars.get(variableName);
 	}
 
+	@Override
 	public IBuildEnvironmentVariable[] getVariables(IManagedProject project, IEnvironmentVariableProvider provider) {
 		return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]);
 	}
 
+	@Override
 	public IBuildEnvironmentVariable[] getVariables(IConfiguration configuration,
 			IEnvironmentVariableProvider provider) {
 		return envvars.values().toArray(new IBuildEnvironmentVariable[envvars.size()]);
diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
index 6829e4e7921..49ef7dc1114 100644
--- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
+++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinScannerInfoCollector.java
@@ -27,23 +27,29 @@ import org.eclipse.core.runtime.IProgressMonitor;
  */
 public class WinScannerInfoCollector implements IScannerInfoCollector3 {
 
+	@Override
 	public void contributeToScannerConfig(Object resource, Map scannerInfo) {
 	}
 
+	@Override
 	public List getCollectedScannerInfo(Object resource, ScannerInfoTypes type) {
 		return null;
 	}
 
+	@Override
 	public IDiscoveredPathInfo createPathInfoObject() {
 		return new WinDiscoveredPathInfo();
 	}
 
+	@Override
 	public void setInfoContext(InfoContext context) {
 	}
 
+	@Override
 	public void setProject(IProject project) {
 	}
 
+	@Override
 	public void updateScannerConfiguration(IProgressMonitor monitor) throws CoreException {
 	}
 
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java
index bb97050bbfa..b6bdfef9014 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcCompletionHangingTest.java
@@ -26,16 +26,20 @@ public class XlcCompletionHangingTest extends LRCompletionHangingTest {
 	}
 
 	//TODO ??? overwrite some failed test cases
+	@Override
 	public void testCompletionTemplateClassForCPP() throws Exception {
 	}
 
+	@Override
 	public void testCompletionGnuCPP() throws Exception {
 	}
 
+	@Override
 	protected XlcCLanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected XlcCPPLanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java
index 77913611368..47f0aa25cef 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPImplicitNameTests.java
@@ -25,10 +25,12 @@ public class XlcLRCPPImplicitNameTests extends LRCPPImplicitNameTests {
 		return suite(XlcLRCPPImplicitNameTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java
index 0d19effc016..9936cdfd898 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPSpecTest.java
@@ -25,10 +25,12 @@ public class XlcLRCPPSpecTest extends LRCPPSpecTest {
 		return suite(XlcLRCPPSpecTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java
index 3809dec9731..b9d4cbb7587 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCPPTests.java
@@ -27,16 +27,19 @@ public class XlcLRCPPTests extends LRCPPTests {
 	}
 
 	//CDT_70_FIX_FROM_50-#9
+	@Override
 	public void testStaticAssertions_294730() throws Exception {
 		String code = getAboveComment();
 		code = code.replaceAll("static_assert", "__static_assert");
 		parseAndCheckBindings(code, ParserLanguage.CPP);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java
index 1f69df714bb..d6498da5229 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCSpecTests.java
@@ -25,10 +25,12 @@ public class XlcLRCSpecTests extends LRCSpecTests {
 		return suite(XlcLRCSpecTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java
index 934671cbff4..6e0a818e472 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCommentTests.java
@@ -26,10 +26,12 @@ public class XlcLRCommentTests extends LRCommentTests {
 		return suite(XlcLRCommentTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java
index 92b9f6901a9..9606a171601 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompleteParser2Tests.java
@@ -26,10 +26,12 @@ public class XlcLRCompleteParser2Tests extends LRCompleteParser2Tests {
 		return suite(XlcLRCompleteParser2Tests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java
index 35520a46219..0a53f887e7b 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionBasicTest.java
@@ -25,10 +25,12 @@ public class XlcLRCompletionBasicTest extends LRCompletionBasicTest {
 		return suite(XlcLRCompletionBasicTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java
index 24aee9daeb5..a943b3032a0 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRCompletionParseTest.java
@@ -25,6 +25,7 @@ public class XlcLRCompletionParseTest extends LRCompletionParseTest {
 		return new TestSuite(XlcLRCompletionParseTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java
index faca238b206..2be4bce40ff 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationMacroTests.java
@@ -25,10 +25,12 @@ public class XlcLRDOMLocationMacroTests extends LRDOMLocationMacroTests {
 		return suite(XlcLRDOMLocationMacroTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java
index f51f20fdd25..9920a915e09 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMLocationTests.java
@@ -25,10 +25,12 @@ public class XlcLRDOMLocationTests extends LRDOMLocationTests {
 		return suite(XlcLRDOMLocationTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java
index 558e8869e14..0ea3ab34d23 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDOMPreprocessorInformationTest.java
@@ -25,10 +25,12 @@ public class XlcLRDOMPreprocessorInformationTest extends LRDOMPreprocessorInform
 		return suite(XlcLRDOMPreprocessorInformationTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java
index 5885f34dbd6..bfb7b3083d3 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRDigraphTrigraphTests.java
@@ -26,6 +26,7 @@ public class XlcLRDigraphTrigraphTests extends LRDigraphTrigraphTests {
 		return new TestSuite(XlcLRDigraphTrigraphTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java
index e28c164d39e..593c137e193 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCCompleteParseExtensionsTest.java
@@ -25,10 +25,12 @@ public class XlcLRGCCCompleteParseExtensionsTest extends LRGCCCompleteParseExten
 		return suite(XlcLRGCCCompleteParseExtensionsTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java
index 9af5eee2f95..f21a19a567d 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRGCCTests.java
@@ -25,10 +25,12 @@ public class XlcLRGCCTests extends LRGCCTests {
 		return suite(XlcLRGCCTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java
index 8d13d3dab8f..f77ab28e359 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRImageLocationTests.java
@@ -25,10 +25,12 @@ public class XlcLRImageLocationTests extends LRImageLocationTests {
 		return suite(XlcLRImageLocationTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java
index a39d7b9c8ae..4c39e6a024d 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRInactiveCodeTests.java
@@ -25,10 +25,12 @@ public class XlcLRInactiveCodeTests extends LRInactiveCodeTests {
 		return suite(XlcLRInactiveCodeTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java
index e054628c7f0..9e1f5d2957f 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRKnRTests.java
@@ -25,10 +25,12 @@ public class XlcLRKnRTests extends LRKnRTests {
 		return suite(XlcLRKnRTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java
index d9af3c8d38b..6d394b7e3f1 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRNodeSelectorTest.java
@@ -25,10 +25,12 @@ public class XlcLRNodeSelectorTest extends LRNodeSelectorTest {
 		return suite(XlcLRNodeSelectorTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java
index 9dc5d5f89be..76538c7f922 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRQuickParser2Tests.java
@@ -25,10 +25,12 @@ public class XlcLRQuickParser2Tests extends LRQuickParser2Tests {
 		return new TestSuite(XlcLRQuickParser2Tests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java
index 7963c6f8dae..0ac2dc498bb 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSelectionParseTest.java
@@ -33,10 +33,12 @@ public class XlcLRSelectionParseTest extends LRSelectionParseTest {
 		return new TestSuite(XlcLRSelectionParseTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java
index 84ce6ddf89c..051df1b1f7e 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRSemanticsTests.java
@@ -25,10 +25,12 @@ public class XlcLRSemanticsTests extends LRSemanticsTests {
 		return suite(XlcLRSemanticsTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java
index c4c3ccac1d6..b2998bdb60a 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTaskParserTest.java
@@ -25,10 +25,12 @@ public class XlcLRTaskParserTest extends LRTaskParserTest {
 		return suite(XlcLRTaskParserTest.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java
index 84acb881f70..d6f5e0fb11b 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTemplateTests.java
@@ -25,10 +25,12 @@ public class XlcLRTemplateTests extends LRTemplateTests {
 		return suite(XlcLRTemplateTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java
index c0ee1cef8c7..c8a2d9617d2 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRTests.java
@@ -31,10 +31,12 @@ public class XlcLRTests extends LRTests {
 		return suite(XlcLRTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java
index 309116002f9..65d13626662 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilOldTests.java
@@ -25,10 +25,12 @@ public class XlcLRUtilOldTests extends LRUtilOldTests {
 		return suite(XlcLRUtilOldTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java
index 4c32284313a..c6076bddb4e 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/base/XlcLRUtilTests.java
@@ -25,10 +25,12 @@ public class XlcLRUtilTests extends LRUtilTests {
 		return suite(XlcLRUtilTests.class);
 	}
 
+	@Override
 	protected ILanguage getCLanguage() {
 		return XlcCLanguage.getDefault();
 	}
 
+	@Override
 	protected ILanguage getCPPLanguage() {
 		return XlcCPPLanguage.getDefault();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java
index 62573bcccc1..f53098c7778 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCLanguage.java
@@ -53,6 +53,7 @@ public class XlcCLanguage extends GCCLanguage {
 				index, properties);
 	}
 
+	@Override
 	public String getId() {
 		return ID;
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java
index 3504a824e2e..7c19b023dee 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPLanguage.java
@@ -77,6 +77,7 @@ public class XlcCPPLanguage extends GPPLanguage {
 		return parser;
 	}
 
+	@Override
 	public String getId() {
 		return ID;
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java
index c0a5992a9a9..6e8a4495a8c 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCPPTokenMap.java
@@ -294,14 +294,17 @@ public class XlcCPPTokenMap implements IDOMTokenMap {
 				supportStaticAssert);
 	}
 
+	@Override
 	public int getEOFTokenKind() {
 		return TK_EOF_TOKEN;
 	}
 
+	@Override
 	public int getEOCTokenKind() {
 		return TK_EndOfCompletion;
 	}
 
+	@Override
 	public int mapKind(IToken token) {
 
 		switch (token.getType()) {
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java
index c7d026c46d5..0234fc794fc 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/XlcCTokenMap.java
@@ -230,14 +230,17 @@ public final class XlcCTokenMap implements IDOMTokenMap {
 		keywordMap = XlcKeywords.createC(supportVectors, supportDecimalFloatingPoint);
 	}
 
+	@Override
 	public int getEOFTokenKind() {
 		return TK_EOF_TOKEN;
 	}
 
+	@Override
 	public int getEOCTokenKind() {
 		return TK_EndOfCompletion;
 	}
 
+	@Override
 	public int mapKind(IToken token) {
 
 		switch (token.getType()) {
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java
index f2e19a0a5fa..d5aacc9675f 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/core/lrparser/xlc/ast/IXlcCPPASTModifiedArrayModifier.java
@@ -98,6 +98,7 @@ public interface IXlcCPPASTModifiedArrayModifier extends IASTArrayModifier {
 
 	/**
 	 */
+	@Override
 	public IXlcCPPASTModifiedArrayModifier copy();
 
 }
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java
index 6bad31d60b5..daafff40eac 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCASTVectorTypeSpecifier.java
@@ -38,18 +38,22 @@ public class XlcCASTVectorTypeSpecifier extends CASTSimpleDeclSpecifier implemen
 		return copy(copy, style);
 	}
 
+	@Override
 	public boolean isPixel() {
 		return isPixel;
 	}
 
+	@Override
 	public void setPixel(boolean isPixel) {
 		this.isPixel = isPixel;
 	}
 
+	@Override
 	public boolean isBool() {
 		return isBool;
 	}
 
+	@Override
 	public void setBool(boolean isBool) {
 		this.isBool = isBool;
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java
index 3da0095254c..694cdccc238 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCNodeFactory.java
@@ -26,6 +26,7 @@ public class XlcCNodeFactory extends CNodeFactory implements IXlcCNodeFactory {
 		return DEFAULT_INSTANCE;
 	}
 
+	@Override
 	public IXlcCASTVectorTypeSpecifier newVectorTypeSpecifier() {
 		return new XlcCASTVectorTypeSpecifier();
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java
index f6857b5f59f..3d311bfbfdd 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTModifiedArrayModifier.java
@@ -50,46 +50,56 @@ public class XlcCPPASTModifiedArrayModifier extends CPPASTArrayModifier implemen
 		return copy(copy, style);
 	}
 
+	@Override
 	public boolean isConst() {
 		return isConst;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return isStatic;
 	}
 
+	@Override
 	public boolean isRestrict() {
 		return isRestrict;
 	}
 
+	@Override
 	public boolean isVolatile() {
 		return isVolatile;
 	}
 
+	@Override
 	public void setConst(boolean value) {
 		assertNotFrozen();
 		this.isConst = value;
 	}
 
+	@Override
 	public void setVolatile(boolean value) {
 		assertNotFrozen();
 		this.isVolatile = value;
 	}
 
+	@Override
 	public void setRestrict(boolean value) {
 		assertNotFrozen();
 		this.isRestrict = value;
 	}
 
+	@Override
 	public void setStatic(boolean value) {
 		assertNotFrozen();
 		this.isStatic = value;
 	}
 
+	@Override
 	public boolean isVariableSized() {
 		return varSized;
 	}
 
+	@Override
 	public void setVariableSized(boolean value) {
 		assertNotFrozen();
 		varSized = value;
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java
index 3da2bbc8393..d1681f89a5a 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPASTVectorTypeSpecifier.java
@@ -37,10 +37,12 @@ public class XlcCPPASTVectorTypeSpecifier extends CPPASTSimpleDeclSpecifier impl
 		return copy(copy, style);
 	}
 
+	@Override
 	public boolean isPixel() {
 		return isPixel;
 	}
 
+	@Override
 	public void setPixel(boolean isPixel) {
 		this.isPixel = isPixel;
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java
index 0be792d68ae..720d71076cb 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/ast/XlcCPPNodeFactory.java
@@ -28,10 +28,12 @@ public class XlcCPPNodeFactory extends CPPNodeFactory implements IXlcCPPNodeFact
 		return DEFAULT_INSTANCE;
 	}
 
+	@Override
 	public IXlcCPPASTVectorTypeSpecifier newVectorTypeSpecifier() {
 		return new XlcCPPASTVectorTypeSpecifier();
 	}
 
+	@Override
 	public IXlcCPPASTModifiedArrayModifier newModifiedArrayModifier(IASTExpression expr) {
 		return new XlcCPPASTModifiedArrayModifier(expr);
 	}
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java
index cc4230a4305..b886f2f2b4c 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParser.java
@@ -108,6 +108,7 @@ public class XlcCParser extends PrsStream
 		return btParser.getFirstToken();
 	}
 
+	@Override
 	public IToken getLeftIToken() {
 		return super.getIToken(getLeftSpan());
 	}
@@ -116,6 +117,7 @@ public class XlcCParser extends PrsStream
 		return btParser.getLastToken();
 	}
 
+	@Override
 	public IToken getRightIToken() {
 		return super.getIToken(getRightSpan());
 	}
@@ -153,6 +155,7 @@ public class XlcCParser extends PrsStream
 		}
 	}
 
+	@Override
 	public String[] orderedTerminalSymbols() {
 		return XlcCParsersym.orderedTerminalSymbols;
 	}
@@ -236,11 +239,13 @@ public class XlcCParser extends PrsStream
 
 	}
 
+	@Override
 	public void addToken(IToken token) {
 		token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 		super.addToken(token);
 	}
 
+	@Override
 	public IASTTranslationUnit parse() {
 		// this has to be done, or... kaboom!
 		setStreamLength(getSize());
@@ -253,19 +258,23 @@ public class XlcCParser extends PrsStream
 		return (IASTTranslationUnit) action.getParseResult();
 	}
 
+	@Override
 	public IASTCompletionNode getCompletionNode() {
 		return compNode;
 	}
 
 	// uncomment this method to use with backtracking parser
+	@Override
 	public List<IToken> getRuleTokens() {
 		return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 	}
 
+	@Override
 	public String[] getOrderedTerminalSymbols() {
 		return XlcCParsersym.orderedTerminalSymbols;
 	}
 
+	@Override
 	@SuppressWarnings("nls")
 	public String getName() {
 		return "XlcCParser";
@@ -273,6 +282,7 @@ public class XlcCParser extends PrsStream
 
 	private GNUBuildASTParserAction gnuAction;
 
+	@Override
 	public void ruleAction(int ruleNumber) {
 		switch (ruleNumber) {
 
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java
index 2b3cdd11a3c..ff229aede9d 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/c/XlcCParserprs.java
@@ -149,12 +149,14 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static short baseCheck[] = BaseCheck.baseCheck;
 
+	@Override
 	public final int baseCheck(int index) {
 		return baseCheck[index];
 	}
 
 	public final static short rhs[] = baseCheck;
 
+	@Override
 	public final int rhs(int index) {
 		return rhs[index];
 	};
@@ -353,12 +355,14 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char baseAction[] = BaseAction.baseAction;
 
+	@Override
 	public final int baseAction(int index) {
 		return baseAction[index];
 	}
 
 	public final static char lhs[] = baseAction;
 
+	@Override
 	public final int lhs(int index) {
 		return lhs[index];
 	};
@@ -475,6 +479,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static byte termCheck[] = TermCheck.termCheck;
 
+	@Override
 	public final int termCheck(int index) {
 		return termCheck[index];
 	}
@@ -637,6 +642,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char termAction[] = TermAction.termAction;
 
+	@Override
 	public final int termAction(int index) {
 		return termAction[index];
 	}
@@ -665,6 +671,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char asb[] = Asb.asb;
 
+	@Override
 	public final int asb(int index) {
 		return asb[index];
 	}
@@ -705,6 +712,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static byte asr[] = Asr.asr;
 
+	@Override
 	public final int asr(int index) {
 		return asr[index];
 	}
@@ -731,6 +739,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char nasb[] = Nasb.nasb;
 
+	@Override
 	public final int nasb(int index) {
 		return nasb[index];
 	}
@@ -748,6 +757,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char nasr[] = Nasr.nasr;
 
+	@Override
 	public final int nasr(int index) {
 		return nasr[index];
 	}
@@ -762,6 +772,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char terminalIndex[] = TerminalIndex.terminalIndex;
 
+	@Override
 	public final int terminalIndex(int index) {
 		return terminalIndex[index];
 	}
@@ -778,6 +789,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
 
+	@Override
 	public final int nonterminalIndex(int index) {
 		return nonterminalIndex[index];
 	}
@@ -792,6 +804,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char scopePrefix[] = ScopePrefix.scopePrefix;
 
+	@Override
 	public final int scopePrefix(int index) {
 		return scopePrefix[index];
 	}
@@ -806,6 +819,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
 
+	@Override
 	public final int scopeSuffix(int index) {
 		return scopeSuffix[index];
 	}
@@ -820,6 +834,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char scopeLhs[] = ScopeLhs.scopeLhs;
 
+	@Override
 	public final int scopeLhs(int index) {
 		return scopeLhs[index];
 	}
@@ -833,6 +848,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static byte scopeLa[] = ScopeLa.scopeLa;
 
+	@Override
 	public final int scopeLa(int index) {
 		return scopeLa[index];
 	}
@@ -847,6 +863,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
 
+	@Override
 	public final int scopeStateSet(int index) {
 		return scopeStateSet[index];
 	}
@@ -875,6 +892,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char scopeRhs[] = ScopeRhs.scopeRhs;
 
+	@Override
 	public final int scopeRhs(int index) {
 		return scopeRhs[index];
 	}
@@ -898,6 +916,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char scopeState[] = ScopeState.scopeState;
 
+	@Override
 	public final int scopeState(int index) {
 		return scopeState[index];
 	}
@@ -925,6 +944,7 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static char inSymb[] = InSymb.inSymb;
 
+	@Override
 	public final int inSymb(int index) {
 		return inSymb[index];
 	}
@@ -970,24 +990,29 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 38, SCOPE_UBOUND = 94, SCOPE_SIZE = 95, MAX_NAME_LENGTH = 38;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -998,42 +1023,52 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -1042,55 +1077,68 @@ public class XlcCParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCParsers
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java
index 4841efa0c9c..bdd9032c9ed 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParser.java
@@ -110,6 +110,7 @@ public class XlcCPPParser extends PrsStream
 		return btParser.getFirstToken();
 	}
 
+	@Override
 	public IToken getLeftIToken() {
 		return super.getIToken(getLeftSpan());
 	}
@@ -118,6 +119,7 @@ public class XlcCPPParser extends PrsStream
 		return btParser.getLastToken();
 	}
 
+	@Override
 	public IToken getRightIToken() {
 		return super.getIToken(getRightSpan());
 	}
@@ -155,6 +157,7 @@ public class XlcCPPParser extends PrsStream
 		}
 	}
 
+	@Override
 	public String[] orderedTerminalSymbols() {
 		return XlcCPPParsersym.orderedTerminalSymbols;
 	}
@@ -238,11 +241,13 @@ public class XlcCPPParser extends PrsStream
 
 	}
 
+	@Override
 	public void addToken(IToken token) {
 		token.setKind(mapKind(token.getKind())); // TODO does mapKind need to be called?
 		super.addToken(token);
 	}
 
+	@Override
 	public IASTTranslationUnit parse() {
 		// this has to be done, or... kaboom!
 		setStreamLength(getSize());
@@ -255,19 +260,23 @@ public class XlcCPPParser extends PrsStream
 		return (IASTTranslationUnit) action.getParseResult();
 	}
 
+	@Override
 	public IASTCompletionNode getCompletionNode() {
 		return compNode;
 	}
 
 	// uncomment this method to use with backtracking parser
+	@Override
 	public List<IToken> getRuleTokens() {
 		return getTokens().subList(getLeftSpan(), getRightSpan() + 1);
 	}
 
+	@Override
 	public String[] getOrderedTerminalSymbols() {
 		return XlcCPPParsersym.orderedTerminalSymbols;
 	}
 
+	@Override
 	@SuppressWarnings("nls")
 	public String getName() {
 		return "XlcCPPParser";
@@ -275,6 +284,7 @@ public class XlcCPPParser extends PrsStream
 
 	private GNUBuildASTParserAction gnuAction;
 
+	@Override
 	public void ruleAction(int ruleNumber) {
 		switch (ruleNumber) {
 
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java
index 2182dbd1aa4..96919217523 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/parser/org/eclipse/cdt/internal/core/lrparser/xlc/cpp/XlcCPPParserprs.java
@@ -318,12 +318,14 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 		System.arraycopy(BaseCheck1.baseCheck1, 0, baseCheck, index, BaseCheck1.baseCheck1.length);
 	};
 
+	@Override
 	public final int baseCheck(int index) {
 		return baseCheck[index];
 	}
 
 	public final static short rhs[] = baseCheck;
 
+	@Override
 	public final int rhs(int index) {
 		return rhs[index];
 	};
@@ -843,12 +845,14 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 		System.arraycopy(BaseAction1.baseAction1, 0, baseAction, index, BaseAction1.baseAction1.length);
 	};
 
+	@Override
 	public final int baseAction(int index) {
 		return baseAction[index];
 	}
 
 	public final static char lhs[] = baseAction;
 
+	@Override
 	public final int lhs(int index) {
 		return lhs[index];
 	};
@@ -1092,6 +1096,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char termCheck[] = TermCheck.termCheck;
 
+	@Override
 	public final int termCheck(int index) {
 		return termCheck[index];
 	}
@@ -1446,6 +1451,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char termAction[] = TermAction.termAction;
 
+	@Override
 	public final int termAction(int index) {
 		return termAction[index];
 	}
@@ -1492,6 +1498,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char asb[] = Asb.asb;
 
+	@Override
 	public final int asb(int index) {
 		return asb[index];
 	}
@@ -1563,6 +1570,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char asr[] = Asr.asr;
 
+	@Override
 	public final int asr(int index) {
 		return asr[index];
 	}
@@ -1605,6 +1613,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char nasb[] = Nasb.nasb;
 
+	@Override
 	public final int nasb(int index) {
 		return nasb[index];
 	}
@@ -1628,6 +1637,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char nasr[] = Nasr.nasr;
 
+	@Override
 	public final int nasr(int index) {
 		return nasr[index];
 	}
@@ -1643,6 +1653,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char terminalIndex[] = TerminalIndex.terminalIndex;
 
+	@Override
 	public final int terminalIndex(int index) {
 		return terminalIndex[index];
 	}
@@ -1663,6 +1674,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
 
+	@Override
 	public final int nonterminalIndex(int index) {
 		return nonterminalIndex[index];
 	}
@@ -1680,6 +1692,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char scopePrefix[] = ScopePrefix.scopePrefix;
 
+	@Override
 	public final int scopePrefix(int index) {
 		return scopePrefix[index];
 	}
@@ -1697,6 +1710,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
 
+	@Override
 	public final int scopeSuffix(int index) {
 		return scopeSuffix[index];
 	}
@@ -1714,6 +1728,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char scopeLhs[] = ScopeLhs.scopeLhs;
 
+	@Override
 	public final int scopeLhs(int index) {
 		return scopeLhs[index];
 	}
@@ -1730,6 +1745,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char scopeLa[] = ScopeLa.scopeLa;
 
+	@Override
 	public final int scopeLa(int index) {
 		return scopeLa[index];
 	}
@@ -1747,6 +1763,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char scopeStateSet[] = ScopeStateSet.scopeStateSet;
 
+	@Override
 	public final int scopeStateSet(int index) {
 		return scopeStateSet[index];
 	}
@@ -1790,6 +1807,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char scopeRhs[] = ScopeRhs.scopeRhs;
 
+	@Override
 	public final int scopeRhs(int index) {
 		return scopeRhs[index];
 	}
@@ -1830,6 +1848,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char scopeState[] = ScopeState.scopeState;
 
+	@Override
 	public final int scopeState(int index) {
 		return scopeState[index];
 	}
@@ -1872,6 +1891,7 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static char inSymb[] = InSymb.inSymb;
 
+	@Override
 	public final int inSymb(int index) {
 		return inSymb[index];
 	}
@@ -1934,24 +1954,29 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static String name[] = Name.name;
 
+	@Override
 	public final String name(int index) {
 		return name[index];
 	}
 
 	public final static int ERROR_SYMBOL = 81, SCOPE_UBOUND = 161, SCOPE_SIZE = 162, MAX_NAME_LENGTH = 43;
 
+	@Override
 	public final int getErrorSymbol() {
 		return ERROR_SYMBOL;
 	}
 
+	@Override
 	public final int getScopeUbound() {
 		return SCOPE_UBOUND;
 	}
 
+	@Override
 	public final int getScopeSize() {
 		return SCOPE_SIZE;
 	}
 
+	@Override
 	public final int getMaxNameLength() {
 		return MAX_NAME_LENGTH;
 	}
@@ -1962,42 +1987,52 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 
 	public final static boolean BACKTRACK = true;
 
+	@Override
 	public final int getNumStates() {
 		return NUM_STATES;
 	}
 
+	@Override
 	public final int getNtOffset() {
 		return NT_OFFSET;
 	}
 
+	@Override
 	public final int getLaStateOffset() {
 		return LA_STATE_OFFSET;
 	}
 
+	@Override
 	public final int getMaxLa() {
 		return MAX_LA;
 	}
 
+	@Override
 	public final int getNumRules() {
 		return NUM_RULES;
 	}
 
+	@Override
 	public final int getNumNonterminals() {
 		return NUM_NONTERMINALS;
 	}
 
+	@Override
 	public final int getNumSymbols() {
 		return NUM_SYMBOLS;
 	}
 
+	@Override
 	public final int getSegmentSize() {
 		return SEGMENT_SIZE;
 	}
 
+	@Override
 	public final int getStartState() {
 		return START_STATE;
 	}
 
+	@Override
 	public final int getStartSymbol() {
 		return lhs[0];
 	}
@@ -2006,55 +2041,68 @@ public class XlcCPPParserprs implements lpg.lpgjavaruntime.ParseTable, XlcCPPPar
 		return IDENTIFIER_SYMBOL;
 	}
 
+	@Override
 	public final int getEoftSymbol() {
 		return EOFT_SYMBOL;
 	}
 
+	@Override
 	public final int getEoltSymbol() {
 		return EOLT_SYMBOL;
 	}
 
+	@Override
 	public final int getAcceptAction() {
 		return ACCEPT_ACTION;
 	}
 
+	@Override
 	public final int getErrorAction() {
 		return ERROR_ACTION;
 	}
 
+	@Override
 	public final boolean isValidForParser() {
 		return isValidForParser;
 	}
 
+	@Override
 	public final boolean getBacktrack() {
 		return BACKTRACK;
 	}
 
+	@Override
 	public final int originalState(int state) {
 		return -baseCheck[state];
 	}
 
+	@Override
 	public final int asi(int state) {
 		return asb[originalState(state)];
 	}
 
+	@Override
 	public final int nasi(int state) {
 		return nasb[originalState(state)];
 	}
 
+	@Override
 	public final int inSymbol(int state) {
 		return inSymb[originalState(state)];
 	}
 
+	@Override
 	public final int ntAction(int state, int sym) {
 		return baseAction[state + sym];
 	}
 
+	@Override
 	public final int tAction(int state, int sym) {
 		int i = baseAction[state], k = i + sym;
 		return termAction[termCheck[k] == sym ? k : i];
 	}
 
+	@Override
 	public final int lookAhead(int la_state, int sym) {
 		int k = la_state + sym;
 		return termAction[termCheck[k] == sym ? k : la_state];
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java b/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java
index a088097f086..141b70c57d9 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc/ui/org/eclipse/cdt/internal/core/lrparser/xlc/ui/preferences/XlcLanguageOptionsPreferencePage.java
@@ -62,6 +62,7 @@ public class XlcLanguageOptionsPreferencePage extends PreferencePage
 			Link link = new Link(page, SWT.NONE);
 			link.setText(PreferenceMessages.XlcLanguageOptionsPreferencePage_link);
 			link.addListener(SWT.Selection, new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					PreferencesUtil.createPreferenceDialogOn(getShell(), event.text, null, null).open();
 				}
@@ -104,10 +105,12 @@ public class XlcLanguageOptionsPreferencePage extends PreferencePage
 		return isPropertyPage() ? (IProject) element.getAdapter(IProject.class) : null;
 	}
 
+	@Override
 	public IAdaptable getElement() {
 		return element;
 	}
 
+	@Override
 	public void setElement(IAdaptable element) {
 		this.element = element;
 	}
@@ -116,6 +119,7 @@ public class XlcLanguageOptionsPreferencePage extends PreferencePage
 		return element != null;
 	}
 
+	@Override
 	public void init(IWorkbench workbench) {
 		// TODO Auto-generated method stub
 	}
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java
index b3d238b791d..00fa2c7161a 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestsPlugin.java
@@ -41,6 +41,7 @@ public class TestsPlugin extends AbstractUIPlugin {
 	/**
 	 * This method is called upon plug-in activation
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 	}
@@ -48,6 +49,7 @@ public class TestsPlugin extends AbstractUIPlugin {
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
 		plugin = null;
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java
index f6a7fdb10e7..217943ebd27 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/XlcErrorParserTester.java
@@ -67,10 +67,12 @@ public class XlcErrorParserTester {
 	 */
 	private class MockMarkerGenerator implements IMarkerGenerator {
 
+		@Override
 		public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
 			// dummy
 		}
 
+		@Override
 		public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
 			// dummy
 		}
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java b/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java
index e455e15efe8..ac1b18573fa 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc/src/org/eclipse/cdt/errorparsers/xlc/Activator.java
@@ -39,6 +39,7 @@ public class Activator extends AbstractUIPlugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 	}
@@ -47,6 +48,7 @@ public class Activator extends AbstractUIPlugin {
 	 * (non-Javadoc)
 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);