bug 319777: Missing @Override annotations

patch from Petri Tuononen

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

@@ -176,6 +176,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC
 		/* (non-Javadoc)
 		* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
 		*/
+		@Override
 		public Image getImage(Object element) {
 			if (element instanceof ITargetRule) {
 				return MakeUIImages.getImage(MakeUIImages.IMG_OBJS_MAKEFILE_TARGET_RULE);
@@ -198,6 +199,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC
 		/* (non-Javadoc)
 		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
 		 */
+		@Override
 		public String getText(Object element) {
 			String name;
 			if (element instanceof IRule) {
@@ -233,6 +235,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.IPage#createControl(org.eclipse.swt.widgets.Composite)
 	 */
+	@Override
 	public void createControl(Composite parent) {
 		super.createControl(parent);
 		TreeViewer viewer = getTreeViewer();
@@ -322,6 +325,7 @@ public class MakefileContentOutlinePage extends ContentOutlinePage implements IC
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.IPage#setActionBars(org.eclipse.ui.IActionBars)
 	 */
+	@Override
 	public void setActionBars(IActionBars actionBars) {
 		super.setActionBars(actionBars);
 		IToolBarManager toolBarManager= actionBars.getToolBarManager();

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

@@ -52,6 +52,7 @@ public class MakefileEditorActionContributor extends BasicTextEditorActionContri
 	/**
 	 * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(IEditorPart)
 	 */
+	@Override
 	public void setActiveEditor(IEditorPart targetEditor) {
 		super.setActiveEditor(targetEditor);
 		doSetActiveEditor(targetEditor);
@@ -78,6 +79,7 @@ public class MakefileEditorActionContributor extends BasicTextEditorActionContri
 	/*
 	 * @see IEditorActionBarContributor#dispose()
 	 */
+	@Override
 	public void dispose() {
 		doSetActiveEditor(null);
 		super.dispose();
@@ -86,6 +88,7 @@ public class MakefileEditorActionContributor extends BasicTextEditorActionContri
 	/**
 	 * @see org.eclipse.ui.part.EditorActionBarContributor#init(IActionBars)
 	 */
+	@Override
 	public void init(IActionBars bars) {
 		super.init(bars);
 		IMenuManager menuManager = bars.getMenuManager();

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

@@ -31,6 +31,7 @@ public class MakefileEditorTogglePresentationAction extends TextEditorAction {
 	/**
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		ITextEditor editor= getTextEditor();
 		editor.resetHighlightRange();
@@ -42,6 +43,7 @@ public class MakefileEditorTogglePresentationAction extends TextEditorAction {
 	/**
 	 * @see org.eclipse.ui.texteditor.IUpdate#update()
 	 */
+	@Override
 	public void update() {
 		setChecked(getTextEditor() != null && getTextEditor().showsHighlightRangeOnly());
 		setEnabled(true);

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

@@ -27,6 +27,7 @@ public class MakefileStorageDocumentProvider extends StorageDocumentProvider {
 	 * @see org.eclipse.ui.editors.text.StorageDocumentProvider#setupDocument(java.lang.Object,
 	 *      org.eclipse.jface.text.IDocument)
 	 */
+	@Override
 	protected void setupDocument(Object element, IDocument document) {
 		if (document != null) {
 			IDocumentPartitioner partitioner= createDocumentPartitioner();

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

@@ -37,6 +37,7 @@ public class OpenDeclarationAction extends TextEditorAction {
 	 * 
 	 * @see org.eclipse.jface.action.IAction#run()
 	 */
+	@Override
 	public void run() {
 		ITextEditor editor = getTextEditor();
 		if (editor == null) {

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

@@ -59,6 +59,7 @@ public abstract class SharedPartWithButtons extends SharedPart {
 	/*
 	 * @see SharedPart#createControl(Composite, FormWidgetFactory)
 	 */
+	@Override
 	public void createControl(Composite parent, int style, int span) {
 		createMainLabel(parent, span);
 		createMainControl(parent, style, span - 1);
@@ -98,6 +99,7 @@ public abstract class SharedPartWithButtons extends SharedPart {
 		return button;
 	}
 
+	@Override
 	protected void updateEnabledState() {
 		for (int i = 0; i < controls.length; i++) {
 			Control c = controls[i];

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

@@ -38,6 +38,7 @@ public abstract class StructuredViewerPart extends SharedPartWithButtons {
 	/*
 	 * @see SharedPartWithButtons#createMainControl(Composite, int, FormWidgetFactory)
 	 */
+	@Override
 	protected void createMainControl(Composite parent, int style, int span) {
 		viewer = createStructuredViewer(parent, style);
 		Control control = viewer.getControl();
@@ -60,6 +61,7 @@ public abstract class StructuredViewerPart extends SharedPartWithButtons {
 		}
 	}
 
+	@Override
 	protected void updateEnabledState() {
 		getControl().setEnabled(isEnabled());
 		super.updateEnabledState();

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

@@ -59,6 +59,7 @@ public class WizardCheckboxTablePart extends CheckboxTablePart {
 		this.deselectAllIndex = index;
 	}
 
+	@Override
 	protected void buttonSelected(Button button, int index) {
 		if (index == selectAllIndex) {
 			handleSelectAll(true);
@@ -88,16 +89,19 @@ public class WizardCheckboxTablePart extends CheckboxTablePart {
 		updateCounter(0);
 	}
 
+	@Override
 	protected Button createButton(Composite parent, String label, int index) {
 		Button button = super.createButton(parent, label, index);
 		return button;
 	}
 
+	@Override
 	protected StructuredViewer createStructuredViewer(Composite parent, int style) {
 		StructuredViewer viewer = super.createStructuredViewer(parent, style);
 		return viewer;
 	}
 
+	@Override
 	protected void createMainLabel(Composite parent, int span) {
 		if (tableName == null)
 			return;
@@ -144,6 +148,7 @@ public class WizardCheckboxTablePart extends CheckboxTablePart {
 		}
 		updateCounter(selected);
 	}
+	@Override
 	protected void elementChecked(Object element, boolean checked) {
 		int count = getSelectionCount();
 		updateCounter(checked ? count + 1 : count - 1);

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

@@ -20,6 +20,7 @@ import org.eclipse.swt.widgets.Layout;
 
 public class TabFolderLayout extends Layout {
 
+	@Override
 	protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) {
 		if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT)
 			return new Point(wHint, hHint);
@@ -43,6 +44,7 @@ public class TabFolderLayout extends Layout {
 		
 	}
 	
+	@Override
 	protected void layout (Composite composite, boolean flushCache) {
 		Rectangle rect= composite.getClientArea();
 	

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

@@ -14,6 +14,7 @@ import org.eclipse.cdt.ui.newui.AbstractPage;
 
 public class PathAndSymbolPage extends AbstractPage {
 
+	@Override
 	protected boolean isSingle() {
 		return false;
 	}

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

@@ -85,6 +85,7 @@ public class WordPartDetector {
 	/**
 	 * @return String
 	 */
+	@Override
 	public String toString() {
 		return wordPart;
 	}

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/wizards/StatusWizardPage.java

@@ -35,6 +35,7 @@ public abstract class StatusWizardPage extends WizardPage {
 	/*
 	 * @see WizardPage#becomesVisible
 	 */
+	@Override
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
 		fPageVisible= visible;

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestPathConverter4.java

@@ -27,6 +27,7 @@ public class TestPathConverter4 extends TestPathConverter1 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.tests.TestPathConverter1#convertToPlatformLocation(java.lang.String)
 	 */
+	@Override
 	public IPath convertToPlatformLocation(String toolSpecificPath, IOption option, ITool tool) {
 		String convertedString = toolSpecificPath.substring("file://".length());
 		IPath path = new Path(convertedString);

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/TestValueHandler.java

@@ -23,6 +23,7 @@ public class TestValueHandler extends ManagedOptionValueHandler implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IManagedOptionValueHandler#handleValue(IConfiguration,IToolChain,IOption,String,int)
 	 */
+	@Override
 	public boolean handleValue(IBuildObject configuration, 
                    IHoldsOptions holder, 
                    IOption option,

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/templateengine/tests/TestProcesses.java

@@ -44,11 +44,13 @@ public class TestProcesses extends TestCase {
 
 	String projectName;
 	
+	@Override
 	protected void setUp() throws Exception {
 		TemplateEngineTestsHelper.turnOffAutoBuild();
 		projectName= "TemplateEngineTestsProject"+System.currentTimeMillis();
 	}
 	
+	@Override
 	protected void tearDown() throws Exception {
 		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
 		project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/BackwardCompatiblityTests.java

@@ -76,10 +76,12 @@ public class BackwardCompatiblityTests extends TestCase {
 		return ManagedBuildTestHelper.loadProject(name, TEST_3X_STD_MAKE_PROJECTS);
 	}
 
+	@Override
 	protected void setUp() throws Exception {
 		super.setUp();
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 		for(Iterator iter = projList.iterator(); iter.hasNext();){
 			IProject proj = (IProject)iter.next();

build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/OptionStringListValueTests.java

@@ -52,9 +52,11 @@ public class OptionStringListValueTests extends TestCase {
 		return new TestSuite(OptionStringListValueTests.class);
 	}
 	
+	@Override
 	protected void setUp() throws Exception {
 	}
 
+	@Override
 	protected void tearDown() throws Exception {
 	}
 	

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/core/scannerconfig/CfgInfoContext.java

@@ -183,6 +183,7 @@ public final class CfgInfoContext{
 		return null;
 	}
 	
+	@Override
 	public boolean equals(Object obj) {
 		if(this == obj)
 			return true;
@@ -206,6 +207,7 @@ public final class CfgInfoContext{
 		return true;
 	}
 
+	@Override
 	public int hashCode() {
 		int code = getCode(fCfg);
 		code += getCode(fRcInfo);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/PerFileSettingsCalculator.java

@@ -236,6 +236,7 @@ public class PerFileSettingsCalculator {
 			return fMaxMatchInfo;
 		}
 		
+		@Override
 		public boolean equals(Object obj) {
 			if(obj == this)
 				return true;
@@ -259,6 +260,7 @@ public class PerFileSettingsCalculator {
 			return true;
 		}
 
+		@Override
 		public int hashCode() {
 			int hash = fHash;
 			if(hash == 0){
@@ -287,6 +289,7 @@ public class PerFileSettingsCalculator {
 			fExts = exts == null || exts.length == 0 ? EMPTY_STRING_ARRAY : (String[])exts.clone();
 		}
 		
+		@Override
 		public boolean equals(Object obj) {
 			if(this == obj)
 				return true;
@@ -311,6 +314,7 @@ public class PerFileSettingsCalculator {
 			return (String[])fExts.clone();
 		}
 
+		@Override
 		public int hashCode() {
 			int hash = fHash;
 			if(hash == 0){
@@ -329,6 +333,7 @@ public class PerFileSettingsCalculator {
 			return fExtsSet;
 		}
 
+		@Override
 		public String toString() {
 			if(fExts.length == 0)
 				return "<empty>"; //$NON-NLS-1$

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/build/internal/core/scannerconfig/jobs/CfgSCJobsUtil.java

@@ -49,6 +49,7 @@ public class CfgSCJobsUtil {
             this.rc = rc;
         }
         
+        @Override
         public String toString() {
             return rc ? "true" : "false"; //$NON-NLS-1$ //$NON-NLS-2$
         }

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/OptionStringValue.java

@@ -156,6 +156,7 @@ public final class OptionStringValue {
 		return srcPrefixMapping;
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		if(obj == this)
 			return true;
@@ -183,6 +184,7 @@ public final class OptionStringValue {
 		return true;
 	}
 
+	@Override
 	public int hashCode() {
 		return code(value);
 	}
@@ -191,6 +193,7 @@ public final class OptionStringValue {
 		return str != null ? str.hashCode() : 0;
 	}
 
+	@Override
 	public String toString() {
 		return new StringBuffer().append("ov:").append(value.toString()).toString(); //$NON-NLS-1$
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ResourceChangeHandler2.java

@@ -82,6 +82,7 @@ class ResourceChangeHandler2 extends ResourceChangeHandlerBase{
 		}
 	}
 	
+	@Override
 	protected IResourceMoveHandler createResourceMoveHandler(
 			IResourceChangeEvent event) {
 		return new RcMoveHandler();
@@ -166,6 +167,7 @@ class ResourceChangeHandler2 extends ResourceChangeHandlerBase{
 		return false;
 	}
 	
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		super.resourceChanged(event);
 		
@@ -193,6 +195,7 @@ class ResourceChangeHandler2 extends ResourceChangeHandlerBase{
 		
 		Job job = new Job(ManagedMakeMessages.getString("ResourceChangeHandler2.0")){ //$NON-NLS-1$
 
+			@Override
 			protected IStatus run(IProgressMonitor monitor) {
 				for(Iterator iter = projSet.iterator(); iter.hasNext();){
 					IProject project = (IProject)iter.next();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/BuildStateManager.java

@@ -63,6 +63,7 @@ public class BuildStateManager {
 	
 	private class EventListener extends ResourceChangeHandlerBase implements ICProjectDescriptionListener {
 
+		@Override
 		public void resourceChanged(IResourceChangeEvent event) {
 			super.resourceChanged(event);
 			//TODO: may handle resource changes as well
@@ -113,6 +114,7 @@ public class BuildStateManager {
 			}
 		}
 
+		@Override
 		protected IResourceMoveHandler createResourceMoveHandler(
 				IResourceChangeEvent event) {
 			return new ResourceMoveHandler();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/CommandBuilder.java

@@ -81,6 +81,7 @@ public class CommandBuilder implements IBuildModelBuilder {
 	 */
 	private class CommandSearchLauncher extends CommandLauncher{
 
+		@Override
 		protected String[] constructCommandArray(String command, String[] commandArgs) {
 			String[] args = new String[1 + commandArgs.length];
 			if(!isWindows()){
@@ -97,6 +98,7 @@ public class CommandBuilder implements IBuildModelBuilder {
 		}
 
 		
+		@Override
 		protected void printCommandLine(OutputStream os) {
 			if (os != null) {
 				String cmd = CommandBuilder.this.getCommandLine();
@@ -117,22 +119,27 @@ public class CommandBuilder implements IBuildModelBuilder {
 			fOut = out;
 		}
 		
+		@Override
 		public void write(int b) throws IOException {
 			fOut.write(b);
 		}
 
+		@Override
 		public void write(byte b[]) throws IOException {
 			fOut.write(b);
 		}
 
+		@Override
 		public void write(byte b[], int off, int len) throws IOException {
 			fOut.write(b, off, len);
 		}
 
+		@Override
 		public void flush() throws IOException {
 			fOut.flush();
 		}
 
+		@Override
 		public void close() throws IOException {
 		}
 

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/FileMacroExplicitSubstitutor.java

@@ -38,6 +38,7 @@ public class FileMacroExplicitSubstitutor extends SupplierBasedCdtVariableSubsti
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.internal.macros.DefaultMacroSubstitutor#resolveMacro(org.eclipse.cdt.managedbuilder.macros.IBuildMacro)
 	 */
+	@Override
 	protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException{
 		if(macro instanceof MbsMacroSupplier.FileContextMacro){
 			MbsMacroSupplier.FileContextMacro fileMacro = (MbsMacroSupplier.FileContextMacro)macro;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildmodel/ParallelBuilder.java

@@ -86,6 +86,7 @@ public class ParallelBuilder {
 			level = _level;
 		}
 		
+		@Override
 		public int hashCode() {
 			return step.hashCode();
 		}
@@ -115,6 +116,7 @@ public class ParallelBuilder {
 			} else { return false; }
 		}
 		
+		@Override
 		public String toString() {
 			return"[BuildQueueElement] " + DbgUtil.stepName(step) + " @ " + level; //$NON-NLS-1$ //$NON-NLS-2$
 		}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildProperties.java

@@ -96,6 +96,7 @@ public class BuildProperties implements IBuildProperties {
 		fPropertiesMap.remove(property.getPropertyType().getId());
 	}
 	
+	@Override
 	public String toString(){
 		String props = toStringExistingProperties();
 		if(fInexistentProperties != null){
@@ -127,6 +128,7 @@ public class BuildProperties implements IBuildProperties {
 		return buf.toString();
 	}
 
+	@Override
 	public Object clone() {
 		try {
 			BuildProperties clone = (BuildProperties)super.clone();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/PropertyBase.java

@@ -29,10 +29,12 @@ public abstract class PropertyBase {
 		return fName;
 	}
 	
+	@Override
 	public String toString(){
 		return getId();
 	}
 	
+	@Override
 	public boolean equals(Object o){
 		if(!o.getClass().equals(getClass()))
 			return false;
@@ -40,6 +42,7 @@ public abstract class PropertyBase {
 		return fId.equals(((PropertyBase)o).getId());
 	}
 	
+	@Override
 	public int hashCode(){
 		return fId.hashCode();
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObject.java

@@ -55,6 +55,7 @@ public class BuildObject implements IBuildObject {
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
+	@Override
 	public String toString() {
 		return name;
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BuildObjectProperties.java

@@ -105,11 +105,13 @@ public class BuildObjectProperties extends BuildProperties implements
 //		return false;
 	}
 
+	@Override
 	public void clear() {
 		super.clear();
 		fListener.propertiesChanged();
 	}
 
+	@Override
 	public IBuildProperty removeProperty(String id) {
 		IBuildProperty property = super.removeProperty(id);
 		if(property != null)
@@ -121,6 +123,7 @@ public class BuildObjectProperties extends BuildProperties implements
 		return super.setProperty(propertyId, propertyValue);
 	}
 
+	@Override
 	public IBuildProperty setProperty(String propertyId, String propertyValue)
 			throws CoreException {
 //		if(!supportsType(propertyId))

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java

@@ -960,6 +960,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider,
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.build.managed.IBuilder#getName()
 	 */
+	@Override
 	public String getName() {
 		return (name == null && superClass != null) ? superClass.getName() : name;
 	}
@@ -2409,6 +2410,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider,
 			this.builder = builder;
 		}
 		
+		@Override
 		public boolean equals(Object obj) {
 			if(obj == this)
 				return true;
@@ -2418,6 +2420,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider,
 			return builder.performMatchComparison(other.builder);
 		}
 
+		@Override
 		public int hashCode() {
 			String name = getName();
 			if(name == null)
@@ -2719,6 +2722,7 @@ public class Builder extends BuildObject implements IBuilder, IMatchKeyProvider,
 	public boolean isExtensionBuildObject() {
 		return isExtensionElement();
 	}
+	@Override
 	public String toString() {
 		return getUniqueRealName();
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java

@@ -1171,6 +1171,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.build.managed.IConfiguration#getName()
 	 */
+	@Override
 	public String getName() {
 		return (name == null && parent != null) ? parent.getName() : name;
 	}
@@ -1847,6 +1848,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 	/**
 	 * @return Returns the version.
 	 */
+	@Override
 	public Version getVersion() {
 		if ( version == null) {
 			if ( rootFolderInfo.getToolChain() != null) {
@@ -1856,6 +1858,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 		return version;
 	}
 	
+	@Override
 	public void setVersion(Version version) {
 		// Do nothing
 	}
@@ -1881,6 +1884,7 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.internal.core.BuildObject#updateManagedBuildRevision(java.lang.String)
 	 */
+	@Override
 	public void updateManagedBuildRevision(String revision){
 		super.updateManagedBuildRevision(revision);
 		

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ConfigurationV2.java

@@ -358,6 +358,7 @@ public class ConfigurationV2 extends BuildObject implements IConfigurationV2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.build.managed.IConfigurationV2#getName()
 	 */
+	@Override
 	public String getName() {
 		return (name == null && parent != null) ? parent.getName() : name;
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OptionCategory.java

@@ -457,6 +457,7 @@ public class OptionCategory extends BuildObject implements IOptionCategory {
 	/**
 	 * @return Returns the managedBuildRevision.
 	 */
+	@Override
 	public String getManagedBuildRevision() {
 		if ( managedBuildRevision == null) {
 			if ( getOptionHolder() != null) {
@@ -469,6 +470,7 @@ public class OptionCategory extends BuildObject implements IOptionCategory {
 	/**
 	 * @return Returns the version.
 	 */
+	@Override
 	public Version getVersion() {
 		if ( version == null) {
 			if ( getOptionHolder() != null) {
@@ -478,6 +480,7 @@ public class OptionCategory extends BuildObject implements IOptionCategory {
 		return version;
 	}
 	
+	@Override
 	public void setVersion(Version version) {
 		// Do nothing
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/OutputType.java

@@ -446,6 +446,7 @@ public class OutputType extends BuildObject implements IOutputType {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.build.managed.IOutputType#getName()
 	 */
+	@Override
 	public String getName() {
 		return (name == null && superClass != null) ? superClass.getName() : name;
 	}
@@ -863,6 +864,7 @@ public class OutputType extends BuildObject implements IOutputType {
 	/**
 	 * @return Returns the managedBuildRevision.
 	 */
+	@Override
 	public String getManagedBuildRevision() {
 		if ( managedBuildRevision == null) {
 			if ( getParent() != null) {
@@ -875,6 +877,7 @@ public class OutputType extends BuildObject implements IOutputType {
 	/**
 	 * @return Returns the version.
 	 */
+	@Override
 	public Version getVersion() {
 		if ( version == null) {
 			if ( getParent() != null) {
@@ -884,6 +887,7 @@ public class OutputType extends BuildObject implements IOutputType {
 		return version;
 	}
 	
+	@Override
 	public void setVersion(Version version) {
 		// Do nothing
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ProjectType.java

@@ -311,6 +311,7 @@ public class ProjectType extends BuildObject implements IProjectType, IBuildProp
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IBuildObject#getName()
 	 */
+	@Override
 	public String getName() {
 		String name = getNameAttribute();
 		if(name.length() == 0){

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ResourceConfiguration.java

@@ -404,6 +404,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	 * @param doc
 	 * @param element
 	 */
+	@Override
 	public void serialize(ICStorageElement element) {
 		super.serialize(element);
 		if (toolsToInvoke != null) {
@@ -729,6 +730,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#isDirty()
 	 */
+	@Override
 	public boolean isDirty() {
 		// This shouldn't be called for an extension tool-chain
  		if (isExtensionResourceConfig) return false;
@@ -750,6 +752,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#setDirty(boolean)
 	 */
+	@Override
 	public void setDirty(boolean isDirty) {
  		if (isExtensionResourceConfig) return;
  		
@@ -768,6 +771,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	/* (non-Javadoc)
 	 *  Resolve the element IDs to interface references
 	 */
+	@Override
 	public void resolveReferences() {
 		if (!resolved) {
 			resolved = true;
@@ -829,6 +833,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	/**
 	 * @return Returns the version.
 	 */
+	@Override
 	public Version getVersion() {
 		if ( version == null) {
 			if ( getParent() != null) {
@@ -838,6 +843,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		return version;
 	}
 	
+	@Override
 	public void setVersion(Version version) {
 		// Do nothing
 	}
@@ -845,6 +851,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.internal.core.BuildObject#updateManagedBuildRevision(java.lang.String)
 	 */
+	@Override
 	public void updateManagedBuildRevision(String revision){
 		super.updateManagedBuildRevision(revision);
 		
@@ -856,6 +863,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#needsRebuild()
 	 */
+	@Override
 	public boolean needsRebuild() {
 		if(super.needsRebuild())
 			return true;
@@ -872,6 +880,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.core.IResourceConfiguration#setRebuildState(boolean)
 	 */
+	@Override
 	public void setRebuildState(boolean rebuild) {
 		if(isExtensionResourceConfiguration() && rebuild)
 			return;
@@ -941,6 +950,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		return baseTc;
 	}
 
+	@Override
 	public boolean isExtensionElement() {
 		return isExtensionResourceConfig;
 	}
@@ -955,18 +965,22 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		return true;
 	}
 
+	@Override
 	public Set contributeErrorParsers(Set set) {
 		return contributeErrorParsers(getToolsToInvoke(), set);
 	}
 
+	@Override
 	public void resetErrorParsers() {
 		resetErrorParsers(getToolsToInvoke());
 	}
 
+	@Override
 	void removeErrorParsers(Set set) {
 		removeErrorParsers(getToolsToInvoke(), set);
 	}
 
+	@Override
 	void resolveProjectReferences(boolean onLoad){
 		for(Iterator iter = getToolList().iterator(); iter.hasNext();){
 			Tool tool = (Tool)iter.next();
@@ -974,6 +988,7 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		}
 	}
 
+	@Override
 	public boolean hasCustomSettings() {
 		IResourceInfo parentRc = getParentResourceInfo();
 		if(parentRc instanceof FolderInfo){
@@ -1011,10 +1026,12 @@ public class ResourceConfiguration extends ResourceInfo implements IFileInfo {
 		info.apply();
 	}
 
+	@Override
 	public boolean isFolderInfo() {
 		return false;
 	}
 
+	@Override
 	void applyToolsInternal(ITool[] resultingTools,
 			ToolListModificationInfo info) {
 		List list = getToolList();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/TargetPlatform.java

@@ -400,6 +400,7 @@ public class TargetPlatform extends BuildObject implements ITargetPlatform {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.build.managed.ITargetPlatform#getName()
 	 */
+	@Override
 	public String getName() {
 		return (name == null && superClass != null) ? superClass.getName() : name;
 	}
@@ -606,6 +607,7 @@ public class TargetPlatform extends BuildObject implements ITargetPlatform {
 	/**
 	 * @return Returns the version.
 	 */
+	@Override
 	public Version getVersion() {
 		if ( version == null) {
 			if ( getParent() != null) {
@@ -615,6 +617,7 @@ public class TargetPlatform extends BuildObject implements ITargetPlatform {
 		return version;
 	}
 	
+	@Override
 	public void setVersion(Version version) {
 		// Do nothing
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolReference.java

@@ -882,6 +882,7 @@ public class ToolReference implements IToolReference {
 	/* (non-Javadoc)
 	 * @see java.lang.Object#toString()
 	 */
+	@Override
 	public String toString() {
 		String answer = new String();	
 		if (parent != null) {

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java

@@ -30,6 +30,7 @@ public class BuildBuildData extends CBuildData {
 		fCfg = (Configuration)fBuilder.getParent().getParent();
 	}
 
+	@Override
 	public IPath getBuilderCWD() {
 		return new Path(fBuilder.getBuildPath());//ManagedBuildManager.getBuildLocation(fCfg, fBuilder);
 	}
@@ -40,34 +41,42 @@ public class BuildBuildData extends CBuildData {
 		return new Path(locationString);
 	}
 
+	@Override
 	public String[] getErrorParserIDs() {
 		return fCfg.getErrorParserList();
 	}
 
+	@Override
 	public ICOutputEntry[] getOutputDirectories() {
 		return fBuilder.getOutputEntries();
 	}
 
+	@Override
 	public void setBuilderCWD(IPath path) {
 		fBuilder.setBuildPath(path.toString());
 	}
 
+	@Override
 	public void setErrorParserIDs(String[] ids) {
 		fCfg.setErrorParserList(ids);
 	}
 
+	@Override
 	public void setOutputDirectories(ICOutputEntry[] entries) {
 		fBuilder.setOutputEntries(entries);
 	}
 
+	@Override
 	public String getId() {
 		return fBuilder.getId();
 	}
 
+	@Override
 	public String getName() {
 		return fBuilder.getName();
 	}
 
+	@Override
 	public boolean isValid() {
 		return fBuilder != null;
 	}
@@ -76,6 +85,7 @@ public class BuildBuildData extends CBuildData {
 		//TODO
 	}
 
+	@Override
 	public IEnvironmentContributor getBuildEnvironmentContributor() {
 //		if(fEnvContibutor == null)
 //			fEnvContibutor = new BuildEnvironmentContributor(this);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildConfigurationData.java

@@ -43,6 +43,7 @@ public class BuildConfigurationData extends CConfigurationData {
 		return fCfg;
 	}
 
+	@Override
 	public CFileData createFileData(IPath path, CFileData base)
 			throws CoreException {
 		String id = ManagedBuildManager.calculateChildId(fCfg.getId(),null);
@@ -50,6 +51,7 @@ public class BuildConfigurationData extends CConfigurationData {
 		return info.getFileData();
 	}
 	
+	@Override
 	public CFileData createFileData(IPath path, CFolderData base, CLanguageData baseLangData)
 		throws CoreException {
 		String id = ManagedBuildManager.calculateChildId(fCfg.getId(),null);
@@ -65,6 +67,7 @@ public class BuildConfigurationData extends CConfigurationData {
 
 
 	
+	@Override
 	public CFolderData createFolderData(IPath path, CFolderData base)
 			throws CoreException {
 		String id = ManagedBuildManager.calculateChildId(fCfg.getId(),null);
@@ -72,10 +75,12 @@ public class BuildConfigurationData extends CConfigurationData {
 		return folderInfo.getFolderData();
 	}
 
+	@Override
 	public String getDescription() {
 		return fCfg.getDescription();
 	}
 
+	@Override
 	public CResourceData[] getResourceDatas() {
 		IResourceInfo infos[] = fCfg.getResourceInfos();
 		CResourceData datas[] = new CResourceData[infos.length];
@@ -85,50 +90,62 @@ public class BuildConfigurationData extends CConfigurationData {
 		return datas;
 	}
 
+	@Override
 	public CFolderData getRootFolderData() {
 		return fCfg.getRootFolderInfo().getFolderData();
 	}
 
+	@Override
 	public void removeResourceData(CResourceData data) throws CoreException {
 		fCfg.removeResourceInfo(data.getPath());
 	}
 
+	@Override
 	public void setDescription(String description) {
 		fCfg.setDescription(description);
 	}
 
+	@Override
 	public String getId() {
 		return fCfg.getId();
 	}
 
+	@Override
 	public String getName() {
 		return fCfg.getName();
 	}
 
+	@Override
 	public void setName(String name) {
 		fCfg.setName(name);
 	}
 
+	@Override
 	public boolean isValid() {
 		return fCfg != null;
 	}
 
+	@Override
 	public CTargetPlatformData getTargetPlatformData() {
 		return fCfg.getToolChain().getTargetPlatformData();
 	}
 
+	@Override
 	public ICSourceEntry[] getSourceEntries() {
 		return fCfg.getSourceEntries();
 	}
 
+	@Override
 	public void setSourceEntries(ICSourceEntry[] entries) {
 		fCfg.setSourceEntries(entries);
 	}
 
+	@Override
 	public CBuildData getBuildData() {
 		return fCfg.getBuildData();
 	}
 
+	@Override
 	public ICdtVariablesContributor getBuildVariablesContributor() {
 //		if(fCdtVars == null)
 //			fCdtVars = new BuildVariablesContributor(this);
@@ -154,6 +171,7 @@ public class BuildConfigurationData extends CConfigurationData {
 		}
 	}
 
+	@Override
 	public CConfigurationStatus getStatus() {
 		int flags = 0;
 		String msg = null;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildFileData.java

@@ -26,6 +26,7 @@ public class BuildFileData extends CFileData {
 		return fFileInfo;
 	}
 
+	@Override
 	public IPath getPath() {
 		return fFileInfo.getPath();
 	}
@@ -38,14 +39,17 @@ public class BuildFileData extends CFileData {
 //		fFileInfo.setExclude(excluded);
 //	}
 
+	@Override
 	public void setPath(IPath path) {
 		fFileInfo.setPath(path);
 	}
 
+	@Override
 	public String getId() {
 		return fFileInfo.getId();
 	}
 
+	@Override
 	public String getName() {
 		return fFileInfo.getName();
 	}
@@ -54,10 +58,12 @@ public class BuildFileData extends CFileData {
 //		fFileInfo.setN
 	}
 
+	@Override
 	public boolean isValid() {
 		return fFileInfo.isValid();
 	}
 
+	@Override
 	public CLanguageData getLanguageData() {
 		CLanguageData datas[] = fFileInfo.getCLanguageDatas();
 		if(datas.length > 0)
@@ -65,6 +71,7 @@ public class BuildFileData extends CFileData {
 		return null;
 	}
 
+	@Override
 	public boolean hasCustomSettings() {
 		return fFileInfo.hasCustomSettings();
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildLanguageData.java

@@ -96,6 +96,7 @@ public class BuildLanguageData extends CLanguageData {
 		}
 	}
 
+	@Override
 	public void setEntries(int kind, ICLanguageSettingEntry entries[]) {
 		BuildEntryStorage storage = getEntryStorage(kind);
 		if(storage != null)
@@ -145,10 +146,12 @@ public class BuildLanguageData extends CLanguageData {
 		
 	}
 */
+	@Override
 	public String getLanguageId() {
 		return fInputType != null ? fInputType.getLanguageId(fTool) : null;
 	}
 
+	@Override
 	public ICLanguageSettingEntry[] getEntries(int kinds) {
 		List<ICLanguageSettingEntry> list = new ArrayList<ICLanguageSettingEntry>();
 		
@@ -185,6 +188,7 @@ public class BuildLanguageData extends CLanguageData {
 		fInputType = type;
 	}
 	
+	@Override
 	public String[] getSourceContentTypeIds() {
 		if(fInputType != null){
 			return fInputType.getSourceContentTypeIds();
@@ -192,6 +196,7 @@ public class BuildLanguageData extends CLanguageData {
 		return null;
 	}
 
+	@Override
 	public String[] getSourceExtensions() {
 		return fInputType != null ? fInputType.getSourceExtensions(fTool) : fTool.getPrimaryInputExtensions();
 	}
@@ -306,6 +311,7 @@ public class BuildLanguageData extends CLanguageData {
 	}
 */	
 
+	@Override
 	public void setLanguageId(String id) {
 		if(CDataUtil.objectsEqual(id, fInputType.getLanguageId(fTool))){
 //			fInputType = fTool.getEdtableInputType(fInputType);
@@ -314,10 +320,12 @@ public class BuildLanguageData extends CLanguageData {
 		}
 	}
 
+	@Override
 	public String getId() {
 		return fId;
 	}
 
+	@Override
 	public String getName() {
 		String name;
 		if(fInputType == null){
@@ -336,6 +344,7 @@ public class BuildLanguageData extends CLanguageData {
 		return name;
 	}
 
+	@Override
 	public boolean isValid() {
 		// TODO Auto-generated method stub
 		return true;
@@ -377,6 +386,7 @@ public class BuildLanguageData extends CLanguageData {
 		return fTool.getParentResourceInfo().getParent();
 	}
 
+	@Override
 	public void setSourceContentTypeIds(String[] ids) {
 		String[] headerIds = fInputType.getHeaderContentTypeIds();
 		
@@ -413,6 +423,7 @@ public class BuildLanguageData extends CLanguageData {
 
 	}
 
+	@Override
 	public void setSourceExtensions(String[] exts) {
 		// TODO Auto-generated method stub
 		
@@ -422,6 +433,7 @@ public class BuildLanguageData extends CLanguageData {
 		fKindToEntryStore.clear(); 
 	}
 
+	@Override
 	public boolean containsDiscoveredScannerInfo() {
 		IResourceInfo rcInfo = fTool.getParentResourceInfo();
 		if(rcInfo instanceof FolderInfo){

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java

@@ -45,6 +45,7 @@ public class BuildSystemSpecificVariableSubstitutor extends SupplierBasedCdtVari
 		super(contextInfo, inexistentMacroValue, listDelimiter);
 	}
 
+	@Override
 	protected ResolvedMacro resolveMacro(String macroName)
 			throws CdtVariableException {
 		if(fFileVarsSet.contains(macroName)

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildTargetPlatformData.java

@@ -19,22 +19,27 @@ public class BuildTargetPlatformData extends CTargetPlatformData {
 	public BuildTargetPlatformData(TargetPlatform targetPlatform){
 		fTargetPlatform = targetPlatform;
 	}
+	@Override
 	public String[] getBinaryParserIds() {
 		return fTargetPlatform.getBinaryParserList();
 	}
 
+	@Override
 	public void setBinaryParserIds(String[] ids) {
 		fTargetPlatform.setBinaryParserList(ids);
 	}
 
+	@Override
 	public String getId() {
 		return fTargetPlatform.getId();
 	}
 
+	@Override
 	public String getName() {
 		return fTargetPlatform.getName();
 	}
 
+	@Override
 	public boolean isValid() {
 		//TODO:
 		return true;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildVariablesContributor.java

@@ -45,6 +45,7 @@ public class BuildVariablesContributor implements ICdtVariablesContributor {
 		}
 
 		
+		@Override
 		protected ICdtVariableSupplier[] getSuppliers(int type, Object data) {
 			switch(type){
 			case IBuildMacroProvider.CONTEXT_CONFIGURATION:
@@ -66,6 +67,7 @@ public class BuildVariablesContributor implements ICdtVariablesContributor {
 		}
 
 
+		@Override
 		public IVariableContextInfo getNext() {
 			switch(getContextType()){
 			case IBuildMacroProvider.CONTEXT_CONFIGURATION:{

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ExternalExtensionMacroSupplier.java

@@ -59,6 +59,7 @@ public class ExternalExtensionMacroSupplier implements ICdtVariableSupplier{
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider#getVariable(java.lang.String, java.lang.Object, boolean)
 		 */
+		@Override
 		public ICdtVariable getVariable(String macroName,
 				int contextType,
 				Object contextData, 
@@ -72,6 +73,7 @@ public class ExternalExtensionMacroSupplier implements ICdtVariableSupplier{
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider#getMacros(int, java.lang.Object, boolean)
 		 */
+		@Override
 		public ICdtVariable[] getVariables(int contextType,Object contextData, boolean includeParent) {
 //			return filterVariables(super.getMacros(contextType, contextData,  includeParent));
 			return filterVariables(fMngr.getVariables(fCfgDes));
@@ -80,6 +82,7 @@ public class ExternalExtensionMacroSupplier implements ICdtVariableSupplier{
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.managedbuilder.internal.envvar.EnvironmentVariableProvider#getContextInfo(java.lang.Object)
 		 */
+		@Override
 		public IMacroContextInfo getMacroContextInfo(int contextType,Object contextData){
 			IMacroContextInfo startInfo = getStartInfo();
 			if(contextType == fContextType &&

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java

@@ -534,6 +534,7 @@ public class ProjectConverter implements ICProjectConverter {
 						CCorePlugin.getDefault().setProjectDescription(project, newDes);
 						Job job = new Job(DataProviderMessages.getString("ProjectConverter.7")){ //$NON-NLS-1$
 
+							@Override
 							protected IStatus run(IProgressMonitor monitor) {
 								try {
 									ICProjectDescription des = CCorePlugin.getDefault().getProjectDescription(project);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ResourcePropertyHolder.java

@@ -57,6 +57,7 @@ class ResourcePropertyHolder extends ResourceChangeHandlerBase {
 		return !fProjectOnly || rc.getType() == IResource.PROJECT;
 	}
 
+	@Override
 	protected IResourceMoveHandler createResourceMoveHandler(
 			IResourceChangeEvent event) {
 		return new ResourceMoveHandler();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/NotExpression.java

@@ -22,6 +22,7 @@ public class NotExpression extends AndExpression {
 		super(element);
 	}
 
+	@Override
 	public boolean evaluate(IResourceInfo rcInfo, 
             IHoldsOptions holder, 
             IOption option) {

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java

@@ -201,6 +201,7 @@ public class StoredBuildPathEnvironmentContainer extends
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.internal.envvar.StorableEnvironmentLoader#getSerializeInfo(java.lang.Object)
 	 */
+	@Override
 	protected ISerializeInfo getSerializeInfo(Object context) {
 		ISerializeInfo serializeInfo = null;
 		if(context instanceof IConfiguration){

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacro.java

@@ -43,6 +43,7 @@ public class BuildMacro extends CdtVariable implements IBuildMacro {
 		return getValueType();
 	}
 
+	@Override
 	public String[] getStringListValue() throws BuildMacroException {
 		// TODO Auto-generated method stub
 		try {
@@ -52,6 +53,7 @@ public class BuildMacro extends CdtVariable implements IBuildMacro {
 		}
 	}
 
+	@Override
 	public String getStringValue() throws BuildMacroException {
 		try {
 			return super.getStringValue();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java

@@ -302,6 +302,7 @@ public class BuildMacroProvider implements IBuildMacroProvider, IMacroContextInf
 		final ICdtVariableManager mngr = CCorePlugin.getDefault().getCdtVariableManager();
 		IMacroContextInfo info = getMacroContextInfo(contextType,contextData);
 		IVariableSubstitutor subst = new SupplierBasedCdtVariableSubstitutor(info,null,""){ //$NON-NLS-1$
+			@Override
 			protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException {
 				IStringVariable var = mngr.toEclipseVariable(macro, null); 
 				if(var instanceof IDynamicVariable)

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java

@@ -214,6 +214,7 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.internal.macros.DefaultMacroSubstitutor#resolveMacro(org.eclipse.cdt.managedbuilder.macros.IBuildMacro)
 	 */
+	@Override
 	protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException{
 		ResolvedMacro resolved = null;
 			
@@ -276,6 +277,7 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.internal.macros.DefaultMacroSubstitutor#setMacroContextInfo(org.eclipse.cdt.managedbuilder.internal.macros.IMacroContextInfo)
 	 */
+	@Override
 	public void setMacroContextInfo(IVariableContextInfo info)
 				throws CdtVariableException{
 		super.setMacroContextInfo(info);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/CoreMacrosSupplier.java

@@ -24,19 +24,23 @@ public class CoreMacrosSupplier extends BuildCdtVariablesSupplierBase {
 		fMngr = CCorePlugin.getDefault().getCdtVariableManager();
 	}
 
+	@Override
 	public IBuildMacro getMacro(String macroName, int contextType,
 			Object contextData) {
 		return BuildMacroProvider.wrap(getVariable(macroName, null));
 	}
 
+	@Override
 	public IBuildMacro[] getMacros(int contextType, Object contextData) {
 		return BuildMacroProvider.wrap(getVariables(null));
 	}
 
+	@Override
 	public ICdtVariable getVariable(String macroName, IMacroContextInfo context) {
 		return fMngr.getVariable(macroName, fCfgDes);
 	}
 
+	@Override
 	public ICdtVariable[] getVariables(IMacroContextInfo context) {
 		return fMngr.getVariables(fCfgDes);
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java

@@ -53,6 +53,7 @@ public class ExplicitFileMacroCollector extends SupplierBasedCdtVariableSubstitu
 */
 	/* (non-Javadoc)
 	 */
+	@Override
 	protected ResolvedMacro resolveMacro(ICdtVariable macro) throws CdtVariableException{
 		if(macro instanceof MbsMacroSupplier.FileContextMacro){
 			MbsMacroSupplier.FileContextMacro fileMacro = (MbsMacroSupplier.FileContextMacro)macro;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java

@@ -113,6 +113,7 @@ public class FileContextBuildMacroValues implements
 	/* (non-Javadoc)
 	 * @see java.lang.Object#clone()
 	 */
+	@Override
 	public Object clone(){
 		FileContextBuildMacroValues cloned = null;
 		try{

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/MbsMacroSupplier.java

@@ -215,6 +215,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase {
 		/* (non-Javadoc)
 		 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacro#getStringValue()
 		 */
+		@Override
 		public String getStringValue(){
 //			loadValue();
 			return fStringValue;
@@ -333,6 +334,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacro(java.lang.String, int, java.lang.Object)
 	 */
+	@Override
 	public IBuildMacro getMacro(String macroName, int contextType,
 			Object contextData) {
 		IBuildMacro macro = null; 
@@ -679,6 +681,7 @@ public class MbsMacroSupplier extends BuildCdtVariablesSupplierBase {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.managedbuilder.macros.IBuildMacroSupplier#getMacros(int, java.lang.Object)
 	 */
+	@Override
 	public IBuildMacro[] getMacros(int contextType, Object contextData) {
 		String names[] = getMacroNames(contextType,false);
 		

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/DefaultGnuWinScannerInfoCollector.java

@@ -30,6 +30,7 @@ public class DefaultGnuWinScannerInfoCollector extends DefaultGCCScannerInfoColl
     /* (non-Javadoc)
      * @see org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector#contributeToScannerConfig(java.lang.Object, java.util.Map)
      */
+    @Override
     public void contributeToScannerConfig(Object resource, Map scannerInfo) {
         // check the resource
 //        if (resource != null && resource instanceof IResource &&
@@ -64,11 +65,13 @@ public class DefaultGnuWinScannerInfoCollector extends DefaultGCCScannerInfoColl
     		super.contributeToScannerConfig(resource, scannerInfo);
         }
 //	}
+	@Override
 	public void setProject(IProject project) {
 		fProject = project;
 		super.setProject(project);
 	}
 
+	@Override
 	public void setInfoContext(InfoContext context) {
 		fProject = context.getProject();
 		super.setInfoContext(context);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedBuildPathEntryContainerInitializer.java

@@ -36,6 +36,7 @@ public class ManagedBuildPathEntryContainerInitializer extends PathEntryContaine
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.model.PathEntryContainerInitializer#initialize(org.eclipse.core.runtime.IPath, org.eclipse.cdt.core.model.ICProject)
 	 */
+	@Override
 	public void initialize(IPath containerPath, ICProject project) throws CoreException {
 		if (VERBOSE) {
 			System.out.println(TRACE_HEADER + 

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/scannerconfig/ManagedGCCScannerInfoConsoleParser.java

@@ -24,12 +24,14 @@ public class ManagedGCCScannerInfoConsoleParser extends
 		GCCScannerInfoConsoleParser {
 	Boolean fManagedBuildOnState;
 	
+	@Override
 	public boolean processLine(String line) {
 		if(isManagedBuildOn())
 			return false;
 		return super.processLine(line);
 	}
 
+	@Override
 	public void shutdown() {
 		if(!isManagedBuildOn()){
 			super.shutdown();
@@ -37,6 +39,7 @@ public class ManagedGCCScannerInfoConsoleParser extends
 		fManagedBuildOnState = null;
 	}
 
+	@Override
 	public void startup(IProject project, IScannerInfoCollector collector) {
 		if(isManagedBuildOn())
 			return;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/CollectionMap.java

@@ -66,6 +66,7 @@ public class CollectionMap {
 			return (Collection)fEntry.getValue();
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			if(obj == this)
 				return true;
@@ -79,6 +80,7 @@ public class CollectionMap {
 			return fEntry.equals(((CollectionEntry)obj).fEntry);
 		}
 
+		@Override
 		public int hashCode() {
 			return fEntry.hashCode();
 		}
@@ -111,10 +113,12 @@ public class CollectionMap {
 			fMapEntrySet = fMap.entrySet();
 		}
 
+		@Override
 		public Iterator iterator() {
 			return new Iter();
 		}
 
+		@Override
 		public int size() {
 			return fMapEntrySet.size();
 		}
@@ -263,6 +267,7 @@ public class CollectionMap {
 //		return new ArrayList(1);
 //	}
 
+	@Override
 	public Object clone() {
 		try {
 			CollectionMap clone = (CollectionMap)super.clone();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ConfigurationModification.java

@@ -193,11 +193,13 @@ public class ConfigurationModification extends FolderInfoModification implements
 		clearToolCompatibilityInfo();
 	}
 	
+	@Override
 	public void setToolChain(IToolChain tc, boolean force) {
 		setBuilder(tc.getBuilder());
 		super.setToolChain(tc, force);
 	}
 
+	@Override
 	public void changeProjectTools(ITool removeTool, ITool addTool) {
 		clearBuilderCompatibilityInfo();
 		super.changeProjectTools(removeTool, addTool);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FileInfoModification.java

@@ -36,20 +36,24 @@ public class FileInfoModification extends
 		super(rcInfo, base);
 	}
 
+	@Override
 	protected boolean canRemove(ITool realTool) {
 		return true;
 	}
 
+	@Override
 	protected boolean canAdd(Tool tool) {
 		String ext = getFileExtension();
 		return tool.buildsFileType(ext, getProject());
 	}
 
+	@Override
 	protected boolean canReplace(Tool fromTool, Tool toTool) {
 		String ext = getFileExtension();
 		return toTool.buildsFileType(ext, getProject());
 	}
 	
+	@Override
 	protected Set getToolApplicabilityPathSet(Tool realTool, boolean isProject) {
 		if(fApplPathSet == null){
 			Set s = new HashSet(1);
@@ -59,10 +63,12 @@ public class FileInfoModification extends
 		return fApplPathSet;
 	}
 
+	@Override
 	protected Set getExtensionConflictToolSet(Tool tool, Tool[] toos) {
 		return Collections.EMPTY_SET;
 	}
 
+	@Override
 	protected Tool[] filterTools(Tool[] tools) {
 		return tools;
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/FolderInfoModification.java

@@ -223,6 +223,7 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		fCurrentCompatibilityInfo = null;
 	}
 	
+	@Override
 	protected boolean canRemove(ITool realTool) {
 		IToolChain extTc = ManagedBuildManager.getExtensionToolChain(fSelectedToolChain);
 		ITool[] tools = extTc.getTools();
@@ -234,10 +235,12 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		return true;
 	}
 
+	@Override
 	protected boolean canAdd(Tool tool) {
 		return !TcModificationUtil.containCommonEntries(getInputExtsSet(), tool.getPrimaryInputExtensions());
 	}
 
+	@Override
 	protected boolean canReplace(Tool fromTool, Tool toTool) {
 		String[] exts = toTool.getPrimaryInputExtensions();
 		Set curInputExts = null;
@@ -255,6 +258,7 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		return false;
 	}
 
+	@Override
 	protected Set getExtensionConflictToolSet(Tool tool, Tool[] tools) {
 		String exts[] = tool.getPrimaryInputExtensions();
 		Set extsSet = new HashSet(Arrays.asList(exts));
@@ -277,12 +281,14 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		return conflictsSet;
 	}
 
+	@Override
 	protected Set getToolApplicabilityPathSet(Tool realTool, boolean isProject) {
 		if(isProject)
 			return (Set)getToolChainApplicabilityPaths().fToolPathMap.get(realTool);
 		return getToolChainApplicabilityPaths().fFolderInfoPaths;
 	}
 
+	@Override
 	protected Tool[] filterTools(Tool[] tools) {
 		IResourceInfo rcInfo = getResourceInfo();
 		return (Tool[])((FolderInfo)rcInfo).filterTools(tools, rcInfo.getParent().getManagedProject());
@@ -327,6 +333,7 @@ public class FolderInfoModification extends ToolListModification implements IFol
 		fTcApplicabilityPaths = tcApplicabilityPaths;
 	}
 	
+	@Override
 	protected void clearToolInfo(ITool[] tools){
 		super.clearToolInfo(tools);
 		fTcApplicabilityPaths = null;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/HashSetMap.java

@@ -15,10 +15,12 @@ import java.util.HashSet;
 
 public class HashSetMap extends CollectionMap {
 
+	@Override
 	protected Collection cloneCollection(Collection l) {
 		return (Collection)((HashSet)l).clone();
 	}
 
+	@Override
 	protected Collection newCollection(int size) {
 		return new HashSet();
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/LinkedHashSetMap.java

@@ -15,10 +15,12 @@ import java.util.LinkedHashSet;
 
 public class LinkedHashSetMap extends CollectionMap {
 
+	@Override
 	protected Collection cloneCollection(Collection l) {
 		return (Collection)((LinkedHashSet)l).clone();
 	}
 
+	@Override
 	protected Collection newCollection(int size) {
 		return new LinkedHashSet();
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java

@@ -67,6 +67,7 @@ public class ListMap implements Cloneable {
 				return (List)fEntry.getValue();
 			}
 
+			@Override
 			public boolean equals(Object obj) {
 				if(obj == this)
 					return true;
@@ -80,6 +81,7 @@ public class ListMap implements Cloneable {
 				return fEntry.equals(((CollectionEntry)obj).fEntry);
 			}
 
+			@Override
 			public int hashCode() {
 				return fEntry.hashCode();
 			}
@@ -112,10 +114,12 @@ public class ListMap implements Cloneable {
 				fMapEntrySet = fMap.entrySet();
 			}
 
+			@Override
 			public Iterator iterator() {
 				return new Iter();
 			}
 
+			@Override
 			public int size() {
 				return fMapEntrySet.size();
 			}
@@ -264,6 +268,7 @@ public class ListMap implements Cloneable {
 //			return new ArrayList(1);
 //		}
 
+		@Override
 		public Object clone() {
 			try {
 				ListMap clone = (ListMap)super.clone();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectSet.java

@@ -56,6 +56,7 @@ public class ObjectSet implements IObjectSet {
 		return fObjectSet.size();
 	}
 	
+	@Override
 	public String toString(){
 		StringBuffer buf = new StringBuffer();
 		buf.append(MatchObjectElement.TypeToStringAssociation.getAssociation(fObjectType).getString());

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ObjectTypeBasedStorage.java

@@ -73,6 +73,7 @@ public final class ObjectTypeBasedStorage implements Cloneable {
 		return oldValue;
 	}
 
+	@Override
 	public Object clone(){
 		try {
 			ObjectTypeBasedStorage clone = (ObjectTypeBasedStorage)super.clone();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PathTreeSetMap.java

@@ -15,10 +15,12 @@ import java.util.TreeSet;
 
 public class PathTreeSetMap extends CollectionMap {
 
+	@Override
 	protected Collection cloneCollection(Collection l) {
 		return (Collection)((TreeSet)l).clone();
 	}
 
+	@Override
 	protected Collection newCollection(int size) {
 		return new TreeSet(PathComparator.INSTANCE);
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeMapStorage.java

@@ -31,6 +31,7 @@ public class PerTypeMapStorage implements Cloneable {
 		return (Map)((HashMap)map).clone();
 	}
 
+	@Override
 	public Object clone(){
 		try {
 			PerTypeMapStorage clone = (PerTypeMapStorage)super.clone();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/PerTypeSetStorage.java

@@ -31,6 +31,7 @@ public class PerTypeSetStorage implements Cloneable {
 		return (Set)((LinkedHashSet)set).clone();
 	}
 
+	@Override
 	public Object clone(){
 		try {
 			PerTypeSetStorage clone = (PerTypeSetStorage)super.clone();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/ConflictDefinition.java

@@ -18,6 +18,7 @@ public class ConflictDefinition extends ObjectSetListBasedDefinition {
 		super(list);
 	}
 
+	@Override
 	public final int getType() {
 		return CONFLICT;
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/MatchObjectElement.java

@@ -76,6 +76,7 @@ public class MatchObjectElement {
 			fType = el.getCompleteOredTypeValue();
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			if(obj == this)
 				return true;
@@ -86,6 +87,7 @@ public class MatchObjectElement {
 			return fType == ((PatternTypeKey)obj).fType;
 		}
 
+		@Override
 		public int hashCode() {
 			return fType;
 		}
@@ -157,6 +159,7 @@ public class MatchObjectElement {
 			return (String[])fIds.toArray(new String[fIds.size()]);
 		}
 
+		@Override
 		public boolean equals(Object obj) {
 			if(obj == this)
 				return true;
@@ -171,6 +174,7 @@ public class MatchObjectElement {
 			return other.fIds.containsAll(fIds);
 		}
 
+		@Override
 		public int hashCode() {
 			if(fHash == 0){
 				fHash = fIds.hashCode();
@@ -244,6 +248,7 @@ public class MatchObjectElement {
 		return fObjectType;
 	}
 
+	@Override
 	public boolean equals(Object obj) {
 		if(obj == this)
 			return true;
@@ -258,6 +263,7 @@ public class MatchObjectElement {
 		return Arrays.equals(other.fPatterns, fPatterns);
 	}
 
+	@Override
 	public int hashCode() {
 		if(fHash == 0){
 			int hash = fObjectType;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/extension/RulesManager.java

@@ -55,6 +55,7 @@ public class RulesManager {
 			setSystem(true);
 		}
 
+		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			try {
 				loadExtensions();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject12.java

@@ -766,6 +766,7 @@ class UpdateManagedProject12 {
 			//initiate the job in all cases
 //			if (treeLock) {
 				WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$
+					@Override
 					public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
 						ManagedBuildManager.saveBuildInfoLegacy(project, false);
 						return Status.OK_STATUS;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject20.java

@@ -117,6 +117,7 @@ class UpdateManagedProject20 {
 			//since the java synchronized mechanism is now used for the build info loadding,
 			//initiate the job in all cases
 				WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$
+					@Override
 					public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
 						ManagedBuildManager.saveBuildInfoLegacy(project, false);
 						return Status.OK_STATUS;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProject21.java

@@ -85,6 +85,7 @@ class UpdateManagedProject21 {
 		//initiate the job in all cases
 //		if (treeLock) {
 			WorkspaceJob job = new WorkspaceJob(ConverterMessages.getResourceString("UpdateManagedProject.notice")) { //$NON-NLS-1$
+				@Override
 				public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
 					checkForCPPWithC(monitor, project);
 					ManagedBuildManager.saveBuildInfoLegacy(project, true);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/projectconverter/UpdateManagedProjectManager.java

@@ -390,6 +390,7 @@ public class UpdateManagedProjectManager {
 			IWorkspace workspace = project.getWorkspace();
 			ISchedulingRule rule = workspace.getRuleFactory().refreshRule(project);
 			WorkspaceJob job = new WorkspaceJob("Refresh Project") { //$NON-NLS-1$
+				@Override
 				public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
 					project.refreshLocal(IResource.DEPTH_ONE, null);
 					return Status.OK_STATUS;

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/CreateProjectProgressMonitor.java

@@ -37,6 +37,7 @@ public class CreateProjectProgressMonitor extends NullProgressMonitor {
 	 * 
 	 * @see IProgressMonitor#setTaskName(String)
 	 */
+	@Override
 	public void setTaskName(String name) {
 		super.setTaskName(name);
 	}
@@ -47,6 +48,7 @@ public class CreateProjectProgressMonitor extends NullProgressMonitor {
 	 * @see IProgressMonitor#isCanceled()
 	 * @see IProgressMonitor#setCanceled(boolean)
 	 */
+	@Override
 	public void setCanceled(boolean cancelled) {
 		super.setCanceled(cancelled);
 	}
@@ -58,6 +60,7 @@ public class CreateProjectProgressMonitor extends NullProgressMonitor {
 	 * @see IProgressMonitor#isCanceled()
 	 * @see IProgressMonitor#setCanceled(boolean)
 	 */
+	@Override
 	public boolean isCanceled() {
 		return super.isCanceled();
 	}

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringListOptionValues.java

@@ -45,6 +45,7 @@ public class AppendToMBSStringListOptionValues extends ProcessRunner {
 	/**
 	 * This method Appends contents to Managed Build System StringList Option Values.
 	 */
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/AppendToMBSStringOptionValue.java

@@ -43,6 +43,7 @@ public class AppendToMBSStringOptionValue extends ProcessRunner {
 	/**
 	 * This method Appends contents to Managed Build System StringList Option Values.
 	 */
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/CreateIncludeFolder.java

@@ -40,6 +40,7 @@ public class CreateIncludeFolder extends CreateSourceFolder {
 	 * This method Creates a include Folder to the project.
 	 * 
 	 */
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		String targetPath = args[1].getSimpleValue();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/ExcludeResources.java

@@ -55,6 +55,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
  */
 public class ExcludeResources extends ProcessRunner {
 	
+	@Override
 	public void process(TemplateCore template, final ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		String configIdPattern = args[1].getSimpleValue();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/GenerateMakefileWithBuildDescription.java

@@ -38,6 +38,7 @@ public class GenerateMakefileWithBuildDescription extends ProcessRunner{
 	/**
 	 * 
 	 */
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/NewManagedProject.java

@@ -49,6 +49,7 @@ public class NewManagedProject extends ProcessRunner {
 		pca = new ProjectCreatedActions();
 	}
 	
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		String location = args[1].getSimpleValue();

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSBooleanOptionValue.java

@@ -40,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
  */
 public class SetMBSBooleanOptionValue extends ProcessRunner {
 	
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringListOptionValues.java

@@ -40,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
  */
 public class SetMBSStringListOptionValues extends ProcessRunner {
 	
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/templateengine/processes/SetMBSStringOptionValue.java

@@ -40,6 +40,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
  */
 public class SetMBSStringOptionValue extends ProcessRunner {
 	
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args, String processId, IProgressMonitor monitor) throws ProcessFailureException {
 		String projectName = args[0].getSimpleValue();
 		IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);

build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/newmake/core/MakeScannerProvider.java

@@ -103,6 +103,7 @@ public class MakeScannerProvider extends ScannerProvider {
 	 * 
 	 * @see org.eclipse.cdt.core.parser.IScannerInfoProvider#getScannerInformation(org.eclipse.core.resources.IResource)
 	 */
+	@Override
 	public IScannerInfo getScannerInformation(IResource resource) {
 		try {
 			getMakeScannerInfo(resource.getProject(), true);

build/org.eclipse.cdt.managedbuilder.gnu.ui/src/org/eclipse/cdt/managedbuilder/gnu/templates/SimpleMakefileGenerator.java

@@ -51,6 +51,7 @@ import org.eclipse.core.runtime.Platform;
 public class SimpleMakefileGenerator extends ProcessRunner {
 
 	private static final String MAKEFILE = "Makefile"; //$NON-NLS-1$
+	@Override
 	public void process(TemplateCore template, ProcessArgument[] args,
 			String processId, IProgressMonitor monitor)
 			throws ProcessFailureException {

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCProjectPlatformPage.java

@@ -38,6 +38,7 @@ public class TestCProjectPlatformPage extends TestCase implements IWizardItemsLi
 	private TestPage page;
 	private boolean currentState=false;
 	
+	@Override
 	protected void setUp() throws Exception {
 		MBSCustomPageManager.init();
 		MBSCustomPageManager.loadExtensions();
@@ -46,6 +47,7 @@ public class TestCProjectPlatformPage extends TestCase implements IWizardItemsLi
 		wizard.addPages();
 	}
 	
+	@Override
 	protected void tearDown() throws Exception {
 		page.dispose();
 		page = null;

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/TestCustomPageManager.java

@@ -50,6 +50,7 @@ public class TestCustomPageManager extends TestCase
 	
 	public static boolean testFlag = false;
 	
+	@Override
 	public void setUp() throws Exception
 	{
 		MBSCustomPageManager.init();

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/testplugin/TestsPlugin.java

@@ -36,6 +36,7 @@ public class TestsPlugin extends AbstractUIPlugin {
 	/**
 	 * This method is called upon plug-in activation
 	 */
+	@Override
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
 	}
@@ -43,6 +44,7 @@ public class TestsPlugin extends AbstractUIPlugin {
 	/**
 	 * This method is called when the plug-in is stopped
 	 */
+	@Override
 	public void stop(BundleContext context) throws Exception {
 		super.stop(context);
 		plugin = null;

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/util/TestToolchain.java

@@ -33,16 +33,19 @@ public class TestToolchain extends HoldsOptions implements IToolChain {
 		// TODO Auto-generated constructor stub
 	}
 
+	@Override
 	public String getManagedBuildRevision() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	@Override
 	public Version getVersion() {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
+	@Override
 	public void setVersion(Version version) {
 		// TODO Auto-generated method stub
 		
@@ -226,16 +229,19 @@ public class TestToolchain extends HoldsOptions implements IToolChain {
 
 	}
 
+	@Override
 	public boolean isDirty() {
 		// TODO Auto-generated method stub
 		return false;
 	}
 
+	@Override
 	public void setDirty(boolean isDirty) {
 		// TODO Auto-generated method stub
 
 	}
 
+	@Override
 	public boolean isExtensionElement() {
 		// TODO Auto-generated method stub
 		return false;
@@ -251,11 +257,13 @@ public class TestToolchain extends HoldsOptions implements IToolChain {
 		return null;
 	}
 
+	@Override
 	public String getId() {
 		return id;
 	
 	}
 
+	@Override
 	public String getName() {
 		// TODO Auto-generated method stub
 		return null;
@@ -276,6 +284,7 @@ public class TestToolchain extends HoldsOptions implements IToolChain {
 		return null;
 	}
 
+	@Override
 	protected IResourceInfo getParentResourceInfo() {
 		// TODO Auto-generated method stub
 		return null;

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/AlwaysPresentWizardPage.java

@@ -32,6 +32,7 @@ public class AlwaysPresentWizardPage extends MBSCustomPage
 		pageID = "org.eclipse.cdt.managedbuilder.ui.tests.wizardPages.AlwaysPresentWizardPage";
 	}
 
+	@Override
 	public boolean canFlipToNextPage()
 	{
 
@@ -125,6 +126,7 @@ public class AlwaysPresentWizardPage extends MBSCustomPage
 
 	}
 
+	@Override
 	protected boolean isCustomPageComplete()
 	{
 		return true;

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureAWizardPage.java

@@ -117,6 +117,7 @@ public class NatureAWizardPage extends MBSCustomPage
 
 	}
 
+	@Override
 	protected boolean isCustomPageComplete()
 	{
 		return true;

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/NatureBWizardPage.java

@@ -117,6 +117,7 @@ public class NatureBWizardPage extends MBSCustomPage
 
 	}
 
+	@Override
 	protected boolean isCustomPageComplete()
 	{
 		return true;

build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/wizardPages/ProjectTypeDWizardPage.java

@@ -117,6 +117,7 @@ public class ProjectTypeDWizardPage extends MBSCustomPage
 
 	}
 
+	@Override
 	protected boolean isCustomPageComplete()
 	{
 		return true;