auto-clean: @Override annotations + organize imports + unnecessary

casts/$NON-NLS + trailing white spaces

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/CDataProviderTests.java

@@ -118,6 +118,7 @@ public class CDataProviderTests extends TestCase {
 		final Object[] result = new Object[1];
 		ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 				IProject project = root.getProject(name);

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/builder/tests/StandardBuildTests.java

@@ -108,6 +108,7 @@ public class StandardBuildTests extends TestCase {
 		final Object[] result = new Object[1];
 		ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 				IProject project = root.getProject(name);

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/MakefileReaderProviderTests.java

@@ -87,6 +87,7 @@ public class MakefileReaderProviderTests extends TestCase {
 				URIUtil.toURI(path), true, inclDirs,
 				new IMakefileReaderProvider() {
 
+					@Override
 					public Reader getReader(URI fileURI) throws IOException {
 						URL fileUrl;
 						try {
@@ -108,6 +109,7 @@ public class MakefileReaderProviderTests extends TestCase {
 				URIUtil.toURI("/memory/Makefile.main"), true, inclDirs,
 				new IMakefileReaderProvider() {
 
+					@Override
 					public Reader getReader(URI fileURI) throws IOException {
 						String name = new File(fileURI).getName();
 						if (name.equals("Makefile.main"))
@@ -138,6 +140,7 @@ public class MakefileReaderProviderTests extends TestCase {
 		MakeCorePlugin.createMakefile(
 				URIUtil.toURI("Makefile.main"), true, inclDirs,
 				new IMakefileReaderProvider() {
+					@Override
 					public Reader getReader(URI fileURI) throws IOException {
 						return new StringReader("") {
 							@Override

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/core/tests/StandardBuildTestHelper.java

@@ -81,6 +81,7 @@ public class StandardBuildTestHelper {
 		if (project.exists()) {
 			IWorkspace workspace = ResourcesPlugin.getWorkspace();
 			IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+				@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
 					System.gc();
 					System.runFinalization();
@@ -99,6 +100,7 @@ public class StandardBuildTestHelper {
 	static public boolean compareBenchmarks(final IProject project, IPath testDir, IPath[] files) {
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
 			}
@@ -124,6 +126,7 @@ public class StandardBuildTestHelper {
 	static public boolean verifyFilesDoNotExist(final IProject project, IPath testDir, IPath[] files) {
 		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
 			}

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/GCCPerFileBOPConsoleParserTests.java

@@ -31,8 +31,10 @@ import org.eclipse.core.runtime.Path;
 
 public class GCCPerFileBOPConsoleParserTests extends BaseBOPConsoleParserTests {
 	private final static IMarkerGenerator MARKER_GENERATOR= new IMarkerGenerator() {
+		@Override
 		public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
 		}
+		@Override
 		public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
 		}
 	};

build/org.eclipse.cdt.make.core.tests/src/org/eclipse/cdt/make/scannerdiscovery/TestScannerInfoCollector.java

@@ -28,6 +28,7 @@ final class TestScannerInfoCollector implements IScannerInfoCollector {
 	private HashMap<ScannerInfoTypes, List> fInfoMap = new HashMap<ScannerInfoTypes, List>();
 	private HashMap<Object, Map<ScannerInfoTypes, List>> fResourceToInfoMap = new HashMap<Object, Map<ScannerInfoTypes, List>>();
 
+	@Override
 	public void contributeToScannerConfig(Object resource, Map scannerInfo0) {
 		Map<ScannerInfoTypes, List> scannerInfo = scannerInfo0;
 		Set<Entry<ScannerInfoTypes, List>> entrySet = scannerInfo.entrySet();
@@ -59,6 +60,7 @@ final class TestScannerInfoCollector implements IScannerInfoCollector {
 		target.addAll(col);
 	}
 
+	@Override
 	public List getCollectedScannerInfo(Object resource, ScannerInfoTypes type) {
 		if (resource == null) {
 			List result= fInfoMap.get(type);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java

@@ -21,8 +21,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.CommandLauncher;
@@ -126,6 +126,7 @@ public class MakeBuilder extends ACBuilder {
 					try {
 						ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 
+							@Override
 							public void run(IProgressMonitor monitor) {
 								invokeMake(CLEAN_BUILD, info, monitor);
 							}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeCorePlugin.java

@@ -74,6 +74,7 @@ public class MakeCorePlugin extends Plugin {
 			fEncoding = encoding != null ? encoding : ResourcesPlugin.getEncoding();
 		}
 
+		@Override
 		public Reader getReader(URI fileURI) throws IOException {
 			try {
 				final IFileStore store = EFS.getStore(fileURI);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeProjectNature.java

@@ -130,6 +130,7 @@ public class MakeProjectNature implements IProjectNature {
 	/**
 		* @see IProjectNature#configure
 		*/
+	@Override
 	public void configure() throws CoreException {
 		addBuildSpec();
 		IMakeBuilderInfo info = MakeCorePlugin.createBuildInfo(MakeCorePlugin.getDefault().getPluginPreferences(), MakeBuilder.BUILDER_ID, false);
@@ -163,6 +164,7 @@ public class MakeProjectNature implements IProjectNature {
 	/**
 	 * @see IProjectNature#deconfigure
 	 */
+	@Override
 	public void deconfigure() throws CoreException {
 		removeBuildSpec();
 	}
@@ -170,6 +172,7 @@ public class MakeProjectNature implements IProjectNature {
 	/**
 		* @see IProjectNature#getProject
 		*/
+	@Override
 	public IProject getProject() {
 		return fProject;
 	}
@@ -177,6 +180,7 @@ public class MakeProjectNature implements IProjectNature {
 	/**
 		* @see IProjectNature#setProject
 		*/
+	@Override
 	public void setProject(IProject project) {
 		fProject = project;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerInfo.java

@@ -72,6 +72,7 @@ public class MakeScannerInfo implements IScannerInfo {
 	 *
 	 * @see org.eclipse.cdt.core.build.managed.IScannerInfo#getIncludePaths()
 	 */
+	@Override
 	public synchronized String[] getIncludePaths() {
 		return getPathList().toArray(new String[getPathList().size()]);
 	}
@@ -81,6 +82,7 @@ public class MakeScannerInfo implements IScannerInfo {
 	 *
 	 * @see org.eclipse.cdt.core.build.managed.IScannerInfo#getIncludePaths()
 	 */
+	@Override
 	public synchronized Map<String, String> getDefinedSymbols() {
 		// Return the defined symbols for the default configuration
 		HashMap<String, String> symbols = new HashMap<String, String>();

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeScannerProvider.java

@@ -188,6 +188,7 @@ public class MakeScannerProvider extends ScannerProvider {
 	public static void updateScannerInfo(final MakeScannerInfo scannerInfo) throws CoreException {
 		ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
 
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IProject project = scannerInfo.getProject();
 

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/makefile/IDirective.java

@@ -43,5 +43,6 @@ public interface IDirective {
 	 */
 	IMakefile getMakefile();
 
+	@Override
 	String toString();
 }

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/makefile/ITarget.java

@@ -16,6 +16,7 @@ package org.eclipse.cdt.make.core.makefile;
  */
 public interface ITarget {
 
+	@Override
 	String toString();
 
 }

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/DiscoveredScannerInfo.java

@@ -55,6 +55,7 @@ public class DiscoveredScannerInfo implements IScannerInfo {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.parser.IScannerInfo#getDefinedSymbols()
 	 */
+	@Override
 	public synchronized Map<String, String> getDefinedSymbols() {
 		Map<String, String> dSymbols = ScannerConfigUtil.scSymbolEntryMap2Map(discoveredSymbols);
 		dSymbols.putAll(userInfo.getDefinedSymbols());
@@ -63,6 +64,7 @@ public class DiscoveredScannerInfo implements IScannerInfo {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.parser.IScannerInfo#getIncludePaths()
 	 */
+	@Override
 	public synchronized String[] getIncludePaths() {
 		String[] iPaths = new String[getUserIncludePaths().length + getActiveIncludePaths().length];
 		System.arraycopy(getUserIncludePaths(), 0, iPaths, 0, getUserIncludePaths().length);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/ScannerConfigNature.java

@@ -45,6 +45,7 @@ public class ScannerConfigNature implements IProjectNature {
 	/**
 	 * @see IProjectNature#configure
 	 */
+	@Override
 	public void configure() throws CoreException {
 		IProjectDescription description = getProject().getDescription();
 		ICommand[] commands = description.getBuildSpec();
@@ -67,6 +68,7 @@ public class ScannerConfigNature implements IProjectNature {
 	/**
 	 * @see IProjectNature#deconfigure
 	 */
+	@Override
 	public void deconfigure() throws CoreException {
 		IProjectDescription description = getProject().getDescription();
 		ICommand[] commands = description.getBuildSpec();
@@ -85,6 +87,7 @@ public class ScannerConfigNature implements IProjectNature {
 	/**
 	 * @see IProjectNature#getProject
 	 */
+	@Override
 	public IProject getProject()  {
 		return fProject;
 	}
@@ -92,6 +95,7 @@ public class ScannerConfigNature implements IProjectNature {
 	/**
 	 * @see IProjectNature#setProject
 	 */
+	@Override
 	public void setProject(IProject project)  {
 		fProject = project;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java

@@ -61,10 +61,12 @@ public class BuildInfoFactory {
 
 	private abstract static class AbstractBuildInfo implements IMakeBuilderInfo {
 
+		@Override
 		public void setUseDefaultBuildCmd(boolean on) throws CoreException {
 			putString(USE_DEFAULT_BUILD_CMD, new Boolean(on).toString());
 		}
 
+		@Override
 		public boolean isDefaultBuildCmd() {
 			if (getString(USE_DEFAULT_BUILD_CMD) == null) { // if no property
 				// then default to
@@ -74,6 +76,7 @@ public class BuildInfoFactory {
 			return getBoolean(USE_DEFAULT_BUILD_CMD);
 		}
 
+		@Override
 		public String getBuildAttribute(String name, String defaultValue) {
 			String value = getString(name);
 			if (value == null ) {
@@ -94,10 +97,12 @@ public class BuildInfoFactory {
 			return value != null ? value : defaultValue != null ? defaultValue : ""; //$NON-NLS-1$
 		}
 
+		@Override
 		public void setBuildAttribute(String name, String value) throws CoreException {
 			putString(name, value);
 		}
 
+		@Override
 		public Map<String, String> getExpandedEnvironment() {
 			Map<String, String> env = getEnvironment();
 			HashMap<String, String> envMap = new HashMap<String, String>(env.entrySet().size());
@@ -121,11 +126,13 @@ public class BuildInfoFactory {
 			return envMap;
 		}
 
+		@Override
 		public void setBuildCommand(IPath location) throws CoreException {
 			putString(IMakeCommonBuildInfo.BUILD_COMMAND, null);
 			putString(BuildInfoFactory.BUILD_COMMAND, location.toString());
 		}
 
+		@Override
 		public IPath getBuildCommand() {
 			if (isDefaultBuildCmd()) {
 				String command = getBuildParameter("defaultCommand"); //$NON-NLS-1$
@@ -163,11 +170,13 @@ public class BuildInfoFactory {
 
 		protected abstract String getBuilderID();
 
+		@Override
 		public void setBuildLocation(IPath location) throws CoreException {
 			putString(IMakeCommonBuildInfo.BUILD_LOCATION, null);
 			putString(BuildInfoFactory.BUILD_LOCATION, location.toString());
 		}
 
+		@Override
 		public IPath getBuildLocation() {
 			String result = getBuildAttribute(IMakeCommonBuildInfo.BUILD_LOCATION, getString(BuildInfoFactory.BUILD_LOCATION));
 			try {
@@ -177,6 +186,7 @@ public class BuildInfoFactory {
 			return new Path(result);
 		}
 
+		@Override
 		public String getBuildArguments() {
 			String result = getBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, getString(BuildInfoFactory.BUILD_ARGUMENTS));
 			if (result == null) {
@@ -189,24 +199,29 @@ public class BuildInfoFactory {
 			return result;
 		}
 
+		@Override
 		public void setBuildArguments(String args) throws CoreException {
 			putString(IMakeCommonBuildInfo.BUILD_ARGUMENTS, null);
 			putString(BuildInfoFactory.BUILD_ARGUMENTS, args);
 		}
 
+		@Override
 		public void setStopOnError(boolean enabled) throws CoreException {
 			putString(STOP_ON_ERROR, new Boolean(enabled).toString());
 		}
 
+		@Override
 		public boolean isStopOnError() {
 			return getBoolean(STOP_ON_ERROR);
 		}
 
+		@Override
 		public void setAutoBuildTarget(String target) throws CoreException {
 			putString(IMakeBuilderInfo.BUILD_TARGET_AUTO, null);
 			putString(BuildInfoFactory.BUILD_TARGET_AUTO, target);
 		}
 
+		@Override
 		public String getAutoBuildTarget() {
 			String result = getBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_AUTO, getString(BuildInfoFactory.BUILD_TARGET_AUTO));
 			try {
@@ -216,11 +231,13 @@ public class BuildInfoFactory {
 			return result;
 		}
 
+		@Override
 		public void setIncrementalBuildTarget(String target) throws CoreException {
 			putString(IMakeBuilderInfo.BUILD_TARGET_INCREMENTAL, null);
 			putString(BuildInfoFactory.BUILD_TARGET_INCREMENTAL, target);
 		}
 
+		@Override
 		public String getIncrementalBuildTarget() {
 			String result = getBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_INCREMENTAL,
 					getString(BuildInfoFactory.BUILD_TARGET_INCREMENTAL));
@@ -231,10 +248,12 @@ public class BuildInfoFactory {
 			return result;
 		}
 
+		@Override
 		public void setFullBuildTarget(String target) throws CoreException {
 
 		}
 
+		@Override
 		public String getFullBuildTarget() {
 			String result = getBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_INCREMENTAL, getString(BuildInfoFactory.BUILD_TARGET_INCREMENTAL));
 			try {
@@ -244,11 +263,13 @@ public class BuildInfoFactory {
 			return result;
 		}
 
+		@Override
 		public void setCleanBuildTarget(String target) throws CoreException {
 			putString(IMakeBuilderInfo.BUILD_TARGET_CLEAN, null);
 			putString(BuildInfoFactory.BUILD_TARGET_CLEAN, target);
 		}
 
+		@Override
 		public String getCleanBuildTarget() {
 			String result = getBuildAttribute(IMakeBuilderInfo.BUILD_TARGET_CLEAN, getString(BuildInfoFactory.BUILD_TARGET_CLEAN));
 			try {
@@ -258,38 +279,47 @@ public class BuildInfoFactory {
 			return result;
 		}
 
+		@Override
 		public void setAutoBuildEnable(boolean enabled) throws CoreException {
 			putString(BUILD_AUTO_ENABLED, new Boolean(enabled).toString());
 		}
 
+		@Override
 		public boolean isAutoBuildEnable() {
 			return getBoolean(BUILD_AUTO_ENABLED);
 		}
 
+		@Override
 		public void setIncrementalBuildEnable(boolean enabled) throws CoreException {
 			putString(BUILD_INCREMENTAL_ENABLED, new Boolean(enabled).toString());
 		}
 
+		@Override
 		public boolean isIncrementalBuildEnabled() {
 			return getBoolean(BUILD_INCREMENTAL_ENABLED);
 		}
 
+		@Override
 		public void setFullBuildEnable(boolean enabled) throws CoreException {
 			putString(BUILD_FULL_ENABLED, new Boolean(enabled).toString());
 		}
 
+		@Override
 		public boolean isFullBuildEnabled() {
 			return getBoolean(BUILD_FULL_ENABLED);
 		}
 
+		@Override
 		public void setCleanBuildEnable(boolean enabled) throws CoreException {
 			putString(BUILD_CLEAN_ENABLED, new Boolean(enabled).toString());
 		}
 
+		@Override
 		public boolean isCleanBuildEnabled() {
 			return getBoolean(BUILD_CLEAN_ENABLED);
 		}
 
+		@Override
 		public String[] getErrorParsers() {
 			String parsers = getString(ErrorParserManager.PREF_ERROR_PARSER);
 			if (parsers != null && parsers.length() > 0) {
@@ -303,6 +333,7 @@ public class BuildInfoFactory {
 			return new String[0];
 		}
 
+		@Override
 		public void setErrorParsers(String[] parsers) throws CoreException {
 			StringBuffer buf = new StringBuffer();
 			for (int i = 0; i < parsers.length; i++) {
@@ -311,14 +342,17 @@ public class BuildInfoFactory {
 			putString(ErrorParserManager.PREF_ERROR_PARSER, buf.toString());
 		}
 
+		@Override
 		public Map<String, String> getEnvironment() {
 			return decodeMap(getString(ENVIRONMENT));
 		}
 
+		@Override
 		public void setEnvironment(Map<String, String> env) throws CoreException {
 			putString(ENVIRONMENT, encodeMap(env));
 		}
 
+		@Override
 		public boolean appendEnvironment() {
 			if (getString(BUILD_APPEND_ENVIRONMENT) != null) {
 				return getBoolean(BUILD_APPEND_ENVIRONMENT);
@@ -326,6 +360,7 @@ public class BuildInfoFactory {
 			return true;
 		}
 
+		@Override
 		public void setAppendEnvironment(boolean append) throws CoreException {
 			putString(BUILD_APPEND_ENVIRONMENT, new Boolean(append).toString());
 		}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeProject.java

@@ -26,6 +26,7 @@ import org.eclipse.core.runtime.Preferences;
 @Deprecated
 public class MakeProject implements ICOwner {
 
+	@Override
 	public void configure(ICDescriptor cDescriptor) throws CoreException {
 		cDescriptor.remove(CCorePlugin.BUILD_SCANNER_INFO_UNIQ_ID);
 		cDescriptor.remove(CCorePlugin.BUILDER_MODEL_ID);
@@ -33,6 +34,7 @@ public class MakeProject implements ICOwner {
 		updateIndexers(cDescriptor);
 	}
 
+	@Override
 	public void update(ICDescriptor cDescriptor, String extensionID) throws CoreException {
 		if (extensionID.equals(CCorePlugin.BINARY_PARSER_UNIQ_ID)) {
 			updateBinaryParsers(cDescriptor);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTarget.java

@@ -63,14 +63,17 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		isStopOnError = info.isStopOnError();
 	}
 
+	@Override
 	public IProject getProject() {
 		return project;
 	}
 
+	@Override
 	public void setContainer(IContainer container) {
 		this.container = container;
 	}
 
+	@Override
 	public void setName(String name) {
 		this.name = name;
 	}
@@ -79,32 +82,39 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return targetAttributes;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
 
+	@Override
 	public String getTargetBuilderID() {
 		return targetBuilderID;
 	}
 
+	@Override
 	public boolean isStopOnError() {
 		return isStopOnError;
 	}
 
+	@Override
 	public void setStopOnError(boolean stopOnError) throws CoreException {
 		isStopOnError = stopOnError;
 		manager.updateTarget(this);
 	}
 
+	@Override
 	public boolean isDefaultBuildCmd() {
 		return isDefaultBuildCmd;
 	}
 
+	@Override
 	public void setUseDefaultBuildCmd(boolean useDefault) throws CoreException {
 		isDefaultBuildCmd = useDefault;
 		manager.updateTarget(this);
 	}
 
+	@Override
 	public IPath getBuildCommand() {
 		if (isDefaultBuildCmd()) {
 			IMakeBuilderInfo info;
@@ -122,10 +132,12 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return new Path(result);
 	}
 
+	@Override
 	public void setBuildCommand(IPath command) throws CoreException {
 		setBuildAttribute(IMakeCommonBuildInfo.BUILD_COMMAND, command.toString());
 	}
 
+	@Override
 	public String getBuildArguments() {
 		if (isDefaultBuildCmd()) {
 			IMakeBuilderInfo info;
@@ -143,14 +155,17 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return result;
 	}
 
+	@Override
 	public void setBuildArguments(String arguments) throws CoreException {
 		setBuildAttribute(IMakeCommonBuildInfo.BUILD_ARGUMENTS, arguments);
 	}
 
+	@Override
 	public void setBuildTarget(String target) throws CoreException {
 		setBuildAttribute(IMakeTarget.BUILD_TARGET, target);
 	}
 
+	@Override
 	public String getBuildTarget() {
 		String result = getBuildAttribute(IMakeTarget.BUILD_TARGET, ""); //$NON-NLS-1$
 		try {
@@ -160,33 +175,40 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return result;
 	}
 
+	@Override
 	public void setRunAllBuilders(boolean runAllBuilders) throws CoreException {
 		this.runAllBuidlers = runAllBuilders;
 		manager.updateTarget(this);
 	}
 
+	@Override
 	public boolean runAllBuilders() {
 		return runAllBuidlers;
 	}
 
+	@Override
 	public void setBuildAttribute(String name, String value) throws CoreException {
 		targetAttributes.put(name, value);
 		manager.updateTarget(this);
 	}
 
+	@Override
 	public String getBuildAttribute(String name, String defaultValue) {
 		String value = targetAttributes.get(name);
 		return value != null ? value : defaultValue;
 	}
 
+	@Override
 	public IPath getBuildLocation() {
 		return container.getLocation();
 	}
 
+	@Override
 	public void setBuildLocation(IPath location) throws CoreException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public String[] getErrorParsers() {
 		IMakeBuilderInfo projectInfo;
 		try {
@@ -197,10 +219,12 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return new String[0];
 	}
 
+	@Override
 	public void setErrorParsers(String[] parsers) throws CoreException {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public Map<String, String> getExpandedEnvironment() throws CoreException {
 		Map<String, String> env = null;
 		if (appendProjectEnvironment()) {
@@ -232,28 +256,34 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return envMap;
 	}
 
+	@Override
 	public boolean appendProjectEnvironment() {
 		return appendProjectEnvironment;
 	}
 
+	@Override
 	public void setAppendProjectEnvironment(boolean append) {
 		appendProjectEnvironment = append;
 	}
 
+	@Override
 	public Map<String, String> getEnvironment() {
 		return buildEnvironment;
 	}
 
+	@Override
 	public void setEnvironment(Map<String, String> env) throws CoreException {
 		buildEnvironment = new HashMap<String, String>(env);
 		manager.updateTarget(this);
 	}
 
+	@Override
 	public void setAppendEnvironment(boolean append) throws CoreException {
 		appendEnvironment = append ? 1 : 0;
 		manager.updateTarget(this);
 	}
 
+	@Override
 	public boolean appendEnvironment() {
 		return appendEnvironment == USE_PROJECT_ENV_SETTING ? getProjectEnvSetting(): appendEnvironment == 1;
 	}
@@ -268,6 +298,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return false;
 	}
 
+	@Override
 	public IContainer getContainer() {
 		return container;
 	}
@@ -288,6 +319,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 		return container.hashCode() * 17 + name != null ? name.hashCode(): 0;
 	}
 
+	@Override
 	public void build(IProgressMonitor monitor) throws CoreException {
 		final String builderID = manager.getBuilderID(targetBuilderID);
 		final HashMap<String, String> infoMap = new HashMap<String, String>();
@@ -314,6 +346,7 @@ public class MakeTarget extends PlatformObject implements IMakeTarget {
 			 *
 			 * @see org.eclipse.core.resources.IWorkspaceRunnable#run(org.eclipse.core.runtime.IProgressMonitor)
 			 */
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				if (runAllBuidlers) {
 					ICommand[] commands = project.getDescription().getBuildSpec();

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/MakeTargetManager.java

@@ -14,8 +14,8 @@ package org.eclipse.cdt.make.internal.core;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Vector;
 import java.util.Map.Entry;
+import java.util.Vector;
 
 import org.eclipse.cdt.make.core.IMakeTarget;
 import org.eclipse.cdt.make.core.IMakeTargetListener;
@@ -55,14 +55,17 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 	public MakeTargetManager() {
 	}
 
+	@Override
 	public IMakeTarget createTarget(IProject project, String name, String targetBuilderID) throws CoreException {
 		return new MakeTarget(this, project, targetBuilderID, name);
 	}
 
+	@Override
 	public void addTarget(IMakeTarget target) throws CoreException {
 		addTarget(null, target);
 	}
 
+	@Override
 	public void addTarget(IContainer container, IMakeTarget target) throws CoreException {
 		if (container instanceof IWorkspaceRoot) {
 			throw new CoreException(new Status(IStatus.ERROR, MakeCorePlugin.getUniqueIdentifier(), -1, MakeMessages.getString("MakeTargetManager.add_to_workspace_root"), null)); //$NON-NLS-1$
@@ -82,6 +85,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		notifyListeners(new MakeTargetEvent(this, MakeTargetEvent.TARGET_ADD, target));
 	}
 
+	@Override
 	public void setTargets(IContainer container, IMakeTarget[] targets) throws CoreException {
 		if (container instanceof IWorkspaceRoot) {
 			throw new CoreException(new Status(IStatus.ERROR, MakeCorePlugin.getUniqueIdentifier(), -1, MakeMessages.getString("MakeTargetManager.add_to_workspace_root"), null)); //$NON-NLS-1$
@@ -104,6 +108,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		notifyListeners(new MakeTargetEvent(this, MakeTargetEvent.TARGET_ADD, targets[0]));
 	}
 
+	@Override
 	public boolean targetExists(IMakeTarget target) {
 		ProjectTargets projectTargets = projectMap.get(target.getProject());
 		if (projectTargets == null) {
@@ -112,6 +117,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		return projectTargets.contains(target);
 	}
 
+	@Override
 	public void removeTarget(IMakeTarget target) throws CoreException {
 		ProjectTargets projectTargets = projectMap.get(target.getProject());
 		if (projectTargets == null) {
@@ -128,6 +134,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		}
 	}
 
+	@Override
 	public void renameTarget(IMakeTarget target, String name) throws CoreException {
 		IMakeTarget makeTarget = target;
 
@@ -142,6 +149,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		}
 	}
 
+	@Override
 	public IMakeTarget[] getTargets(IContainer container) throws CoreException {
 		ProjectTargets projectTargets = projectMap.get(container.getProject());
 		if (projectTargets == null) {
@@ -150,6 +158,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		return projectTargets.get(container);
 	}
 
+	@Override
 	public IMakeTarget findTarget(IContainer container, String name) throws CoreException {
 		ProjectTargets projectTargets = projectMap.get(container.getProject());
 		if (projectTargets == null) {
@@ -158,10 +167,12 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		return projectTargets.findTarget(container, name);
 	}
 
+	@Override
 	public IProject[] getTargetBuilderProjects() {
 		return fProjects.toArray(new IProject[fProjects.size()]);
 	}
 
+	@Override
 	public String[] getTargetBuilders(IProject project) {
 		if (fProjects.contains(project) || hasTargetBuilder(project)) {
 			try {
@@ -182,6 +193,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		return new String[0];
 	}
 
+	@Override
 	public boolean hasTargetBuilder(IProject project) {
 		try {
 			if (project.isAccessible()) {
@@ -213,6 +225,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
 	}
 
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		IResourceDelta delta = event.getDelta();
 		if (delta != null) {
@@ -228,6 +241,7 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		/**
 		 * @see IResourceDeltaVisitor#visit(IResourceDelta)
 		 */
+		@Override
 		public boolean visit(IResourceDelta delta) {
 			if (delta == null) {
 				return false;
@@ -330,14 +344,17 @@ public class MakeTargetManager implements IMakeTargetManager, IResourceChangeLis
 		}
 	}
 
+	@Override
 	public void addListener(IMakeTargetListener listener) {
 		listeners.add(listener);
 	}
 
+	@Override
 	public void removeListener(IMakeTargetListener listener) {
 		listeners.remove(listeners);
 	}
 
+	@Override
 	public String getBuilderID(String targetBuilderID) {
 		return builderMap.get(targetBuilderID);
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/dataprovider/ConfigSupportNature.java

@@ -17,16 +17,20 @@ import org.eclipse.core.runtime.CoreException;
 public class ConfigSupportNature implements IProjectNature {
 	private IProject fProject;
 
+	@Override
 	public void configure() throws CoreException {
 	}
 
+	@Override
 	public void deconfigure() throws CoreException {
 	}
 
+	@Override
 	public IProject getProject() {
 		return fProject;
 	}
 
+	@Override
 	public void setProject(IProject project) {
 		fProject = project;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/AbstractMakefile.java

@@ -45,8 +45,10 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		super(parent);
 	}
 
+	@Override
 	public abstract IDirective[] getBuiltins();
 
+	@Override
 	public IRule[] getRules() {
 		IDirective[] stmts = getDirectives(true);
 		List<IDirective> array = new ArrayList<IDirective>(stmts.length);
@@ -58,6 +60,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IRule[0]);
 	}
 
+	@Override
 	public IRule[] getRules(String target) {
 		IRule[] rules = getRules();
 		List<IRule> array = new ArrayList<IRule>(rules.length);
@@ -69,6 +72,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IRule[0]);
 	}
 
+	@Override
 	public IInferenceRule[] getInferenceRules() {
 		IRule[] rules = getRules();
 		List<IRule> array = new ArrayList<IRule>(rules.length);
@@ -80,6 +84,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IInferenceRule[0]);
 	}
 
+	@Override
 	public IInferenceRule[] getInferenceRules(String target) {
 		IInferenceRule[] irules = getInferenceRules();
 		List<IInferenceRule> array = new ArrayList<IInferenceRule>(irules.length);
@@ -91,6 +96,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IInferenceRule[0]);
 	}
 
+	@Override
 	public ITargetRule[] getTargetRules() {
 		IRule[] trules = getRules();
 		List<IRule> array = new ArrayList<IRule>(trules.length);
@@ -102,6 +108,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new ITargetRule[0]);
 	}
 
+	@Override
 	public ITargetRule[] getTargetRules(String target) {
 		ITargetRule[] trules = getTargetRules();
 		List<ITargetRule> array = new ArrayList<ITargetRule>(trules.length);
@@ -113,6 +120,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new ITargetRule[0]);
 	}
 
+	@Override
 	public IMacroDefinition[] getMacroDefinitions() {
 		IDirective[] stmts = getDirectives(true);
 		List<IDirective> array = new ArrayList<IDirective>(stmts.length);
@@ -124,6 +132,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IMacroDefinition[0]);
 	}
 
+	@Override
 	public IMacroDefinition[] getMacroDefinitions(String name) {
 		IMacroDefinition[] variables = getMacroDefinitions();
 		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(variables.length);
@@ -135,6 +144,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IMacroDefinition[0]);
 	}
 
+	@Override
 	public IMacroDefinition[] getBuiltinMacroDefinitions() {
 		IDirective[] stmts = getBuiltins();
 		List<IDirective> array = new ArrayList<IDirective>(stmts.length);
@@ -146,6 +156,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IMacroDefinition[0]);
 	}
 
+	@Override
 	public IMacroDefinition[] getBuiltinMacroDefinitions(String name) {
 		IMacroDefinition[] variables = getBuiltinMacroDefinitions();
 		List<IMacroDefinition> array = new ArrayList<IMacroDefinition>(variables.length);
@@ -179,10 +190,12 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return array.toArray(new IInferenceRule[0]);
 	}
 
+	@Override
 	public String expandString(String line) {
 		return expandString(line, false);
 	}
 
+	@Override
 	public String expandString(String line, boolean recursive) {
 		int len = line.length();
 		boolean foundDollar = false;
@@ -264,6 +277,7 @@ public abstract class AbstractMakefile extends Parent implements IMakefile {
 		return buffer.toString();
 	}
 
+	@Override
 	public URI getFileURI() {
 		return filename;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Command.java

@@ -39,6 +39,7 @@ public class Command extends Directive implements ICommand {
 	 * target as a prerequisite or has no prerequisites, any error
 	 * found while executing the command will be ignored.
 	 */
+	@Override
 	public boolean shouldIgnoreError() {
 		// Check for the prefix hyphen in the command.
 		if (getPrefix() == HYPHEN) {
@@ -54,6 +55,7 @@ public class Command extends Directive implements ICommand {
 	 * target as a prerequisite or has no prerequisites, the command
 	 * will not be written to standard output before it is executed.
 	 */
+	@Override
 	public boolean shouldBeSilent() {
 		// Check for the prefix at sign
 		if (getPrefix() == AT) {
@@ -67,6 +69,7 @@ public class Command extends Directive implements ICommand {
 	 * command line that will be executed even if -n, -q or -t is
 	 * specified.
 	 */
+	@Override
 	public boolean shouldExecute() {
 		// Check for the prefix at sign
 		if (getPrefix() == PLUS) {
@@ -108,6 +111,7 @@ public class Command extends Directive implements ICommand {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.ICommand#execute(java.lang.String[], java.io.File)
 	 */
+	@Override
 	public Process execute(String shell, String[] envp, File dir) throws IOException {
 		String[] cmdArray = new String[] { shell, "-c", command}; //$NON-NLS-1$
 		return Runtime.getRuntime().exec(cmdArray, envp, dir);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Directive.java

@@ -33,6 +33,7 @@ public abstract class Directive implements IDirective {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getEndLine()
 	 */
+	@Override
 	public int getEndLine() {
 		return endLine;
 	}
@@ -40,6 +41,7 @@ public abstract class Directive implements IDirective {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getStartLine()
 	 */
+	@Override
 	public int getStartLine() {
 		return startLine;
 	}
@@ -47,6 +49,7 @@ public abstract class Directive implements IDirective {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getParent()
 	 */
+	@Override
 	public IDirective getParent() {
 		return parent;
 	}
@@ -54,6 +57,7 @@ public abstract class Directive implements IDirective {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IDirective#getMakefile()
 	 */
+	@Override
 	public IMakefile getMakefile() {
 		return parent.getMakefile();
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/MacroDefinition.java

@@ -29,6 +29,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 		value = v;
 	}
 
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -37,6 +38,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 		name = (n == null) ? "" : n.trim() ; //$NON-NLS-1$
 	}
 
+	@Override
 	public StringBuffer getValue() {
 		return value;
 	}
@@ -78,6 +80,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromCommand()
 	 */
+	@Override
 	public boolean isFromCommand() {
 		return fromCommand;
 	}
@@ -85,6 +88,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromDefault()
 	 */
+	@Override
 	public boolean isFromDefault() {
 		return fromDefault;
 	}
@@ -92,6 +96,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromEnviroment()
 	 */
+	@Override
 	public boolean isFromEnviroment() {
 		return fromEnvironment;
 	}
@@ -99,6 +104,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromEnviroment()
 	 */
+	@Override
 	public boolean isFromEnvironmentOverride() {
 		return fromEnvironmentOverride;
 	}
@@ -106,6 +112,7 @@ public class MacroDefinition extends Directive implements IMacroDefinition {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMacroDefinition#isFromMakefile()
 	 */
+	@Override
 	public boolean isFromMakefile() {
 		return fromMakefile;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/NullMakefile.java

@@ -62,12 +62,14 @@ public class NullMakefile extends AbstractMakefile {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.io.Reader)
 	 */
+	@Override
 	public void parse(String name, Reader makefile) throws IOException {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#getMakefileReaderProvider()
 	 */
+	@Override
 	public IMakefileReaderProvider getMakefileReaderProvider() {
 		return null;
 	}
@@ -78,12 +80,14 @@ public class NullMakefile extends AbstractMakefile {
 	public void parse(String name,
 			IMakefileReaderProvider makefileReaderProvider) throws IOException {
 	}
+	@Override
 	public void parse(URI fileURI, Reader makefile) throws IOException {
     }
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.net.URI, org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider)
 	 */
+	@Override
 	public void parse(URI fileURI,
 			IMakefileReaderProvider makefileReaderProvider) throws IOException {
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Parent.java

@@ -13,8 +13,8 @@ package org.eclipse.cdt.make.internal.core.makefile;
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.eclipse.cdt.make.core.makefile.IParent;
 import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IParent;
 
 /**
  * IParent
@@ -32,6 +32,7 @@ public abstract class Parent extends Directive implements IParent {
 		return getDirectives();
 	}
 
+	@Override
 	public IDirective[] getDirectives() {
 		children.trimToSize();
 		return children.toArray(new IDirective[0]);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/Rule.java

@@ -13,8 +13,8 @@ package org.eclipse.cdt.make.internal.core.makefile;
 import java.util.ArrayList;
 
 import org.eclipse.cdt.make.core.makefile.ICommand;
-import org.eclipse.cdt.make.core.makefile.IRule;
 import org.eclipse.cdt.make.core.makefile.IDirective;
+import org.eclipse.cdt.make.core.makefile.IRule;
 import org.eclipse.cdt.make.core.makefile.ITarget;
 
 public abstract class Rule extends Parent implements IRule {
@@ -31,6 +31,7 @@ public abstract class Rule extends Parent implements IRule {
 		addDirectives(cmds);
 	}
 
+	@Override
 	public ICommand[] getCommands() {
 		IDirective[] directives = getDirectives();
 		ArrayList<IDirective> cmds = new ArrayList<IDirective>(directives.length);
@@ -42,6 +43,7 @@ public abstract class Rule extends Parent implements IRule {
 		return cmds.toArray(new ICommand[0]);
 	}
 
+	@Override
 	public ITarget getTarget() {
 		return target;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/SpecialRule.java

@@ -10,8 +10,8 @@
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.core.makefile;
 
-import org.eclipse.cdt.make.core.makefile.ISpecialRule;
 import org.eclipse.cdt.make.core.makefile.ICommand;
+import org.eclipse.cdt.make.core.makefile.ISpecialRule;
 
 /**
  * Targets that have special meaning for Make.
@@ -25,6 +25,7 @@ public abstract class SpecialRule extends Rule implements ISpecialRule {
 		prerequisites = reqs;
 	}
 
+	@Override
 	public String[] getPrerequisites() {
 		return prerequisites;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/TargetRule.java

@@ -46,6 +46,7 @@ public class TargetRule extends Rule implements ITargetRule {
 		prerequisites = reqs;
 	}
 
+	@Override
 	public String[] getPrerequisites() {
 		return prerequisites;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/Conditional.java

@@ -39,34 +39,42 @@ public abstract class Conditional extends Parent implements IConditional {
 	}
 
 
+	@Override
 	public String getConditional() {
 		return cond;
 	}
 
+	@Override
 	public String getArg1() {
 		return arg1;
 	}
 
+	@Override
 	public String getArg2() {
 		return arg2;
 	}
 
+	@Override
 	public boolean isIfdef() {
 		return false;
 	}
 
+	@Override
 	public boolean isIfndef() {
 		return false;
 	}
 
+	@Override
 	public boolean isIfeq() {
 		return false;
 	}
 
+	@Override
 	public boolean isIfneq() {
 		return false;
 	}
 
+	@Override
 	public boolean isElse() {
 		return false;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefile.java

@@ -86,10 +86,12 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#getMakefileReaderProvider()
 	 */
+	@Override
 	public IMakefileReaderProvider getMakefileReaderProvider() {
 		return makefileReaderProvider;
 	}
 
+	@Override
 	public void parse(String filePath, Reader reader) throws IOException {
 		parse(URIUtil.toURI(filePath), new MakefileReader(reader));
 	}
@@ -97,6 +99,7 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.net.URI, org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider)
 	 */
+	@Override
 	public void parse(URI fileURI,
 			IMakefileReaderProvider makefileReaderProvider) throws IOException {
 		this.makefileReaderProvider = makefileReaderProvider;
@@ -120,6 +123,7 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		parse(fileURI, reader);
 	}
 
+	@Override
 	public void parse(URI filePath, Reader reader) throws IOException {
 		parse(filePath, new MakefileReader(reader));
 	}
@@ -814,10 +818,12 @@ public class GNUMakefile extends AbstractMakefile implements IGNUMakefile {
 		return builtins;
 	}
 
+	@Override
 	public void setIncludeDirectories(String[] dirs) {
 		includeDirectories = dirs;
 	}
 
+	@Override
 	public String[] getIncludeDirectories() {
 		return includeDirectories;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileChecker.java

@@ -38,6 +38,7 @@ public class GNUMakefileChecker extends ACBuilder {
 			this.monitor = monitor;
 		}
 
+		@Override
 		public boolean visit(IResourceDelta delta) throws CoreException {
 			IResource resource = delta.getResource();
 			if (resource != null && resource.getProject() == getProject()) {

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/GNUMakefileValidator.java

@@ -41,6 +41,7 @@ public class GNUMakefileValidator implements IMakefileValidator {
 		setMarkerGenerator(errorHandler);
 	}
 
+	@Override
 	public void setMarkerGenerator(IMarkerGenerator errorHandler) {
 		reporter = errorHandler;
 	}
@@ -49,6 +50,7 @@ public class GNUMakefileValidator implements IMakefileValidator {
 		if (reporter == null) {
 			reporter = new IMarkerGenerator() {
 
+				@Override
 				public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
 					ProblemMarkerInfo problemMarkerInfo = new ProblemMarkerInfo(file, lineNumber, errorDesc, severity, errorVar, null);
 					addMarker(problemMarkerInfo);
@@ -59,6 +61,7 @@ public class GNUMakefileValidator implements IMakefileValidator {
 				/* (non-Javadoc)
 				 * @see org.eclipse.cdt.core.IMarkerGenerator#addMarker(org.eclipse.cdt.core.ProblemMarkerInfo)
 				 */
+				@Override
 				public void addMarker(ProblemMarkerInfo problemMarkerInfo) {
 					String name = "Makefile"; //$NON-NLS-1$
 					if (problemMarkerInfo.file != null) {
@@ -100,6 +103,7 @@ public class GNUMakefileValidator implements IMakefileValidator {
 		return reporter;
 	}
 
+	@Override
 	public void checkFile(IFile file, IProgressMonitor monitor) {
 		String message = MakefileMessages.getString("MakefileValidator.checkingFile") + file.getFullPath().toString(); //$NON-NLS-1$
 		monitor.subTask(message);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/Include.java

@@ -44,6 +44,7 @@ public class Include extends Parent implements IInclude {
 		return sb.toString();
 	}
 
+	@Override
 	public String[] getFilenames() {
 		return filenames;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/Terminal.java

@@ -19,10 +19,12 @@ public abstract class Terminal extends Directive implements ITerminal {
 		super(parent);
 	}
 
+	@Override
 	public boolean isEndif() {
 		return false;
 	}
 
+	@Override
 	public boolean isEndef() {
 		return false;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/UnExport.java

@@ -29,6 +29,7 @@ public class UnExport extends Directive implements IUnExport {
 		return sb.toString();
 	}
 
+	@Override
 	public String getVariable() {
 		return variable;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/VPath.java

@@ -36,10 +36,12 @@ public class VPath extends Directive implements IVPath {
 		return sb.toString();
 	}
 
+	@Override
 	public String[] getDirectories() {
 		return directories;
 	}
 
+	@Override
 	public String getPattern() {
 		return pattern;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/gnu/VariableDefinition.java

@@ -84,31 +84,38 @@ public class VariableDefinition extends MacroDefinition implements IVariableDefi
 		return sb.toString();
 	}
 
+	@Override
 	public boolean isRecursivelyExpanded() {
 		return type == TYPE_RECURSIVE_EXPAND;
 	}
 
+	@Override
 	public boolean isSimplyExpanded() {
 		return type == TYPE_SIMPLE_EXPAND;
 	}
 
+	@Override
 	public boolean isConditional() {
 		return type == TYPE_CONDITIONAL;
 	}
 
+	@Override
 	public boolean isAppend() {
 		return type == TYPE_APPEND;
 	}
 
+	@Override
 	public boolean isTargetSpecific() {
 		String t = getTarget();
 		return t != null && t.length() > 0;
 	}
 
+	@Override
 	public boolean isExport() {
 		return false;
 	}
 
+	@Override
 	public boolean isMultiLine() {
 		return false;
 	}
@@ -116,6 +123,7 @@ public class VariableDefinition extends MacroDefinition implements IVariableDefi
 	/**
 	 * Variable from an `override' directive.
 	 */
+	@Override
 	public boolean isOverride() {
 		return false;
 	}
@@ -123,10 +131,12 @@ public class VariableDefinition extends MacroDefinition implements IVariableDefi
 	/**
 	 * Automatic variable -- cannot be set.
 	 */
+	@Override
 	public boolean isAutomatic() {
 		return false;
 	}
 
+	@Override
 	public String getTarget() {
 		return varTarget;
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/makefile/posix/PosixMakefile.java

@@ -74,10 +74,12 @@ public class PosixMakefile extends AbstractMakefile {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#getMakefileReaderProvider()
 	 */
+	@Override
 	public IMakefileReaderProvider getMakefileReaderProvider() {
 		return makefileReaderProvider;
 	}
 
+	@Override
 	public void parse(String name, Reader reader) throws IOException {
 		parse(URIUtil.toURI(name), new MakefileReader(reader));
 	}
@@ -85,6 +87,7 @@ public class PosixMakefile extends AbstractMakefile {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.makefile.IMakefile#parse(java.net.URI, org.eclipse.cdt.make.core.makefile.IMakefileReaderProvider)
 	 */
+	@Override
 	public void parse(URI fileURI,
 			IMakefileReaderProvider makefileReaderProvider) throws IOException {
 		this.makefileReaderProvider = makefileReaderProvider;
@@ -103,6 +106,7 @@ public class PosixMakefile extends AbstractMakefile {
 		parse(fileURI, reader);
 	}
 
+	@Override
 	public void parse(URI fileURI, Reader reader) throws IOException {
 		parse(fileURI, new MakefileReader(reader));
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/CDataDiscoveredInfoCalculator.java

@@ -84,12 +84,14 @@ public class CDataDiscoveredInfoCalculator {
 			fRcData = rcData;
 		}
 
+		@Override
 		public ILangSettingInfo[] getLangInfos() {
 			if(fLangInfoList != null && fLangInfoList.size() != 0)
 				return fLangInfoList.toArray(new ILangSettingInfo[fLangInfoList.size()]);
 			return new ILangSettingInfo[0];
 		}
 
+		@Override
 		public CResourceData getResourceData() {
 			return fRcData;
 		}
@@ -110,10 +112,12 @@ public class CDataDiscoveredInfoCalculator {
 			fPathInfo = info;
 		}
 
+		@Override
 		public PathInfo getFilePathInfo() {
 			return fPathInfo;
 		}
 
+		@Override
 		public CLanguageData getLanguageData() {
 			return fLangData;
 		}
@@ -493,6 +497,7 @@ public class CDataDiscoveredInfoCalculator {
 			final List<Object> list = new ArrayList<Object>();
 			fContainer.accept(new IPathSettingsContainerVisitor(){
 
+				@Override
 				public boolean visit(PathSettingsContainer container) {
 					if(includeCurrent || container != fContainer){
 						list.add(container.getValue());

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathContainer.java

@@ -49,14 +49,17 @@ public class DiscoveredPathContainer implements IPathEntryContainer {
 //        return fPathEntries;
 //    }
 
+    @Override
 	public String getDescription() {
         return MakeMessages.getString("DiscoveredContainer.description"); //$NON-NLS-1$
     }
 
+    @Override
 	public IPath getPath() {
         return CONTAINER_ID;
     }
 
+    @Override
 	public IPathEntry[] getPathEntries() {
         if (fPathEntries == null) {
             try {

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathInfo.java

@@ -51,10 +51,12 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
 		discoveredSymbols = new LinkedHashMap<String, SymbolEntry>();
 	}
 
+	@Override
 	public IProject getProject() {
 		return project;
 	}
 
+	@Override
 	public synchronized Map<String, String> getSymbols() {
 		if (activeSymbols == null) {
 			createSymbolsMap();
@@ -63,6 +65,7 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
 		return dSymbols;
 	}
 
+	@Override
 	public synchronized IPath[] getIncludePaths() {
 		if ( activePaths == null) {
 			createPathLists();
@@ -70,10 +73,12 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
 		return activePaths.toArray(new IPath[activePaths.size()]);
 	}
 
+	@Override
 	public LinkedHashMap<String, Boolean> getIncludeMap() {
 		return new LinkedHashMap<String, Boolean>(discoveredPaths);
 	}
 
+	@Override
 	public synchronized void setIncludeMap(LinkedHashMap<String, Boolean> paths) {
 		discoveredPaths = SafeStringInterner.safeIntern(new LinkedHashMap<String, Boolean>(paths));
 		activePaths = null;
@@ -95,10 +100,12 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
 		}
 	}
 
+	@Override
 	public LinkedHashMap<String, SymbolEntry> getSymbolMap() {
 		return new LinkedHashMap<String, SymbolEntry>(discoveredSymbols);
 	}
 
+	@Override
 	public synchronized void setSymbolMap(LinkedHashMap<String, SymbolEntry> symbols) {
 		discoveredSymbols = SafeStringInterner.safeIntern(new LinkedHashMap<String, SymbolEntry>(symbols));
 		activeSymbols = null;
@@ -131,6 +138,7 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore.IDiscoveredScannerInfoSerializable#serialize(org.w3c.dom.Element)
 	 */
+	@Override
 	public void serialize(Element collectorElem) {
 		Document doc = collectorElem.getOwnerDocument();
 
@@ -172,6 +180,7 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore.IDiscoveredScannerInfoSerializable#deserialize(org.w3c.dom.Element)
 	 */
+	@Override
 	public void deserialize(Element collectorElem) {
 		LinkedHashMap<String, Boolean> includes = getIncludeMap();
 		LinkedHashMap<String, SymbolEntry> symbols = getSymbolMap();
@@ -198,6 +207,7 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore.IDiscoveredScannerInfoSerializable#getCollectorId()
 	 */
+	@Override
 	public String getCollectorId() {
 		return PerProjectSICollector.COLLECTOR_ID;
 	}
@@ -205,6 +215,7 @@ public class DiscoveredPathInfo implements IPerProjectDiscoveredPathInfo, IDisco
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo#getSerializable()
      */
+    @Override
 	public IDiscoveredScannerInfoSerializable getSerializable() {
         return this;
     }

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredPathManager.java

@@ -112,6 +112,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
 	 */
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		if (event.getSource() instanceof IWorkspace) {
 			IResource resource = event.getResource();
@@ -134,14 +135,17 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
 
 
 
+	@Override
 	public IDiscoveredPathInfo getDiscoveredInfo(IProject project) throws CoreException {
 		return getDiscoveredInfo(project, new InfoContext(project));
 	}
 
+	@Override
 	public IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context) throws CoreException{
 		return getDiscoveredInfo(project, context, true);
 	}
 
+	@Override
 	public IDiscoveredPathInfo getDiscoveredInfo(IProject project, InfoContext context, boolean defaultToProjectSettings) throws CoreException{
 		DiscoveredInfoHolder holder = getHolder(project, true);
 		IDiscoveredPathInfo info = holder.getInfo(context);
@@ -212,10 +216,12 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
 //		return pathInfo;
 //	}
 
+	@Override
 	public void removeDiscoveredInfo(IProject project) {
 		removeDiscoveredInfo(project, new InfoContext(project));
 	}
 
+	@Override
 	public void removeDiscoveredInfo(IProject project, InfoContext context) {
 		DiscoveredInfoHolder holder = getHolder(project, false);
 		if(holder != null){
@@ -229,6 +235,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager#updateDiscoveredInfo(org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo, java.util.List)
      */
+    @Override
 	public void updateDiscoveredInfo(IDiscoveredPathInfo info, List<IResource> changedResources) throws CoreException {
     	updateDiscoveredInfo(new InfoContext(info.getProject()), info, true, changedResources);
     }
@@ -236,6 +243,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager#updateDiscoveredInfo(org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo, java.util.List)
      */
+    @Override
 	public void updateDiscoveredInfo(InfoContext context, IDiscoveredPathInfo info, boolean updateContainer, List<IResource> changedResources) throws CoreException {
     	DiscoveredInfoHolder holder = getHolder(info.getProject(), true);
     	IDiscoveredPathInfo oldInfo = holder.getInfo(context);
@@ -304,6 +312,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager#changeDiscoveredContainer(org.eclipse.core.resources.IProject, java.lang.String)
      */
+    @Override
 	public void changeDiscoveredContainer(final IProject project, final ScannerConfigScope profileScope, final List<IResource> changedResources) {
         // order here is of essence
         // 1. clear DiscoveredPathManager's path info cache
@@ -314,6 +323,7 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
         // 2. switch the containers
         try {
         	IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
+        		@Override
 				public void run(IProgressMonitor monitor) throws CoreException {
         			ICProject cProject = CoreModel.getDefault().create(project);
         			if (ScannerConfigScope.PROJECT_SCOPE.equals(profileScope)) {
@@ -363,12 +373,14 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
 			if (listener != null) {
 				SafeRunner.run(new ISafeRunnable() {
 
+					@Override
 					public void handleException(Throwable exception) {
 						IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, -1,
 								CCorePlugin.getResourceString("CDescriptorManager.exception.listenerError"), exception); //$NON-NLS-1$
 						CCorePlugin.log(status);
 					}
 
+					@Override
 					public void run() throws Exception {
 						switch (type) {
 							case INFO_CHANGED :
@@ -384,10 +396,12 @@ public class DiscoveredPathManager implements IDiscoveredPathManager, IResourceC
 		}
 	}
 
+	@Override
 	public void addDiscoveredInfoListener(IDiscoveredInfoListener listener) {
 		listeners.add(listener);
 	}
 
+	@Override
 	public void removeDiscoveredInfoListener(IDiscoveredInfoListener listener) {
 		listeners.remove(listener);
 	}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/DiscoveredScannerInfoStore.java

@@ -32,8 +32,8 @@ import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
 import org.eclipse.cdt.make.core.MakeCorePlugin;
-import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
 import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredScannerInfoSerializable;
+import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
 import org.eclipse.cdt.make.internal.core.MakeMessages;
 import org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector;
 import org.eclipse.core.resources.IProject;
@@ -345,6 +345,7 @@ public final class DiscoveredScannerInfoStore {
         try {
             delta.accept(new IResourceDeltaVisitor() {
 
+                @Override
 				public boolean visit(IResourceDelta delta) throws CoreException {
                     IResource resource = delta.getResource();
                     if (resource instanceof IProject) {

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/PerFileDiscoveredPathContainer.java

@@ -36,6 +36,7 @@ public class PerFileDiscoveredPathContainer extends DiscoveredPathContainer
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.model.IPathEntryContainerExtension#getPathEntries(org.eclipse.core.runtime.IPath, int)
      */
+    @Override
 	public IPathEntry[] getPathEntries(IPath path, int mask) {
 		ArrayList<IPathEntry> entries = new ArrayList<IPathEntry>();
         try {
@@ -94,6 +95,7 @@ public class PerFileDiscoveredPathContainer extends DiscoveredPathContainer
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.IPathEntryContainerExtension#isEmpty(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public boolean isEmpty(IPath path) {
         IDiscoveredPathInfo info;
 		try {

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/ScannerConfigInfoFactory.java

@@ -60,6 +60,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#isAutoDiscoveryEnabled()
 		 */
+		@Override
 		public boolean isAutoDiscoveryEnabled() {
 			return getBoolean(BUILD_SCANNER_CONFIG_ENABLED);
 		}
@@ -67,6 +68,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setAutoDiscoveryEnabled(boolean)
 		 */
+		@Override
 		public void setAutoDiscoveryEnabled(boolean enabled) throws CoreException {
 			putString(BUILD_SCANNER_CONFIG_ENABLED, Boolean.toString(enabled));
 		}
@@ -74,6 +76,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#isMakeBuilderConsoleParserEnabled()
 		 */
+		@Override
 		public boolean isMakeBuilderConsoleParserEnabled() {
 			if (getString(MAKE_BUILDER_PARSER_ENABLED) == null ||
 				getString(MAKE_BUILDER_PARSER_ENABLED).length() == 0) { // if no property then default to true
@@ -85,6 +88,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setMakeBuilderConsoleParserEnabled(boolean)
 		 */
+		@Override
 		public void setMakeBuilderConsoleParserEnabled(boolean enabled) throws CoreException {
 			putString(MAKE_BUILDER_PARSER_ENABLED, Boolean.toString(enabled));
 		}
@@ -92,6 +96,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#getMakeBuilderConsoleParserId()
 		 */
+		@Override
 		public String getMakeBuilderConsoleParserId() {
 			String parserId = getString(MAKE_BUILDER_PARSER_ID);
 			if (parserId == null || parserId.length() == 0) {
@@ -105,6 +110,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setMakeBuilderConsoleParserId(java.lang.String)
 		 */
+		@Override
 		public void setMakeBuilderConsoleParserId(String parserId) throws CoreException {
 			putString(MAKE_BUILDER_PARSER_ID, parserId);
 		}
@@ -112,6 +118,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#isESIProviderCommandEnabled()
 		 */
+		@Override
 		public boolean isESIProviderCommandEnabled() {
 			if (getString(ESI_PROVIDER_COMMAND_ENABLED) == null ||
 				getString(ESI_PROVIDER_COMMAND_ENABLED).length() == 0) { // if no property then default to true
@@ -123,6 +130,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setESIProviderCommandEnabled(boolean)
 		 */
+		@Override
 		public void setESIProviderCommandEnabled(boolean enabled) throws CoreException {
 			putString(ESI_PROVIDER_COMMAND_ENABLED, Boolean.toString(enabled));
 		}
@@ -130,6 +138,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#isDefaultESIProviderCmd()
 		 */
+		@Override
 		public boolean isDefaultESIProviderCmd() {
 			if (getString(USE_DEFAULT_ESI_PROVIDER_CMD) == null ||
 				getString(USE_DEFAULT_ESI_PROVIDER_CMD).length() == 0) { // if no property then default to true
@@ -141,6 +150,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setUseDefaultESIProviderCmd(boolean)
 		 */
+		@Override
 		public void setUseDefaultESIProviderCmd(boolean on) throws CoreException {
 			putString(USE_DEFAULT_ESI_PROVIDER_CMD, Boolean.toString(on));
 		}
@@ -148,6 +158,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#getESIProviderCommand()
 		 */
+		@Override
 		public IPath getESIProviderCommand() {
 			if (isDefaultESIProviderCmd()) {
 				String command = getESIProviderParameter("defaultCommand"); //$NON-NLS-1$
@@ -162,6 +173,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setESIProviderCommand(org.eclipse.core.runtime.IPath)
 		 */
+		@Override
 		public void setESIProviderCommand(IPath command) throws CoreException {
 			putString(ESI_PROVIDER_COMMAND, command.toString());
 		}
@@ -169,6 +181,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#getESIProviderArguments()
 		 */
+		@Override
 		public String getESIProviderArguments() {
 			if (isDefaultESIProviderCmd()) {
 				String attributes = getESIProviderParameter("defaultAttributes"); //$NON-NLS-1$
@@ -183,6 +196,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setESIProviderArguments(java.lang.String)
 		 */
+		@Override
 		public void setESIProviderArguments(String args) throws CoreException {
 			putString(ESI_PROVIDER_ARGUMENTS, args);
 		}
@@ -190,6 +204,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#getESIProviderConsoleParserId()
 		 */
+		@Override
 		public String getESIProviderConsoleParserId() {
 			String parserId = getString(ESI_PROVIDER_PARSER_ID);
 			if (parserId == null || parserId.length() == 0) {
@@ -204,6 +219,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setESIProviderConsoleParserId(java.lang.String)
 		 */
+		@Override
 		public void setESIProviderConsoleParserId(String parserId) throws CoreException {
 			putString(ESI_PROVIDER_PARSER_ID, parserId);
 		}
@@ -211,6 +227,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#isSIProblemGenerationEnabled()
 		 */
+		@Override
 		public boolean isSIProblemGenerationEnabled() {
 			if (getString(SI_PROBLEM_GENERATION_ENABLED) == null ||
 					getString(SI_PROBLEM_GENERATION_ENABLED).length() == 0) { // if no property then default to true
@@ -222,6 +239,7 @@ public class ScannerConfigInfoFactory {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo#setSIProblemGenerationEnabled(boolean)
 		 */
+		@Override
 		public void setSIProblemGenerationEnabled(boolean enabled) throws CoreException {
 			putString(SI_PROBLEM_GENERATION_ENABLED, Boolean.toString(enabled));
 		}

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/AbstractGCCBOPConsoleParser.java

@@ -19,8 +19,8 @@ import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser;
 import org.eclipse.cdt.make.internal.core.MakeMessages;
 import org.eclipse.cdt.make.internal.core.scannerconfig.util.TraceUtil;
 import org.eclipse.cdt.make.internal.core.scannerconfig2.SCProfileInstance;
-import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager;
 import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfile.BuildOutputProvider;
+import org.eclipse.cdt.make.internal.core.scannerconfig2.ScannerConfigProfileManager;
 import org.eclipse.core.resources.IProject;
 
 /**
@@ -92,6 +92,7 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#processLine(java.lang.String)
      */
+    @Override
 	public boolean processLine(String line) {
         boolean rc = false;
         int lineBreakPos = line.length()-1;
@@ -160,6 +161,7 @@ public abstract class AbstractGCCBOPConsoleParser implements IScannerInfoConsole
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#shutdown()
      */
+    @Override
 	public void shutdown() {
         if (getUtility() != null) {
             getUtility().reportProblems();

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileBOPConsoleParser.java

@@ -19,6 +19,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.eclipse.cdt.core.IMarkerGenerator;
 import org.eclipse.cdt.internal.core.resources.ResourceLookup;
 import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector;
@@ -46,6 +47,7 @@ public class GCCPerFileBOPConsoleParser extends AbstractGCCBOPConsoleParser {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#startup(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector, org.eclipse.cdt.core.IMarkerGenerator)
      */
+    @Override
 	public void startup(IProject project, IPath workingDirectory, IScannerInfoCollector collector, IMarkerGenerator markerGenerator) {
         fUtil = (project != null && workingDirectory != null && markerGenerator != null) ?
                 new GCCPerFileBOPConsoleParserUtility(project, workingDirectory, markerGenerator) : null;

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCPerFileSIPConsoleParser.java

@@ -51,6 +51,7 @@ public class GCCPerFileSIPConsoleParser implements IScannerInfoConsoleParser {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#startup(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector, org.eclipse.cdt.core.IMarkerGenerator)
      */
+    @Override
 	public void startup(IProject project, IPath workingDirectory, IScannerInfoCollector collector, IMarkerGenerator markerGenerator) {
         this.fCollector = collector;
     }
@@ -58,6 +59,7 @@ public class GCCPerFileSIPConsoleParser implements IScannerInfoConsoleParser {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.internal.core.scannerconfig.IScannerInfoConsoleParser#processLine(java.lang.String)
      */
+    @Override
 	public boolean processLine(String line) {
         boolean rc = false;
         line= line.trim();
@@ -121,6 +123,7 @@ public class GCCPerFileSIPConsoleParser implements IScannerInfoConsoleParser {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.internal.core.scannerconfig.IScannerInfoConsoleParser#shutdown()
      */
+    @Override
 	public void shutdown() {
 //        Map scannerInfo = new HashMap();
 //        scannerInfo.put(ScannerInfoTypes.INCLUDE_PATHS, includes);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCScannerInfoConsoleParser.java

@@ -41,6 +41,7 @@ public class GCCScannerInfoConsoleParser extends AbstractGCCBOPConsoleParser {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#startup(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector, org.eclipse.cdt.core.IMarkerGenerator)
      */
+    @Override
 	public void startup(IProject project, IPath workingDirectory, IScannerInfoCollector collector, IMarkerGenerator markerGenerator) {
         fUtil = (project != null && workingDirectory != null && markerGenerator != null) ?
                 new ScannerInfoConsoleParserUtility(project, workingDirectory, markerGenerator) : null;

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/GCCSpecsConsoleParser.java

@@ -47,6 +47,7 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoConsoleParser#startup(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector, org.eclipse.cdt.core.IMarkerGenerator)
      */
+    @Override
 	public void startup(IProject project, IPath workingDirectory, IScannerInfoCollector collector, IMarkerGenerator markerGenerator) {
 		this.fProject = project;
 		this.fCollector = collector;
@@ -55,6 +56,7 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.internal.core.scannerconfig.IScannerInfoConsoleParser#processLine(java.lang.String)
 	 */
+	@Override
 	public boolean processLine(String line) {
 		boolean rc = false;
 		line= line.trim();
@@ -113,6 +115,7 @@ public class GCCSpecsConsoleParser implements IScannerInfoConsoleParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.internal.core.scannerconfig.IScannerInfoConsoleParser#shutdown()
 	 */
+	@Override
 	public void shutdown() {
 		Map<ScannerInfoTypes, List<String>> scannerInfo = new HashMap<ScannerInfoTypes, List<String>>();
 		scannerInfo.put(ScannerInfoTypes.INCLUDE_PATHS, includes);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/jobs/SCJobsUtil.java

@@ -90,6 +90,7 @@ public class SCJobsUtil {
                 if (esiProvider != null) {
                     ISafeRunnable runnable = new ISafeRunnable() {
 
+                        @Override
 						public void run() {
                         	// TODO we need the environment for the project here...
                         	ICProjectDescription projDesc = CoreModel.getDefault().getProjectDescription(project);
@@ -105,6 +106,7 @@ public class SCJobsUtil {
                             rc.set(true);
                         }
 
+                        @Override
 						public void handleException(Throwable exception) {
                             rc.set(false);
                             MakeCorePlugin.log(exception);
@@ -143,11 +145,13 @@ public class SCJobsUtil {
             final IScannerInfoCollector2 collector2 = (IScannerInfoCollector2) collector;
             ISafeRunnable runnable = new ISafeRunnable() {
 
+                @Override
 				public void run() throws Exception {
                     collector2.updateScannerConfiguration(monitor);
                     rc.set(true);
                 }
 
+                @Override
 				public void handleException(Throwable exception) {
                     rc.set(false);
                     MakeCorePlugin.log(exception);
@@ -181,11 +185,13 @@ public class SCJobsUtil {
         if (buildInfo.isBuildOutputFileActionEnabled()) {
             ISafeRunnable runnable = new ISafeRunnable() {
 
+                @Override
 				public void run() {
                     esiProvider.invokeProvider(monitor, project, context, null, buildInfo, collector, null);
                     rc.set(true);
                 }
 
+                @Override
 				public void handleException(Throwable exception) {
                     rc.set(false);
                     MakeCorePlugin.log(exception);

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultRunSIProvider.java

@@ -73,12 +73,14 @@ public class DefaultRunSIProvider implements IExternalScannerInfoProvider {
 
     private SCMarkerGenerator markerGenerator = new SCMarkerGenerator();
 
+    @Override
 	public boolean invokeProvider(IProgressMonitor monitor, IResource resource,
     		String providerId, IScannerConfigBuilderInfo2 buildInfo,
     		IScannerInfoCollector collector) {
     	return invokeProvider(monitor, resource, new InfoContext(resource.getProject()), providerId, buildInfo, collector, null);
     }
 
+    @Override
 	public boolean invokeProvider(IProgressMonitor monitor,
                                   IResource resource,
                                   InfoContext context,

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/DefaultSIFileReader.java

@@ -50,12 +50,14 @@ public class DefaultSIFileReader implements IExternalScannerInfoProvider {
 
     private SCMarkerGenerator markerGenerator = new SCMarkerGenerator();
 
+    @Override
 	public boolean invokeProvider(IProgressMonitor monitor, IResource resource,
     		String providerId, IScannerConfigBuilderInfo2 buildInfo,
     		IScannerInfoCollector collector) {
     	return invokeProvider(monitor, resource, new InfoContext(resource.getProject()), providerId, buildInfo, collector, null);
     }
 
+    @Override
 	public boolean invokeProvider(IProgressMonitor monitor,
                                   IResource resource,
                                   InfoContext context,

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerFileSICollector.java

@@ -20,22 +20,22 @@ import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.Map.Entry;
 
 import org.eclipse.cdt.internal.core.SafeStringInterner;
 import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
+import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredScannerInfoSerializable;
+import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo;
+import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo2;
 import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector3;
 import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorCleaner;
 import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
 import org.eclipse.cdt.make.core.scannerconfig.PathInfo;
 import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredScannerInfoSerializable;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo2;
 import org.eclipse.cdt.make.internal.core.MakeMessages;
 import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore;
 import org.eclipse.cdt.make.internal.core.scannerconfig.ScannerConfigUtil;
@@ -80,6 +80,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore.IDiscoveredScannerInfoSerializable#serialize(org.w3c.dom.Element)
          */
+        @Override
 		public void serialize(Element collectorElem) {
         	synchronized (PerFileSICollector.this.fLock) {
 	            Document doc = collectorElem.getOwnerDocument();
@@ -114,6 +115,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore.IDiscoveredScannerInfoSerializable#deserialize(org.w3c.dom.Element)
          */
+        @Override
 		public void deserialize(Element collectorElem) {
         	synchronized (PerFileSICollector.this.fLock) {
 	            for (Node child = collectorElem.getFirstChild(); child != null; child = child.getNextSibling()) {
@@ -145,6 +147,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredScannerInfoStore.IDiscoveredScannerInfoSerializable#getCollectorId()
          */
+        @Override
 		public String getCollectorId() {
             return COLLECTOR_ID;
         }
@@ -206,10 +209,12 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector2#setProject(org.eclipse.core.resources.IProject)
      */
+    @Override
 	public void setProject(IProject project) {
     	setInfoContext(new InfoContext(project));
     }
 
+    @Override
 	public void setInfoContext(InfoContext context) {
         this.project = context.getProject();
         this.context = context;
@@ -230,6 +235,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
 	/* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector#contributeToScannerConfig(java.lang.Object, java.util.Map)
      */
+    @Override
 	public void contributeToScannerConfig(Object resource, @SuppressWarnings("rawtypes") Map scannerInfo) {
         // check the resource
         String errorMessage = null;
@@ -426,6 +432,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector2#updateScannerConfiguration(org.eclipse.core.runtime.IProgressMonitor)
      */
+    @Override
 	public void updateScannerConfiguration(IProgressMonitor monitor) throws CoreException {
         if (monitor == null) {
             monitor = new NullProgressMonitor();
@@ -464,6 +471,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector2#createPathInfoObject()
      */
+    @Override
 	public IDiscoveredPathInfo createPathInfoObject() {
         return new PerFileDiscoveredPathInfo();
     }
@@ -477,6 +485,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector#getCollectedScannerInfo(java.lang.Object, org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes)
      */
+    @Override
 	public List<CCommandDSC> getCollectedScannerInfo(Object resource, ScannerInfoTypes type) {
         List<CCommandDSC> rv = new ArrayList<CCommandDSC>();
         // check the resource
@@ -540,6 +549,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deleteAllPaths(org.eclipse.core.resources.IResource)
      */
+    @Override
 	public void deleteAllPaths(IResource resource) {
         // TODO Auto-generated method stub
 
@@ -548,6 +558,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deleteAllSymbols(org.eclipse.core.resources.IResource)
      */
+    @Override
 	public void deleteAllSymbols(IResource resource) {
         // TODO Auto-generated method stub
 
@@ -556,6 +567,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deletePath(org.eclipse.core.resources.IResource, java.lang.String)
      */
+    @Override
 	public void deletePath(IResource resource, String path) {
         // TODO Auto-generated method stub
 
@@ -564,6 +576,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deleteSymbol(org.eclipse.core.resources.IResource, java.lang.String)
      */
+    @Override
 	public void deleteSymbol(IResource resource, String symbol) {
         // TODO Auto-generated method stub
 
@@ -572,6 +585,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorCleaner#deleteAll(org.eclipse.core.resources.IResource)
      */
+    @Override
 	public void deleteAll(IResource resource) {
         if (resource.equals(project)) {
         	synchronized (fLock) {
@@ -602,6 +616,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo#getProject()
          */
+        @Override
 		public IProject getProject() {
             return project;
         }
@@ -609,6 +624,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo#getIncludePaths()
          */
+        @Override
 		public IPath[] getIncludePaths() {
         	final IPath[] includepaths;
         	final IPath[] quotepaths;
@@ -632,6 +648,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo#getSymbols()
          */
+        @Override
 		public Map<String, String> getSymbols() {
 //            return new HashMap();
         	synchronized (PerFileSICollector.this.fLock) {
@@ -642,6 +659,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo#getIncludePaths(org.eclipse.core.runtime.IPath)
          */
+        @Override
 		public IPath[] getIncludePaths(IPath path) {
         	synchronized (PerFileSICollector.this.fLock) {
 	            // get the command
@@ -660,6 +678,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo#getQuoteIncludePaths(org.eclipse.core.runtime.IPath)
          */
+        @Override
 		public IPath[] getQuoteIncludePaths(IPath path) {
         	synchronized (PerFileSICollector.this.fLock) {
 	            // get the command
@@ -678,6 +697,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo#getSymbols(org.eclipse.core.runtime.IPath)
          */
+        @Override
 		public Map<String, String> getSymbols(IPath path) {
         	synchronized (PerFileSICollector.this.fLock) {
 	            // get the command
@@ -703,6 +723,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo#getIncludeFiles(org.eclipse.core.runtime.IPath)
          */
+        @Override
 		public IPath[] getIncludeFiles(IPath path) {
         	synchronized (PerFileSICollector.this.fLock) {
 	            // get the command
@@ -721,6 +742,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo#getMacroFiles(org.eclipse.core.runtime.IPath)
          */
+        @Override
 		public IPath[] getMacroFiles(IPath path) {
         	synchronized (PerFileSICollector.this.fLock) {
 	            // get the command
@@ -739,6 +761,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo#getSerializable()
          */
+        @Override
 		public IDiscoveredScannerInfoSerializable getSerializable() {
         	synchronized (PerFileSICollector.this.fLock) {
         		return sid;
@@ -748,6 +771,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerFileDiscoveredPathInfo#isEmpty(org.eclipse.core.runtime.IPath)
 		 */
+		@Override
 		public boolean isEmpty(IPath path) {
 			boolean rc = true;
 			IResource resource = project.getWorkspace().getRoot().findMember(path);
@@ -764,6 +788,7 @@ public class PerFileSICollector implements IScannerInfoCollector3, IScannerInfoC
 			return rc;
 		}
 
+		@Override
 		public Map<IResource, PathInfo> getPathInfoMap() {
         	synchronized (PerFileSICollector.this.fLock) {
 				//TODO: do we need to cache this?

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/PerProjectSICollector.java

@@ -27,6 +27,8 @@ import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.core.model.IPathEntry;
 import org.eclipse.cdt.make.core.MakeCorePlugin;
+import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
+import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerProjectDiscoveredPathInfo;
 import org.eclipse.cdt.make.core.scannerconfig.IExternalScannerInfoProvider;
 import org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2;
 import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector;
@@ -35,8 +37,6 @@ import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector3;
 import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorCleaner;
 import org.eclipse.cdt.make.core.scannerconfig.InfoContext;
 import org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
-import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IPerProjectDiscoveredPathInfo;
 import org.eclipse.cdt.make.internal.core.MakeMessages;
 import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredPathContainer;
 import org.eclipse.cdt.make.internal.core.scannerconfig.DiscoveredPathInfo;
@@ -94,6 +94,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector2#setProject(org.eclipse.core.resources.IProject)
 	 */
+	@Override
 	public void setProject(IProject project) {
 		this.project = project;
 		this.context = new InfoContext(project);
@@ -112,6 +113,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector#contributeToScannerConfig(java.lang.Object, java.util.Map)
 	 */
+	@Override
 	public synchronized void contributeToScannerConfig(Object resource, @SuppressWarnings("rawtypes") Map scannerInfo) {
 		// check the resource
 		String errorMessage = null;
@@ -208,6 +210,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector2#updateScannerConfiguration(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	public synchronized void updateScannerConfiguration(IProgressMonitor monitor) throws CoreException {
 		if (monitor == null) {
 			monitor = new NullProgressMonitor();
@@ -348,6 +351,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector#getCollectedScannerInfo(java.lang.Object, org.eclipse.cdt.make.core.scannerconfig.ScannerInfoTypes)
      */
+    @Override
 	public List<String> getCollectedScannerInfo(Object resource, ScannerInfoTypes type) {
         List<String> rv = null;
         // check the resource
@@ -406,6 +410,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deleteAllPaths(org.eclipse.core.resources.IResource)
      */
+    @Override
 	public void deleteAllPaths(IResource resource) {
         IProject project = resource.getProject();
         if (project != null && project.equals(this.project)) {
@@ -416,6 +421,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deleteAllSymbols(org.eclipse.core.resources.IResource)
      */
+    @Override
 	public void deleteAllSymbols(IResource resource) {
         IProject project = resource.getProject();
         if (project != null && project.equals(this.project)) {
@@ -426,6 +432,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deletePath(org.eclipse.core.resources.IResource, java.lang.String)
      */
+    @Override
 	public void deletePath(IResource resource, String path) {
         IProject project = resource.getProject();
         if (project != null && project.equals(this.project)) {
@@ -436,6 +443,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorUtil#deleteSymbol(org.eclipse.core.resources.IResource, java.lang.String)
      */
+    @Override
 	public void deleteSymbol(IResource resource, String symbol) {
         IProject project = resource.getProject();
         if (project != null && project.equals(this.project)) {
@@ -447,6 +455,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollectorCleaner#deleteAll(org.eclipse.core.resources.IResource)
      */
+    @Override
 	public void deleteAll(IResource resource) {
         deleteAllPaths(resource);
         deleteAllSymbols(resource);
@@ -455,6 +464,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector2#createPathInfoObject()
      */
+    @Override
 	public IDiscoveredPathInfo createPathInfoObject() {
         DiscoveredPathInfo pathInfo = new DiscoveredPathInfo(project);
         try {
@@ -488,6 +498,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
 		// Set the arguments for the provider
 
 		ISafeRunnable runnable = new ISafeRunnable() {
+			@Override
 			public void run() throws CoreException {
 				IProgressMonitor monitor = new NullProgressMonitor();
 				esiProvider.invokeProvider(monitor, project, "specsFile", buildInfo, collector);//$NON-NLS-1$
@@ -497,6 +508,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
 				}
 			}
 
+			@Override
 			public void handleException(Throwable exception) {
 				if (exception instanceof OperationCanceledException) {
 					throw (OperationCanceledException) exception;
@@ -521,6 +533,7 @@ public class PerProjectSICollector implements IScannerInfoCollector3, IScannerIn
         MakeCorePlugin.getDefault().getDiscoveryManager().removeDiscoveredInfo(project);
     }
 
+	@Override
 	public void setInfoContext(InfoContext context) {
 		this.context = context;
 		this.project = context.getProject();

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/SCMarkerGenerator.java

@@ -44,6 +44,7 @@ public class SCMarkerGenerator implements IMarkerGenerator {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IMarkerGenerator#addMarker(org.eclipse.core.resources.IResource, int, java.lang.String, int, java.lang.String)
 	 */
+	@Override
 	public void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar) {
 		ProblemMarkerInfo info = new ProblemMarkerInfo(file, lineNumber, errorDesc, severity, errorVar);
 		addMarker(info);
@@ -52,6 +53,7 @@ public class SCMarkerGenerator implements IMarkerGenerator {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IMarkerGenerator#addMarker(org.eclipse.cdt.core.ProblemMarkerInfo)
 	 */
+	@Override
 	public void addMarker(final ProblemMarkerInfo problemMarkerInfo) {
 		// we have to add the marker in the job or we can deadlock other
 		// threads that are responding to a resource delta by doing something

build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig2/ScannerConfigInfoFactory2.java

@@ -124,6 +124,7 @@ public class ScannerConfigInfoFactory2 {
 			}
 		}
 
+		@Override
 		public void save() throws CoreException {
 			save(false);
 		}
@@ -165,6 +166,7 @@ public class ScannerConfigInfoFactory2 {
 			}
 		}
 
+		@Override
 		public IProject getProject() {
 			return fProject;
 		}
@@ -206,6 +208,7 @@ public class ScannerConfigInfoFactory2 {
 
 		}
 
+		@Override
 		public void save() throws CoreException {
 			if (isDirty()) {
 
@@ -242,6 +245,7 @@ public class ScannerConfigInfoFactory2 {
 			}
 		}
 
+		@Override
 		public IProject getProject() {
 			return null;
 		}
@@ -276,6 +280,7 @@ public class ScannerConfigInfoFactory2 {
 		StoreSet(){
 		}
 
+		@Override
 		public IScannerConfigBuilderInfo2 createInfo(InfoContext context,
 				IScannerConfigBuilderInfo2 base, String profileId){
 			fIsDirty = true;
@@ -286,24 +291,29 @@ public class ScannerConfigInfoFactory2 {
 
 		protected abstract Store doCreateStore(InfoContext context, Store base, String profileId);
 
+		@Override
 		public IScannerConfigBuilderInfo2 createInfo(InfoContext context,
 				IScannerConfigBuilderInfo2 base){
 			fIsDirty = true;
 			return createInfo(context, base, ScannerConfigProfileManager.NULL_PROFILE_ID);
 		}
 
+		@Override
 		public InfoContext[] getContexts() {
 			return fMap.keySet().toArray(new InfoContext[fMap.size()]);
 		}
 
+		@Override
 		public IScannerConfigBuilderInfo2 getInfo(InfoContext context) {
 			return fMap.get(context);
 		}
 
+		@Override
 		public Map<InfoContext, IScannerConfigBuilderInfo2> getInfoMap() {
 			return Collections.unmodifiableMap(fMap);
 		}
 
+		@Override
 		public IScannerConfigBuilderInfo2 removeInfo(InfoContext context) throws CoreException {
 			checkRemoveInfo(context);
 			fIsDirty = true;
@@ -326,11 +336,13 @@ public class ScannerConfigInfoFactory2 {
 			return false;
 		}
 
+		@Override
 		public IScannerConfigBuilderInfo2 createInfo(InfoContext context) {
 			fIsDirty = true;
 			return createInfo(context, ScannerConfigProfileManager.NULL_PROFILE_ID);
 		}
 
+		@Override
 		public IScannerConfigBuilderInfo2 createInfo(InfoContext context,
 				String profileId) {
 			fIsDirty = true;
@@ -524,6 +536,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#isAutoDiscoveryEnabled()
 		 */
+		@Override
 		public boolean isAutoDiscoveryEnabled() {
 			return autoDiscoveryEnabled;
 		}
@@ -531,6 +544,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setAutoDiscoveryEnabled(boolean)
 		 */
+		@Override
 		public void setAutoDiscoveryEnabled(boolean enable) {
             autoDiscoveryEnabled = setDirty(autoDiscoveryEnabled, enable);
 		}
@@ -538,18 +552,21 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#isSIProblemGenerationEnabled()
 		 */
+		@Override
 		public boolean isProblemReportingEnabled() {
 			return problemReportingEnabled;
 		}
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setSIProblemGenerationEnabled(boolean)
 		 */
+		@Override
 		public void setProblemReportingEnabled(boolean enable) {
             problemReportingEnabled = setDirty(problemReportingEnabled, enable);
 		}
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#getSelectedProfileId()
 		 */
+		@Override
 		public String getSelectedProfileId() {
 			return selectedProfile;
 		}
@@ -557,6 +574,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setSelectedProfileId(java.lang.String)
 		 */
+		@Override
 		public void setSelectedProfileId(String profileId) {
             selectedProfile = SafeStringInterner.safeIntern(setDirty(selectedProfile, profileId));
 //			if (isDirty) {
@@ -573,6 +591,7 @@ public class ScannerConfigInfoFactory2 {
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#getProfileIdList()
          */
+        @Override
 		public List<String> getProfileIdList() {
             return new ArrayList<String>(profileOptionsMap.keySet());
         }
@@ -580,6 +599,7 @@ public class ScannerConfigInfoFactory2 {
         /* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#isBuildOutputFileActionEnabled()
 		 */
+		@Override
 		public boolean isBuildOutputFileActionEnabled() {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             return (po != null) ? po.buildOutputFileActionEnabled : false;
@@ -588,6 +608,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setBuildOutputFileActionEnabled(boolean)
 		 */
+		@Override
 		public void setBuildOutputFileActionEnabled(boolean enable) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -598,6 +619,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#getBuildOutputFilePath()
 		 */
+		@Override
 		public String getBuildOutputFilePath() {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
 			return (po != null) ? po.buildOutputFilePath : EMPTY_STRING;
@@ -606,6 +628,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setBuildOutputFilePath(java.lang.String)
 		 */
+		@Override
 		public void setBuildOutputFilePath(String path) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -616,6 +639,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#isBuildOutputParserEnabled()
 		 */
+		@Override
 		public boolean isBuildOutputParserEnabled() {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
 			return (po != null) ? po.buildOutputParserEnabled : true;
@@ -624,6 +648,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setBuildOutputParserEnabled(boolean)
 		 */
+		@Override
 		public void setBuildOutputParserEnabled(boolean enable) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -634,6 +659,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#getSIProviderIdList()
 		 */
+		@Override
 		public List<String> getProviderIdList() {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             return (po != null) ? new ArrayList<String>(po.providerOptionsMap.keySet()) : new ArrayList<String>(0);
@@ -656,6 +682,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#isSIProviderOutputParserEnabled(java.lang.String)
 		 */
+		@Override
 		public boolean isProviderOutputParserEnabled(String providerId) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -668,6 +695,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setSIProviderOutputParserEnabled(java.lang.String, boolean)
 		 */
+		@Override
 		public void setProviderOutputParserEnabled(String providerId, boolean enable) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -681,6 +709,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#isUseDefaultProviderCommand(java.lang.String)
 		 */
+		@Override
 		public boolean isUseDefaultProviderCommand(String providerId) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -693,6 +722,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setUseDefaultProviderCommand(java.lang.String, boolean)
 		 */
+		@Override
 		public void setUseDefaultProviderCommand(String providerId, boolean enable) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -706,6 +736,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#getProviderRunCommand(java.lang.String)
 		 */
+		@Override
 		public String getProviderRunCommand(String providerId) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -718,6 +749,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setProviderRunCommand(java.lang.String, java.lang.String)
 		 */
+		@Override
 		public void setProviderRunCommand(String providerId, String command) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -731,6 +763,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#getProviderRunArguments(java.lang.String)
 		 */
+		@Override
 		public String getProviderRunArguments(String providerId) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -743,6 +776,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setProviderRunArguments(java.lang.String, java.lang.String)
 		 */
+		@Override
 		public void setProviderRunArguments(String providerId, String arguments) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -756,6 +790,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#getProviderOpenFilePath(java.lang.String)
 		 */
+		@Override
 		public String getProviderOpenFilePath(String providerId) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -768,6 +803,7 @@ public class ScannerConfigInfoFactory2 {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#setProviderOpenFilePath(java.lang.String, java.lang.String)
 		 */
+		@Override
 		public void setProviderOpenFilePath(String providerId, String filePath) {
             ProfileOptions po = profileOptionsMap.get(selectedProfile);
             if (po != null) {
@@ -1110,6 +1146,7 @@ public class ScannerConfigInfoFactory2 {
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#save()
          */
+        @Override
 		public synchronized void save() throws CoreException {
         	if(isDirty){
         		container.save(true);
@@ -1117,6 +1154,7 @@ public class ScannerConfigInfoFactory2 {
         	}
         }
 
+        @Override
 		public InfoContext getContext(){
         	return context;
         }
@@ -1304,11 +1342,13 @@ public class ScannerConfigInfoFactory2 {
         /* (non-Javadoc)
          * @see org.eclipse.cdt.make.core.scannerconfig.IScannerConfigBuilderInfo2#save()
          */
+        @Override
 		public void save() throws CoreException {
         	if(isDirty)
         		prefsContainer.save();
         }
 
+        @Override
 		public InfoContext getContext(){
         	return context;
         }

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeEnvironmentBlock.java

@@ -10,7 +10,6 @@
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.ui;
 
-import com.ibm.icu.text.MessageFormat;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -66,6 +65,8 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.dialogs.ListSelectionDialog;
 
+import com.ibm.icu.text.MessageFormat;
+
 /**
  * @deprecated as of CDT 4.0. This tab was used to set preferences/properties
  * for 3.X style projects.
@@ -175,6 +176,7 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 	 */
 	protected class EnvironmentVariableContentProvider implements IStructuredContentProvider {
 
+		@Override
 		public Object[] getElements(Object inputElement) {
 			EnvironmentVariable[] elements = new EnvironmentVariable[0];
 			IMakeCommonBuildInfo info = (IMakeCommonBuildInfo)inputElement;
@@ -189,8 +191,10 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 			}
 			return elements;
 		}
+		@Override
 		public void dispose() {
 		}
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 			if (newInput == null) {
 				return;
@@ -222,6 +226,7 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 	 */
 	public class EnvironmentVariableLabelProvider extends LabelProvider implements ITableLabelProvider {
 
+		@Override
 		public String getColumnText(Object element, int columnIndex) {
 			String result = null;
 			if (element != null) {
@@ -237,6 +242,7 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 			}
 			return result;
 		}
+		@Override
 		public Image getColumnImage(Object element, int columnIndex) {
 			if (columnIndex == 0) {
 				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ENV_VAR);
@@ -278,6 +284,7 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 		// To avoid multi-build
 		IWorkspaceRunnable operation = new IWorkspaceRunnable() {
 
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				monitor.beginTask(MakeUIPlugin.getResourceString("SettingsBlock.monitor.applyingSettings"), 1); //$NON-NLS-1$
 				IMakeCommonBuildInfo info = null;
@@ -413,12 +420,14 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 		environmentTable.setColumnProperties(envTableColumnProperties);
 		environmentTable.addSelectionChangedListener(new ISelectionChangedListener() {
 
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				handleTableSelectionChanged(event);
 			}
 		});
 		environmentTable.addDoubleClickListener(new IDoubleClickListener() {
 
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				if (!environmentTable.getSelection().isEmpty()) {
 					handleEnvEditButtonSelected();
@@ -632,20 +641,26 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 	private ILabelProvider createSelectionDialogLabelProvider() {
 		return new ILabelProvider() {
 
+			@Override
 			public Image getImage(Object element) {
 				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_ENVIRONMNET);
 			}
+			@Override
 			public String getText(Object element) {
 				EnvironmentVariable var = (EnvironmentVariable)element;
 				return var.getName() + " [" + var.getValue() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
 			}
+			@Override
 			public void addListener(ILabelProviderListener listener) {
 			}
+			@Override
 			public void dispose() {
 			}
+			@Override
 			public boolean isLabelProperty(Object element, String property) {
 				return false;
 			}
+			@Override
 			public void removeListener(ILabelProviderListener listener) {
 			}
 		};
@@ -661,12 +676,14 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 	private IStructuredContentProvider createSelectionDialogContentProvider() {
 		return new IStructuredContentProvider() {
 
+			@Override
 			@SuppressWarnings({ "unchecked", "rawtypes" })
 			public Object[] getElements(Object inputElement) {
 				EnvironmentVariable[] elements = null;
 				if (inputElement instanceof Map<?, ?>) {
 					Comparator<String> comparator = new Comparator() {
 
+						@Override
 						public int compare(Object o1, Object o2) {
 							String s1 = (String)o1;
 							String s2 = (String)o2;
@@ -685,8 +702,10 @@ public class MakeEnvironmentBlock extends AbstractCOptionPage {
 				}
 				return elements;
 			}
+			@Override
 			public void dispose() {
 			}
+			@Override
 			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 			}
 		};

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeStartup.java

@@ -34,6 +34,7 @@ public class MakeStartup extends Job {
         final IProject[] oldProject = UpdateMakeProjectAction.getOldProjects();
         if (oldProject.length > 0) {
             Display.getDefault().asyncExec(new Runnable() {
+                @Override
 				public void run() {
                     Shell shell = MakeUIPlugin.getDefault().getShell();
                     boolean shouldUpdate = MessageDialog.openQuestion(shell,

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIPlugin.java

@@ -179,6 +179,7 @@ public class MakeUIPlugin extends AbstractUIPlugin {
 			display = Display.getDefault();
 		final IStatus fstatus = status;
 		display.asyncExec(new Runnable() {
+			@Override
 			public void run() {
 				ErrorDialog.openError(null, title, null, fstatus);
 			}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MultipleInputDialog.java

@@ -152,6 +152,7 @@ public class MultipleInputDialog extends Dialog {
 				}
 			});
 			text.addModifyListener(new ModifyListener() {
+				@Override
 				public void modifyText(ModifyEvent e) {
 					validateFields();
 				}
@@ -195,6 +196,7 @@ public class MultipleInputDialog extends Dialog {
 			});
 
 			text.addModifyListener(new ModifyListener() {
+				@Override
 				public void modifyText(ModifyEvent e) {
 					validateFields();
 				}
@@ -261,6 +263,7 @@ public class MultipleInputDialog extends Dialog {
 			});
 
 			text.addModifyListener(new ModifyListener() {
+				@Override
 				public void modifyText(ModifyEvent e) {
 					validateFields();
 				}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/actions/FoldingActionGroup.java

@@ -17,6 +17,7 @@ package org.eclipse.cdt.make.internal.ui.actions;
 
 import java.util.ResourceBundle;
 
+import org.eclipse.cdt.make.internal.ui.editor.MakefileEditor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.text.ITextViewer;
@@ -29,8 +30,6 @@ import org.eclipse.ui.texteditor.IUpdate;
 import org.eclipse.ui.texteditor.ResourceAction;
 import org.eclipse.ui.texteditor.TextOperationAction;
 
-import org.eclipse.cdt.make.internal.ui.editor.MakefileEditor;
-
 /**
  * Groups the CDT folding actions.
  */
@@ -49,6 +48,7 @@ public class FoldingActionGroup extends ActionGroup {
 			super(bundle, prefix, IAction.AS_PUSH_BUTTON);
 		}
 
+		@Override
 		public void update() {
 			setEnabled(FoldingActionGroup.this.isEnabled() && fViewer.isProjectionMode());
 		}
@@ -91,9 +91,11 @@ public class FoldingActionGroup extends ActionGroup {
 		fViewer= (ProjectionViewer) viewer;
 
 		fProjectionListener= new IProjectionListener() {
+			@Override
 			public void projectionEnabled() {
 				update();
 			}
+			@Override
 			public void projectionDisabled() {
 				update();
 			}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/compare/MakefileContentViewerCreator.java

@@ -11,15 +11,11 @@
  *******************************************************************************/
 package org.eclipse.cdt.make.internal.ui.compare;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-
-
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.IViewerCreator;
-
-
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
 
 
 /**
@@ -27,6 +23,7 @@ import org.eclipse.jface.viewers.Viewer;
  */
 public class MakefileContentViewerCreator implements IViewerCreator {
 
+	@Override
 	public Viewer createViewer(Composite parent, CompareConfiguration mp) {
 		return new MakefileMergeViewer(parent, SWT.NULL, mp);
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/compare/MakefileMergeViewer.java

@@ -77,6 +77,7 @@ public class MakefileMergeViewer extends TextMergeViewer {
 		if (fPreferenceStore == null) {
 			fPreferenceStore= MakeUIPlugin.getDefault().getCombinedPreferenceStore();
 			fPreferenceChangeListener= new IPropertyChangeListener() {
+				@Override
 				public void propertyChange(PropertyChangeEvent event) {
 					handlePropertyChange(event);
 				}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/AbstractContainerAreaDropAdapter.java

@@ -109,6 +109,7 @@ public abstract class AbstractContainerAreaDropAdapter implements TransferDropTa
 	 *
 	 * @see DropTargetEvent
 	 */
+	@Override
 	public boolean isEnabled(DropTargetEvent event) {
 		return true;
 	}
@@ -121,6 +122,7 @@ public abstract class AbstractContainerAreaDropAdapter implements TransferDropTa
 	 *
 	 * @see DropTargetEvent
 	 */
+	@Override
 	public void dragEnter(DropTargetEvent event) {
 		lastDragOverTarget = null;
 		lastDragOverOperation = DND.DROP_NONE;
@@ -142,6 +144,7 @@ public abstract class AbstractContainerAreaDropAdapter implements TransferDropTa
 	 *
 	 * @see DropTargetEvent
 	 */
+	@Override
 	public void dragOperationChanged(DropTargetEvent event) {
 		originallyRequestedOperation = event.detail;
 		event.detail = dragOverOperationCached(originallyRequestedOperation,
@@ -156,6 +159,7 @@ public abstract class AbstractContainerAreaDropAdapter implements TransferDropTa
 	 *
 	 * @see DropTargetEvent
 	 */
+	@Override
 	public void dragOver(DropTargetEvent event) {
 		event.detail = dragOverOperationCached(originallyRequestedOperation,
 			determineDropContainer(event), determineDropTarget(event));
@@ -180,6 +184,7 @@ public abstract class AbstractContainerAreaDropAdapter implements TransferDropTa
 	 *
 	 * @see DropTargetEvent
 	 */
+	@Override
 	public void dragLeave(DropTargetEvent event) {
 		// no action
 	}
@@ -192,6 +197,7 @@ public abstract class AbstractContainerAreaDropAdapter implements TransferDropTa
 	 *
 	 * @see DropTargetEvent
 	 */
+	@Override
 	public void dropAccept(DropTargetEvent event) {
 		// no action
 	}
@@ -204,6 +210,7 @@ public abstract class AbstractContainerAreaDropAdapter implements TransferDropTa
 	 *
 	 * @see DropTargetEvent
 	 */
+	@Override
 	public void drop(DropTargetEvent event) {
 		IContainer dropContainer = determineDropContainer(event);
 		if (dropContainer != null) {

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/AbstractSelectionDragAdapter.java

@@ -88,6 +88,7 @@ public abstract class AbstractSelectionDragAdapter implements TransferDragSource
 	 *
 	 * @param event the information associated with the drag event
 	 */
+	@Override
 	public void dragStart(DragSourceEvent event) {
 		ISelection selection= fProvider.getSelection();
 		if (isDragable(selection)) {
@@ -107,6 +108,7 @@ public abstract class AbstractSelectionDragAdapter implements TransferDragSource
 	 *
 	 * @param event the information associated with the drag event
 	 */
+	@Override
 	public void dragSetData(DragSourceEvent event) {
 		// Define data type so a listener could examine it with isSupportedType().
 		// The selection is not passed using event by the LocalSelectionTransfer internally.
@@ -122,6 +124,7 @@ public abstract class AbstractSelectionDragAdapter implements TransferDragSource
 	 *
 	 * @param event the information associated with the drag event
 	 */
+	@Override
 	public void dragFinished(DragSourceEvent event) {
 		dragDone();
 		event.doit = false;

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/FileTransferDropTargetListener.java

@@ -52,6 +52,7 @@ public class FileTransferDropTargetListener extends AbstractContainerAreaDropAda
 	 * @return the {@link Transfer} type that this listener can accept a
 	 * drop operation for.
 	 */
+	@Override
 	public Transfer getTransfer() {
 		return FileTransfer.getInstance();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDragSourceListener.java

@@ -38,6 +38,7 @@ public class LocalTransferDragSourceListener extends AbstractSelectionDragAdapte
 	 * @return the {@link Transfer} type that this listener can accept a
 	 * drop operation for.
 	 */
+	@Override
 	public Transfer getTransfer() {
 		return LocalSelectionTransfer.getTransfer();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/LocalTransferDropTargetListener.java

@@ -52,6 +52,7 @@ public class LocalTransferDropTargetListener extends AbstractContainerAreaDropAd
 	 * @return the {@link Transfer} type that this listener can accept a
 	 * drop operation for.
 	 */
+	@Override
 	public Transfer getTransfer() {
 		return LocalSelectionTransfer.getTransfer();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetDndUtil.java

@@ -12,7 +12,6 @@
 package org.eclipse.cdt.make.internal.ui.dnd;
 
 import java.lang.reflect.InvocationTargetException;
-import com.ibm.icu.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,6 +40,8 @@ import org.eclipse.swt.SWTException;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.widgets.Shell;
 
+import com.ibm.icu.text.MessageFormat;
+
 /**
  * A collection of various functions for Make Target View drag and drop support.
  */
@@ -267,6 +268,7 @@ public class MakeTargetDndUtil {
 	private static void copyTargetsWithProgressIndicator(final IMakeTarget[] makeTargets,
 		final IContainer container, final int operation, final Shell shell) {
 		IRunnableWithProgress runnable = new IRunnableWithProgress() {
+			@Override
 			public void run(IProgressMonitor monitor) throws InvocationTargetException,
 				InterruptedException {
 				boolean isMove = operation == DND.DROP_MOVE;

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetTransferDragSourceListener.java

@@ -41,6 +41,7 @@ public class MakeTargetTransferDragSourceListener extends AbstractSelectionDragA
 	 * @return the {@link Transfer} type that this listener can accept a
 	 * drop operation for.
 	 */
+	@Override
 	public Transfer getTransfer() {
 		return MakeTargetTransfer.getInstance();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/MakeTargetTransferDropTargetListener.java

@@ -42,6 +42,7 @@ public class MakeTargetTransferDropTargetListener extends AbstractContainerAreaD
 	 * @return the {@link Transfer} type that this listener can accept a
 	 * drop operation for.
 	 */
+	@Override
 	public Transfer getTransfer() {
 		return MakeTargetTransfer.getInstance();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDragSourceListener.java

@@ -42,6 +42,7 @@ public class TextTransferDragSourceListener extends AbstractSelectionDragAdapter
 	 * @return the {@link Transfer} type that this listener can accept a
 	 * drop operation for.
 	 */
+	@Override
 	public Transfer getTransfer() {
 		return TextTransfer.getInstance();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/dnd/TextTransferDropTargetListener.java

@@ -11,7 +11,6 @@
 
 package org.eclipse.cdt.make.internal.ui.dnd;
 
-import com.ibm.icu.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -26,6 +25,8 @@ import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.widgets.Shell;
 
+import com.ibm.icu.text.MessageFormat;
+
 /**
  * {@code TextTransferDropTargetListener} handles dropping of selected text to
  * Make Target View. Each line of miltiline text passed is treated as separate
@@ -50,6 +51,7 @@ public class TextTransferDropTargetListener extends AbstractContainerAreaDropAda
 	 * @return the {@link Transfer} type that this listener can accept a
 	 * drop operation for.
 	 */
+	@Override
 	public Transfer getTransfer() {
 		return TextTransfer.getInstance();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileContentOutlinePage.java

@@ -69,6 +69,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 		/* (non-Javadoc)
 		* @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
 		*/
+		@Override
 		public Object[] getChildren(Object element) {
 			if (element == fInput) {
 				return getElements(makefile);
@@ -81,6 +82,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
 		 */
+		@Override
 		public Object getParent(Object element) {
 			if (element instanceof IMakefile) {
 				return fInput;
@@ -93,6 +95,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
 		 */
+		@Override
 		public boolean hasChildren(Object element) {
 			if (element == fInput) {
 				return true;
@@ -109,6 +112,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
 		 */
+		@Override
 		public Object[] getElements(Object inputElement) {
 			IDirective[] directives;
 			if (inputElement == fInput) {
@@ -147,12 +151,14 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
 		 */
+		@Override
 		public void dispose() {
 		}
 
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
 		 */
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 			if (oldInput != null) {
 				makefile = nullMakefile;
@@ -246,6 +252,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 		MenuManager manager= new MenuManager("#MakefileOutlinerContext"); //$NON-NLS-1$
 		manager.setRemoveAllWhenShown(true);
 		manager.addMenuListener(new IMenuListener() {
+			@Override
 			public void menuAboutToShow(IMenuManager m) {
 				contextMenuAboutToShow(m);
 			}
@@ -258,6 +265,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 			/* (non-Javadoc)
 			 * @see org.eclipse.jface.viewers.IDoubleClickListener#doubleClick(org.eclipse.jface.viewers.DoubleClickEvent)
 			 */
+			@Override
 			public void doubleClick(DoubleClickEvent event) {
 				if (fOpenIncludeAction != null) {
 					fOpenIncludeAction.run();
@@ -307,6 +315,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage {
 			final Control control = viewer.getControl();
 			if (control != null && !control.isDisposed()) {
 				control.getDisplay().asyncExec(new Runnable() {
+					@Override
 					public void run() {
 						if (!control.isDisposed()) {
 							control.setRedraw(false);

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentProvider.java

@@ -125,6 +125,7 @@ public class MakefileDocumentProvider extends TextFileDocumentProvider implement
 	/*
 	 * @see org.eclipse.cdt.make.internal.ui.IMakefileDocumentProvider#getWorkingCopy(java.lang.Object)
 	 */
+	@Override
 	public IMakefile getWorkingCopy(Object element) {
 		FileInfo fileInfo= getFileInfo(element);
 		if (fileInfo instanceof MakefileFileInfo) {
@@ -137,6 +138,7 @@ public class MakefileDocumentProvider extends TextFileDocumentProvider implement
 	/*
 	 * @see org.eclipse.cdt.make.internal.ui.IMakefileDocumentProvider#shutdown()
 	 */
+	@Override
 	public void shutdown() {
 		Iterator<?> e= getConnectedElementsIterator();
 		while (e.hasNext())

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java

@@ -35,6 +35,7 @@ public class MakefileDocumentSetupParticipant  implements IDocumentSetupParticip
 	/*
 	 * @see org.eclipse.core.filebuffers.IDocumentSetupParticipant#setup(org.eclipse.jface.text.IDocument)
 	 */
+	@Override
 	public void setup(IDocument document) {
 		if (document instanceof IDocumentExtension3) {
 			IDocumentExtension3 extension3= (IDocumentExtension3) document;

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileEditor.java

@@ -17,9 +17,9 @@ import java.util.ResourceBundle;
 
 import org.eclipse.cdt.make.core.makefile.IDirective;
 import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
+import org.eclipse.cdt.make.internal.ui.actions.FoldingActionGroup;
 import org.eclipse.cdt.make.internal.ui.preferences.MakefileEditorPreferenceConstants;
 import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileWordDetector;
-import org.eclipse.cdt.make.internal.ui.actions.FoldingActionGroup;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.action.IAction;
@@ -252,6 +252,7 @@ public class MakefileEditor extends TextEditor implements ISelectionChangedListe
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		ISelection selection = event.getSelection();
 		if (selection.isEmpty()) {
@@ -372,6 +373,7 @@ public class MakefileEditor extends TextEditor implements ISelectionChangedListe
 
 	/*
 	 */
+	@Override
 	public void reconciled() {
 		// Notify listeners
 		Object[] listeners = fReconcilingListeners.getListeners();

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/ProjectionMakefileUpdater.java

@@ -96,6 +96,7 @@ public class ProjectionMakefileUpdater implements IProjectionListener {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.make.internal.ui.editor.IReconcilingParticipant#reconciled()
 		 */
+		@Override
 		public void reconciled() {
 			processReconcile();
 		}
@@ -115,6 +116,7 @@ public class ProjectionMakefileUpdater implements IProjectionListener {
 	/*
 	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionEnabled()
 	 */
+	@Override
 	public void projectionEnabled() {
 		// http://home.ott.oti.com/teams/wswb/anon/out/vms/index.html
 		// projectionEnabled messages are not always paired with projectionDisabled
@@ -131,6 +133,7 @@ public class ProjectionMakefileUpdater implements IProjectionListener {
 	/*
 	 * @see org.eclipse.jface.text.source.projection.IProjectionListener#projectionDisabled()
 	 */
+	@Override
 	public void projectionDisabled() {
 		fCachedDocument= null;
 		if (fParticipant != null) {

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/WorkingCopyManager.java

@@ -47,6 +47,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana
 	/*
 	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#connect(org.eclipse.ui.IEditorInput)
 	 */
+	@Override
 	public void connect(IEditorInput input) throws CoreException {
 		fDocumentProvider.connect(input);
 	}
@@ -54,6 +55,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana
 	/*
 	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#disconnect(org.eclipse.ui.IEditorInput)
 	 */
+	@Override
 	public void disconnect(IEditorInput input) {
 		fDocumentProvider.disconnect(input);
 	}
@@ -61,6 +63,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana
 	/*
 	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#shutdown()
 	 */
+	@Override
 	public void shutdown() {
 		if (!fIsShuttingDown) {
 			fIsShuttingDown= true;
@@ -79,6 +82,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana
 	/*
 	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManager#getWorkingCopy(org.eclipse.ui.IEditorInput)
 	 */
+	@Override
 	public IMakefile getWorkingCopy(IEditorInput input) {
 		IMakefile unit= fMap == null ? null : (IMakefile) fMap.get(input);
 		return unit != null ? unit : fDocumentProvider.getWorkingCopy(input);
@@ -87,6 +91,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana
 	/*
 	 * @see org.eclipse.cdt.make.ui.IWorkingCopyManagerExtension#setWorkingCopy(org.eclipse.ui.IEditorInput, org.eclipse.cdt.make.core.makefile.IMakefile)
 	 */
+	@Override
 	public void setWorkingCopy(IEditorInput input, IMakefile workingCopy) {
 		if (fDocumentProvider.getDocument(input) != null) {
 			if (fMap == null)
@@ -98,6 +103,7 @@ public class WorkingCopyManager implements IWorkingCopyManager, IWorkingCopyMana
 	/*
 	 * @see org.eclipse.cdt.make.internal.ui.javaeditor.IWorkingCopyManagerExtension#removeWorkingCopy(org.eclipse.ui.IEditorInput)
 	 */
+	@Override
 	public void removeWorkingCopy(IEditorInput input) {
 		fMap.remove(input);
 		if (fMap.isEmpty())

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/CheckboxTablePart.java

@@ -37,11 +37,13 @@ public class CheckboxTablePart extends StructuredViewerPart {
 		style |= SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER;
 		CheckboxTableViewer tableViewer = CheckboxTableViewer.newCheckList(parent, style);
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
 			public void selectionChanged(SelectionChangedEvent e) {
 				CheckboxTablePart.this.selectionChanged((IStructuredSelection) e.getSelection());
 			}
 		});
 		tableViewer.addCheckStateListener(new ICheckStateListener() {
+			@Override
 			public void checkStateChanged(CheckStateChangedEvent event) {
 				elementChecked(event.getElement(), event.getChecked());
 			}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/part/SharedPartWithButtons.java

@@ -29,9 +29,11 @@ public abstract class SharedPartWithButtons extends SharedPart {
 	private Composite buttonContainer;
 
 	private class SelectionHandler implements SelectionListener {
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			buttonSelected(e);
 		}
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 			buttonSelected(e);
 		}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/AbstractMakefileEditorPreferencePage.java

@@ -14,7 +14,6 @@ package org.eclipse.cdt.make.internal.ui.preferences;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import com.ibm.icu.text.MessageFormat;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -40,6 +39,8 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
+import com.ibm.icu.text.MessageFormat;
+
 /**
  * AbstraceMakeEditorPreferencePage
  */
@@ -48,8 +49,10 @@ public abstract class AbstractMakefileEditorPreferencePage extends PreferencePag
 
 	Map<Control, String> fCheckBoxes= new HashMap<Control, String>();
 	private SelectionListener fCheckBoxListener= new SelectionListener() {
+		@Override
 		public void widgetDefaultSelected(SelectionEvent e) {
 		}
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			Button button= (Button) e.widget;
 			fOverlayStore.setValue(fCheckBoxes.get(button), button.getSelection());
@@ -58,6 +61,7 @@ public abstract class AbstractMakefileEditorPreferencePage extends PreferencePag
 
 	Map<Control, String> fTextFields= new HashMap<Control, String>();
 	private ModifyListener fTextFieldListener= new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
 			Text text= (Text) e.widget;
 			fOverlayStore.setValue(fTextFields.get(text), text.getText());
@@ -66,6 +70,7 @@ public abstract class AbstractMakefileEditorPreferencePage extends PreferencePag
 
 	private Map<Text, String[]> fNumberFields= new HashMap<Text, String[]>();
 	private ModifyListener fNumberFieldListener= new ModifyListener() {
+		@Override
 		public void modifyText(ModifyEvent e) {
 			numberFieldChanged((Text) e.widget);
 		}
@@ -82,6 +87,7 @@ public abstract class AbstractMakefileEditorPreferencePage extends PreferencePag
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/ColorEditor.java

@@ -66,6 +66,7 @@ public class ColorEditor {
 		});
 
 		fButton.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent event) {
 				if (fImage != null)  {
 					fImage.dispose();

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakePreferencePage.java

@@ -104,6 +104,7 @@ public class MakePreferencePage extends FieldEditorPreferencePage implements IWo
 		prefs.setDefault(PREF_BUILD_LAST_TARGET, PREF_BUILD_LAST_PROJECT);
 	}
 
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 }

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java

@@ -157,6 +157,7 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		/*
 		 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
 		 */
+		@Override
 		public Color getForeground(Object element) {
 			return ((HighlightingColorListItem)element).getItemColor();
 		}
@@ -164,6 +165,7 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		/*
 		 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
 		 */
+		@Override
 		public Color getBackground(Object element) {
 			return null;
 		}
@@ -179,6 +181,7 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		/*
 		 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
 		 */
+		@Override
 		public Object[] getElements(Object inputElement) {
 			return ((List<?>)inputElement).toArray();
 		}
@@ -186,12 +189,14 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		/*
 		 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
 		 */
+		@Override
 		public void dispose() {
 		}
 
 		/*
 		 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
 		 */
+		@Override
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 		}
 	}
@@ -361,15 +366,18 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		fItalicCheckBox.setLayoutData(gd);
 
 		fHighlightingColorListViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				handleSyntaxColorListSelection();
 			}
 		});
 
 		foregroundColorButton.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// do nothing
 			}
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				HighlightingColorListItem item= getHighlightingColorListItem();
 				PreferenceConverter.setValue(getOverlayStore(), item.getColorKey(), fSyntaxForegroundColorEditor.getColorValue());
@@ -377,9 +385,11 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		});
 
 		fBoldCheckBox.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// do nothing
 			}
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				HighlightingColorListItem item= getHighlightingColorListItem();
 				getOverlayStore().setValue(item.getBoldKey(), fBoldCheckBox.getSelection());
@@ -387,9 +397,11 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		});
 
 		fItalicCheckBox.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 				// do nothing
 			}
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				HighlightingColorListItem item= getHighlightingColorListItem();
 				getOverlayStore().setValue(item.getItalicKey(), fItalicCheckBox.getSelection());
@@ -418,11 +430,13 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen
 		gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
 		fFoldingCheckbox.setLayoutData(gd);
 		fFoldingCheckbox.addSelectionListener(new SelectionListener() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				boolean enabled= fFoldingCheckbox.getSelection();
 				getOverlayStore().setValue(MakefileEditorPreferenceConstants.EDITOR_FOLDING_ENABLED, enabled);
 			}
 
+			@Override
 			public void widgetDefaultSelected(SelectionEvent e) {
 			}
 		});

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileSettingsPreferencePage.java

@@ -74,6 +74,7 @@ public class MakefileSettingsPreferencePage extends FieldEditorPreferencePage im
 	public static void initDefaults(IPreferenceStore prefs) {
 	}
 
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 }

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/NewMakeProjectPreferencePage.java

@@ -64,6 +64,7 @@ public class NewMakeProjectPreferencePage extends PreferencePage implements IWor
 	}
 
 
+	@Override
 	public void init(IWorkbench workbench) {
 	}
 
@@ -83,6 +84,7 @@ public class NewMakeProjectPreferencePage extends PreferencePage implements IWor
 		fOptionBlock.setVisible(visible);
 	}
 
+	@Override
 	public void updateContainer() {
 		fOptionBlock.update();
 		boolean ok = fOptionBlock.isValid();
@@ -95,6 +97,7 @@ public class NewMakeProjectPreferencePage extends PreferencePage implements IWor
 		setValid(ok);
 	}
 
+	@Override
 	public IProject getProject() {
 		return null;
 	}
@@ -114,6 +117,7 @@ public class NewMakeProjectPreferencePage extends PreferencePage implements IWor
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.ui.dialogs.ICOptionContainer#getPreferences()
 	 */
+	@Override
 	public Preferences getPreferences() {
 		return MakeCorePlugin.getDefault().getPluginPreferences();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/OverlayPreferenceStore.java

@@ -53,6 +53,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 		/*
 		 * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent)
 		 */
+		@Override
 		public void propertyChange(PropertyChangeEvent event) {
 			OverlayKey key= findOverlayKey(event.getProperty());
 			if (key != null)
@@ -219,6 +220,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#addPropertyChangeListener(IPropertyChangeListener)
 	 */
+	@Override
 	public void addPropertyChangeListener(IPropertyChangeListener listener) {
 		fStore.addPropertyChangeListener(listener);
 	}
@@ -226,6 +228,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#removePropertyChangeListener(IPropertyChangeListener)
 	 */
+	@Override
 	public void removePropertyChangeListener(IPropertyChangeListener listener) {
 		fStore.removePropertyChangeListener(listener);
 	}
@@ -233,6 +236,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#firePropertyChangeEvent(String, Object, Object)
 	 */
+	@Override
 	public void firePropertyChangeEvent(String name, Object oldValue, Object newValue) {
 		fStore.firePropertyChangeEvent(name, oldValue, newValue);
 	}
@@ -240,6 +244,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#contains(String)
 	 */
+	@Override
 	public boolean contains(String name) {
 		return fStore.contains(name);
 	}
@@ -247,6 +252,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getBoolean(String)
 	 */
+	@Override
 	public boolean getBoolean(String name) {
 		return fStore.getBoolean(name);
 	}
@@ -254,6 +260,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getDefaultBoolean(String)
 	 */
+	@Override
 	public boolean getDefaultBoolean(String name) {
 		return fStore.getDefaultBoolean(name);
 	}
@@ -261,6 +268,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getDefaultDouble(String)
 	 */
+	@Override
 	public double getDefaultDouble(String name) {
 		return fStore.getDefaultDouble(name);
 	}
@@ -268,6 +276,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getDefaultFloat(String)
 	 */
+	@Override
 	public float getDefaultFloat(String name) {
 		return fStore.getDefaultFloat(name);
 	}
@@ -275,6 +284,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getDefaultInt(String)
 	 */
+	@Override
 	public int getDefaultInt(String name) {
 		return fStore.getDefaultInt(name);
 	}
@@ -282,6 +292,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getDefaultLong(String)
 	 */
+	@Override
 	public long getDefaultLong(String name) {
 		return fStore.getDefaultLong(name);
 	}
@@ -289,6 +300,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getDefaultString(String)
 	 */
+	@Override
 	public String getDefaultString(String name) {
 		return fStore.getDefaultString(name);
 	}
@@ -296,6 +308,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getDouble(String)
 	 */
+	@Override
 	public double getDouble(String name) {
 		return fStore.getDouble(name);
 	}
@@ -303,6 +316,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getFloat(String)
 	 */
+	@Override
 	public float getFloat(String name) {
 		return fStore.getFloat(name);
 	}
@@ -310,6 +324,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getInt(String)
 	 */
+	@Override
 	public int getInt(String name) {
 		return fStore.getInt(name);
 	}
@@ -317,6 +332,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getLong(String)
 	 */
+	@Override
 	public long getLong(String name) {
 		return fStore.getLong(name);
 	}
@@ -324,6 +340,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#getString(String)
 	 */
+	@Override
 	public String getString(String name) {
 		return fStore.getString(name);
 	}
@@ -331,6 +348,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#isDefault(String)
 	 */
+	@Override
 	public boolean isDefault(String name) {
 		return fStore.isDefault(name);
 	}
@@ -338,6 +356,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#needsSaving()
 	 */
+	@Override
 	public boolean needsSaving() {
 		return fStore.needsSaving();
 	}
@@ -345,6 +364,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#putValue(String, String)
 	 */
+	@Override
 	public void putValue(String name, String value) {
 		if (covers(name))
 			fStore.putValue(name, value);
@@ -353,6 +373,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setDefault(String, double)
 	 */
+	@Override
 	public void setDefault(String name, double value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
@@ -361,6 +382,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setDefault(String, float)
 	 */
+	@Override
 	public void setDefault(String name, float value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
@@ -369,6 +391,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setDefault(String, int)
 	 */
+	@Override
 	public void setDefault(String name, int value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
@@ -377,6 +400,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setDefault(String, long)
 	 */
+	@Override
 	public void setDefault(String name, long value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
@@ -385,6 +409,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setDefault(String, String)
 	 */
+	@Override
 	public void setDefault(String name, String value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
@@ -393,6 +418,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setDefault(String, boolean)
 	 */
+	@Override
 	public void setDefault(String name, boolean value) {
 		if (covers(name))
 			fStore.setDefault(name, value);
@@ -401,6 +427,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setToDefault(String)
 	 */
+	@Override
 	public void setToDefault(String name) {
 		fStore.setToDefault(name);
 	}
@@ -408,6 +435,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setValue(String, double)
 	 */
+	@Override
 	public void setValue(String name, double value) {
 		if (covers(name))
 			fStore.setValue(name, value);
@@ -416,6 +444,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setValue(String, float)
 	 */
+	@Override
 	public void setValue(String name, float value) {
 		if (covers(name))
 			fStore.setValue(name, value);
@@ -424,6 +453,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setValue(String, int)
 	 */
+	@Override
 	public void setValue(String name, int value) {
 		if (covers(name))
 			fStore.setValue(name, value);
@@ -432,6 +462,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setValue(String, long)
 	 */
+	@Override
 	public void setValue(String name, long value) {
 		if (covers(name))
 			fStore.setValue(name, value);
@@ -440,6 +471,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setValue(String, String)
 	 */
+	@Override
 	public void setValue(String name, String value) {
 		if (covers(name))
 			fStore.setValue(name, value);
@@ -448,6 +480,7 @@ class OverlayPreferenceStore  implements IPreferenceStore {
 	/*
 	 * @see IPreferenceStore#setValue(String, boolean)
 	 */
+	@Override
 	public void setValue(String name, boolean value) {
 		if (covers(name))
 			fStore.setValue(name, value);

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/StatusInfo.java

@@ -47,6 +47,7 @@ public class StatusInfo implements IStatus {
 	/**
 	 *  Returns if the status' severity is OK.
 	 */
+	@Override
 	public boolean isOK() {
 		return fSeverity == IStatus.OK;
 	}
@@ -75,6 +76,7 @@ public class StatusInfo implements IStatus {
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.runtime.IStatus#getMessage()
 	 */
+	@Override
 	public String getMessage() {
 		return fStatusMessage;
 	}
@@ -120,6 +122,7 @@ public class StatusInfo implements IStatus {
 	/*
 	 * @see IStatus#matches(int)
 	 */
+	@Override
 	public boolean matches(int severityMask) {
 		return (fSeverity & severityMask) != 0;
 	}
@@ -128,6 +131,7 @@ public class StatusInfo implements IStatus {
 	 * Returns always <code>false</code>.
 	 * @see IStatus#isMultiStatus()
 	 */
+	@Override
 	public boolean isMultiStatus() {
 		return false;
 	}
@@ -135,6 +139,7 @@ public class StatusInfo implements IStatus {
 	/*
 	 * @see IStatus#getSeverity()
 	 */
+	@Override
 	public int getSeverity() {
 		return fSeverity;
 	}
@@ -142,6 +147,7 @@ public class StatusInfo implements IStatus {
 	/*
 	 * @see IStatus#getPlugin()
 	 */
+	@Override
 	public String getPlugin() {
 		return MakeUIPlugin.getPluginId();
 	}
@@ -150,6 +156,7 @@ public class StatusInfo implements IStatus {
 	 * Returns always <code>null</code>.
 	 * @see IStatus#getException()
 	 */
+	@Override
 	public Throwable getException() {
 		return null;
 	}
@@ -158,6 +165,7 @@ public class StatusInfo implements IStatus {
 	 * Returns always the error severity.
 	 * @see IStatus#getCode()
 	 */
+	@Override
 	public int getCode() {
 		return fSeverity;
 	}
@@ -166,6 +174,7 @@ public class StatusInfo implements IStatus {
 	 * Returns always <code>null</code>.
 	 * @see IStatus#getChildren()
 	 */
+	@Override
 	public IStatus[] getChildren() {
 		return new IStatus[0];
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/properties/MakePropertyPage.java

@@ -84,6 +84,7 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer
 	@Override
 	public boolean performOk() {
 		IRunnableWithProgress runnable = new IRunnableWithProgress() {
+			@Override
 			public void run(IProgressMonitor monitor) {
 				fOptionBlock.performApply(monitor);
 			}
@@ -101,6 +102,7 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer
 		return true;
 	}
 
+	@Override
 	public IProject getProject() {
 		Object element = getElement();
 		if (element instanceof IProject) {
@@ -115,6 +117,7 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer
 		fOptionBlock.setVisible(visible);
 	}
 
+	@Override
 	public void updateContainer() {
 		fOptionBlock.update();
 		setValid(fOptionBlock.isValid());
@@ -133,6 +136,7 @@ public class MakePropertyPage extends PropertyPage implements ICOptionContainer
 		return super.isValid();
 	}
 
+	@Override
 	public Preferences getPreferences() {
 		return MakeCorePlugin.getDefault().getPluginPreferences();
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/scannerconfig/DiscoveredElementLabelProvider.java

@@ -138,6 +138,7 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object)
 	 */
+	@Override
 	public Color getForeground(Object element) {
 		if (element instanceof DiscoveredElement) {
 			DiscoveredElement elem = (DiscoveredElement) element;
@@ -157,6 +158,7 @@ public class DiscoveredElementLabelProvider extends LabelProvider implements ICo
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object)
 	 */
+	@Override
 	public Color getBackground(Object element) {
 		return null;
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/ColorManager.java

@@ -52,6 +52,7 @@ public class ColorManager implements ISharedTextColors {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.source.ISharedTextColors#dispose()
 	 */
+	@Override
 	public void dispose() {
 		Iterator<Color> e = fColorTable.values().iterator();
 		while (e.hasNext())
@@ -61,6 +62,7 @@ public class ColorManager implements ISharedTextColors {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.source.ISharedTextColors#getColor(org.eclipse.swt.graphics.RGB)
 	 */
+	@Override
 	public Color getColor(RGB rgb) {
 		Color color = fColorTable.get(rgb);
 		if (color == null) {

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/CompletionProposalComparator.java

@@ -26,6 +26,7 @@ public class CompletionProposalComparator implements Comparator<ICompletionPropo
 	/* (non-Javadoc)
 	 * @see Comparator#compare(Object, Object)
 	 */
+	@Override
 	public int compare(ICompletionProposal c1, ICompletionProposal c2) {
 		return c1.getDisplayString().compareToIgnoreCase(c2.getDisplayString());
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java

@@ -32,10 +32,12 @@ class MacroDefinitionRule implements IPredicateRule {
 		this.defaultToken = defaultToken;
 	}
 
+	@Override
 	public IToken getSuccessToken() {
 		return token;
 	}
 
+	@Override
 	public IToken evaluate(ICharacterScanner scanner, boolean resume) {
 		buffer.setLength(0);
 		int state = INIT_STATE;
@@ -103,6 +105,7 @@ class MacroDefinitionRule implements IPredicateRule {
 
 	}
 
+	@Override
 	public IToken evaluate(ICharacterScanner scanner) {
 		return evaluate(scanner, false);
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileAnnotationHover.java

@@ -42,6 +42,7 @@ public class MakefileAnnotationHover implements IAnnotationHover {
 	 * @see org.eclipse.jface.text.source.IAnnotationHover#getHoverInfo(org.eclipse.jface.text.source.ISourceViewer,
 	 *      int)
 	 */
+	@Override
 	public String getHoverInfo(ISourceViewer sourceViewer, int lineNumber) {
 		IDocument document = sourceViewer.getDocument();
 		try {

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java

@@ -67,6 +67,7 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
 
 		// Add generic whitespace rule.
 		rules.add(new WhitespaceRule(new IWhitespaceDetector() {
+			@Override
 			public boolean isWhitespace(char character) {
 				return Character.isWhitespace(character);
 			}
@@ -82,9 +83,11 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
 		// Add word rule for keywords, types, and constants.
 		// We restrict the detection of the keywords to be the first column to be valid.
 		WordRule keyWordRule = new WordRule(new IWordDetector() {
+			@Override
 			public boolean isWordPart(char c) {
 				return Character.isLetterOrDigit(c) || c == '_';
 			}
+			@Override
 			public boolean isWordStart(char c) {
 				return Character.isLetterOrDigit(c) || c == '_' || c == '-';
 			}}, other);
@@ -95,9 +98,11 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
 		rules.add(keyWordRule);
 
 		WordRule functionRule = new WordRule(new IWordDetector() {
+			@Override
 			public boolean isWordPart(char c) {
 				return Character.isLetterOrDigit(c) || c == '_';
 			}
+			@Override
 			public boolean isWordStart(char c) {
 				return Character.isLetterOrDigit(c) || c == '_';
 			}}, other);

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCompletionProcessor.java

@@ -51,6 +51,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 		/*
 		 * @see IContextInformationValidator#isContextInformationValid(int)
 		 */
+		@Override
 		public boolean isContextInformationValid(int offset) {
 			return Math.abs(fInstallOffset - offset) < 5;
 		}
@@ -58,6 +59,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 		/*
 		 * @see IContextInformationValidator#install(IContextInformation, ITextViewer, int)
 		 */
+		@Override
 		public void install(IContextInformation info, ITextViewer viewer, int offset) {
 			fInstallOffset = offset;
 		}
@@ -65,6 +67,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 		/*
 		 * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int, TextPresentation)
 		 */
+		@Override
 		public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
 			return false;
 		}
@@ -75,6 +78,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 		/* (non-Javadoc)
 		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
 		 */
+		@Override
 		public int compare(Object o1, Object o2) {
 			String name1;
 			String name2;
@@ -116,6 +120,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer, int)
 	 */
+	@Override
 	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
 		WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
 		boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
@@ -171,6 +176,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer, int)
 	 */
+	@Override
 	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
 		WordPartDetector wordPart = new WordPartDetector(viewer, documentOffset);
 		boolean macro = WordPartDetector.inMacro(viewer, documentOffset);
@@ -215,6 +221,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
 	 */
+	@Override
 	public char[] getCompletionProposalAutoActivationCharacters() {
 		return null;
 	}
@@ -222,6 +229,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
 	 */
+	@Override
 	public char[] getContextInformationAutoActivationCharacters() {
 		return null;
 	}
@@ -229,6 +237,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
 	 */
+	@Override
 	public String getErrorMessage() {
 		return null;
 	}
@@ -236,6 +245,7 @@ public class MakefileCompletionProcessor implements IContentAssistProcessor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
 	 */
+	@Override
 	public IContextInformationValidator getContextInformationValidator() {
 		return fValidator;
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileReconcilingStrategy.java

@@ -54,6 +54,7 @@ public class MakefileReconcilingStrategy implements IReconcilingStrategy, IRecon
 	/**
 	 * @see IReconcilingStrategy#setDocument(IDocument)
 	 */
+	@Override
 	public void setDocument(IDocument document) {
 	}
 
@@ -61,6 +62,7 @@ public class MakefileReconcilingStrategy implements IReconcilingStrategy, IRecon
 	/**
 	 * @see IReconcilingStrategy#reconcile(IRegion)
 	 */
+	@Override
 	public void reconcile(IRegion region) {
 		reconcile();
 	}
@@ -68,6 +70,7 @@ public class MakefileReconcilingStrategy implements IReconcilingStrategy, IRecon
 	/**
 	 * @see IReconcilingStrategy#reconcile(DirtyRegion, IRegion)
 	 */
+	@Override
 	public void reconcile(DirtyRegion dirtyRegion, IRegion region) {
 		assert false : "This is a non-incremental reconciler"; //$NON-NLS-1$
 	}
@@ -99,6 +102,7 @@ public class MakefileReconcilingStrategy implements IReconcilingStrategy, IRecon
 	/*
 	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#setProgressMonitor(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	public void setProgressMonitor(IProgressMonitor monitor) {
 		// no use for a progress monitor at the moment
 	}
@@ -106,6 +110,7 @@ public class MakefileReconcilingStrategy implements IReconcilingStrategy, IRecon
 	/*
 	 * @see org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension#initialReconcile()
 	 */
+	@Override
 	public void initialReconcile() {
 		// no need to reconcile initially
 //		reconcile();