Bug 460048 - Move platform runtime plugins to Java 1.7 BREE -

org.eclipse.core.tests.runtime

Fixed all new compiler warnings and cleaned up code.

Change-Id: I66a4bbeaabb7e1a56cd70c0771f83e45ae61a238
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>

83 files changed, 637 insertions, 215 deletions

diff --git a/tests/org.eclipse.core.tests.runtime/.classpath b/tests/org.eclipse.core.tests.runtime/.classpath
index 304e86186..3bc247511 100644
--- a/tests/org.eclipse.core.tests.runtime/.classpath
+++ b/tests/org.eclipse.core.tests.runtime/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.core.prefs
index eb9fe93d7..b77376352 100644
--- a/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -6,11 +6,17 @@ org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
 org.eclipse.jdt.core.circularClasspath=error
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -27,6 +33,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -34,6 +41,7 @@ org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
@@ -43,7 +51,9 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
@@ -51,27 +61,40 @@ org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
 org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
@@ -82,17 +105,20 @@ org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=error
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.ui.prefs
index 3b3955742..3cfbba9ac 100644
--- a/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.core.tests.runtime/.settings/org.eclipse.jdt.ui.prefs
@@ -69,7 +69,7 @@ org.eclipse.jdt.ui.staticondemandthreshold=99
 org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} IBM Corporation and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *     IBM Corporation - initial API and implementation\n ******************************************************************************/\n</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @since 3.2\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="New classes and interfaces" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*******************************************************************************\n * Copyright (c) ${year} IBM Corporation and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n * \n * Contributors\:\n *     IBM Corporation - initial API and implementation\n *******************************************************************************/\n${filecomment}\n${package_declaration}\n\n/**\n * \n */\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">fail("4.99", ${exception_var});</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template></templates>
 sp_cleanup.add_default_serial_version_id=true
 sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=false
+sp_cleanup.add_missing_annotations=true
 sp_cleanup.add_missing_deprecated_annotations=true
 sp_cleanup.add_missing_methods=false
 sp_cleanup.add_missing_nls_tags=false
@@ -93,7 +93,7 @@ sp_cleanup.make_type_abstract_if_missing_method=false
 sp_cleanup.make_variable_declarations_final=false
 sp_cleanup.never_use_blocks=false
 sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.on_save_use_additional_actions=true
 sp_cleanup.organize_imports=true
 sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
 sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
@@ -105,9 +105,9 @@ sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
 sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
 sp_cleanup.remove_unused_local_variables=false
 sp_cleanup.remove_unused_private_fields=true
 sp_cleanup.remove_unused_private_members=false
@@ -116,7 +116,7 @@ sp_cleanup.remove_unused_private_types=true
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
 sp_cleanup.use_anonymous_class_creation=false
-sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks=true
 sp_cleanup.use_blocks_only_for_return_and_throw=false
 sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
diff --git a/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
index 1a1ead496..0cbeef56c 100644
--- a/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.runtime/META-INF/MANIFEST.MF
@@ -19,6 +19,6 @@ Require-Bundle: org.eclipse.core.tests.harness;bundle-version="3.4.0",
  org.eclipse.test.performance;resolution:=optional,
  org.eclipse.core.runtime.compatibility
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Plugin-Class: org.eclipse.core.tests.runtime.RuntimeTestsPlugin
 Eclipse-BundleShape: dir
diff --git a/tests/org.eclipse.core.tests.runtime/build.properties b/tests/org.eclipse.core.tests.runtime/build.properties
index 55a750734..a6fd78b58 100644
--- a/tests/org.eclipse.core.tests.runtime/build.properties
+++ b/tests/org.eclipse.core.tests.runtime/build.properties
@@ -1,10 +1,10 @@
 ###############################################################################
-# Copyright (c) 2000, 2014 IBM Corporation and others.
+# Copyright (c) 2000, 2015 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
-# 
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #     Mat Booth (Red Hat Inc) - 419524 Get rid of nested jars
@@ -19,3 +19,4 @@ bin.includes = plugin.xml,\
                testData/
 src.includes = about.html
 javacWarnings..=-unchecked,-raw
+jre.compilation.profile = JavaSE-1.7
\ No newline at end of file
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/BadTestScope.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/BadTestScope.java
index 7f3382789..fe889dd78 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/BadTestScope.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/BadTestScope.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,46 +37,56 @@ public class BadTestScope extends EclipsePreferences implements IScopeContext {
 		// cache the segment count
 		IPath path = new Path(absolutePath());
 		segmentCount = path.segmentCount();
-		if (segmentCount < 2)
+		if (segmentCount < 2) {
 			return;
+		}
 
 		// cache the qualifier
 		String scope = path.segment(0);
-		if (BadTestScope.SCOPE.equals(scope))
+		if (BadTestScope.SCOPE.equals(scope)) {
 			qualifier = path.segment(1);
+		}
 
 		// cache the location
-		if (qualifier == null)
+		if (qualifier == null) {
 			return;
+		}
 	}
 
+	@Override
 	protected IEclipsePreferences getLoadLevel() {
 		if (loadLevel == null) {
-			if (qualifier == null)
+			if (qualifier == null) {
 				return null;
+			}
 			// Make it relative to this node rather than navigating to it from the root.
 			// Walk backwards up the tree starting at this node.
 			// This is important to avoid a chicken/egg thing on startup.
 			IEclipsePreferences node = this;
-			for (int i = 2; i < segmentCount; i++)
+			for (int i = 2; i < segmentCount; i++) {
 				node = (IEclipsePreferences) node.parent();
+			}
 			loadLevel = node;
 		}
 		return loadLevel;
 	}
 
+	@Override
 	public IPath getLocation() {
 		return null;
 	}
 
+	@Override
 	public String getName() {
 		return SCOPE;
 	}
 
