@Override annotations and redundant casts.

31 files changed, 102 insertions, 10 deletions

diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java
index 019ecca925c..e27ce10d3c3 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/language/LanguageInheritanceTests.java
@@ -52,6 +52,7 @@ public class LanguageInheritanceTests extends BaseTestCase {
 		return suite(LanguageInheritanceTests.class);
 	}
 	
+	@Override
 	protected void setUp() throws Exception {
 		String name = getClass().getName() + "_" + getName();
 		fCProject = CProjectHelper.createCCProject(name , BIN_FOLDER, IPDOMManager.ID_NO_INDEXER);
@@ -71,6 +72,7 @@ public class LanguageInheritanceTests extends BaseTestCase {
 		fManager.storeWorkspaceLanguageConfiguration(EMPTY_CONTENT_TYPES);
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		CProjectHelper.delete(fCProject);
 	}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java
index 8b0e483be46..386ae9e6857 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ASTCacheTests.java
@@ -56,6 +56,7 @@ public class ASTCacheTests extends BaseTestCase {
 			fCache= cache;
 			setDaemon(true);
 		}
+		@Override
 		public void run() {
 			while (!fStopped) {
 				try {
@@ -98,6 +99,7 @@ public class ASTCacheTests extends BaseTestCase {
 	private final String SOURCE1= "void foo1() {}"; //$NON-NLS-1$
 	private final String SOURCE2= "void foo2() {}"; //$NON-NLS-1$
 
+	@Override
 	public void setUp() throws Exception {
 		super.setUp();
 		IProgressMonitor npm= new NullProgressMonitor();
@@ -116,6 +118,7 @@ public class ASTCacheTests extends BaseTestCase {
 		fIndex.acquireReadLock();
 	}
 
+	@Override
 	public void tearDown() throws Exception {
 		if (fIndex != null) {
 			fIndex.releaseReadLock();
@@ -158,6 +161,7 @@ public class ASTCacheTests extends BaseTestCase {
 		final int[] counter= {0};
 		cache.setActiveElement(fTU1);
 		IStatus status= cache.runOnAST(fTU1, false, null, new ASTRunnable() {
+			@Override
 			public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
 				assertNull(ast);
 				counter[0]++;
@@ -169,6 +173,7 @@ public class ASTCacheTests extends BaseTestCase {
 		IProgressMonitor npm= new NullProgressMonitor();
 		npm.setCanceled(true);
 		status= cache.runOnAST(fTU1, true, npm, new ASTRunnable() {
+			@Override
 			public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
 				assertNull(ast);
 				counter[0]++;
@@ -179,6 +184,7 @@ public class ASTCacheTests extends BaseTestCase {
 
 		npm.setCanceled(false);
 		status= cache.runOnAST(fTU1, true, npm, new ASTRunnable() {
+			@Override
 			public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
 				assertNotNull(ast);
 				counter[0]++;
@@ -204,6 +210,7 @@ public class ASTCacheTests extends BaseTestCase {
 			}
 			reconciler1.fStopped= true;
 			IStatus status= cache.runOnAST(fTU1, true, null, new ASTRunnable() {
+				@Override
 				public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
 					assertNotNull(ast);
 					assertTrue(cache.isActiveElement(fTU1));
@@ -226,6 +233,7 @@ public class ASTCacheTests extends BaseTestCase {
 			reconciler2.fStopped= true;
 			
 			status= cache.runOnAST(fTU2, true, null, new ASTRunnable() {
+				@Override
 				public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) throws CoreException {
 					assertNotNull(ast);
 					assertTrue(cache.isActiveElement(fTU2));
@@ -257,6 +265,7 @@ public class ASTCacheTests extends BaseTestCase {
 				cache.setActiveElement(fTU1);
 				Thread.sleep(50);
 				waitForAST(cache, fTU1, new ASTRunnable() {
+					@Override
 					public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
 						assertNotNull(ast);
 						assertEquals("void foo1() {}", ast.getDeclarations()[0].getRawSignature());
@@ -265,6 +274,7 @@ public class ASTCacheTests extends BaseTestCase {
 				});
 
 				waitForAST(cache, fTU2, new ASTRunnable() {
+					@Override
 					public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
 						assertNotNull(ast);
 						assertEquals("void foo2() {}", ast.getDeclarations()[0].getRawSignature());
@@ -276,6 +286,7 @@ public class ASTCacheTests extends BaseTestCase {
 				cache.setActiveElement(fTU2);
 				Thread.sleep(50);
 				waitForAST(cache, fTU2, new ASTRunnable() {
+					@Override
 					public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
 						assertNotNull(ast);
 						assertEquals("void foo2() {}", ast.getDeclarations()[0].getRawSignature());
@@ -284,6 +295,7 @@ public class ASTCacheTests extends BaseTestCase {
 				});
 
 				waitForAST(cache, fTU1, new ASTRunnable() {
+					@Override
 					public IStatus runOnAST(ILanguage lang, IASTTranslationUnit ast) {
 						assertNotNull(ast);
 						assertEquals("void foo1() {}", ast.getDeclarations()[0].getRawSignature());
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
index e28ebe71260..32cec750ac8 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ArchiveTests.java
@@ -78,7 +78,8 @@ public class ArchiveTests extends TestCase {
      * Example code test the packages in the project 
      *  "com.qnx.tools.ide.cdt.core"
      */
-    protected void setUp() throws Exception {
+    @Override
+	protected void setUp() throws Exception {
             
         /***
          * Setup the various files, paths and projects that are needed by the
@@ -134,7 +135,8 @@ public class ArchiveTests extends TestCase {
      *
      * Called after every test case method.
      */
-    protected void tearDown()  {
+    @Override
+	protected void tearDown()  {
 		  CProjectHelper.delete(testProject);
     }
     
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java
index 3949ba43306..950808e7ea7 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/Bug311189.java
@@ -78,6 +78,7 @@ public class Bug311189 extends BaseTestCase {
 		// Path entry update should now be running...
 		// Tick a workspace job through the workspace so we get when it's finished
 		ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 			}
 		}, null);
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java
index 584bcf869b3..4365bfc2ae6 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelExceptionTest.java
@@ -46,7 +46,8 @@ public class CModelExceptionTest extends TestCase {
      * Example code test the packages in the project 
      *  "com.qnx.tools.ide.cdt.core"
      */
-    protected void setUp() {
+    @Override
+	protected void setUp() {
         // create shared resources and setup the test fixture
         cModelStatus = new CModelStatus();
         coreException = new CoreException(cModelStatus);
@@ -57,7 +58,8 @@ public class CModelExceptionTest extends TestCase {
      *
      * Called after every test case method.
      */
-    protected void tearDown() {
+    @Override
+	protected void tearDown() {
        // release resources here and clean-up
     }
     
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java
index 94138184a59..b088b350c38 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelIdentifierTests.java
@@ -50,6 +50,7 @@ public class CModelIdentifierTests extends BaseTestCase {
 	private ICProject fCProject;
 	private IFile fHeaderFile;
 
+	@Override
 	protected void setUp() throws Exception {
 		// reusing project setup from CModelElementsTests
 		NullProgressMonitor monitor= new NullProgressMonitor();
@@ -69,6 +70,7 @@ public class CModelIdentifierTests extends BaseTestCase {
 		CCorePlugin.getIndexManager().joinIndexer(10000, new NullProgressMonitor());
 	}
 
+	@Override
 	protected void tearDown() {
 		CProjectHelper.delete(fCProject);
 	}	
@@ -91,6 +93,7 @@ public class CModelIdentifierTests extends BaseTestCase {
 		final List elements= new ArrayList();
 		final List identifiers= new ArrayList();
 		ICElementVisitor visitor= new ICElementVisitor() {
+			@Override
 			public boolean visit(ICElement element) throws CoreException {
 				elements.add(element);
 				identifiers.add(element.getHandleIdentifier());
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java
index 07c547b1d46..94cbe031908 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CModelTests.java
@@ -502,7 +502,8 @@ public class CModelTests extends TestCase {
         final boolean binContainerChanged[] = { false };
         
         IElementChangedListener elementChangedListener = new IElementChangedListener() {
-            public void elementChanged(ElementChangedEvent event) {
+            @Override
+			public void elementChanged(ElementChangedEvent event) {
                 ICElementDelta delta = event.getDelta();
                 processDelta(delta);
             }
@@ -560,7 +561,8 @@ public class CModelTests extends TestCase {
             String baseDir= FileLocator.toFileURL(FileLocator.find(bundle, new Path(sources), null)).getFile();
             ImportOperation importOp = new ImportOperation(project.getProject().getFullPath(),
                     new File(baseDir), FileSystemStructureProvider.INSTANCE, new IOverwriteQuery() {
-                        public String queryOverwrite(String file) {
+                        @Override
+						public String queryOverwrite(String file) {
                             return ALL;
                         }});
             importOp.setCreateContainerStructure(true);
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java
index 9febc3e7ced..f5abf048221 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/CPathEntryTest.java
@@ -80,6 +80,7 @@ public class CPathEntryTest extends BaseTestCase {
 		 * 
 		 * @see org.eclipse.cdt.core.model.IElementChangedListener#elementChanged(org.eclipse.cdt.core.model.ElementChangedEvent)
 		 */
+		@Override
 		public void elementChanged(ElementChangedEvent event) {
 			processDelta(event.getDelta());
 		}
@@ -101,6 +102,7 @@ public class CPathEntryTest extends BaseTestCase {
 	 * Called before every test case method.
 	 *  
 	 */
+	@Override
 	protected void setUp() throws CoreException {
 		/***************************************************************************************************************************
 		 * The test of the tests assume that they have a working workspace and workspace root object to use to create
@@ -126,6 +128,7 @@ public class CPathEntryTest extends BaseTestCase {
 	 * 
 	 * Called after every test case method.
 	 */
+	@Override
 	protected void tearDown() {
 		// release resources here and clean-up
 	}
@@ -205,6 +208,7 @@ public class CPathEntryTest extends BaseTestCase {
 		IContainerEntry containerEntry = CoreModel.newContainerEntry(containerID);
 		IPathEntryContainer container = new IPathEntryContainer() {
 
+			@Override
 			public IPathEntry[] getPathEntries() {
 				IPathEntry[] entries = new IPathEntry[3];
 				entries[0] = CoreModel.newIncludeEntry(new Path(""), null, new Path("/usr/include"), true);
@@ -213,10 +217,12 @@ public class CPathEntryTest extends BaseTestCase {
 				return entries;
 			}
 
+			@Override
 			public String getDescription() {
 				return "Testing container"; //$NON-NLS-1$
 			}
 
+			@Override
 			public IPath getPath() {
 				return containerID;
 			}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java
index 8d6f8d09530..bcd9e131432 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ElementDeltaTests.java
@@ -66,6 +66,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen
 		super(name);
 	}
 	
+	@Override
 	protected void setUp() throws Exception {
 		monitor = new NullProgressMonitor();
 
@@ -91,6 +92,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen
 		changedElements = new Vector(20);
 	}
 
+	@Override
 	protected void tearDown()  {
 		  CProjectHelper.delete(fCProject);
 	}	
@@ -237,6 +239,7 @@ public class ElementDeltaTests extends TestCase implements IElementChangedListen
 		return found;						
 	}
 	
+	@Override
 	public void elementChanged(ElementChangedEvent event){
 		try {
 			addedElements.clear();
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java
index efdc5a79e29..8d711309387 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/FlagTests.java
@@ -41,7 +41,8 @@ public class FlagTests extends TestCase {
      * Example code test the packages in the project 
      *  "com.qnx.tools.ide.cdt.core"
      */
-    protected void setUp() {
+    @Override
+	protected void setUp() {
         flags=new int[15];
         flags[0]=IConstants.AccPublic;
         flags[1]=IConstants.AccPrivate;
@@ -66,7 +67,8 @@ public class FlagTests extends TestCase {
      *
      * Called after every test case method.
      */
-    protected void tearDown() {
+    @Override
+	protected void tearDown() {
        // release resources here and clean-up
     }
     
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java
index 28c9a6a1a81..43f44ee518e 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IIncludeTests.java
@@ -40,6 +40,7 @@ public class IIncludeTests extends IntegratedCModelTest {
 	/**
 	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
 	 */
+	@Override
 	public String getSourcefileSubdir() {
 		return "resources/cmodel/";
 	}
@@ -47,6 +48,7 @@ public class IIncludeTests extends IntegratedCModelTest {
 	/**
 	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
 	 */
+	@Override
 	public String getSourcefileResource() {
 		return "IIncludeTest.h";
 	}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java
index 442082d39f9..16649837b42 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IMacroTests.java
@@ -54,6 +54,7 @@ public class IMacroTests extends IntegratedCModelTest {
 	/**
 	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
 	 */
+	@Override
 	public String getSourcefileSubdir() {
 		return "resources/cmodel/";
 	}
@@ -61,6 +62,7 @@ public class IMacroTests extends IntegratedCModelTest {
 	/**
 	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
 	 */
+	@Override
 	public String getSourcefileResource() {
 		return "IMacroTest.h";
 	}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java
index 1685b8b4f20..004a6431909 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/ITemplateTests.java
@@ -46,6 +46,7 @@ public class ITemplateTests extends IntegratedCModelTest {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IntegratedCModelTest#getSourcefileSubdir()
 	 */
+	@Override
 	public String getSourcefileSubdir() {
 		return "resources/cmodel/";
 	}
@@ -53,6 +54,7 @@ public class ITemplateTests extends IntegratedCModelTest {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IntegratedCModelTest#getSourcefileResource()
 	 */
+	@Override
 	public String getSourcefileResource() {
 		return "ITemplate.cpp";
 	}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java
index 52261a42956..338069dc751 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/IntegratedCModelTest.java
@@ -68,6 +68,7 @@ public abstract class IntegratedCModelTest extends TestCase {
 	 */
 	abstract public String getSourcefileResource();
 
+	@Override
 	public void setUp() throws Exception {
 		monitor = new NullProgressMonitor();
 		fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_FAST_INDEXER);
@@ -86,6 +87,7 @@ public abstract class IntegratedCModelTest extends TestCase {
 		CCorePlugin.getIndexManager().joinIndexer(2000, new NullProgressMonitor());
 	}
 
+	@Override
 	protected void tearDown() {
 		CProjectHelper.delete(fCProject);
 	}	
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java
index 79cdd89b365..2b1acb4aafa 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/MacroTests.java
@@ -41,6 +41,7 @@ public class MacroTests extends IntegratedCModelTest {
 	/**
 	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
 	 */
+	@Override
 	public String getSourcefileSubdir() {
 		return "resources/cmodel/";
 	}
@@ -48,6 +49,7 @@ public class MacroTests extends IntegratedCModelTest {
 	/**
 	 * @see org.eclipse.cdt.internal.core.model.IntegratedCModelTest
 	 */
+	@Override
 	public String getSourcefileResource() {
 		return "MacroTests.cpp";
 	}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java
index afb8b7f5065..592e9d4739e 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralCModelElementsTests.java
@@ -69,6 +69,7 @@ public class StructuralCModelElementsTests extends TestCase {
 		super(name);
 	}
 		
+	@Override
 	protected void setUp() throws Exception {
 		monitor = new NullProgressMonitor();
 		fCProject= CProjectHelper.createCCProject("TestProject1", "bin", IPDOMManager.ID_FAST_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$
@@ -92,6 +93,7 @@ public class StructuralCModelElementsTests extends TestCase {
 	}
 
 	
+	@Override
 	protected void tearDown() {
 		  CProjectHelper.delete(fCProject);
 	}	
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java
index 854ffbabfad..96e3508c391 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralMacroTests.java
@@ -39,6 +39,7 @@ public class StructuralMacroTests extends IMacroTests {
 	}
 	
 	
+	@Override
 	public void testGetElementName() throws CModelException {
 		setStructuralParse(true);
 		super.testGetElementName();
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java
index 312ffe06b86..229f9585466 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralStructureTests.java
@@ -54,6 +54,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testAnonymousStructObject()
 	 */
+	@Override
 	public void testAnonymousStructObject() throws CModelException {
 		setStructuralParse(true);
 		super.testAnonymousStructObject();
@@ -61,6 +62,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetAccessControl()
 	 */
+	@Override
 	public void testGetAccessControl() throws CModelException {
 		setStructuralParse(true);
 		super.testGetAccessControl();
@@ -68,6 +70,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetBaseTypes()
 	 */
+	@Override
 	public void testGetBaseTypes() throws CModelException {
 		setStructuralParse(true);
 		super.testGetBaseTypes();
@@ -75,6 +78,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetChildrenOfTypeClass()
 	 */
+	@Override
 	public void testGetChildrenOfTypeClass() throws CModelException {
 		setStructuralParse(true);
 		super.testGetChildrenOfTypeClass();
@@ -82,6 +86,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetChildrenOfTypeStruct()
 	 */
+	@Override
 	public void testGetChildrenOfTypeStruct() throws CModelException {
 		setStructuralParse(true);
 		super.testGetChildrenOfTypeStruct();
@@ -89,6 +94,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetField()
 	 */
+	@Override
 	public void testGetField() throws CModelException {
 		setStructuralParse(true);
 		super.testGetField();
@@ -96,6 +102,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetFields()
 	 */
+	@Override
 	public void testGetFields() throws CModelException {
 		setStructuralParse(true);
 		super.testGetFields();
@@ -103,6 +110,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetFieldsHack()
 	 */
+	@Override
 	public void testGetFieldsHack() throws CModelException {
 		setStructuralParse(true);
 		super.testGetFieldsHack();
@@ -110,6 +118,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethod()
 	 */
+	@Override
 	public void testGetMethod() throws CModelException {
 		setStructuralParse(true);
 		super.testGetMethod();
@@ -117,6 +126,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethods()
 	 */
+	@Override
 	public void testGetMethods() throws CModelException {
 		setStructuralParse(true);
 		super.testGetMethods();
@@ -124,6 +134,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetMethodsHack()
 	 */
+	@Override
 	public void testGetMethodsHack() throws CModelException {
 		setStructuralParse(true);
 		super.testGetMethodsHack();
@@ -131,6 +142,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testGetStructureInfo()
 	 */
+	@Override
 	public void testGetStructureInfo() {
 		setStructuralParse(true);
 		super.testGetStructureInfo();
@@ -138,6 +150,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testInnerStruct()
 	 */
+	@Override
 	public void testInnerStruct() throws CModelException {
 		setStructuralParse(true);
 		super.testInnerStruct();
@@ -145,6 +158,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsAbstract()
 	 */
+	@Override
 	public void testIsAbstract() throws CModelException {
 		setStructuralParse(true);
 		super.testIsAbstract();
@@ -152,6 +166,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsClass()
 	 */
+	@Override
 	public void testIsClass() throws CModelException {
 		setStructuralParse(true);
 		super.testIsClass();
@@ -159,6 +174,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsStruct()
 	 */
+	@Override
 	public void testIsStruct() throws CModelException {
 		setStructuralParse(true);
 		super.testIsStruct();
@@ -166,6 +182,7 @@ public class StructuralStructureTests extends IStructureTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.IStructureTests#testIsUnion()
 	 */
+	@Override
 	public void testIsUnion() throws CModelException {
 		setStructuralParse(true);
 		super.testIsUnion();
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java
index 963c54569b3..02679f02441 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/StructuralTemplateTests.java
@@ -47,6 +47,7 @@ public class StructuralTemplateTests extends ITemplateTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetChildrenOfTypeTemplate()
 	 */
+	@Override
 	public void testGetChildrenOfTypeTemplate() throws CModelException {
 		setStructuralParse(true);
 		ITranslationUnit tu = getTU();
@@ -116,6 +117,7 @@ public class StructuralTemplateTests extends ITemplateTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetNumberOfTemplateParameters()
 	 */
+	@Override
 	public void testGetNumberOfTemplateParameters() throws CModelException {
 		setStructuralParse(true);
 		ITranslationUnit tu = getTU();
@@ -145,6 +147,7 @@ public class StructuralTemplateTests extends ITemplateTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetTemplateParameterTypes()
 	 */
+	@Override
 	public void testGetTemplateParameterTypes() throws CModelException {
 		setStructuralParse(true);
 		ITranslationUnit tu = getTU();
@@ -195,6 +198,7 @@ public class StructuralTemplateTests extends ITemplateTests {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.tests.ITemplateTests#testGetTemplateSignature()
 	 */
+	@Override
 	public void testGetTemplateSignature() throws CModelException {
 		setStructuralParse(true);
 		ITranslationUnit tu = getTU();
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java
index ec53a6cee14..12eb79c34bd 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/TranslationUnitBaseTest.java
@@ -71,7 +71,8 @@ public class TranslationUnitBaseTest extends TestCase
          * Example code test the packages in the project 
          *  "com.qnx.tools.ide.cdt.core"
          */
-    protected void setUp() throws Exception
+    @Override
+	protected void setUp() throws Exception
     {
         /***
          * The rest of the tests assume that they have a working workspace
@@ -145,7 +146,8 @@ public class TranslationUnitBaseTest extends TestCase
          *
          * Called after every test case method.
          */
-    protected void tearDown() 
+    @Override
+	protected void tearDown() 
     {
        // release resources here and clean-up
        try {
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
index a0cae852b04..25b52142def 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/model/tests/WorkingCopyTests.java
@@ -56,6 +56,7 @@ public class WorkingCopyTests extends TestCase {
 		super(name);
 	}
 	
+	@Override
 	protected void setUp() throws Exception {
 		monitor = new NullProgressMonitor();
 	
@@ -75,6 +76,7 @@ public class WorkingCopyTests extends TestCase {
 		}
 	}
 
+	@Override
 	protected void tearDown()  {
 		CProjectHelper.delete(fCProject);
 	}	
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java
index 7515deff93c..4ef0bdff3a1 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CConfigurationDescriptionExportSettings.java
@@ -433,6 +433,7 @@ public class CConfigurationDescriptionExportSettings extends BaseTestCase {
 
 		// Now replace the .cproject with .cproject_back. The exported settings should be picked up in the referenced config
 		ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				libCproject.setContents(libCproject_back.getContents(), IResource.NONE, null);
 				mainCproject.setContents(mainCproject_back.getContents(), IResource.NONE, null);
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java
index be8bd6cf0e0..5fc9770f30e 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionDeltaTests.java
@@ -41,6 +41,7 @@ public class CProjectDescriptionDeltaTests  extends BaseTestCase{
 			fDelta = null;
 		}
 		
+		@Override
 		public void handleEvent(CProjectDescriptionEvent event) {
 			if(!event.getProject().getName().equals(fProjName))
 				return;
@@ -66,9 +67,11 @@ public class CProjectDescriptionDeltaTests  extends BaseTestCase{
 		return suite(CProjectDescriptionDeltaTests.class, "_");
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 	}
 	
+	@Override
 	protected void tearDown() throws Exception {
 		ResourceHelper.cleanUp();
 	}
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
index 9a065ad9a14..0a191764db1 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CProjectDescriptionStorageTests.java
@@ -351,6 +351,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
 		csettings.create(true, false, null);
 
 		csettings_back.accept(new IResourceVisitor() {
+			@Override
 			public boolean visit(IResource resource) throws CoreException {
 				assertTrue(resource instanceof IFile);
 				csettings.getFile(resource.getName()).create(((IFile)resource).getContents(), false, null);
@@ -448,6 +449,7 @@ public class CProjectDescriptionStorageTests extends BaseTestCase {
 	private static class OurResourceChangeListener implements IResourceChangeListener {
 		boolean changeDetected;
 		private Set<IPath> filesToWatch = new HashSet<IPath>();
+		@Override
 		public synchronized void resourceChanged(IResourceChangeEvent event) {
 			IResourceDelta delta = event.getDelta();
 			if (delta == null)
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java
index 27be0e08933..52021457a34 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/CfgSettingsTests.java
@@ -28,6 +28,7 @@ public class CfgSettingsTests extends BaseTestCase {
 		return suite(CfgSettingsTests.class, "_");
 	}
 	
+	@Override
 	protected void setUp() throws Exception {
 	}
 	
@@ -147,6 +148,7 @@ public class CfgSettingsTests extends BaseTestCase {
 		return ICProjectDescriptionPreferences.CONFIGS_INDEPENDENT;
 	}
 	
+	@Override
 	protected void tearDown() throws Exception {
 		try {
 			if(p1 != null){
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java
index 7dce5fa0d77..b83dcc5967c 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ExternalSettingsProviderTests.java
@@ -35,6 +35,7 @@ public class ExternalSettingsProviderTests extends BaseTestCase{
 		return suite(ExternalSettingsProviderTests.class, "_");
 	}
 	
+	@Override
 	protected void setUp() throws Exception {
 		p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER);
 		p2 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "b", IPDOMManager.ID_NO_INDEXER);
@@ -425,6 +426,7 @@ public class ExternalSettingsProviderTests extends BaseTestCase{
 		assertTrue(Arrays.equals(expectedEntriesSet, entries));
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		try {
 			p1.getProject().delete(true, null);
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java
index e7e1793ddc3..1d9f7d77b73 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/PathSettingsContainerTests.java
@@ -26,9 +26,11 @@ public class PathSettingsContainerTests extends BaseTestCase {
 		return suite(PathSettingsContainerTests.class, "_");
 	}
 	
+	@Override
 	protected void setUp() throws Exception {
 	}
 	
+	@Override
 	protected void tearDown() throws Exception {
 	}
 
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java
index 80b2aad5b81..4345fe9dec8 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/ProjectCreationStateTests.java
@@ -42,6 +42,7 @@ public class ProjectCreationStateTests  extends BaseTestCase{
 			fProjName = projName;
 		}
 		
+		@Override
 		public void handleEvent(CProjectDescriptionEvent event) {
 			if(!event.getProject().getName().equals(fProjName))
 				return;
@@ -89,6 +90,7 @@ public class ProjectCreationStateTests  extends BaseTestCase{
 		return suite(ProjectCreationStateTests.class, "_");
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 //		p1 = CProjectHelper.createNewStileCProject(PROJ_NAME_PREFIX + "a", IPDOMManager.ID_NO_INDEXER);
 	}
@@ -362,6 +364,7 @@ public class ProjectCreationStateTests  extends BaseTestCase{
 	}
 
 	
+	@Override
 	protected void tearDown() throws Exception {
 		if(listener != null){
 			CoreModel.getDefault().getProjectDescriptionManager().removeCProjectDescriptionListener(listener);
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java
index 2c2161559ca..479fa67c030 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestCfgDataProvider.java
@@ -33,6 +33,7 @@ public class TestCfgDataProvider extends CDefaultConfigurationDataProvider {
 	// Overriden so it supports saving Library file and Library path entries
 	private static final class TestDataFactory extends CDataFactory {
 
+		@Override
 		public CLanguageData createLanguageData(CConfigurationData cfg, 
 				CResourceData rcBase,
 				CLanguageData base,
@@ -43,6 +44,7 @@ public class TestCfgDataProvider extends CDefaultConfigurationDataProvider {
 			return new CDefaultLanguageData(id, base);
 		}
 
+		@Override
 		public CLanguageData createLanguageData(CConfigurationData cfg, 
 				CResourceData rcBase,
 				String id,
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java
index f9540663774..93bb40f1c5e 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestExtSettingsProvider.java
@@ -94,6 +94,7 @@ public class TestExtSettingsProvider extends CExternalSettingProvider {
 
 	private static int variantNum;
 	
+	@Override
 	public CExternalSetting[] getSettings(IProject project,
 			ICConfigurationDescription cfg) {
 		return SETTINGS_VARIANTS[variantNum].clone();
diff --git a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java
index 9a8c34381d8..6cba7b82455 100644
--- a/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java
+++ b/core/org.eclipse.cdt.core.tests/model/org/eclipse/cdt/core/settings/model/TestUserAndDiscoveredEntriesCfgDataProvider.java
@@ -34,6 +34,7 @@ public class TestUserAndDiscoveredEntriesCfgDataProvider extends UserAndDiscover
 		ENTRIES_STORES[0].put(ICSettingEntry.MACRO, entries);
 	}
 
+	@Override
 	protected ICLanguageSettingEntry[] getAllDiscoveredEntries(
 			LanguageData data, int kind) {
 		ICLanguageSettingEntry entries[] = (ICLanguageSettingEntry[])ENTRIES_STORES[0].get(kind);