-	public IEclipsePreferences getNode(String qualifier) {
+	@Override
+	public IEclipsePreferences getNode(String qualifier1) {
 		throw new RuntimeException("BadTestScope throws this on purpose.");
 	}
 
+	@Override
 	protected EclipsePreferences internalCreate(EclipsePreferences nodeParent, String nodeName, Object context) {
 		return new BadTestScope(nodeParent, nodeName);
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java
index f6a17c3a9..7c4450223 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/EclipsePreferencesTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ public class EclipsePreferencesTest extends RuntimeTest {
 	class NodeTracer implements IEclipsePreferences.INodeChangeListener {
 		StringBuffer log = new StringBuffer();
 
+		@Override
 		public void added(IEclipsePreferences.NodeChangeEvent event) {
 			log.append("[A:");
 			log.append(event.getParent().absolutePath());
@@ -42,6 +43,7 @@ public class EclipsePreferencesTest extends RuntimeTest {
 			log.append(']');
 		}
 
+		@Override
 		public void removed(IEclipsePreferences.NodeChangeEvent event) {
 			log.append("[R:");
 			log.append(event.getParent().absolutePath());
@@ -75,6 +77,7 @@ public class EclipsePreferencesTest extends RuntimeTest {
 			return null;
 		}
 
+		@Override
 		public void preferenceChange(IEclipsePreferences.PreferenceChangeEvent event) {
 			log.append("[");
 			log.append(event.getKey());
@@ -918,6 +921,7 @@ public class EclipsePreferencesTest extends RuntimeTest {
 		final ArrayList<String> actual = new ArrayList<String>();
 
 		IPreferenceNodeVisitor visitor = new IPreferenceNodeVisitor() {
+			@Override
 			public boolean visit(IEclipsePreferences node) {
 				actual.add(node.absolutePath());
 				return true;
@@ -1027,9 +1031,7 @@ public class EclipsePreferencesTest extends RuntimeTest {
 		assertEquals("3.0", "", tracer.log.toString());
 	}
 
-	/*
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		Preferences node = getScopeRoot();
 		node.removeNode();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/PreferencesServiceTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/PreferencesServiceTest.java
index 3df3df9b2..49ef475af 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/PreferencesServiceTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/PreferencesServiceTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2014 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -478,6 +478,7 @@ public class PreferencesServiceTest extends RuntimeTest {
 	/*
 	 * @see junit.framework.TestCase#tearDown()
 	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		Platform.getPreferencesService().getRootNode().node(TestScope.SCOPE).removeNode();
@@ -860,12 +861,14 @@ public class PreferencesServiceTest extends RuntimeTest {
 
 		// don't match this filter
 		IPreferenceFilter filter = new IPreferenceFilter() {
+			@Override
 			public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
 				Map<String, PreferenceFilterEntry[]> result = new HashMap<String, PreferenceFilterEntry[]>();
 				result.put(QUALIFIER, null);
 				return result;
 			}
 
+			@Override
 			public String[] getScopes() {
 				return new String[] {InstanceScope.SCOPE};
 			}
@@ -912,10 +915,12 @@ public class PreferencesServiceTest extends RuntimeTest {
 
 		// try matching on the root node for a filter which matches all nodes in the scope
 		filter = new IPreferenceFilter() {
+			@Override
 			public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
 				return null;
 			}
 
+			@Override
 			public String[] getScopes() {
 				return new String[] {InstanceScope.SCOPE};
 			}
@@ -947,12 +952,14 @@ public class PreferencesServiceTest extends RuntimeTest {
 		// setup - create a child node with a key/value pair
 		InstanceScope.INSTANCE.getNode(QUALIFIER).node("child").put("key", "value");
 		IPreferenceFilter[] filters = new IPreferenceFilter[] {new IPreferenceFilter() {
+			@Override
 			public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
 				Map<String, PreferenceFilterEntry[]> result = new HashMap<String, PreferenceFilterEntry[]>();
 				result.put(QUALIFIER, null);
 				return result;
 			}
 
+			@Override
 			public String[] getScopes() {
 				return new String[] {InstanceScope.SCOPE};
 			}
@@ -968,12 +975,14 @@ public class PreferencesServiceTest extends RuntimeTest {
 
 		final String VALID_QUALIFIER = getUniqueString();
 		IPreferenceFilter transfer = new IPreferenceFilter() {
+			@Override
 			public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
 				Map<String, PreferenceFilterEntry[]> result = new HashMap<String, PreferenceFilterEntry[]>();
 				result.put(VALID_QUALIFIER, null);
 				return result;
 			}
 
+			@Override
 			public String[] getScopes() {
 				return new String[] {InstanceScope.SCOPE};
 			}
@@ -1007,10 +1016,12 @@ public class PreferencesServiceTest extends RuntimeTest {
 	public void testExportWithTransfers2() {
 		final String VALID_QUALIFIER = getUniqueString();
 		IPreferenceFilter transfer = new IPreferenceFilter() {
+			@Override
 			public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
 				return null;
 			}
 
+			@Override
 			public String[] getScopes() {
 				return new String[] {TestScope.SCOPE};
 			}
@@ -1026,6 +1037,7 @@ public class PreferencesServiceTest extends RuntimeTest {
 		testNode.put(VALID_KEY_2, "value2");
 
 		IPreferenceNodeVisitor visitor = new IPreferenceNodeVisitor() {
+			@Override
 			public boolean visit(IEclipsePreferences node) throws BackingStoreException {
 				String[] keys = node.keys();
 				for (int i = 0; i < keys.length; i++)
@@ -1057,12 +1069,14 @@ public class PreferencesServiceTest extends RuntimeTest {
 
 		final String QUALIFIER = getUniqueString();
 		IPreferenceFilter transfer = new IPreferenceFilter() {
+			@Override
 			public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
 				Map<String, PreferenceFilterEntry[]> result = new HashMap<String, PreferenceFilterEntry[]>();
 				result.put(QUALIFIER, null);
 				return result;
 			}
 
+			@Override
 			public String[] getScopes() {
 				return new String[] {InstanceScope.SCOPE};
 			}
@@ -1100,6 +1114,7 @@ public class PreferencesServiceTest extends RuntimeTest {
 		IPreferenceFilter transfer = new IPreferenceFilter() {
 			Map<String, PreferenceFilterEntry[]> result;
 
+			@Override
 			public Map<String, PreferenceFilterEntry[]> getMapping(String scope) {
 				if (result == null) {
 					result = new HashMap<String, PreferenceFilterEntry[]>();
@@ -1108,6 +1123,7 @@ public class PreferencesServiceTest extends RuntimeTest {
 				return result;
 			}
 
+			@Override
 			public String[] getScopes() {
 				return new String[] {InstanceScope.SCOPE};
 			}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java
index 222d075cb..96cac3065 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- *  Copyright (c) 2013 Google Inc and others.

+ *  Copyright (c) 2013, 2015 Google Inc and others.

  *  All rights reserved. This program and the accompanying materials

  *  are made available under the terms of the Eclipse Public License v1.0

  *  which accompanies this distribution, and is available at

@@ -65,6 +65,7 @@ public class TestBug380859 extends TestCase {
 		super(name);

 	}

 

+	@Override

 	protected void tearDown() throws Exception {

 		new File(FILE_NAME).delete();

 	}

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java
index cb91717ae..f15beb8eb 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- *  Copyright (c) 2012 IBM Corporation and others.

+ *  Copyright (c) 2012, 2015 IBM Corporation and others.

  *  All rights reserved. This program and the accompanying materials

  *  are made available under the terms of the Eclipse Public License v1.0

  *  which accompanies this distribution, and is available at

@@ -60,6 +60,7 @@ public class TestBug388004 extends TestCase {
 		super(name);

 	}

 

+	@Override

 	protected void tearDown() throws Exception {

 		new File(FILE_NAME).delete();

 	}

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestNodeStorage.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestNodeStorage.java
index 86890f159..11c17c69b 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestNodeStorage.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestNodeStorage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2012 IBM Corporation and others.
+ * Copyright (c) 2011, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,18 +17,22 @@ public class TestNodeStorage extends AbstractPreferenceStorage {
 
 	private Map<String, Properties> storage = new HashMap<String, Properties>();
 
+	@Override
 	public Properties load(String nodePath) {
 		return storage.get(nodePath);
 	}
 
+	@Override
 	public void save(String nodePath, Properties properties) {
 		storage.put(nodePath, properties);
 	}
 
+	@Override
 	public String[] childrenNames(String nodePath) {
 		return null;
 	}
 
+	@Override
 	public void removed(String nodePath) {
 		storage.remove(nodePath);
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope.java
index 31398c07b..25de9aa4b 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,14 +26,17 @@ public class TestScope implements IScopeContext {
 		super();
 	}
 
+	@Override
 	public IPath getLocation() {
 		return null;
 	}
 
+	@Override
 	public String getName() {
 		return SCOPE;
 	}
 
+	@Override
 	public IEclipsePreferences getNode(String qualifier) {
 		return (IEclipsePreferences) Platform.getPreferencesService().getRootNode().node(SCOPE).node(qualifier);
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope2.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope2.java
index e69f65740..dc46c9c6c 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope2.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestScope2.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 IBM Corporation and others.
+ * Copyright (c) 2012, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -45,34 +45,41 @@ public class TestScope2 extends EclipsePreferences implements IScopeContext {
 		// cache the segment count
 		IPath path = new Path(absolutePath());
 		segmentCount = path.segmentCount();
-		if (segmentCount < 2)
+		if (segmentCount < 2) {
 			return;
+		}
 
 		// cache the qualifier
 		String scope = path.segment(0);
-		if (TestScope2.SCOPE.equals(scope))
+		if (TestScope2.SCOPE.equals(scope)) {
 			qualifier = path.segment(1);
+		}
 
 		// cache the location
-		if (qualifier == null)
+		if (qualifier == null) {
 			return;
+		}
 	}
 
+	@Override
 	protected IEclipsePreferences getLoadLevel() {
 		if (loadLevel == null) {
-			if (qualifier == null)
+			if (qualifier == null) {
 				return null;
+			}
 			// Make it relative to this node rather than navigating to it from the root.
 			// Walk backwards up the tree starting at this node.
 			// This is important to avoid a chicken/egg thing on startup.
 			IEclipsePreferences node = this;
-			for (int i = 2; i < segmentCount; i++)
+			for (int i = 2; i < segmentCount; i++) {
 				node = (IEclipsePreferences) node.parent();
+			}
 			loadLevel = node;
 		}
 		return loadLevel;
 	}
 
+	@Override
 	public IPath getLocation() {
 		if (location == null) {
 			location = computeLocation(baseLocation, qualifier);
@@ -80,14 +87,17 @@ public class TestScope2 extends EclipsePreferences implements IScopeContext {
 		return location;
 	}
 
+	@Override
 	public String getName() {
 		return SCOPE;
 	}
 
-	public IEclipsePreferences getNode(String qualifier) {
-		return (IEclipsePreferences) Platform.getPreferencesService().getRootNode().node(SCOPE).node(qualifier);
+	@Override
+	public IEclipsePreferences getNode(String qualifier1) {
+		return (IEclipsePreferences) Platform.getPreferencesService().getRootNode().node(SCOPE).node(qualifier1);
 	}
 
+	@Override
 	protected EclipsePreferences internalCreate(EclipsePreferences nodeParent, String nodeName, Object context) {
 		return new TestScope2(nodeParent, nodeName);
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ContributorsTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ContributorsTest.java
index 9314dac2f..64b3dde7b 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ContributorsTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ContributorsTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -158,7 +158,7 @@ public class ContributorsTest extends TestCase {
 		String fullPath = RuntimeTestsPlugin.TEST_FILES_ROOT + "registry/elementsByContributor/" + fileName + "/plugin.xml";
 		URL urlA = RuntimeTestsPlugin.getContext().getBundle().getEntry(fullPath);
 		InputStream is = urlA.openStream();
-		IContributor nonBundleContributor = ContributorFactorySimple.createContributor(fileName); //$NON-NLS-1$
+		IContributor nonBundleContributor = ContributorFactorySimple.createContributor(fileName); 
 		return registry.addContribution(is, nonBundleContributor, false, urlA.getFile(), null, null);
 	}
 
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ExtensionRegistryDynamicTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ExtensionRegistryDynamicTest.java
index b91ddaaae..c5a881c82 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ExtensionRegistryDynamicTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/ExtensionRegistryDynamicTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -107,10 +107,12 @@ public class ExtensionRegistryDynamicTest extends TestCase {
 
 			tracker.registerHandler(new IExtensionChangeHandler() {
 
+				@Override
 				public void addExtension(IExtensionTracker currentTracker, IExtension extension) {
 					additionCalled = true;
 				}
 
+				@Override
 				public void removeExtension(IExtension extension, Object[] objects) {
 					removalCalled = true;
 				}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/InputErrorTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/InputErrorTest.java
index 6b7dd179d..1cdc49795 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/InputErrorTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/InputErrorTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ public class InputErrorTest extends TestCase {
 			super(theStorageDir, cacheReadOnly, key);
 		}
 
+		@Override
 		public void log(IStatus status) {
 			msg = status.getMessage();
 		}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/MultiLanguageTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/MultiLanguageTest.java
index b3f30c51b..8a49b7f6c 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/MultiLanguageTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/MultiLanguageTest.java
@@ -33,12 +33,13 @@ public class MultiLanguageTest extends TestCase {
 	class LocaleProviderTest implements LocaleProvider {
 		public Locale currentLocale;
 
+		@Override
 		public Locale getLocale() {
 			return currentLocale;
 		}
 	}
 
-	private ServiceTracker bundleTracker = null;
+	private ServiceTracker<?, PackageAdmin> bundleTracker;
 
 	private static String helloWorld = "Hello World";
 	private static String helloWorldGerman = "Hallo Welt";
@@ -64,6 +65,7 @@ public class MultiLanguageTest extends TestCase {
 	private IPath tmpPath;
 	private File registryLocation;
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 
@@ -82,6 +84,7 @@ public class MultiLanguageTest extends TestCase {
 		System.setProperty(IRegistryConstants.PROP_MULTI_LANGUAGE, "true");
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		// delete registry cache
 		FileSystemHelper.clear(tmpPath.toFile());
@@ -92,10 +95,11 @@ public class MultiLanguageTest extends TestCase {
 		refreshPackages(new Bundle[] {bundle});
 
 		// restore system environment
-		if (oldMultiLangValue == null)
+		if (oldMultiLangValue == null) {
 			System.clearProperty(IRegistryConstants.PROP_MULTI_LANGUAGE);
-		else
+		} else {
 			System.setProperty(IRegistryConstants.PROP_MULTI_LANGUAGE, oldMultiLangValue);
+		}
 
 		if (bundleTracker != null) {
 			bundleTracker.close();
@@ -109,12 +113,14 @@ public class MultiLanguageTest extends TestCase {
 
 		final boolean[] flag = new boolean[] {false};
 		FrameworkListener listener = new FrameworkListener() {
+			@Override
 			public void frameworkEvent(FrameworkEvent event) {
-				if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED)
+				if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED) {
 					synchronized (flag) {
 						flag[0] = true;
 						flag.notifyAll();
 					}
+				}
 			}
 		};
 		context.addFrameworkListener(listener);
@@ -249,8 +255,9 @@ public class MultiLanguageTest extends TestCase {
 			assertEquals(eclipse, subdivisionElements[0].getAttribute("division"));
 			assertEquals(catsAndDogs, elementValue.getValue());
 		} finally {
-			if (registration != null)
+			if (registration != null) {
 				registration.unregister();
+			}
 		}
 	}
 
@@ -315,8 +322,9 @@ public class MultiLanguageTest extends TestCase {
 		assertEquals(proverbLatin, elementFrag.getAttribute("name", "la_LA")); // check internal cache
 		assertEquals(proverb, elementFrag.getAttribute("name", "some_OtherABC"));
 
-		if (!extended)
+		if (!extended) {
 			return;
+		}
 
 		assertEquals(helloWorldFinnish, extPoint.getLabel("fi_FI"));
 		assertEquals(catsAndDogsFinnish, extension.getLabel("fi_FI"));
@@ -336,9 +344,9 @@ public class MultiLanguageTest extends TestCase {
 	 */
 	private PackageAdmin getBundleAdmin() {
 		if (bundleTracker == null) {
-			bundleTracker = new ServiceTracker(RuntimeTestsPlugin.getContext(), PackageAdmin.class.getName(), null);
+			bundleTracker = new ServiceTracker<>(RuntimeTestsPlugin.getContext(), PackageAdmin.class, null);
 			bundleTracker.open();
 		}
-		return (PackageAdmin) bundleTracker.getService();
+		return bundleTracker.getService();
 	}
 }
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/StaleObjects.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/StaleObjects.java
index f571131df..bbc0ed326 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/StaleObjects.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/StaleObjects.java
@@ -27,6 +27,7 @@ public class StaleObjects extends TestCase {
 			Platform.getExtensionRegistry().addRegistryChangeListener(this);
 		}
 
+		@Override
 		public void registryChanged(IRegistryChangeEvent event) {
 			boolean gotException = false;
 			try {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java
index c7d13b5b1..f72e801fb 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/WaitingRegistryListener.java
@@ -116,6 +116,7 @@ public class WaitingRegistryListener extends Assert implements IRegistryEventLis
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IRegistryEventListener#added(org.eclipse.core.runtime.IExtension[])
 	 */
+	@Override
 	synchronized public void added(IExtension[] extensions) {
 		extensionsToString(extensions);
 		added = true;
@@ -123,9 +124,7 @@ public class WaitingRegistryListener extends Assert implements IRegistryEventLis
 		notify();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IRegistryEventListener#removed(org.eclipse.core.runtime.IExtension[])
-	 */
+	@Override
 	synchronized public void removed(IExtension[] extensions) {
 		extensionsToString(extensions);
 		removed = true;
@@ -133,9 +132,7 @@ public class WaitingRegistryListener extends Assert implements IRegistryEventLis
 		notify();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IRegistryEventListener#added(org.eclipse.core.runtime.IExtensionPoint[])
-	 */
+	@Override
 	synchronized public void added(IExtensionPoint[] extensionPoints) {
 		extPointsToString(extensionPoints);
 		added = true;
@@ -143,9 +140,7 @@ public class WaitingRegistryListener extends Assert implements IRegistryEventLis
 		notify();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IRegistryEventListener#removed(org.eclipse.core.runtime.IExtensionPoint[])
-	 */
+	@Override
 	synchronized public void removed(IExtensionPoint[] extensionPoints) {
 		extPointsToString(extensionPoints);
 		removed = true;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/BaseExtensionRegistryRun.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/BaseExtensionRegistryRun.java
index 2f0490f88..a1ce6c2f7 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/BaseExtensionRegistryRun.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/BaseExtensionRegistryRun.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@ public class BaseExtensionRegistryRun extends TestCase {
 	/**
 	 * Create the "imaging device" registry
 	 */
+	@Override
 	protected void setUp() throws Exception {
 		// create the imaging device registry
 		simpleRegistry = startRegistry();
@@ -51,6 +52,7 @@ public class BaseExtensionRegistryRun extends TestCase {
 	/**
 	 * Properly dispose of the extension registry
 	 */
+	@Override
 	protected void tearDown() throws Exception {
 		stopRegistry();
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionCreateTwoRegistries.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionCreateTwoRegistries.java
index f071d82ae..7721bc7f2 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionCreateTwoRegistries.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionCreateTwoRegistries.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,10 +36,12 @@ public class DirectExtensionCreateTwoRegistries extends BaseExtensionRegistryRun
 		super(name);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		startRegistries();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		stopRegistries();
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionRemove.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionRemove.java
index a813fc22b..4443b3075 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionRemove.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DirectExtensionRemove.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -96,6 +96,7 @@ public class DirectExtensionRemove extends BaseExtensionRegistryRun {
 		// remove extension1
 		// listener to verify that valid CEs are included in the notification
 		IRegistryChangeListener listener = new IRegistryChangeListener() {
+			@Override
 			public void registryChanged(IRegistryChangeEvent event) {
 				IExtensionDelta[] deltas = event.getExtensionDeltas();
 				assertTrue(deltas.length == 1);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DuplicatePoints.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DuplicatePoints.java
index ae995bd05..242930b55 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DuplicatePoints.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/DuplicatePoints.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -44,6 +44,7 @@ public class DuplicatePoints extends BaseExtensionRegistryRun {
 	 * Use registry strategy with modified logging
 	 * @return - open extension registry
 	 */
+	@Override
 	protected IExtensionRegistry startRegistry() {
 		// use plugin's metadata directory to save cache data
 		Bundle theBundle = RuntimeTestsPlugin.getContext().getBundle();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java
index 580f46245..216fc1d12 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/XMLExecutableExtension.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,6 +38,7 @@ public class XMLExecutableExtension extends BaseExtensionRegistryRun {
 	 * Provide own class loader to the registry executable element strategry
 	 * @return - open extension registry
 	 */
+	@Override
 	protected IExtensionRegistry startRegistry() {
 		// use plugin's metadata directory to save cache data
 		Bundle theBundle = RuntimeTestsPlugin.getContext().getBundle();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExeExtensionStrategy.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExeExtensionStrategy.java
index a075adf18..54973047c 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExeExtensionStrategy.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExeExtensionStrategy.java
@@ -26,6 +26,7 @@ public class ExeExtensionStrategy extends RegistryStrategy {
 		super(theStorageDir, cacheReadOnly);
 	}
 
+	@Override
 	public Object createExecutableExtension(RegistryContributor defaultContributor, String className, String requestedContributorName) {
 		Class<?> classInstance = null;
 		try {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExecutableRegistryObject.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExecutableRegistryObject.java
index c238aa974..b5aecc5dc 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExecutableRegistryObject.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/ExecutableRegistryObject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2012 IBM Corporation and others.
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ public class ExecutableRegistryObject implements IExecutableExtensionFactory {
 		// intentionally left empty
 	}
 
+	@Override
 	public Object create() throws CoreException {
 		if (createCalled) {
 			Status status = new Status(IStatus.ERROR, "org.eclipse.core.tests.runtime", 0, "Duplicate executable extension call.", null); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/HiddenLogRegistryStrategy.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/HiddenLogRegistryStrategy.java
index ed151aa6e..745bb2413 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/HiddenLogRegistryStrategy.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/HiddenLogRegistryStrategy.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -27,10 +27,12 @@ public class HiddenLogRegistryStrategy extends RegistryStrategy {
 		super(theStorageDir, cacheReadOnly);
 	}
 
+	@Override
 	public boolean debug() {
 		return true;
 	}
 
+	@Override
 	public void log(IStatus status) {
 		log(status, null);
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/SimpleRegistryListener.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/SimpleRegistryListener.java
index 1578e4a25..2531b1d48 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/SimpleRegistryListener.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registry/simple/utils/SimpleRegistryListener.java
@@ -24,6 +24,7 @@ public class SimpleRegistryListener implements IRegistryChangeListener {
 
 	private List<IRegistryChangeEvent> events = new LinkedList<IRegistryChangeEvent>();
 
+	@Override
 	public synchronized void registryChanged(IRegistryChangeEvent newEvent) {
 		events.add(newEvent);
 		notify();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java
index c1851a9a8..9c016d80e 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -109,22 +109,23 @@ public class LogSerializationTest extends RuntimeTest {
 		char lastChar = 0;
 		for (int i = 0; i < sb.length();) {
 			// only \n is used as line separator, with no consecutive occurrences
-			if (LINE_SEPARATORS.indexOf(sb.charAt(i)) != -1)
+			if (LINE_SEPARATORS.indexOf(sb.charAt(i)) != -1) {
 				if (LINE_SEPARATORS.indexOf(lastChar) != -1) {
 					sb.deleteCharAt(i);
 					continue;
-				} else
-					sb.setCharAt(i, NEW_LINE);
-			// each line (except the first one) starts with a tab
-			else if (lastChar == NEW_LINE)
+				}
+				sb.setCharAt(i, NEW_LINE);
+			} else if (lastChar == NEW_LINE) {
+				// each line (except the first one) starts with a tab
 				sb.insert(i, TAB);
-			// only ' ' is used as space, with no consecutive occurrences
-			else if (SPACES.indexOf(sb.charAt(i)) != -1)
+			} else if (SPACES.indexOf(sb.charAt(i)) != -1) {
+				// only ' ' is used as space, with no consecutive occurrences
 				if (SPACES.indexOf(lastChar) != -1) {
 					sb.deleteCharAt(i);
 					continue;
-				} else
-					sb.setCharAt(i, SPACE);
+				}
+				sb.setCharAt(i, SPACE);
+			}
 			lastChar = sb.charAt(i);
 			i++;
 		}
@@ -168,6 +169,7 @@ public class LogSerializationTest extends RuntimeTest {
 		return reader.readLogFile(logFile.getAbsolutePath());
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		//setup the log file
@@ -176,6 +178,7 @@ public class LogSerializationTest extends RuntimeTest {
 		}
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		logFile.delete();
@@ -228,8 +231,9 @@ public class LogSerializationTest extends RuntimeTest {
 	}
 
 	protected void writeLog(IStatus[] statuses) {
-		if (logFile.exists())
+		if (logFile.exists()) {
 			logFile.delete();
+		}
 		for (int i = 0; i < statuses.length; i++) {
 			RuntimeLog.log(statuses[i]);
 		}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java
index 64a768568..bd29caa4a 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java
@@ -50,8 +50,9 @@ public class PlatformLogReader {
 	}
 
 	protected Throwable readException(String message) throws IOException {
-		if (currentLine == null || getLineType() != STACK)
+		if (currentLine == null || getLineType() != STACK) {
 			return null;
+		}
 		StringTokenizer tokenizer = new StringTokenizer(currentLine);
 		tokenizer.nextToken();
 		// FIXME: handle the code to read status objects which were
@@ -77,8 +78,9 @@ public class PlatformLogReader {
 				switch (getLineType()) {
 					case ENTRY :
 						IStatus status = readEntry();
-						if (status != null)
+						if (status != null) {
 							list.add(status);
+						}
 						break;
 					case SESSION :
 						readSession();
@@ -95,8 +97,9 @@ public class PlatformLogReader {
 			log(e);
 		} finally {
 			try {
-				if (input != null)
+				if (input != null) {
 					input.close();
+				}
 			} catch (IOException e) {
 				log(e);
 			}
@@ -105,21 +108,27 @@ public class PlatformLogReader {
 	}
 
 	protected int getLineType() {
-		if (currentLine == null)
+		if (currentLine == null) {
 			return NULL;
+		}
 		StringTokenizer tokenizer = new StringTokenizer(currentLine);
 		if (tokenizer.hasMoreTokens()) {
 			String token = tokenizer.nextToken();
-			if (token.equals(KEYWORD_SESSION))
+			if (token.equals(KEYWORD_SESSION)) {
 				return SESSION;
-			if (token.equals(KEYWORD_ENTRY))
+			}
+			if (token.equals(KEYWORD_ENTRY)) {
 				return ENTRY;
-			if (token.equals(KEYWORD_SUBENTRY))
+			}
+			if (token.equals(KEYWORD_SUBENTRY)) {
 				return SUBENTRY;
-			if (token.equals(KEYWORD_MESSAGE))
+			}
+			if (token.equals(KEYWORD_MESSAGE)) {
 				return MESSAGE;
-			if (token.equals(KEYWORD_STACK))
+			}
+			if (token.equals(KEYWORD_STACK)) {
 				return STACK;
+			}
 		}
 		return UNKNOWN;
 	}
@@ -140,26 +149,31 @@ public class PlatformLogReader {
 			this.stackTrace = stack;
 		}
 
+		@Override
 		public String getMessage() {
 			return message;
 		}
 
+		@Override
 		public void printStackTrace() {
 			printStackTrace(System.out);
 		}
 
+		@Override
 		public void printStackTrace(PrintWriter writer) {
 			writer.println(stackTrace);
 		}
 
+		@Override
 		public void printStackTrace(PrintStream stream) {
 			stream.println(stackTrace);
 		}
 	}
 
 	protected IStatus readEntry() throws IOException {
-		if (currentLine == null || getLineType() != ENTRY)
+		if (currentLine == null || getLineType() != ENTRY) {
 			return null;
+		}
 		StringTokenizer tokens = new StringTokenizer(currentLine);
 		// skip over the ENTRY keyword
 		tokens.nextToken();
@@ -170,8 +184,9 @@ public class PlatformLogReader {
 		currentLine = reader.readLine();
 		String message = readMessage();
 		Throwable exception = readException(message);
-		if (currentLine == null || getLineType() != SUBENTRY)
+		if (currentLine == null || getLineType() != SUBENTRY) {
 			return new Status(severity, pluginID, code, message, exception);
+		}
 		MultiStatus parent = new MultiStatus(pluginID, code, message, exception);
 		readSubEntries(parent);
 		return parent;
@@ -223,8 +238,9 @@ public class PlatformLogReader {
 	}
 
 	protected String readMessage() throws IOException {
-		if (currentLine == null || getLineType() != MESSAGE)
+		if (currentLine == null || getLineType() != MESSAGE) {
 			return "";
+		}
 		StringBuffer buffer = new StringBuffer();
 		buffer.append(currentLine.substring(KEYWORD_MESSAGE.length() + 1, currentLine.length()));
 		currentLine = reader.readLine();
@@ -233,18 +249,19 @@ public class PlatformLogReader {
 	}
 
 	protected String readSession() throws IOException {
-		if (currentLine == null || getLineType() != SESSION)
+		if (currentLine == null || getLineType() != SESSION) {
 			return "";
+		}
 		currentLine = reader.readLine();
 		return readText();
 	}
 
 	protected String readText() throws IOException {
 		StringBuffer buffer = new StringBuffer();
-		if (currentLine == null || getLineType() != UNKNOWN)
+		if (currentLine == null || getLineType() != UNKNOWN) {
 			return "";
-		else
-			buffer.append(currentLine);
+		}
+		buffer.append(currentLine);
 		boolean done = false;
 		while (!done) {
 			currentLine = reader.readLine();
@@ -256,8 +273,9 @@ public class PlatformLogReader {
 				// preserves line terminators between lines
 				buffer.append('\n');
 				buffer.append(currentLine);
-			} else
+			} else {
 				done = true;
+			}
 		}
 		return buffer.toString();
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AdapterManagerDynamicTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AdapterManagerDynamicTest.java
index 9f0955f8e..0ec7b1e45 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AdapterManagerDynamicTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AdapterManagerDynamicTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2012 IBM Corporation and others.
+ * Copyright (c) 2008, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -51,11 +51,13 @@ public class AdapterManagerDynamicTest extends TestCase {
 		super("");
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		manager = Platform.getAdapterManager();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		manager = null;
 		super.tearDown();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerServiceTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerServiceTest.java
index 9bcd92feb..cf7faabe5 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerServiceTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerServiceTest.java
@@ -27,7 +27,7 @@ public class IAdapterManagerServiceTest extends TestCase {
 	private static final String NON_EXISTING = "com.does.not.Exist";
 	private static final String TEST_ADAPTER = "org.eclipse.core.tests.runtime.TestAdapter";
 
-	private ServiceTracker<IAdapterManager, ?> adapterManagerTracker = null;
+	private ServiceTracker<IAdapterManager, IAdapterManager> adapterManagerTracker;
 
 	public IAdapterManagerServiceTest(String name) {
 		super(name);
@@ -47,12 +47,13 @@ public class IAdapterManagerServiceTest extends TestCase {
 	public IAdapterManager getAdapterManager() {
 		if (adapterManagerTracker == null) {
 			BundleContext context = RuntimeTestsPlugin.getContext();
-			adapterManagerTracker = new ServiceTracker(context, IAdapterManager.class, null);
+			adapterManagerTracker = new ServiceTracker<>(context, IAdapterManager.class, null);
 			adapterManagerTracker.open();
 		}
-		return (IAdapterManager) adapterManagerTracker.getService();
+		return adapterManagerTracker.getService();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		if (adapterManagerTracker != null) {
 			adapterManagerTracker.close();
@@ -79,13 +80,16 @@ public class IAdapterManagerServiceTest extends TestCase {
 
 		//register an adapter factory that maps adaptables to strings
 		IAdapterFactory fac = new IAdapterFactory() {
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adapterType == String.class)
-					return adaptableObject.toString();
+			@Override
+			public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+				if (adapterType == String.class) {
+					return adapterType.cast(adaptableObject.toString());
+				}
 				return null;
 			}
 
-			public Class[] getAdapterList() {
+			@Override
+			public Class<?>[] getAdapterList() {
 				return new Class[] {String.class};
 			}
 		};
@@ -120,13 +124,16 @@ public class IAdapterManagerServiceTest extends TestCase {
 
 		//register an adapter factory that maps adaptables to strings
 		IAdapterFactory fac = new IAdapterFactory() {
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adapterType == String.class)
-					return adaptableObject.toString();
+			@Override
+			public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+				if (adapterType == String.class) {
+					return adapterType.cast(adaptableObject.toString());
+				}
 				return null;
 			}
 
-			public Class[] getAdapterList() {
+			@Override
+			public Class<?>[] getAdapterList() {
 				return new Class[] {String.class};
 			}
 		};
@@ -161,13 +168,16 @@ public class IAdapterManagerServiceTest extends TestCase {
 
 		//register an adapter factory that maps adaptables to strings
 		IAdapterFactory fac = new IAdapterFactory() {
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adapterType == String.class)
-					return adaptableObject.toString();
+			@Override
+			public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+				if (adapterType == String.class) {
+					return adapterType.cast(adaptableObject.toString());
+				}
 				return null;
 			}
 
-			public Class[] getAdapterList() {
+			@Override
+			public Class<?>[] getAdapterList() {
 				return new Class[] {String.class};
 			}
 		};
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java
index c6716cd3b..86ec85baa 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/IAdapterManagerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2004, 2012 IBM Corporation and others.
+ *  Copyright (c) 2004, 2015 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -67,6 +67,7 @@ public class IAdapterManagerTest extends TestCase {
 		super("");
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		manager = Platform.getAdapterManager();
 	}
@@ -87,13 +88,16 @@ public class IAdapterManagerTest extends TestCase {
 
 		//register an adapter factory that maps adaptables to strings
 		IAdapterFactory fac = new IAdapterFactory() {
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adapterType == String.class)
-					return adaptableObject.toString();
+			@Override
+			public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+				if (adapterType == String.class) {
+					return adapterType.cast(adaptableObject.toString());
+				}
 				return null;
 			}
 
-			public Class[] getAdapterList() {
+			@Override
+			public Class<?>[] getAdapterList() {
 				return new Class[] {String.class};
 			}
 		};
@@ -126,13 +130,16 @@ public class IAdapterManagerTest extends TestCase {
 
 		//register an adapter factory that maps adaptables to strings
 		IAdapterFactory fac = new IAdapterFactory() {
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adapterType == String.class)
-					return adaptableObject.toString();
+			@Override
+			public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+				if (adapterType == String.class) {
+					return adapterType.cast(adaptableObject.toString());
+				}
 				return null;
 			}
 
-			public Class[] getAdapterList() {
+			@Override
+			public Class<?>[] getAdapterList() {
 				return new Class[] {String.class};
 			}
 		};
@@ -151,7 +158,7 @@ public class IAdapterManagerTest extends TestCase {
 	public void testGetAdapterNullArgs() {
 		TestAdaptable adaptable = new TestAdaptable();
 		try {
-			manager.getAdapter(adaptable, (Class) null);
+			manager.getAdapter(adaptable, (Class<?>) null);
 			fail("1.0");
 		} catch (RuntimeException e) {
 			//expected
@@ -182,13 +189,16 @@ public class IAdapterManagerTest extends TestCase {
 
 		//register an adapter factory that maps adaptables to strings
 		IAdapterFactory fac = new IAdapterFactory() {
-			public Object getAdapter(Object adaptableObject, Class adapterType) {
-				if (adapterType == String.class)
-					return adaptableObject.toString();
+			@Override
+			public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+				if (adapterType == String.class) {
+					return adapterType.cast(adaptableObject.toString());
+				}
 				return null;
 			}
 
-			public Class[] getAdapterList() {
+			@Override
+			public Class<?>[] getAdapterList() {
 				return new Class[] {String.class};
 			}
 		};
@@ -224,8 +234,9 @@ public class IAdapterManagerTest extends TestCase {
 			assertNotNull(result);
 			assertTrue(TEST_ADAPTER_CL.equals(result.getClass().getName()));
 		} finally {
-			if (bundle != null)
+			if (bundle != null) {
 				bundle.uninstall();
+			}
 		}
 	}
 
@@ -233,8 +244,9 @@ public class IAdapterManagerTest extends TestCase {
 	 * Tests for {@link IAdapterManager#computeClassOrder(Class)}.
 	 */
 	public void testComputeClassOrder() {
-		Class[] expected = new Class[] {X.class, Y.class, Object.class, A.class, B.class, M.class, N.class, O.class, C.class, D.class};
-		Class[] actual = manager.computeClassOrder(X.class);
+		Class<?>[] expected = new Class[] { X.class, Y.class, Object.class, A.class, B.class, M.class, N.class, O.class,
+				C.class, D.class };
+		Class<?>[] actual = manager.computeClassOrder(X.class);
 		assertEquals("1.0", expected.length, actual.length);
 		for (int i = 0; i < actual.length; i++) {
 			assertEquals("1.1." + i, expected[i], actual[i]);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java
index 9194098f6..4a6c49adb 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@ public class PlatformTest extends RuntimeTest {
 		super(name);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		//ensure platform locations are initialized
@@ -51,6 +52,7 @@ public class PlatformTest extends RuntimeTest {
 		originalLocation = logService.getFile();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		//undo any damage done by log location test
 		super.tearDown();
@@ -117,6 +119,7 @@ public class PlatformTest extends RuntimeTest {
 
 		// add a log listener to ensure that we report using the right plug-in id
 		ILogListener logListener = new ILogListener() {
+			@Override
 			public void logging(IStatus status, String plugin) {
 				collected.add(status);
 			}
@@ -125,10 +128,12 @@ public class PlatformTest extends RuntimeTest {
 
 		final Exception exception = new Exception("PlatformTest.testRunnable: this exception is thrown on purpose as part of the test.");
 		ISafeRunnable runnable = new ISafeRunnable() {
-			public void handleException(Throwable exception) {
-				exceptions.addElement(exception);
+			@Override
+			public void handleException(Throwable t) {
+				exceptions.addElement(t);
 			}
 
+			@Override
 			public void run() throws Exception {
 				throw exception;
 			}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceExportTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceExportTest.java
index 718bfcbda..bd96774df 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceExportTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceExportTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@ public class PreferenceExportTest extends RuntimeTest {
 		super(name);
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 
@@ -117,6 +118,7 @@ public class PreferenceExportTest extends RuntimeTest {
 		Plugin testPlugin = Platform.getPlugin(PI_RUNTIME_TESTS);
 		Preferences prefs = testPlugin.getPluginPreferences();
 		Preferences.IPropertyChangeListener listener = new Preferences.IPropertyChangeListener() {
+			@Override
 			public void propertyChange(Preferences.PropertyChangeEvent event) {
 				assertSame("1.0", event.getProperty(), key);
 			}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java
index 35fcc7832..c0f3011dc 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferenceForwarderTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2004, 2014 IBM Corporation and others.
+ *  Copyright (c) 2004, 2015 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -52,6 +52,7 @@ public class PreferenceForwarderTest extends RuntimeTest {
 			return null;
 		}
 
+		@Override
 		public void propertyChange(Preferences.PropertyChangeEvent event) {
 			log.append('[');
 			log.append(event.getProperty());
@@ -78,16 +79,12 @@ public class PreferenceForwarderTest extends RuntimeTest {
 		//				return suite;
 	}
 
-	/*
-	 * @see TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() {
 		// do nothing
 	}
 
-	/*
-	 * @see TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() {
 		// do nothing
 	}
@@ -623,6 +620,7 @@ public class PreferenceForwarderTest extends RuntimeTest {
 
 		// adds 2 and removes 1 during during callback!
 		class Trouble implements Preferences.IPropertyChangeListener {
+			@Override
 			public void propertyChange(Preferences.PropertyChangeEvent event) {
 				ps.removePropertyChangeListener(tracer1);
 				ps.addPropertyChangeListener(tracer2);
@@ -832,6 +830,7 @@ public class PreferenceForwarderTest extends RuntimeTest {
 	public void testListenerOnRemove() {
 		// create a new log listener that will fail if anything is written
 		ILogListener logListener = new ILogListener() {
+			@Override
 			public void logging(IStatus status, String plugin) {
 				CoreException ex = new CoreException(status);
 				fail("0.99", ex);
@@ -846,6 +845,7 @@ public class PreferenceForwarderTest extends RuntimeTest {
 		// add a property change listener which will cause one to be
 		// added at the preference node level
 		IPropertyChangeListener listener = new Preferences.IPropertyChangeListener() {
+			@Override
 			public void propertyChange(PropertyChangeEvent event) {
 			}
 		};
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java
index 9130b8a05..1c24460ec 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -52,6 +52,7 @@ public class PreferencesTest extends RuntimeTest {
 			return null;
 		}
 
+		@Override
 		public void propertyChange(Preferences.PropertyChangeEvent event) {
 			log.append("[");
 			log.append(event.getProperty());
@@ -77,16 +78,12 @@ public class PreferencesTest extends RuntimeTest {
 		//		return suite;
 	}
 
-	/*
-	 * @see TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() {
 		// do nothing
 	}
 
-	/*
-	 * @see TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() {
 		// do nothing
 	}
@@ -577,6 +574,7 @@ public class PreferencesTest extends RuntimeTest {
 
 		// adds 2 and removes 1 during during callback!
 		class Trouble implements Preferences.IPropertyChangeListener {
+			@Override
 			public void propertyChange(Preferences.PropertyChangeEvent event) {
 				ps.removePropertyChangeListener(tracer1);
 				ps.addPropertyChangeListener(tracer2);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTestsPlugin.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTestsPlugin.java
index ce8da81b9..fbb30e2ef 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTestsPlugin.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTestsPlugin.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,11 +26,13 @@ public class RuntimeTestsPlugin extends Plugin {
 		plugin = this;
 	}
 
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 		this.bundleContext = context;
 	}
 
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		context = null;
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SafeRunnerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SafeRunnerTest.java
index c78e10d96..841dbc2ea 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SafeRunnerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SafeRunnerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,9 +29,11 @@ public class SafeRunnerTest extends RuntimeTest {
 		boolean caught = false;
 		try {
 			SafeRunner.run(new ISafeRunnable() {
+				@Override
 				public void handleException(Throwable exception) {
 				}
 
+				@Override
 				public void run() throws Exception {
 					throw new OperationCanceledException();
 				}
@@ -52,10 +54,12 @@ public class SafeRunnerTest extends RuntimeTest {
 			final Throwable current = failures[i];
 			try {
 				SafeRunner.run(new ISafeRunnable() {
+					@Override
 					public void handleException(Throwable exception) {
 						handled[0] = exception;
 					}
 
+					@Override
 					public void run() throws Exception {
 						if (current instanceof Exception) {
 							throw (Exception) current;
@@ -83,9 +87,11 @@ public class SafeRunnerTest extends RuntimeTest {
 			final Throwable current = thrown[i];
 			try {
 				SafeRunner.run(new ISafeRunnable() {
+					@Override
 					public void handleException(Throwable exception) {
 					}
 
+					@Override
 					public void run() throws Exception {
 						if (current instanceof Exception) {
 							throw (Exception) current;
@@ -118,11 +124,13 @@ public class SafeRunnerTest extends RuntimeTest {
 		boolean caught = false;
 		try {
 			SafeRunner.run(new ISafeRunnable() {
+				@Override
 				public void handleException(Throwable exception) {
 					if (exception instanceof IllegalArgumentException)
 						throw (IllegalArgumentException) exception;
 				}
 
+				@Override
 				public void run() throws Exception {
 					throw new IllegalArgumentException();
 				}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
index 30e45a3c8..2a463a1c3 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -59,6 +59,7 @@ public class StatusTest extends RuntimeTest {
 		return suite;
 	}
 
+	@Override
 	protected void setUp() {
 		status1 = new Status(status1Severity, status1PluginId, status1Code, status1Message, status1Exception);
 		status2 = new Status(status2Severity, status2PluginId, status2Code, status2Message, status2Exception);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorSmallTicksTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorSmallTicksTest.java
index 727fc37d3..1b2d0e538 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorSmallTicksTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorSmallTicksTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -25,6 +25,7 @@ public class SubMonitorSmallTicksTest extends TestCase {
 
 	private static int TOTAL_WORK = 1000;
 
+	@Override
 	protected void setUp() throws Exception {
 		topmostMonitor = new TestProgressMonitor();
 		smallTicksChild = SubMonitor.convert(topmostMonitor, 10);
@@ -48,6 +49,7 @@ public class SubMonitorSmallTicksTest extends TestCase {
 		}
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		smallTicksChild.done();
 		topmostMonitor.done();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java
index 049496300..6aa8c6739 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubMonitorTest.java
@@ -55,11 +55,13 @@ public class SubMonitorTest extends TestCase {
 		super(name);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		startTime = System.currentTimeMillis();
 		super.setUp();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		long endTime = System.currentTimeMillis();
 		reportPerformance(getClass().getName(), getName(), startTime, endTime);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java
index 920b99ba8..83ce1688c 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressSubclass.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@ public class SubProgressSubclass extends SubProgressMonitor {
 		super(monitor, ticks);
 	}
 
+	@Override
 	public void internalWorked(double work) {
 		internalWorkedCalls++;
 		super.internalWorked(work);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java
index 707aba951..4bb7dd17f 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/SubProgressTest.java
@@ -51,11 +51,13 @@ public class SubProgressTest extends TestCase {
 		super(name);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		startTime = System.currentTimeMillis();
 		super.setUp();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		long endTime = System.currentTimeMillis();
 		SubMonitorTest.reportPerformance(getClass().getName(), getName(), startTime, endTime);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactory.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactory.java
index d49a69166..d98023c65 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactory.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,12 +16,14 @@ import org.eclipse.core.runtime.IAdapterFactory;
 /**
  */
 public class TestAdapterFactory extends Assert implements IAdapterFactory {
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	@Override
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		assertTrue("Request for wrong adapter", adaptableObject instanceof TestAdaptable);
-		return new TestAdapter();
+		return adapterType.cast(new TestAdapter());
 	}
 
-	public Class[] getAdapterList() {
+	@Override
+	public Class<?>[] getAdapterList() {
 		return new Class[] {TestAdapter.class};
 	}
 }
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactoryLoader.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactoryLoader.java
index e88ce4652..ee345e1aa 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactoryLoader.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestAdapterFactoryLoader.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 IBM Corporation and others.
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,10 +24,11 @@ import org.osgi.framework.Bundle;
  */
 public class TestAdapterFactoryLoader extends Assert implements IAdapterFactory {
 
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
+	@Override
+	public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
 		try {
-			Class[] targets = getAdapterList();
-			return targets[0].newInstance();
+			Class<?>[] targets = getAdapterList();
+			return adapterType.cast(targets[0].newInstance());
 		} catch (InstantiationException e) {
 			e.printStackTrace();
 			fail("Unable to load target class");
@@ -39,12 +40,14 @@ public class TestAdapterFactoryLoader extends Assert implements IAdapterFactory
 		}
 	}
 
-	public Class[] getAdapterList() {
+	@Override
+	public Class<?>[] getAdapterList() {
 		IExtensionRegistry registry = RegistryFactory.getRegistry();
 		IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.core.tests.runtime.factoryLoaderTest");
 		IExtension[] extensions = extPoint.getExtensions();
-		if (extensions.length == 0)
+		if (extensions.length == 0) {
 			return new Class[0];
+		}
 		IExtension extension = extensions[0];
 		IConfigurationElement[] confElements = extension.getConfigurationElements();
 		String className = confElements[0].getAttribute("name");
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestProgressMonitor.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestProgressMonitor.java
index 9c0b0cfca..f325a2258 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestProgressMonitor.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/TestProgressMonitor.java
@@ -206,16 +206,19 @@ public class TestProgressMonitor implements IProgressMonitor {
 		return totalWork;
 	}
 
+	@Override
 	public void beginTask(String name, int workToDo) {
 		beginTaskCalls++;
 		this.expectedWork = workToDo;
 		this.beginTaskName = name;
 	}
 
+	@Override
 	public void done() {
 		doneCalls++;
 	}
 
+	@Override
 	public void internalWorked(double work) {
 		workCalls++;
 		doubleWorkedCalls++;
@@ -224,15 +227,18 @@ public class TestProgressMonitor implements IProgressMonitor {
 		totalWork += work;
 	}
 
+	@Override
 	public boolean isCanceled() {
 		isCanceledCalls++;
 		return cancelled;
 	}
 
+	@Override
 	public void setCanceled(boolean value) {
 		this.cancelled = value;
 	}
 
+	@Override
 	public void setTaskName(String name) {
 		taskNameCalls++;
 		if (equals(name, taskName))
@@ -240,6 +246,7 @@ public class TestProgressMonitor implements IProgressMonitor {
 		taskName = name;
 	}
 
+	@Override
 	public void subTask(String name) {
 		subTaskCalls++;
 		if (equals(name, subTaskName))
@@ -247,6 +254,7 @@ public class TestProgressMonitor implements IProgressMonitor {
 		subTaskName = name;
 	}
 
+	@Override
 	public void worked(int work) {
 		workCalls++;
 		intWorkedCalls++;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/compatibility/PluginCompatibilityTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/compatibility/PluginCompatibilityTests.java
index 2975acf08..89b9b5b3b 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/compatibility/PluginCompatibilityTests.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/compatibility/PluginCompatibilityTests.java
@@ -27,6 +27,7 @@ public class PluginCompatibilityTests extends TestCase {
 	public void testPluginWithNoRuntimeLibrary() {
 		assertNull("0.0", BundleTestingHelper.getBundles(RuntimeTestsPlugin.getContext(), "bundle01", "1.0"));
 		BundleTestingHelper.runWithBundles("0.1", new Runnable() {
+			@Override
 			public void run() {
 				Bundle[] installed = BundleTestingHelper.getBundles(RuntimeTestsPlugin.getContext(), "bundle01", "1.0");
 				assertEquals("1.0", 1, installed.length);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AbstractJobManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AbstractJobManagerTest.java
index 9e258ce1a..1c13c8d65 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AbstractJobManagerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AbstractJobManagerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2014 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@ public class AbstractJobManagerTest extends AbstractJobTest {
 		super(name);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		manager = Job.getJobManager();
@@ -37,6 +38,7 @@ public class AbstractJobManagerTest extends AbstractJobTest {
 		manager.setProgressProvider(progressProvider);
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		progressProvider.sanityCheck();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchExecThread.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchExecThread.java
index 6fc2a1467..4f11a88fd 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchExecThread.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchExecThread.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,6 +40,7 @@ public class AsynchExecThread extends Thread {
 	/* (non-Javadoc)
 	 * @see java.lang.Runnable#run()
 	 */
+	@Override
 	public void run() {
 		//wait until the main testing method allows this thread to run
 		TestBarrier.waitForStatus(status, index, TestBarrier.STATUS_WAIT_FOR_RUN);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchTestJob.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchTestJob.java
index 39dfe822d..00fc2bb49 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchTestJob.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/AsynchTestJob.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@ class AsynchTestJob extends Job {
 		this.index = index;
 	}
 
+	@Override
 	public IStatus run(IProgressMonitor monitor) {
 		status[index] = TestBarrier.STATUS_RUNNING;
 		AsynchExecThread t = new AsynchExecThread(monitor, this, 100, 10, getName(), status, index);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java
index 0799b5537..440c8b982 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/BeginEndRuleTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@ public class BeginEndRuleTest extends AbstractJobManagerTest {
 			this.status = status;
 		}
 
+		@Override
 		public void run() {
 			try {
 				status[0] = TestBarrier.STATUS_RUNNING;
@@ -344,6 +345,7 @@ public class BeginEndRuleTest extends AbstractJobManagerTest {
 		final ISchedulingRule rule2 = new PathRule("/testFailedNestRuleInJob/B/");
 		final Exception[] exception = new Exception[1];
 		Job job = new Job("testFailedNestRuleInJob") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					try {
@@ -600,6 +602,7 @@ public class BeginEndRuleTest extends AbstractJobManagerTest {
 	public void testIgnoreScheduleThreadJob() throws Exception {
 		final int[] count = new int[1];
 		JobChangeAdapter a = new JobChangeAdapter() {
+			@Override
 			public void running(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
 				count[0]++;
 			}
@@ -620,6 +623,7 @@ public class BeginEndRuleTest extends AbstractJobManagerTest {
 	public void testRunThreadJobIsNotRescheduled() throws Exception {
 		final int[] count = new int[1];
 		JobChangeAdapter a = new JobChangeAdapter() {
+			@Override
 			public void running(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
 				count[0]++;
 			}
@@ -643,6 +647,7 @@ public class BeginEndRuleTest extends AbstractJobManagerTest {
 		final int[] count = new int[1];
 
 		final Job job = new Job(getName() + "acquire") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					Job.getJobManager().beginRule(subRule, null);
@@ -655,6 +660,7 @@ public class BeginEndRuleTest extends AbstractJobManagerTest {
 		job.setRule(rule);
 
 		JobChangeAdapter a = new JobChangeAdapter() {
+			@Override
 			public void running(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
 				if (event.getJob() == job)
 					return;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java
index dd3a6adf0..1749e780e 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_129551.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 IBM Corporation and others.
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -31,6 +31,7 @@ public class Bug_129551 extends AbstractJobManagerTest {
 			super("Bug_129551", 1, 1);
 		}
 
+		@Override
 		public boolean shouldRun() {
 			//skip everything if the test is already done
 			if (!shouldSleep[0])
@@ -60,6 +61,7 @@ public class Bug_129551 extends AbstractJobManagerTest {
 	public Bug_129551(String name) {
 		super(name);
 	}
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		//don't use fussy progress monitor, because in this case we kill
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_211799.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_211799.java
index 63e7647f8..2dbf1bdf4 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_211799.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_211799.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2014 IBM Corporation and others.
+ * Copyright (c) 2008, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,6 +34,7 @@ public class Bug_211799 extends AbstractJobManagerTest {
 			return new Long(this.id);
 		}
 
+		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			synchronized (list) {
 				Long val = list.getFirst();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307282.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307282.java
index a7415f2b8..d75113ee5 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307282.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307282.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Broadcom Corporation and others.
+ * Copyright (c) 2010, 2015 Broadcom Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -45,6 +45,7 @@ public class Bug_307282 extends AbstractJobManagerTest {
 		final int RELEASE_LOCK = 10001;
 
 		Thread t = new Thread() {
+			@Override
 			public void run() {
 				lock1.acquire();
 
@@ -60,6 +61,7 @@ public class Bug_307282 extends AbstractJobManagerTest {
 		};
 
 		Thread t2 = new Thread() {
+			@Override
 			public void run() {
 				lock2.acquire();
 
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307391.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307391.java
index a137d2167..6ab7b24cd 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307391.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_307391.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Broadcom Corporation and others.
+ * Copyright (c) 2010, 2015 Broadcom Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -67,6 +67,7 @@ public class Bug_307391 extends AbstractJobManagerTest {
 		};
 
 		Thread t2 = new Thread() {
+			@Override
 			public void run() {
 				tb2.setStatus(TestBarrier.STATUS_WAIT_FOR_START);
 				tb2.waitForStatus(TestBarrier.STATUS_START);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311756.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311756.java
index 0500e05f2..05f7bd081 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311756.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311756.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 IBM Corporation and others.
+ * Copyright (c) 2010, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,6 +46,7 @@ public class Bug_311756 extends AbstractJobManagerTest {
 		final TestBarrier barrier = new TestBarrier(TestBarrier.STATUS_START);
 		IdentityRule rule = new IdentityRule();
 		Job conflicting = new Job("Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				try {
@@ -92,6 +93,7 @@ public class Bug_311756 extends AbstractJobManagerTest {
 		final IdentityRule rule = new IdentityRule();
 		final Thread[] destinationThread = new Thread[1];
 		Job conflicting = new Job("Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				barrier.waitForStatus(TestBarrier.STATUS_BLOCKED);
@@ -105,6 +107,7 @@ public class Bug_311756 extends AbstractJobManagerTest {
 			}
 		};
 		Job transferTo = new Job("TransferTo") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				destinationThread[0] = getThread();
 				barrier.setStatus(TestBarrier.STATUS_BLOCKED);
@@ -145,6 +148,7 @@ public class Bug_311756 extends AbstractJobManagerTest {
 		final TestBarrier barrier = new TestBarrier(TestBarrier.STATUS_START);
 		IdentityRule rule = new IdentityRule();
 		Job conflicting = new Job("Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				try {
@@ -199,6 +203,7 @@ public class Bug_311756 extends AbstractJobManagerTest {
 		final TestBarrier barrier = new TestBarrier(TestBarrier.STATUS_START);
 		IdentityRule rule = new IdentityRule();
 		Job conflicting = new Job("Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				try {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311863.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311863.java
index c022d9c00..c4b50fa5b 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311863.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_311863.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Broadcom Corporation and others.
+ * Copyright (c) 2010, 2015 Broadcom Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,6 +43,7 @@ public class Bug_311863 extends AbstractJobManagerTest {
 			this.yield_time = yield_time;
 		}
 
+		@Override
 		public void run() {
 			while (true) {
 				tb.waitForStatus(WAIT_ACQUIRE);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_316839.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_316839.java
index 8878985c2..e9e6e9b26 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_316839.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_316839.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Oracle Corporation and others.
+ * Copyright (c) 2010, 2015 Oracle Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -38,6 +38,7 @@ public class Bug_316839 extends AbstractJobManagerTest {
 		interruptingJob = new TestJob("job with root rule"); //$NON-NLS-1$		job.setRule(new Root());
 		interruptingJob.setRule(new PathRule("/"));
 		interruptingJob.addJobChangeListener(new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				//at the moment we are done, the lock graph should be empty
 				lockGraphWasEmpty = ((JobManager) Job.getJobManager()).getLockManager().isEmpty();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_366170.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_366170.java
index ab68b9ceb..468a543e9 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_366170.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_366170.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 IBM Corporation and others.
+ * Copyright (c) 2012, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -45,6 +45,7 @@ public class Bug_366170 extends AbstractJobManagerTest {
 				return true;
 			}
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				System.out.println("begin " + getName());
 				try {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java
index d700d03cc..bdd1fbddc 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2013 IBM Corporation and others.

+ * Copyright (c) 2013, 2015 IBM Corporation and others.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -41,6 +41,7 @@ public class Bug_412138 extends TestCase {
 		new File(FILE_NAME).delete();

 		final int[] status = {-1};

 		final Job fakeBuild = new Job("Fake AutoBuildJob") {

+			@Override

 			protected IStatus run(IProgressMonitor monitor) {

 				try {

 					// synchronize on the job object

@@ -59,6 +60,7 @@ public class Bug_412138 extends TestCase {
 			}

 		};

 		Job job = new Job("Some job") {

+			@Override

 			protected IStatus run(IProgressMonitor monitor) {

 				TestBarrier.waitForStatus(status, TestBarrier.STATUS_RUNNING);

 				try {

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/DeadlockDetectionTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/DeadlockDetectionTest.java
index d2b516109..1b3c22d81 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/DeadlockDetectionTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/DeadlockDetectionTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2014 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -179,6 +179,7 @@ public class DeadlockDetectionTest extends TestCase {
 		final int[] status = {TestBarrier.STATUS_WAIT_FOR_START, TestBarrier.STATUS_WAIT_FOR_START};
 
 		Thread first = new Thread("Test1") {
+			@Override
 			public void run() {
 				lock.acquire();
 				status[0] = TestBarrier.STATUS_START;
@@ -193,6 +194,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		Thread second = new Thread("Test2") {
+			@Override
 			public void run() {
 				manager.beginRule(rule, null);
 				status[1] = TestBarrier.STATUS_START;
@@ -236,6 +238,7 @@ public class DeadlockDetectionTest extends TestCase {
 		final ILock lock = manager.newLock();
 
 		Job first = new Job("Test1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					assertTrue("1.0", getLockManager().isLockOwner());
@@ -255,6 +258,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		Job second = new Job("Test2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					assertTrue("1.0", getLockManager().isLockOwner());
@@ -309,6 +313,7 @@ public class DeadlockDetectionTest extends TestCase {
 		Job[] jobs = new Job[NUM_JOBS];
 
 		jobs[0] = new Job("Test 0") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -325,6 +330,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[1] = new Job("Test 1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -346,6 +352,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[2] = new Job("Test 2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -416,6 +423,7 @@ public class DeadlockDetectionTest extends TestCase {
 		Job[] jobs = new Job[NUM_JOBS];
 
 		jobs[0] = new Job("Test 0") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -432,6 +440,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[1] = new Job("Test 1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -451,6 +460,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[2] = new Job("Test 2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -519,6 +529,7 @@ public class DeadlockDetectionTest extends TestCase {
 		Job[] jobs = new Job[NUM_JOBS];
 
 		jobs[0] = new Job("Test 0") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -535,6 +546,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[1] = new Job("Test 1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -551,6 +563,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[2] = new Job("Test 2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -608,6 +621,7 @@ public class DeadlockDetectionTest extends TestCase {
 		final IProgressMonitor canceller = new FussyProgressMonitor();
 
 		Job ruleOwner = new Job("Test1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					status[0] = TestBarrier.STATUS_START;
@@ -624,6 +638,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		Job ruleWait = new Job("Test2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					status[1] = TestBarrier.STATUS_RUNNING;
@@ -672,6 +687,7 @@ public class DeadlockDetectionTest extends TestCase {
 		Job[] jobs = new Job[NUM_JOBS];
 
 		jobs[0] = new Job("Test 0") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -688,6 +704,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[1] = new Job("Test 1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -704,6 +721,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[2] = new Job("Test 2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -721,6 +739,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[3] = new Job("Test 3") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -798,6 +817,7 @@ public class DeadlockDetectionTest extends TestCase {
 		Job[] jobs = new Job[NUM_JOBS];
 
 		jobs[0] = new Job("Test 0") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -814,6 +834,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[1] = new Job("Test 1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -831,6 +852,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[2] = new Job("Test 2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -848,6 +870,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[3] = new Job("Test 3") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -865,6 +888,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		jobs[4] = new Job("Test 4") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -1020,6 +1044,7 @@ public class DeadlockDetectionTest extends TestCase {
 
 		for (int i = 0; i < jobs.length; i++) {
 			jobs[i] = new Job("Test" + i) {
+				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					try {
 						monitor.beginTask("Testing", IProgressMonitor.UNKNOWN);
@@ -1094,6 +1119,7 @@ public class DeadlockDetectionTest extends TestCase {
 		final int[] status = {TestBarrier.STATUS_WAIT_FOR_START};
 
 		Job first = new Job("Test1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					assertTrue("1.0", getLockManager().isLockOwner());
@@ -1109,6 +1135,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		Job second = new Job("Test2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					assertTrue("2.0", getLockManager().isLockOwner());
@@ -1151,6 +1178,7 @@ public class DeadlockDetectionTest extends TestCase {
 		final int[] status = {TestBarrier.STATUS_WAIT_FOR_START, TestBarrier.STATUS_WAIT_FOR_START};
 
 		Job first = new Job("Test1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					manager.beginRule(rule, null);
@@ -1168,6 +1196,7 @@ public class DeadlockDetectionTest extends TestCase {
 		};
 
 		Job second = new Job("Test2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					lock.acquire();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FamilyTestJob.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FamilyTestJob.java
index 79d905ae7..009eef302 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FamilyTestJob.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FamilyTestJob.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@ class FamilyTestJob extends TestJob {
 		familyType = type;
 	}
 
+	@Override
 	public boolean belongsTo(Object family) {
 		return ((family instanceof TestJobFamily) && (((TestJobFamily) family).getType() == familyType));
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FussyProgressProvider.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FussyProgressProvider.java
index ce0186610..4c6222d9a 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FussyProgressProvider.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/FussyProgressProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2014 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,7 @@ import org.eclipse.core.tests.harness.FussyProgressMonitor;
 public class FussyProgressProvider extends ProgressProvider {
 	private ArrayList<FussyProgressMonitor> monitors = new ArrayList<FussyProgressMonitor>();
 
+	@Override
 	public IProgressMonitor createMonitor(Job job) {
 		//only give a fussy monitor to jobs from runtime tests
 		String name = job == null ? "" : job.getClass().getName();
@@ -38,6 +39,7 @@ public class FussyProgressProvider extends ProgressProvider {
 			monitor.sanityCheck();
 	}
 
+	@Override
 	public IProgressMonitor getDefaultMonitor() {
 		return createMonitor(null);
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
index 6d8c2cec3..664f31ef0 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IJobManagerTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2014 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 			}
 		}
 
+		@Override
 		public void done(IJobChangeEvent event) {
 			synchronized (IJobManagerTest.this) {
 				if (scheduled.remove(event.getJob())) {
@@ -40,6 +41,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 			}
 		}
 
+		@Override
 		public void scheduled(IJobChangeEvent event) {
 			Job job = event.getJob();
 			synchronized (IJobManagerTest.this) {
@@ -108,9 +110,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		return "UNKNOWN";
 	}
 
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		completedJobs = 0;
@@ -122,9 +122,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		for (int i = 0; i < jobListeners.length; i++)
 			if (jobListeners[i] instanceof TestJobListener)
@@ -188,10 +186,12 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 	public void testBeginInvalidNestedRules() {
 		final ISchedulingRule root = new PathRule("/");
 		final ISchedulingRule invalid = new ISchedulingRule() {
+			@Override
 			public boolean isConflicting(ISchedulingRule rule) {
 				return this == rule;
 			}
 
+			@Override
 			public boolean contains(ISchedulingRule rule) {
 				return this == rule || root.contains(rule);
 			}
@@ -217,6 +217,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 	public void testBeginRuleNoEnd() {
 		final PathRule rule = new PathRule("testBeginRuleNoEnd");
 		Job job = new Job("testBeginRuleNoEnd") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				monitor.beginTask(getName(), 1);
 				try {
@@ -297,6 +298,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final boolean[] success = new boolean[] {false};
 		//create a job that will complete asynchronously
 		final Job job = new Job("Test Job") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				setThread(thread[0]);
 				done[0] = true;
@@ -305,6 +307,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		};
 		//create and run a thread that will run and finish the asynchronous job
 		Runnable r = new Runnable() {
+			@Override
 			public void run() {
 				job.schedule();
 				//wait for job to start running
@@ -341,6 +344,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		//next test in a job with no rule of its own
 		final List<AssertionFailedError> errors = new ArrayList<AssertionFailedError>();
 		Job sequenceJob = new Job("testCurrentRule") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					runRuleSequence();
@@ -730,6 +734,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		}
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -802,6 +807,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		}
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -874,6 +880,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		}
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -992,6 +999,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		Object family = new Object();
 		final int count = 1;
 		RepeatingJob job = new RepeatingJob("testJobFamilyJoinShouldSchedule", count) {
+			@Override
 			public boolean shouldSchedule() {
 				return shouldRun();
 			}
@@ -1039,6 +1047,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		}
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -1099,17 +1108,20 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final Job waiting = new FamilyTestJob("waiting job", 1000000, 10, TestJobFamily.TYPE_ONE);
 		final Job running = new FamilyTestJob("running job", 200, 10, TestJobFamily.TYPE_ONE);
 		final IJobChangeListener listener = new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				if (event.getJob() == running)
 					barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_DONE);
 			}
 
+			@Override
 			public void running(IJobChangeEvent event) {
 				if (event.getJob() == running)
 					barrier.setStatus(TestBarrier.STATUS_RUNNING);
 			}
 		};
 		Job job = new Job("main job") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					manager.addJobChangeListener(listener);
@@ -1119,6 +1131,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 					manager.setLockListener(new LockListener() {
 						private boolean scheduled = false;
 
+						@Override
 						public boolean aboutToWait(Thread lockOwner) {
 							// aboutToWait will be called when main job will start joining the running job
 							if (!scheduled) {
@@ -1180,17 +1193,20 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final Job waiting = new FamilyTestJob("waiting job", 1000000, 10, TestJobFamily.TYPE_ONE);
 		final Job running = new FamilyTestJob("running job", 200, 10, TestJobFamily.TYPE_ONE);
 		final IJobChangeListener listener = new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				if (event.getJob() == running)
 					barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_DONE);
 			}
 
+			@Override
 			public void running(IJobChangeEvent event) {
 				if (event.getJob() == running)
 					barrier.setStatus(TestBarrier.STATUS_RUNNING);
 			}
 		};
 		Job job = new Job("main job") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					manager.addJobChangeListener(listener);
@@ -1200,6 +1216,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 					manager.setLockListener(new LockListener() {
 						private boolean scheduled = false;
 
+						@Override
 						public boolean aboutToWait(Thread lockOwner) {
 							// aboutToWait will be called when main job will start joining the running job
 							if (!scheduled) {
@@ -1261,11 +1278,13 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final Job waiting = new FamilyTestJob("waiting job", 400, 10, TestJobFamily.TYPE_ONE);
 		final Job running = new FamilyTestJob("running job", 200, 10, TestJobFamily.TYPE_ONE);
 		final IJobChangeListener listener = new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				if (event.getJob() == running)
 					barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_DONE);
 			}
 
+			@Override
 			public void running(IJobChangeEvent event) {
 				if (event.getJob() == running)
 					barrier.setStatus(TestBarrier.STATUS_RUNNING);
@@ -1281,6 +1300,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 			manager.setLockListener(new LockListener() {
 				private boolean scheduled = false;
 
+				@Override
 				public boolean aboutToWait(Thread lockOwner) {
 					// aboutToWait will be called when main thread will start joining the running job
 					if (!scheduled) {
@@ -1582,6 +1602,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		//ensure jobs are run in order from lowest to highest sleep time.
 		final List<Job> done = Collections.synchronizedList(new ArrayList<Job>());
 		IJobChangeListener listener = new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				if (event.getJob() instanceof TestJob)
 					done.add(event.getJob());
@@ -1614,6 +1635,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		//ensure jobs are run in order from lowest to highest sleep time.
 		final List<Job> done = Collections.synchronizedList(new ArrayList<Job>());
 		IJobChangeListener listener = new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				if (event.getJob() instanceof TestJob)
 					//add at start of list to get reverse order
@@ -1651,6 +1673,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final boolean[] running = new boolean[] {false};
 		final boolean[] failure = new boolean[] {false};
 		final Job testJob = new Job("testScheduleRace") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					synchronized (running) {
@@ -1673,6 +1696,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 			}
 		};
 		testJob.addJobChangeListener(new JobChangeAdapter() {
+			@Override
 			public void scheduled(IJobChangeEvent event) {
 				while (count[0]++ < 2) {
 					testJob.schedule();
@@ -1702,10 +1726,12 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 	 */
 	public void testSetInvalidRule() {
 		class InvalidRule implements ISchedulingRule {
+			@Override
 			public boolean isConflicting(ISchedulingRule rule) {
 				return false;
 			}
 
+			@Override
 			public boolean contains(ISchedulingRule rule) {
 				return false;
 			}
@@ -1716,6 +1742,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		ISchedulingRule multi = MultiRule.combine(rule1, rule2);
 
 		Job job = new Job("job with invalid rule") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
@@ -1857,6 +1884,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 
 		//should not be able to run a job that uses the rule
 		Job job = new Job("TestSuspend") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
@@ -1974,6 +2002,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final TestBarrier barrier = new TestBarrier();
 		final Thread[] sourceThread = new Thread[1];
 		final Job destination = new Job("testTransferJobToJob.destination") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_DONE);
@@ -1981,6 +2010,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 			}
 		};
 		final Job source = new Job("testTransferJobToJob.source") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				sourceThread[0] = Thread.currentThread();
 				//schedule the destination job and wait until it is running
@@ -2035,6 +2065,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 				this.rule = rule;
 			}
 
+			@Override
 			public void run() {
 				try {
 					manager.endRule(rule);
@@ -2069,6 +2100,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final Thread testThread = Thread.currentThread();
 		//create a job that the rule will be transferred to
 		Job job = new Job("testTransferSimple") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_DONE);
@@ -2123,6 +2155,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final Thread testThread = Thread.currentThread();
 		//create a job that the rule will be transferred to
 		Job job = new Job("testTransferToJobWaitingOnChildRule") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				//this will block until the rule is transferred
@@ -2180,6 +2213,7 @@ public class IJobManagerTest extends AbstractJobManagerTest {
 		final Thread testThread = Thread.currentThread();
 		//create a job that the rule will be transferred to
 		Job job = new Job("testTransferToWaitingJob") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				//this will block until the rule is transferred
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IdentityRule.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IdentityRule.java
index 2a18c12e0..b9ff2c41d 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IdentityRule.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/IdentityRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -20,14 +20,17 @@ public class IdentityRule implements ISchedulingRule {
 	private static int nextRule = 0;
 	private final int ruleNumber = nextRule++;
 
+	@Override
 	public boolean contains(ISchedulingRule rule) {
 		return rule == this;
 	}
 
+	@Override
 	public boolean isConflicting(ISchedulingRule rule) {
 		return rule == this;
 	}
 
+	@Override
 	public String toString() {
 		return "IdentityRule(" + ruleNumber + ")";
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobGroupTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobGroupTest.java
index 9721899e7..6913eae29 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobGroupTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobGroupTest.java
@@ -24,6 +24,7 @@ public class JobGroupTest extends AbstractJobTest {
 	private IJobManager manager;
 	private FussyProgressProvider progressProvider;
 
+	@Override
 	public void setUp() throws Exception {
 		super.setUp();
 		manager = Job.getJobManager();
@@ -31,6 +32,7 @@ public class JobGroupTest extends AbstractJobTest {
 		manager.setProgressProvider(progressProvider);
 	}
 
+	@Override
 	public void tearDown() throws Exception {
 		super.tearDown();
 		progressProvider.sanityCheck();
@@ -56,6 +58,7 @@ public class JobGroupTest extends AbstractJobTest {
 		// Use a thread to record the maximum number of running jobs and
 		// cancel the running jobs so that the waiting jobs will be scheduled.
 		final Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				while (jobGroup.getState() != JobGroup.NONE) {
@@ -127,6 +130,7 @@ public class JobGroupTest extends AbstractJobTest {
 			// An example usage would be a directory digger that starts
 			// with a set of root directories.
 			Job job = new Job("SeedJob") {
+				@Override
 				public IStatus run(IProgressMonitor monitor) {
 					for (int j = 0; j < NUM_CHILD_JOBS; j++) {
 						TestJob childJob = new TestJob("ChildTestJob", 1000000, 10);
@@ -421,6 +425,7 @@ public class JobGroupTest extends AbstractJobTest {
 		}
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -497,6 +502,7 @@ public class JobGroupTest extends AbstractJobTest {
 		final long duration[] = {-1};
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -565,6 +571,7 @@ public class JobGroupTest extends AbstractJobTest {
 		}
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -637,6 +644,7 @@ public class JobGroupTest extends AbstractJobTest {
 		}
 
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -789,6 +797,7 @@ public class JobGroupTest extends AbstractJobTest {
 		final TestJob running = new TestJob("RunningJob", 200, 10);
 		running.setJobGroup(jobGroup);
 		Job job = new Job("MainJob") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_START);
 				try {
@@ -851,6 +860,7 @@ public class JobGroupTest extends AbstractJobTest {
 		running.setJobGroup(jobGroup);
 
 		final Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				try {
@@ -864,6 +874,7 @@ public class JobGroupTest extends AbstractJobTest {
 			}
 		});
 		Job job = new Job("MainJob") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_START);
 				try {
@@ -927,6 +938,7 @@ public class JobGroupTest extends AbstractJobTest {
 		running.setJobGroup(jobGroup);
 
 		final Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				try {
@@ -940,6 +952,7 @@ public class JobGroupTest extends AbstractJobTest {
 			}
 		});
 		Job job = new Job("MainJob") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_START);
 
@@ -1070,6 +1083,7 @@ public class JobGroupTest extends AbstractJobTest {
 		final int NUM_JOBS = 10;
 		final int numShouldCancelCalled[] = {0};
 		final JobGroup jobGroup = new JobGroup("JobGroup", 1, NUM_JOBS) {
+			@Override
 			protected boolean shouldCancel(IStatus lastCompletedJobResult, int numberOfFailedJobs, int numberOfCanceledJobs) {
 				numShouldCancelCalled[0]++;
 				return super.shouldCancel(lastCompletedJobResult, numberOfFailedJobs, numberOfCanceledJobs);
@@ -1104,6 +1118,7 @@ public class JobGroupTest extends AbstractJobTest {
 		final TestBarrier barrier = new TestBarrier();
 
 		final JobGroup jobGroup = new JobGroup("JobGroup", 1, status.length) {
+			@Override
 			protected boolean shouldCancel(IStatus lastCompletedJobResult, int numberOfFailedJobs, int numberOfCanceledJobs) {
 				numShouldCancelCalled[0]++;
 				failedJobsCount[0] = numberOfFailedJobs;
@@ -1118,6 +1133,7 @@ public class JobGroupTest extends AbstractJobTest {
 			final int jobNumber = i;
 			final IStatus returnedStatus[] = new IStatus[1];
 			Job job = new TestJob("TestJob", 10, 10) {
+				@Override
 				public IStatus run(IProgressMonitor monitor) {
 					super.run(monitor);
 					returnedStatus[0] = new Status(status[jobNumber], "org.eclipse.core.jobs", "Job " + jobNumber);
@@ -1164,6 +1180,7 @@ public class JobGroupTest extends AbstractJobTest {
 		final int numShouldCancelCalled[] = {0};
 		final TestBarrier barrier = new TestBarrier();
 		final JobGroup jobGroup = new JobGroup("JobGroup", 10, NUM_JOBS) {
+			@Override
 			protected boolean shouldCancel(IStatus lastCompletedJobResult, int numberOfFailedJobs, int numberOfCanceledJobs) {
 				numShouldCancelCalled[0]++;
 				if (numShouldCancelCalled[0] == NUM_JOBS_LIMIT)
@@ -1174,6 +1191,7 @@ public class JobGroupTest extends AbstractJobTest {
 		for (int i = 0; i < NUM_JOBS; i++) {
 			final int jobNumber = i;
 			Job job = new TestJob("TestJob", 10, 10) {
+				@Override
 				public IStatus run(IProgressMonitor monitor) {
 					barrier.waitForStatus(TestBarrier.STATUS_START);
 					super.run(monitor);
@@ -1195,6 +1213,7 @@ public class JobGroupTest extends AbstractJobTest {
 	public void testDefaultComputeGroupResult() {
 		final int status[] = {IStatus.OK, IStatus.INFO, IStatus.WARNING, IStatus.ERROR, IStatus.CANCEL};
 		final JobGroup jobGroup = new JobGroup("JobGroup", 1, status.length) {
+			@Override
 			protected boolean shouldCancel(IStatus lastCompletedJobResult, int numberOfFailedJobs, int numberOfCanceledJobs) {
 				// Return false always so that the group will not be canceled due to failed jobs.
 				return false;
@@ -1204,6 +1223,7 @@ public class JobGroupTest extends AbstractJobTest {
 		for (int i = 0; i < status.length; i++) {
 			final int jobNumber = i;
 			Job job = new TestJob("TestJob", 10, 10) {
+				@Override
 				public IStatus run(IProgressMonitor monitor) {
 					super.run(monitor);
 					return new Status(status[jobNumber], "org.eclipse.core.jobs", "Job " + jobNumber);
@@ -1225,10 +1245,12 @@ public class JobGroupTest extends AbstractJobTest {
 		final IStatus originalJobResults[][] = {new IStatus[0]};
 		final int status[] = {IStatus.OK, IStatus.INFO, IStatus.WARNING, IStatus.ERROR, IStatus.CANCEL};
 		final JobGroup jobGroup = new JobGroup("group", 1, status.length) {
+			@Override
 			protected boolean shouldCancel(IStatus lastCompletedJobResult, int numberOfFailedJobs, int numberOfCanceledJobs) {
 				return false;
 			}
 
+			@Override
 			protected MultiStatus computeGroupResult(List<IStatus> jobResults) {
 				// Record the original job results and return a dummy groupresult.
 				originalJobResults[0] = jobResults.toArray(new IStatus[jobResults.size()]);
@@ -1240,6 +1262,7 @@ public class JobGroupTest extends AbstractJobTest {
 		for (int i = 0; i < status.length; i++) {
 			final int jobNumber = i;
 			Job job = new TestJob("TestJob", 10, 10) {
+				@Override
 				public IStatus run(IProgressMonitor monitor) {
 					super.run(monitor);
 					return new Status(status[jobNumber], "org.eclipse.core.jobs", "Job " + jobNumber);
@@ -1260,6 +1283,7 @@ public class JobGroupTest extends AbstractJobTest {
 	// https://bugs.eclipse.org/461621
 	public void testSlowComputeGroupResult() throws Exception {
 		final JobGroup jobGroup = new JobGroup("group", 1, 1) {
+			@Override
 			protected MultiStatus computeGroupResult(List<IStatus> jobResults) {
 				sleep(500);
 				return new MultiStatus("org.eclipse.core.jobs", 0, new IStatus[0], "custom result", null);
@@ -1267,6 +1291,7 @@ public class JobGroupTest extends AbstractJobTest {
 		};
 
 		Job job = new Job("TestJob") {
+			@Override
 			public IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobQueueTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobQueueTest.java
index 2d9cde36b..53f5ba0c3 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobQueueTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobQueueTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ public class JobQueueTest extends TestCase {
 			setPriority(value);
 		}
 
+		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			return Status.OK_STATUS;
 		}
@@ -37,11 +38,13 @@ public class JobQueueTest extends TestCase {
 		super(name);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		this.queue = new JobQueue(false);
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobRuleRunner.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobRuleRunner.java
index 219d8403d..c50dcb864 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobRuleRunner.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobRuleRunner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -47,6 +47,7 @@ class JobRuleRunner extends Job {
 		this(name, rule, barrier, 1, false);
 	}
 
+	@Override
 	protected IStatus run(IProgressMonitor monitor) {
 		//begin executing the job
 		monitor.beginTask(getName(), numRepeats);
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java
index 9f506f506..92dfb87f9 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/JobTest.java
@@ -86,9 +86,7 @@ public class JobTest extends AbstractJobTest {
 			jobs[i].cancel();
 	}
 
-	/*
-	 * @see TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		shortJob = new TestJob("Short Test Job", 100, 10);
@@ -97,9 +95,7 @@ public class JobTest extends AbstractJobTest {
 		Job.getJobManager().setProgressProvider(progressProvider);
 	}
 
-	/*
-	 * @see TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		Job.getJobManager().setProgressProvider(null);
@@ -366,14 +362,17 @@ public class JobTest extends AbstractJobTest {
 		final int[] runningCount = new int[] {0};
 		TestJob job = new TestJob("testCancelFromAboutToRun", 0, 0);
 		job.addJobChangeListener(new JobChangeAdapter() {
+			@Override
 			public void aboutToRun(IJobChangeEvent event) {
 				event.getJob().cancel();
 			}
 
+			@Override
 			public void done(IJobChangeEvent event) {
 				doneCount[0]++;
 			}
 
+			@Override
 			public void running(IJobChangeEvent event) {
 				runningCount[0]++;
 			}
@@ -401,11 +400,13 @@ public class JobTest extends AbstractJobTest {
 
 			int runCount = 0;
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				++runCount;
 				return Status.OK_STATUS;
 			}
 
+			@Override
 			public boolean shouldRun() {
 				return false;
 			}
@@ -434,11 +435,13 @@ public class JobTest extends AbstractJobTest {
 
 			int runCount = 0;
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				++runCount;
 				return Status.OK_STATUS;
 			}
 
+			@Override
 			public boolean shouldRun() {
 				throw new RuntimeException("Exception thrown on purpose as part of a test");
 			}
@@ -461,6 +464,7 @@ public class JobTest extends AbstractJobTest {
 			volatile int runningCount = 0;
 			boolean cancelled;
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				if (++runningCount > 1)
 					failure[0] = "Multiple running at once!";
@@ -475,10 +479,12 @@ public class JobTest extends AbstractJobTest {
 				return Status.OK_STATUS;
 			}
 
+			@Override
 			public boolean belongsTo(Object family) {
 				return JobTest.this == family;
 			}
 
+			@Override
 			public boolean shouldRun() {
 				if (!cancelled) {
 					cancelled = true;
@@ -514,10 +520,12 @@ public class JobTest extends AbstractJobTest {
 		barrier.setStatus(TestBarrier.STATUS_WAIT_FOR_START);
 		final int[] canceling = new int[] {0};
 		Job job = new Job("Testing#testCanceling") {
+			@Override
 			protected void canceling() {
 				canceling[0]++;
 			}
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_WAIT_FOR_RUN);
 				barrier.waitForStatus(TestBarrier.STATUS_RUNNING);
@@ -546,10 +554,12 @@ public class JobTest extends AbstractJobTest {
 		final int[] canceling = new int[] {0};
 		final IProgressMonitor[] jobmonitor = new IProgressMonitor[1];
 		Job job = new Job("Testing#testCancelingByMonitor") {
+			@Override
 			protected void canceling() {
 				canceling[0]++;
 			}
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				jobmonitor[0] = monitor;
 				barrier.setStatus(TestBarrier.STATUS_WAIT_FOR_RUN);
@@ -579,6 +589,7 @@ public class JobTest extends AbstractJobTest {
 		final Job j = new Job("testCancelAboutToSchedule") {
 			volatile int runningCount = 0;
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				if (++runningCount > 1)
 					failure[0] = true;
@@ -593,6 +604,7 @@ public class JobTest extends AbstractJobTest {
 				return Status.OK_STATUS;
 			}
 
+			@Override
 			public boolean belongsTo(Object family) {
 				return JobTest.this == family;
 			}
@@ -600,6 +612,7 @@ public class JobTest extends AbstractJobTest {
 		JobChangeAdapter listener = new JobChangeAdapter() {
 			boolean canceled = false;
 
+			@Override
 			public void scheduled(IJobChangeEvent event) {
 				if (event.getJob().belongsTo(JobTest.this) && !canceled) {
 					canceled = true;
@@ -831,6 +844,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = new int[1];
 		status[0] = TestBarrier.STATUS_WAIT_FOR_START;
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -867,6 +881,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = new int[1];
 		status[0] = TestBarrier.STATUS_WAIT_FOR_START;
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -910,6 +925,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = new int[1];
 		status[0] = TestBarrier.STATUS_WAIT_FOR_START;
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -939,6 +955,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = new int[1];
 		status[0] = TestBarrier.STATUS_WAIT_FOR_START;
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -969,6 +986,7 @@ public class JobTest extends AbstractJobTest {
 	public void testJoinInterruptNonUIThread() throws InterruptedException {
 		final Job job = new TestJob("job", 1000, 100);
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				job.schedule();
 				try {
@@ -989,6 +1007,7 @@ public class JobTest extends AbstractJobTest {
 	public void testJoinInterruptUIThread() throws InterruptedException {
 		final Job job = new TestJob("job", 1000, 100);
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				job.schedule();
 				try {
@@ -1000,6 +1019,7 @@ public class JobTest extends AbstractJobTest {
 		});
 		try {
 			Job.getJobManager().setLockListener(new LockListener() {
+				@Override
 				public boolean canBlock() {
 					// pretend to be the UI thread
 					return false;
@@ -1045,6 +1065,7 @@ public class JobTest extends AbstractJobTest {
 	 */
 	public void testJoinFailingListener() {
 		shortJob.addJobChangeListener(new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				throw new RuntimeException("This exception thrown on purpose as part of a test");
 			}
@@ -1052,6 +1073,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = new int[1];
 		//create a thread that will join the job
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -1075,6 +1097,7 @@ public class JobTest extends AbstractJobTest {
 	public void testJoinSelf() {
 		final Exception[] failure = new Exception[1];
 		Job selfJoiner = new Job("testJoinSelf") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					this.join();
@@ -1102,6 +1125,7 @@ public class JobTest extends AbstractJobTest {
 	 */
 	public void testJoinRemoveListener() {
 		final IJobChangeListener listener = new JobChangeAdapter() {
+			@Override
 			public void done(IJobChangeEvent event) {
 				shortJob.removeJobChangeListener(this);
 			}
@@ -1110,6 +1134,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = new int[1];
 		//create a thread that will join the job
 		Thread t = new Thread(new Runnable() {
+			@Override
 			public void run() {
 				status[0] = TestBarrier.STATUS_START;
 				try {
@@ -1133,6 +1158,7 @@ public class JobTest extends AbstractJobTest {
 	public void testRescheduleCancel() {
 		final int[] status = {TestBarrier.STATUS_WAIT_FOR_START};
 		Job job = new Job("Testing") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -1167,6 +1193,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = {TestBarrier.STATUS_WAIT_FOR_START};
 		final int[] runCount = new int[] {0};
 		Job job = new Job("Testing") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -1205,6 +1232,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] status = {TestBarrier.STATUS_WAIT_FOR_START};
 		final int[] runCount = new int[] {0};
 		Job job = new Job("Testing") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -1246,12 +1274,14 @@ public class JobTest extends AbstractJobTest {
 		final int[] count = new int[] {0};
 		final int REPEATS = 10;
 		Job job = new Job("testRescheduleRepeat") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				count[0]++;
 				schedule();
 				return Status.OK_STATUS;
 			}
 
+			@Override
 			public boolean shouldSchedule() {
 				return count[0] < REPEATS;
 			}
@@ -1275,12 +1305,14 @@ public class JobTest extends AbstractJobTest {
 		final int[] count = new int[] {0};
 		final int REPEATS = 10;
 		Job job = new Job("testRescheduleRepeat") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				count[0]++;
 				schedule(10);
 				return Status.OK_STATUS;
 			}
 
+			@Override
 			public boolean shouldSchedule() {
 				return count[0] < REPEATS;
 			}
@@ -1304,6 +1336,7 @@ public class JobTest extends AbstractJobTest {
 	public void testRescheduleSimple() {
 		final int[] status = {TestBarrier.STATUS_WAIT_FOR_START};
 		Job job = new Job("testRescheduleSimple") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -1349,6 +1382,7 @@ public class JobTest extends AbstractJobTest {
 		final int[] runCount = new int[] {0};
 		final ISchedulingRule rule = new IdentityRule();
 		Job first = new Job("Testing1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -1362,6 +1396,7 @@ public class JobTest extends AbstractJobTest {
 			}
 		};
 		Job second = new Job("Testing2") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					monitor.beginTask("Testing", 1);
@@ -1420,6 +1455,7 @@ public class JobTest extends AbstractJobTest {
 	public void testSetProgressGroup() {
 		final TestBarrier barrier = new TestBarrier();
 		Job job = new Job("testSetProgressGroup") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_DONE);
@@ -1543,6 +1579,7 @@ public class JobTest extends AbstractJobTest {
 		//when the state is changed to RUNNING, the thread should not be null
 		final Thread[] thread = new Thread[1];
 		IJobChangeListener listener = new JobChangeAdapter() {
+			@Override
 			public void running(IJobChangeEvent event) {
 				thread[0] = event.getJob().getThread();
 			}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/LockAcquiringRunnable.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/LockAcquiringRunnable.java
index 1806263e4..6a70704d4 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/LockAcquiringRunnable.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/LockAcquiringRunnable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@ public class LockAcquiringRunnable implements Runnable {
 		alive = false;
 	}
 
+	@Override
 	public void run() {
 		while (alive) {
 			try {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/OrderedLockTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/OrderedLockTest.java
index d79bb0d90..d74c433f5 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/OrderedLockTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/OrderedLockTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -95,6 +95,7 @@ public class OrderedLockTest extends TestCase {
 		final ILock lock = manager.newLock();
 		final boolean[] wasInterupted = new boolean[] {false};
 		Thread t = new Thread() {
+			@Override
 			public void run() {
 				barrier.setStatus(TestBarrier.STATUS_RUNNING);
 				barrier.waitForStatus(TestBarrier.STATUS_WAIT_FOR_START);
@@ -134,6 +135,7 @@ public class OrderedLockTest extends TestCase {
 
 		//first runnable which is going to hold the created lock
 		Runnable getLock = new Runnable() {
+			@Override
 			public void run() {
 				lock.acquire();
 				status[0] = TestBarrier.STATUS_RUNNING;
@@ -150,6 +152,7 @@ public class OrderedLockTest extends TestCase {
 
 		//second runnable which is going to try and acquire the given lock and then time out
 		Runnable tryForLock = new Runnable() {
+			@Override
 			public void run() {
 				boolean success = false;
 				try {
@@ -191,6 +194,7 @@ public class OrderedLockTest extends TestCase {
 
 		//first runnable which is going to hold the created lock
 		Runnable getLock = new Runnable() {
+			@Override
 			public void run() {
 				lock.acquire();
 				status[0] = TestBarrier.STATUS_START;
@@ -202,6 +206,7 @@ public class OrderedLockTest extends TestCase {
 
 		//second runnable which is going to submit a request for this lock and wait until it is available
 		Runnable waitForLock = new Runnable() {
+			@Override
 			public void run() {
 				status[1] = TestBarrier.STATUS_START;
 				lock.acquire();
@@ -215,6 +220,7 @@ public class OrderedLockTest extends TestCase {
 		//third runnable which is going to submit a request for this lock but not wait
 		//because the hook is going to force it to be given the lock (implicitly)
 		Runnable forceGetLock = new Runnable() {
+			@Override
 			public void run() {
 				lock.acquire();
 				lock.release();
@@ -224,6 +230,7 @@ public class OrderedLockTest extends TestCase {
 
 		//a locklistener to force lock manager to give the lock to the third runnable (implicitly)
 		LockListener listener = new LockListener() {
+			@Override
 			public boolean aboutToWait(Thread lockOwner) {
 				return true;
 			}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/PathRule.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/PathRule.java
index eea0acb4c..4f02d2ec2 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/PathRule.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/PathRule.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -30,6 +30,7 @@ public class PathRule implements ISchedulingRule {
 		this.path = new Path(pathString);
 	}
 
+	@Override
 	public boolean contains(ISchedulingRule rule) {
 		if (this == rule)
 			return true;
@@ -38,6 +39,7 @@ public class PathRule implements ISchedulingRule {
 		return path.isPrefixOf(((PathRule) rule).getFullPath());
 	}
 
+	@Override
 	public boolean isConflicting(ISchedulingRule rule) {
 		if (!(rule instanceof PathRule))
 			return false;
@@ -48,9 +50,8 @@ public class PathRule implements ISchedulingRule {
 	public IPath getFullPath() {
 		return path;
 	}
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
+
+	@Override
 	public String toString() {
 		return "PathRule(" + path + ")";
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RandomTestRunnable.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RandomTestRunnable.java
index efb5752a9..7e3f175e3 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RandomTestRunnable.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RandomTestRunnable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,6 +37,7 @@ public class RandomTestRunnable extends Thread {
 		alive = false;
 	}
 
+	@Override
 	public void run() {
 		while (alive) {
 			if (needRandomization) {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RepeatingJob.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RepeatingJob.java
index 7247d530e..fb81940da 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RepeatingJob.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/RepeatingJob.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,6 +28,7 @@ public class RepeatingJob extends Job {
 		this.repeats = repeats;
 	}
 
+	@Override
 	public boolean belongsTo(Object family) {
 		return family == myFamily;
 	}
@@ -39,6 +40,7 @@ public class RepeatingJob extends Job {
 		return runCount;
 	}
 
+	@Override
 	protected IStatus run(IProgressMonitor monitor) {
 		schedule(DELAY);
 		runCount++;
@@ -49,6 +51,7 @@ public class RepeatingJob extends Job {
 		this.myFamily = family;
 	}
 
+	@Override
 	public boolean shouldRun() {
 		return runCount < repeats;
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/SimpleRuleRunner.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/SimpleRuleRunner.java
index 69642c85a..8d039675c 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/SimpleRuleRunner.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/SimpleRuleRunner.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@ class SimpleRuleRunner implements Runnable {
 		this.exception = null;
 	}
 
+	@Override
 	public void run() {
 		//tell the caller that we have entered the run method
 		status[0] = TestBarrier.STATUS_RUNNING;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestBlockingMonitor.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestBlockingMonitor.java
index b74053226..341bf3d6c 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestBlockingMonitor.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestBlockingMonitor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -31,18 +31,22 @@ class TestBlockingMonitor extends TestProgressMonitor implements IProgressMonito
 		this.barrier = barrier;
 	}
 
+	@Override
 	public void clearBlocked() {
 		//leave empty for now
 	}
 
+	@Override
 	public boolean isCanceled() {
 		return cancelled;
 	}
 
+	@Override
 	public void setBlocked(IStatus reason) {
 		barrier.setStatus(TestBarrier.STATUS_BLOCKED);
 	}
 
+	@Override
 	public void setCanceled(boolean b) {
 		cancelled = true;
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestLockListener.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestLockListener.java
index c66424537..5d9ad2425 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestLockListener.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/TestLockListener.java
@@ -20,10 +20,12 @@ import org.junit.Assert;
 public class TestLockListener extends LockListener {
 	private boolean waiting;
 
+	@Override
 	public synchronized void aboutToRelease() {
 		waiting = false;
 	}
 
+	@Override
 	public synchronized boolean aboutToWait(Thread lockOwner) {
 		waiting = true;
 		return false;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/VerboseJobListener.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/VerboseJobListener.java
index eeaddeb86..3f8706451 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/VerboseJobListener.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/VerboseJobListener.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2012 IBM Corporation and others.
+ * Copyright (c) 2003, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,26 +17,32 @@ import org.eclipse.core.runtime.jobs.IJobChangeListener;
  *
  */
 public class VerboseJobListener implements IJobChangeListener {
+	@Override
 	public void aboutToRun(IJobChangeEvent event) {
 		System.out.println("[" + Thread.currentThread() + "] aboutToRun: " + event.getJob());
 	}
 
+	@Override
 	public void scheduled(IJobChangeEvent event) {
 		System.out.println("[" + Thread.currentThread() + "] scheduled: " + event.getJob());
 	}
 
+	@Override
 	public void done(IJobChangeEvent event) {
 		System.out.println("[" + Thread.currentThread() + "] finished: " + event.getJob());
 	}
 
+	@Override
 	public void running(IJobChangeEvent event) {
 		System.out.println("[" + Thread.currentThread() + "] running: " + event.getJob());
 	}
 
+	@Override
 	public void sleeping(IJobChangeEvent event) {
 		System.out.println("[" + Thread.currentThread() + "] sleeping: " + event.getJob());
 	}
 
+	@Override
 	public void awake(IJobChangeEvent event) {
 		System.out.println("[" + Thread.currentThread() + "] awake: " + event.getJob());
 	}
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
index b9ab33055..90be1ffa6 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/YieldTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 IBM Corporation and others.
+ * Copyright (c) 2009, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,6 +33,7 @@ public class YieldTest extends AbstractJobManagerTest {
 			}
 		}
 
+		@Override
 		public void done(IJobChangeEvent event) {
 			synchronized (YieldTest.this) {
 				if (scheduled.remove(event.getJob())) {
@@ -43,6 +44,7 @@ public class YieldTest extends AbstractJobManagerTest {
 			}
 		}
 
+		@Override
 		public void scheduled(IJobChangeEvent event) {
 			Job job = event.getJob();
 			synchronized (YieldTest.this) {
@@ -73,9 +75,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		super(name);
 	}
 
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		completedJobs = 0;
@@ -87,9 +87,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
+	@Override
 	protected void tearDown() throws Exception {
 		for (int i = 0; i < jobListeners.length; i++)
 			if (jobListeners[i] instanceof TestJobListener)
@@ -107,6 +105,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final TestBarrier barrier2 = new TestBarrier(location, 1);
 
 		final Job yielding = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier2.setStatus(TestBarrier.STATUS_START);
 				barrier1.waitForStatus(TestBarrier.STATUS_START);
@@ -114,6 +113,7 @@ public class YieldTest extends AbstractJobManagerTest {
 			}
 		};
 		Job otherJob = new Job(getName() + " ShouldFault") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier2.waitForStatus(TestBarrier.STATUS_START);
 				try {
@@ -137,6 +137,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 	public void testExceptionWhenYieldingNotRunning() {
 		final Job yielding = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
@@ -155,6 +156,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final Job[] jobs = new Job[2];
 		Job yieldJob = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				assertNull("Conflicting job result is not null: " + jobs[1].getResult(), jobs[1].getResult());
 				Thread before = getThread();
@@ -173,6 +175,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		yieldJob.setRule(rule);
 
 		Job conflictingJob = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				assertTrue(jobs[0].getState() == WAITING);
 				assertTrue(jobs[0].getResult() == null);
@@ -195,6 +198,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final Job[] jobs = new Job[2];
 		Job yieldJob = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				assertTrue(jobs[1].getResult() == null);
 				while (yieldRule(null) == null) {
@@ -210,6 +214,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		yieldJob.setRule(rule);
 
 		Job conflictingJob = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				assertEquals(WAITING, jobs[0].getState());
 				assertTrue(jobs[0].getResult() == null);
@@ -281,6 +286,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final TestBarrier barrier1 = new TestBarrier(location, 0);
 		final Job[] jobs = new Job[2];
 		Job yieldJob = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier1.waitForStatus(TestBarrier.STATUS_START);
 				barrier1.setStatus(TestBarrier.STATUS_RUNNING);
@@ -295,6 +301,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		yieldJob.setRule(rule);
 
 		final Job conflictingJob1 = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier1.setStatus(TestBarrier.STATUS_DONE);
 				return Status.OK_STATUS;
@@ -303,6 +310,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		conflictingJob1.setRule(rule);
 
 		Job nonConflict = new Job(getName() + " Non-conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
@@ -329,6 +337,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final PathRule rule = new PathRule(getName());
 		final TestBarrier barrier = new TestBarrier();
 		final Job yielding = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_START);
 				while (yieldRule(null) == null) {
@@ -341,6 +350,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		};
 		yielding.setRule(rule);
 		Thread t = new Thread(getName() + " Conflicting") {
+			@Override
 			public void run() {
 				try {
 					Job.getJobManager().beginRule(rule, null);
@@ -363,6 +373,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final PathRule rule = new PathRule(getName());
 		final TestBarrier barrier = new TestBarrier();
 		final Job yielding = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					Job.getJobManager().beginRule(rule, null);
@@ -380,6 +391,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		};
 
 		Thread t = new Thread(getName() + " Conflicting") {
+			@Override
 			public void run() {
 				try {
 					Job.getJobManager().beginRule(rule, null);
@@ -403,6 +415,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final PathRule rule = new PathRule(getName());
 		final TestBarrier barrier = new TestBarrier();
 		final Thread t = new Thread() {
+			@Override
 			public void run() {
 				IJobManager m = Job.getJobManager();
 				try {
@@ -423,6 +436,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		};
 
 		final Job conflictingJob = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.setStatus(TestBarrier.STATUS_DONE);
 				return Status.OK_STATUS;
@@ -443,6 +457,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final PathRule rule = new PathRule(getName());
 		final TestBarrier barrier = new TestBarrier();
 		Thread t = new Thread(getName() + " Yielding") {
+			@Override
 			public void run() {
 				try {
 					Job.getJobManager().beginRule(rule, null);
@@ -461,6 +476,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		};
 
 		final Job conflicting = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				try {
 					Job.getJobManager().beginRule(rule, null);
@@ -503,6 +519,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final PathRule rule = new PathRule(getName());
 
 		final Thread A = new Thread() {
+			@Override
 			public void run() {
 				try {
 					Job.getJobManager().beginRule(rule, null);
@@ -518,6 +535,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		};
 
 		Thread B = new Thread() {
+			@Override
 			public void run() {
 				barrier.waitForStatus(TestBarrier.STATUS_RUNNING);
 
@@ -550,6 +568,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final Thread[] t = new Thread[1];
 		final Job A = new Job(getName() + "A") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				t[0] = getThread();
 				try {
@@ -567,6 +586,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		};
 		Job B = new Job(getName() + "B") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.waitForStatus(TestBarrier.STATUS_RUNNING);
 
@@ -598,6 +618,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final Job[] jobs = new Job[2];
 		Job yieldJob = new Job(getName() + " Yielding") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				assertTrue(jobs[1].getResult() == null);
 				while (yieldRule(null) == null) {
@@ -611,6 +632,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		yieldJob.setRule(rule);
 
 		Job conflictingJob = new Job(getName() + " ConflictingJob1") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				assertEquals(WAITING, jobs[0].getState());
 				while (yieldRule(null) == null) {
@@ -646,6 +668,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final List<Job> jobs = new ArrayList<Job>();
 		for (int i = 0; i < count; i++) {
 			Job conflictingJob = new Job(getName() + " ConflictingJob" + i) {
+				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					synchronized (SYNC) {
 						started[0] = new Integer(started[0].intValue() + 1);
@@ -715,6 +738,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final List<Job> jobs_A = new ArrayList<Job>();
 		for (int i = 0; i < count; i++) {
 			Job conflictingJob = new Job(getName() + " ConflictingJob_A_" + i) {
+				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					synchronized (SYNC_A) {
 						started_A[0] = new Integer(started_A[0].intValue() + 1);
@@ -770,6 +794,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final List<Job> jobs_B = new ArrayList<Job>();
 		for (int i = 0; i < count; i++) {
 			Job conflictingJob = new Job(getName() + " ConflictingJob_B_" + i) {
+				@Override
 				protected IStatus run(IProgressMonitor monitor) {
 					synchronized (SYNC_B) {
 						started_B[0] = new Integer(started_B[0].intValue() + 1);
@@ -839,6 +864,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final int count = 50;
 		Job yieldA = new Job(getName() + " YieldingA") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.waitForStatus(TestBarrier.STATUS_START);
 				int yields = 0;
@@ -854,6 +880,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		yieldA.schedule();
 
 		Job yieldB = new Job(getName() + " YieldingB") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				barrier.waitForStatus(TestBarrier.STATUS_START);
 				int yields = 0;
@@ -891,6 +918,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final PathRule rule = new PathRule(getName());
 		final TestBarrier b = new TestBarrier(TestBarrier.STATUS_START);
 		final Job yieldA = new Job(getName()) {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 
 				try {
@@ -907,6 +935,7 @@ public class YieldTest extends AbstractJobManagerTest {
 			}
 		};
 		Job conflicting = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
@@ -933,6 +962,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		final PathRule rule = new PathRule(getName());
 		final TestBarrier b = new TestBarrier(TestBarrier.STATUS_START);
 		final Job yieldA = new Job(getName()) {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 
 				try {
@@ -951,6 +981,7 @@ public class YieldTest extends AbstractJobManagerTest {
 			}
 		};
 		final Job conflicting = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
@@ -959,6 +990,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final int[] count = new int[1];
 		JobChangeAdapter a = new JobChangeAdapter() {
+			@Override
 			public void running(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
 				if (event.getJob() == yieldA)
 					count[0]++;
@@ -990,6 +1022,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final TestBarrier b = new TestBarrier(TestBarrier.STATUS_START);
 		final Job yieldA = new Job(getName()) {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 
 				b.setStatus(TestBarrier.STATUS_RUNNING);
@@ -1009,6 +1042,7 @@ public class YieldTest extends AbstractJobManagerTest {
 		yieldA.setRule(rule);
 
 		final Job conflicting = new Job(getName() + " Conflicting") {
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				return Status.OK_STATUS;
 			}
@@ -1017,6 +1051,7 @@ public class YieldTest extends AbstractJobManagerTest {
 
 		final int[] count = new int[1];
 		JobChangeAdapter a = new JobChangeAdapter() {
+			@Override
 			public void running(org.eclipse.core.runtime.jobs.IJobChangeEvent event) {
 				if (event.getJob() == conflicting)
 					count[0]++;
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/BenchPath.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/BenchPath.java
index a34067149..16122bd34 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/BenchPath.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/BenchPath.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,6 +46,7 @@ public class BenchPath extends RuntimeTest {
 			map.put(paths[i], "");
 		final int numPaths = paths.length;
 		new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				for (int p = 0; p < numPaths; p++)
 					map.get(paths[p]);
@@ -59,6 +60,7 @@ public class BenchPath extends RuntimeTest {
 	public void testPathCreation() {
 		final int REPEAT = 50000;
 		new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				//folders (5)
 				new Path("/");
@@ -94,6 +96,7 @@ public class BenchPath extends RuntimeTest {
 		final int REPEAT = 50000;
 		final IPath[] paths = generateVariousPaths();
 		new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				for (int p = paths.length; --p >= 0;)
 					paths[p].toOSString();
@@ -108,6 +111,7 @@ public class BenchPath extends RuntimeTest {
 		final int REPEAT = 50000;
 		final IPath[] paths = generateVariousPaths();
 		new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				for (int p = paths.length; --p >= 0;)
 					paths[p].toString();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/ContentTypePerformanceTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/ContentTypePerformanceTest.java
index 3c80ce705..ac03f5fde 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/ContentTypePerformanceTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/ContentTypePerformanceTest.java
@@ -258,6 +258,7 @@ public class ContentTypePerformanceTest extends RuntimeTest {
 		loadDescribers();
 		loadChildren();
 		new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				try {
 					for (int i = 0; i < TOTAL_NUMBER_OF_ELEMENTS; i++) {
@@ -273,9 +274,7 @@ public class ContentTypePerformanceTest extends RuntimeTest {
 		}.run(this, 10, 2);
 	}
 
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 		if (getName().equals("testDoSetUp") || getName().equals("testDoTearDown"))
@@ -308,6 +307,7 @@ public class ContentTypePerformanceTest extends RuntimeTest {
 		final IContentType root = manager.getContentType(getContentTypeId(0));
 		assertNotNull("2.0", root);
 		new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				for (int i = 0; i < TOTAL_NUMBER_OF_ELEMENTS; i++) {
 					IContentType type = manager.getContentType(getContentTypeId(i));
@@ -325,6 +325,7 @@ public class ContentTypePerformanceTest extends RuntimeTest {
 		// warm up preference service
 		loadPreferences();
 		PerformanceTestRunner runner = new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				// any interation that will cause the registry to be loaded
 				Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT);
@@ -344,6 +345,7 @@ public class ContentTypePerformanceTest extends RuntimeTest {
 		loadDescribers();
 		loadChildren();
 		new PerformanceTestRunner() {
+			@Override
 			protected void test() {
 				IContentType[] associated = manager.findContentTypesFor("foo.txt");
 				// we know at least the etxt content type should be here
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/PreferencePerformanceTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/PreferencePerformanceTest.java
index e14f3e1a8..0ac3ecdff 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/PreferencePerformanceTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/perf/PreferencePerformanceTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- *  Copyright (c) 2005, 2014 IBM Corporation and others.
+ *  Copyright (c) 2005, 2015 IBM Corporation and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  which accompanies this distribution, and is available at
@@ -112,6 +112,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			Preferences prefs;
 
 			// set the values outside the timed loop
+			@Override
 			protected void setUp() {
 				prefs = getScopeRoot().node(qualifier);
 				for (int i = 0; i < keys.length; i++)
@@ -119,6 +120,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			//  clean-up
+			@Override
 			protected void tearDown() {
 				try {
 					prefs.removeNode();
@@ -128,6 +130,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// test retrieval
+			@Override
 			protected void test() {
 				for (int i = 0; i < keys.length; i++)
 					prefs.get(keys[i], null);
@@ -154,6 +157,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			Preferences prefs;
 
 			// set the values outside the timed loop
+			@Override
 			protected void setUp() {
 				prefs = getScopeRoot().node(qualifier);
 				for (int i = 0; i < keys.length; i++)
@@ -161,6 +165,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// clean-up
+			@Override
 			protected void tearDown() {
 				try {
 					prefs.removeNode();
@@ -170,6 +175,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// how long to get the values?
+			@Override
 			protected void test() {
 				for (int i = 0; i < keys.length; i++)
 					prefs.get(missingKeys[i], null);
@@ -193,6 +199,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			Preferences prefs;
 
 			// set the values outside the timed loop
+			@Override
 			protected void setUp() {
 				prefs = getScopeRoot().node(qualifier);
 				for (int i = 0; i < keys.length; i++)
@@ -200,6 +207,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// clean-up
+			@Override
 			protected void tearDown() {
 				try {
 					prefs.removeNode();
@@ -209,6 +217,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// how long to get the values?
+			@Override
 			protected void test() {
 				for (int i = 0; i < keys.length; i++)
 					prefs.get(keys[i], null);
@@ -231,6 +240,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			Preferences prefs;
 
 			// set the values outside the timed loop
+			@Override
 			protected void setUp() {
 				prefs = getScopeRoot().node(qualifier);
 				for (int i = 0; i < keys.length; i++)
@@ -238,6 +248,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// clean-up
+			@Override
 			protected void tearDown() {
 				try {
 					prefs.removeNode();
@@ -247,6 +258,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// how long to get the values?
+			@Override
 			protected void test() {
 				for (int i = 0; i < keys.length; i++)
 					prefs.get(keys[i], null);
@@ -274,11 +286,13 @@ public class PreferencePerformanceTest extends RuntimeTest {
 		new PerformanceTestRunner() {
 			Preferences prefs;
 
+			@Override
 			protected void setUp() {
 				prefs = getScopeRoot().node(qualifier);
 			}
 
 			// clean-up
+			@Override
 			protected void tearDown() {
 				try {
 					prefs.removeNode();
@@ -288,6 +302,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// how long to set the values?
+			@Override
 			protected void test() {
 				for (int i = 0; i < keys.length; i++)
 					prefs.put(keys[i], values[i]);
@@ -316,6 +331,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			Preferences prefs;
 
 			// fill the node with values each run
+			@Override
 			protected void setUp() {
 				prefs = getScopeRoot().node(qualifier);
 				for (int i = 0; i < keys.length; i++)
@@ -323,6 +339,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			}
 
 			// clean-up at the end of each run
+			@Override
 			protected void tearDown() {
 				try {
 					prefs.removeNode();
@@ -334,6 +351,7 @@ public class PreferencePerformanceTest extends RuntimeTest {
 			// can only run this once because there is only so many keys you can remove
 
 			// the test is how long it takes to remove all the values
+			@Override
 			protected void test() {
 				for (int i = 0; i < keys.length; i++)
 					prefs.remove(keys[i]);