@Override annotations and redundant casts.

core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java

@@ -46,6 +46,7 @@ public interface IQualifiedTypeName extends Comparable<IQualifiedTypeName> {
 	
 	public boolean equals(IQualifiedTypeName typeName);
 	public boolean equalsIgnoreCase(IQualifiedTypeName typeName);
+	@Override
 	public int compareTo(IQualifiedTypeName typeName);
 	public int compareToIgnoreCase(IQualifiedTypeName typeName);
 }

core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java

@@ -162,10 +162,12 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 		this(rhs.fqn, rhs.fileLocal, rhs.elementType, rhs.index, rhs.params, rhs.returnType, ref);
 	}
 
+	@Override
 	public int getCElementType() {
 		return elementType;
 	}
 
+	@Override
 	public ICProject getEnclosingProject() {
 		if(getResolvedReference()!=null) {
 			IProject project = reference.getProject();
@@ -176,10 +178,12 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 		return null;
 	}
 
+	@Override
 	public String getName() {
 		return fqn[fqn.length-1];
 	}
 
+	@Override
 	public IQualifiedTypeName getQualifiedTypeName() {
 		return new QualifiedTypeName(fqn);
 	}
@@ -187,6 +191,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	/*
 	 * @see org.eclipse.cdt.internal.core.browser.IFunctionInfo#getParameters()
 	 */
+	@Override
 	public String[] getParameters() {
 		return params;
 	}
@@ -194,6 +199,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	/*
 	 * @see org.eclipse.cdt.internal.core.browser.IFunctionInfo#getReturnType()
 	 */
+	@Override
 	public String getReturnType() {
 		return returnType;
 	}
@@ -242,6 +248,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 		return fileLocal != null;
 	}
 
+	@Override
 	public ITypeReference getResolvedReference() {
 		if(reference==null) {
 			if (elementType == ICElement.C_MACRO) {
@@ -369,6 +376,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 		return null;
 	}
 
+	@Override
 	public ITypeReference[] getReferences() {
 		if (elementType == ICElement.C_MACRO) {
 			return getMacroReferences();
@@ -472,6 +480,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public void addDerivedReference(ITypeReference location) {
 		throw new UnsupportedOperationException();
@@ -481,6 +490,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public void addReference(ITypeReference location) {
 		throw new UnsupportedOperationException();
@@ -490,6 +500,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean canSubstituteFor(ITypeInfo info) {
 		throw new UnsupportedOperationException();
@@ -499,6 +510,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean encloses(ITypeInfo info) {
 		throw new UnsupportedOperationException();
@@ -508,6 +520,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean exists() {
 		throw new UnsupportedOperationException();
@@ -517,6 +530,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeReference[] getDerivedReferences() {
 		throw new UnsupportedOperationException();
@@ -526,6 +540,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getEnclosedTypes() {
 		throw new UnsupportedOperationException();
@@ -535,6 +550,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getEnclosedTypes(int[] kinds) {
 		throw new UnsupportedOperationException();
@@ -544,6 +560,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingNamespace(boolean includeGlobalNamespace) {
 		throw new UnsupportedOperationException();
@@ -554,6 +571,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingType() {
 		// TODO not sure
@@ -564,6 +582,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingType(int[] kinds) {
 		throw new UnsupportedOperationException();
@@ -574,6 +593,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getRootNamespace(boolean includeGlobalNamespace) {
 		throw new UnsupportedOperationException();
@@ -583,6 +603,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getSubTypes() {
 		throw new UnsupportedOperationException();
@@ -592,6 +613,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ASTAccessVisibility getSuperTypeAccess(ITypeInfo subType) {
 		throw new UnsupportedOperationException();
@@ -601,6 +623,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getSuperTypes() {
 		throw new UnsupportedOperationException();
@@ -610,6 +633,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean hasEnclosedTypes() {
 		throw new UnsupportedOperationException();
@@ -619,6 +643,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean hasSubTypes() {
 		throw new UnsupportedOperationException();
@@ -628,6 +653,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean hasSuperTypes() {
 		throw new UnsupportedOperationException();
@@ -637,6 +663,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isClass() {
 		throw new UnsupportedOperationException();
@@ -646,6 +673,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosed(ITypeInfo info) {
 		throw new UnsupportedOperationException();
@@ -655,6 +683,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosed(ITypeSearchScope scope) {
 		throw new UnsupportedOperationException();
@@ -664,6 +693,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosedType() {
 		throw new UnsupportedOperationException();
@@ -673,6 +703,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosingType() {
 		throw new UnsupportedOperationException();
@@ -682,6 +713,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isReferenced(ITypeSearchScope scope) {
 		throw new UnsupportedOperationException();
@@ -691,6 +723,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isUndefinedType() {
 		throw new UnsupportedOperationException();
@@ -700,6 +733,7 @@ public class IndexTypeInfo implements ITypeInfo, IFunctionInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public void setCElementType(int type) {
 		throw new UnsupportedOperationException();

core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java

@@ -97,6 +97,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 	    return segments;
 	}
 
+	@Override
 	public String getName() {
 		if (fSegments.length > 0) {
 			return fSegments[fSegments.length - 1];
@@ -104,6 +105,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return EMPTY_STRING;
 	}
 
+	@Override
 	public String[] getEnclosingNames() {
 		if (fSegments.length > 1) {
 			String[] enclosingNames = new String[fSegments.length - 1];
@@ -113,6 +115,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return NO_SEGMENTS;
 	}
 	
+	@Override
 	public String getFullyQualifiedName() {
 		if (fSegments.length > 0) {
 			StringBuffer buf = new StringBuffer(fSegments.length * INITIAL_SEGMENT_LENGTH);
@@ -127,6 +130,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return EMPTY_STRING;
 	}
 
+	@Override
 	public IQualifiedTypeName getEnclosingTypeName() {
 		String[] enclosingNames = getEnclosingNames();
 		if (enclosingNames.length > 0) {
@@ -137,28 +141,34 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return null;
 	}
 
+	@Override
 	public boolean isQualified() {
 		return (fSegments.length > 1);
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return (fSegments.length == 0);
 	}
 	
+	@Override
 	public boolean isGlobal() {
 	    return (fSegments.length <= 1 || fSegments[0].length() == 0);
 	}
 
+	@Override
 	public int segmentCount() {
 		return fSegments.length;
 	}
 
+	@Override
 	public String[] segments() {
 		String[] segmentCopy = new String[fSegments.length];
 		System.arraycopy(fSegments, 0, segmentCopy, 0, fSegments.length);
 		return segmentCopy;
 	}
 	
+	@Override
 	public String segment(int index) {
 		if (index >= fSegments.length) {
 			return null;
@@ -166,6 +176,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return fSegments[index];
 	}
 	
+	@Override
 	public String lastSegment() {
 		if (fSegments.length > 0) {
 			return fSegments[fSegments.length - 1];
@@ -173,6 +184,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return null;
 	}
 	
+	@Override
 	public int matchingFirstSegments(IQualifiedTypeName typeName) {
 		int max = Math.min(fSegments.length, typeName.segmentCount());
 		int count = 0;
@@ -185,6 +197,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return count;
 	}
 
+	@Override
 	public boolean isPrefixOf(IQualifiedTypeName typeName) {
 		if (fSegments.length == 0)
 			return true;
@@ -201,6 +214,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return true;
 	}
 
+	@Override
 	public IQualifiedTypeName append(String[] names) {
 		int length = fSegments.length;
 		int typeNameLength = names.length;
@@ -212,6 +226,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return newTypeName;
 	}
 
+	@Override
 	public IQualifiedTypeName append(IQualifiedTypeName typeName) {
 		int length = fSegments.length;
 		int typeNameLength = typeName.segmentCount();
@@ -225,10 +240,12 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return newTypeName;
 	}
 
+	@Override
 	public IQualifiedTypeName append(String qualifiedName) {
 		return append(createSegments(qualifiedName));
 	}
 	
+	@Override
 	public IQualifiedTypeName removeFirstSegments(int count) {
 		if (count == 0) {
 			return this;
@@ -244,6 +261,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		}
 	}
 
+	@Override
 	public IQualifiedTypeName removeLastSegments(int count) {
 		if (count == 0) {
 			return this;
@@ -259,6 +277,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		}
 	}
 
+	@Override
 	public boolean isLowLevel() {
 		for (int i = 0; i < fSegments.length; ++i) {
 			if (fSegments[i].startsWith("_")) { //$NON-NLS-1$
@@ -268,6 +287,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return false;
 	}
 
+	@Override
 	public boolean isValid() {
 		for (int i = 0; i < fSegments.length; ++i) {
 		    String segment = fSegments[i];
@@ -279,6 +299,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return true;
 	}
 	
+	@Override
 	public boolean isValidSegment(String segment) {
 		if (segment.indexOf(QUALIFIER) != -1)
 		    return false;
@@ -303,6 +324,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return getFullyQualifiedName();
 	}
 
+	@Override
 	public int compareTo(IQualifiedTypeName typeName) {
 		if (typeName == this)
 			return 0;
@@ -322,6 +344,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
         return result;
 	}
 
+	@Override
 	public int compareToIgnoreCase(IQualifiedTypeName typeName) {
 		if (typeName == this)
 			return 0;
@@ -352,6 +375,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
 		return equals((IQualifiedTypeName)obj);
 	}
 	
+	@Override
 	public boolean equals(IQualifiedTypeName typeName) {
 		if (typeName == this)
 			return true;
@@ -369,6 +393,7 @@ public class QualifiedTypeName implements IQualifiedTypeName {
         return true;
 	}
 
+	@Override
 	public boolean equalsIgnoreCase(IQualifiedTypeName typeName) {
 		if (typeName == this)
 			return true;

core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java

@@ -28,6 +28,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public void addReference(ITypeReference location) {
 		throw new UnsupportedOperationException();
@@ -37,6 +38,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeReference[] getReferences() {
 		throw new UnsupportedOperationException();
@@ -46,6 +48,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeReference getResolvedReference() {
 		throw new UnsupportedOperationException();
@@ -64,6 +67,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isReferenced(ITypeSearchScope scope) {
 		throw new UnsupportedOperationException();
@@ -73,6 +77,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isUndefinedType() {
 		throw new UnsupportedOperationException();
@@ -82,6 +87,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean canSubstituteFor(ITypeInfo info) {
 		throw new UnsupportedOperationException();
@@ -95,6 +101,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean exists() {
 		throw new UnsupportedOperationException();
@@ -104,6 +111,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public int getCElementType() {
 		throw new UnsupportedOperationException();
@@ -113,6 +121,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public void setCElementType(int type) {
 		throw new UnsupportedOperationException();
@@ -122,6 +131,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public IQualifiedTypeName getQualifiedTypeName() {
 		throw new UnsupportedOperationException();
@@ -131,6 +141,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public String getName() {
 		throw new UnsupportedOperationException();
@@ -140,6 +151,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosedType() {
 		throw new UnsupportedOperationException();
@@ -149,6 +161,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingType(int kinds[]) {
 		throw new UnsupportedOperationException();
@@ -158,6 +171,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingType() {
 		throw new UnsupportedOperationException();
@@ -167,6 +181,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingNamespace(boolean includeGlobalNamespace) {
 		throw new UnsupportedOperationException();
@@ -176,6 +191,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo getRootNamespace(boolean includeGlobalNamespace) {
 		throw new UnsupportedOperationException();
@@ -185,6 +201,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosingType() {
 		throw new UnsupportedOperationException();
@@ -194,6 +211,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean encloses(ITypeInfo info) {
 		throw new UnsupportedOperationException();
@@ -203,6 +221,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosed(ITypeInfo info) {
 		throw new UnsupportedOperationException();
@@ -212,6 +231,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean hasEnclosedTypes() {
 		throw new UnsupportedOperationException();
@@ -221,6 +241,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getEnclosedTypes() {
 		throw new UnsupportedOperationException();
@@ -230,6 +251,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getEnclosedTypes(int kinds[]) {
 		throw new UnsupportedOperationException();
@@ -239,6 +261,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ICProject getEnclosingProject() {
 		throw new UnsupportedOperationException();
@@ -248,6 +271,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isEnclosed(ITypeSearchScope scope) {
 		throw new UnsupportedOperationException();
@@ -266,6 +290,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public void addDerivedReference(ITypeReference location) {
 		throw new UnsupportedOperationException();
@@ -275,6 +300,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeReference[] getDerivedReferences() {
 		throw new UnsupportedOperationException();
@@ -284,6 +310,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean hasSubTypes() {
 		throw new UnsupportedOperationException();
@@ -293,6 +320,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getSubTypes() {
 		throw new UnsupportedOperationException();
@@ -302,6 +330,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean hasSuperTypes() {
 		throw new UnsupportedOperationException();
@@ -311,6 +340,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ITypeInfo[] getSuperTypes() {
 		throw new UnsupportedOperationException();
@@ -320,6 +350,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public ASTAccessVisibility getSuperTypeAccess(ITypeInfo superType) {
 		throw new UnsupportedOperationException();
@@ -329,6 +360,7 @@ public class TypeInfo implements ITypeInfo {
 	 * @deprecated
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
+	@Override
 	@Deprecated
 	public boolean isClass() {
 		throw new UnsupportedOperationException();

core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java

@@ -76,6 +76,7 @@ public class TypeReference implements ITypeReference {
 		this(workingCopy, project, 0, 0);
 	}
 
+	@Override
 	public IPath getPath() {
 		if (fWorkingCopy != null) {
 			return fWorkingCopy.getPath();
@@ -86,6 +87,7 @@ public class TypeReference implements ITypeReference {
 		}
 	}
 	
+	@Override
 	public IPath getLocation() {
 		if (fWorkingCopy != null) {
 			IResource resource = fWorkingCopy.getUnderlyingResource();
@@ -104,14 +106,17 @@ public class TypeReference implements ITypeReference {
 		}
 	}
 	
+	@Override
 	public IResource getResource() {
 		return fResource;
 	}
 
+	@Override
 	public IWorkingCopy getWorkingCopy() {
 		return fWorkingCopy;
 	}
 	
+	@Override
 	public IProject getProject() {
 		if (fProject != null) {
 			return fProject;
@@ -129,6 +134,7 @@ public class TypeReference implements ITypeReference {
 		}
 	}
 	
+	@Override
 	public ITranslationUnit getTranslationUnit() {
 		ITranslationUnit unit = null;
 		if (fWorkingCopy != null) {
@@ -172,6 +178,7 @@ public class TypeReference implements ITypeReference {
 		return null;
 	}
 
+	@Override
 	public ICElement[] getCElements() {
 		ITranslationUnit unit = getTranslationUnit();
 		if (unit != null) {
@@ -189,14 +196,17 @@ public class TypeReference implements ITypeReference {
 		return null;
 	}
 	
+	@Override
 	public int getOffset() {
 		return fOffset;
 	}
 	
+	@Override
 	public int getLength() {
 		return fLength;
 	}
 	
+	@Override
 	public IPath getRelativeIncludePath(IProject project) {
 		IPath path = getLocation();
 		if (path != null) {
@@ -207,6 +217,7 @@ public class TypeReference implements ITypeReference {
 		return path;
 	}
 	
+	@Override
 	public IPath getRelativePath(IPath relativeToPath) {
 		IPath path = getPath();
 		if (path != null) {
@@ -246,7 +257,8 @@ public class TypeReference implements ITypeReference {
 		return toString().equals(ref.toString());
 	}
 
-    public boolean isLineNumber() {
+    @Override
+	public boolean isLineNumber() {
         return offsetIsLineNumber;
     }
 }

core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java

@@ -57,19 +57,24 @@ public class TypeSearchScope implements ITypeSearchScope {
 		add(project);
 	}
 
+	@Override
 	public Collection<IPath> pathSet() {
 		return fPathSet;
 	}
+	@Override
 	public Collection<IPath> containerSet() {
 		return fContainerSet;
 	}
+	@Override
 	public Collection<ICProject> projectSet() {
 		return fProjectSet;
 	}
+	@Override
 	public Collection<ICProject> enclosingProjectSet() {
 		return fEnclosingProjectSet;
 	}
 
+	@Override
 	public boolean encloses(ITypeSearchScope scope) {
 		if (isWorkspaceScope())
 			return true;
@@ -104,6 +109,7 @@ public class TypeSearchScope implements ITypeSearchScope {
 		return true;
 	}
 
+	@Override
 	public boolean encloses(ICProject project) {
 		if (isWorkspaceScope())
 			return true;
@@ -115,6 +121,7 @@ public class TypeSearchScope implements ITypeSearchScope {
 		return false;
 	}
 	
+	@Override
 	public boolean encloses(IPath path) {
 		if (isWorkspaceScope())
 			return true;
@@ -155,18 +162,22 @@ public class TypeSearchScope implements ITypeSearchScope {
 		return false;
 	}
 
+	@Override
 	public boolean encloses(String path) {
 		return encloses(new Path(path));
 	}
 
+	@Override
 	public boolean encloses(ICElement element) {
 		return encloses(element.getPath());
 	}
 
+	@Override
 	public boolean encloses(IWorkingCopy workingCopy) {
 		return encloses(workingCopy.getOriginalElement().getPath());
 	}
 	
+	@Override
 	public ICProject[] getEnclosingProjects() {
 		if (isWorkspaceScope()) {
 			return getAllProjects();
@@ -242,22 +253,27 @@ public class TypeSearchScope implements ITypeSearchScope {
 		}
 	}
 	
+	@Override
 	public boolean isPathScope() {
 		return !fPathSet.isEmpty();
 	}
 
+	@Override
 	public boolean isProjectScope() {
 		return !fProjectSet.isEmpty();
 	}
 
+	@Override
 	public boolean isWorkspaceScope() {
 		return fWorkspaceScope;
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return (!isWorkspaceScope() && fPathSet.isEmpty() && fContainerSet.isEmpty() && fProjectSet.isEmpty());
 	}
 	
+	@Override
 	public void add(IWorkingCopy workingCopy) {
 		IPath path = workingCopy.getOriginalElement().getPath();
 		ICProject cProject = workingCopy.getCProject();
@@ -265,6 +281,7 @@ public class TypeSearchScope implements ITypeSearchScope {
 		addEnclosingProject(cProject);
 	}
 
+	@Override
 	public void add(IPath path, boolean addSubfolders, ICProject enclosingProject) {
 		if (addSubfolders) {
 			fContainerSet.add(path);
@@ -289,6 +306,7 @@ public class TypeSearchScope implements ITypeSearchScope {
 		}
 	}
 
+	@Override
 	public void add(ICProject project) {
 		fProjectSet.add(project);
 		fProjects = null;
@@ -300,12 +318,14 @@ public class TypeSearchScope implements ITypeSearchScope {
 		fEnclosingProjectSet.add(project);
 	}
 
+	@Override
 	public void addWorkspace() {
 		fWorkspaceScope = true;
 		fProjects = null;
 		fAllProjects = null;
 	}
 	
+	@Override
 	public void add(ICElement elem) {
 		if (elem == null)
 			return;
@@ -349,6 +369,7 @@ public class TypeSearchScope implements ITypeSearchScope {
 		}
 	}
 
+	@Override
 	public void add(ITypeSearchScope scope) {
 		fPathSet.addAll(scope.pathSet());
 		fContainerSet.addAll(scope.containerSet());
@@ -360,6 +381,7 @@ public class TypeSearchScope implements ITypeSearchScope {
 		fWorkspaceScope |= scope.isWorkspaceScope();
 	}
 	
+	@Override
 	public void clear() {
 		fPathSet.clear();
 		fContainerSet.clear();

core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java

@@ -107,26 +107,32 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo {
 		this.reference= reference;
 	}
 	
+	@Override
 	public int getCElementType() {
 		return elementType;
 	}
 
+	@Override
 	public String getName() {
 		return fqn[fqn.length-1];
 	}
 
+	@Override
 	public IQualifiedTypeName getQualifiedTypeName() {
 		return new QualifiedTypeName(fqn);
 	}
 
+	@Override
 	public ITypeReference getResolvedReference() {
 		return reference;
 	}
 
+	@Override
 	public ITypeReference[] getReferences() {
 		return new ITypeReference[] {reference};
 	}
 
+	@Override
 	public ICProject getEnclosingProject() {
 		if(getResolvedReference()!=null) {
 			IProject project = reference.getProject();
@@ -137,6 +143,7 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo {
 		return null;
 	}
 
+	@Override
 	public String[] getParameters() {
 		return params;
 	}
@@ -144,6 +151,7 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo {
 	/*
 	 * @see org.eclipse.cdt.internal.core.browser.IFunctionInfo#getReturnType()
 	 */
+	@Override
 	public String getReturnType() {
 		return returnType;
 	}
@@ -206,132 +214,158 @@ public class ASTTypeInfo implements ITypeInfo, IFunctionInfo {
 		return null;
 	}
 	
+	@Override
 	@Deprecated
 	public void addDerivedReference(ITypeReference location) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public void addReference(ITypeReference location) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean canSubstituteFor(ITypeInfo info) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean encloses(ITypeInfo info) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean exists() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeReference[] getDerivedReferences() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo[] getEnclosedTypes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo[] getEnclosedTypes(int[] kinds) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingNamespace(boolean includeGlobalNamespace) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingType() {
 		// TODO not sure
 		return null;
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo getEnclosingType(int[] kinds) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo getRootNamespace(boolean includeGlobalNamespace) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo[] getSubTypes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ASTAccessVisibility getSuperTypeAccess(ITypeInfo subType) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public ITypeInfo[] getSuperTypes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean hasEnclosedTypes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean hasSubTypes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean hasSuperTypes() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean isClass() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean isEnclosed(ITypeInfo info) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean isEnclosed(ITypeSearchScope scope) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean isEnclosedType() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean isEnclosingType() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean isReferenced(ITypeSearchScope scope) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public boolean isUndefinedType() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	@Deprecated
 	public void setCElementType(int type) {
 		throw new UnsupportedOperationException();

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java

@@ -268,22 +268,22 @@ public class CDataUtil {
 
 	public static ICLanguageSettingEntry createEntry(ICLanguageSettingEntry entry, int flags){
 		switch (entry.getKind()){
-		case ICLanguageSettingEntry.INCLUDE_PATH:
+		case ICSettingEntry.INCLUDE_PATH:
 			entry = new CIncludePathEntry(entry.getName(), flags);
 			break;
-		case ICLanguageSettingEntry.MACRO:
+		case ICSettingEntry.MACRO:
 			entry = new CMacroEntry(entry.getName(), entry.getValue(), flags);
 			break;
-		case ICLanguageSettingEntry.INCLUDE_FILE:
+		case ICSettingEntry.INCLUDE_FILE:
 			entry = new CIncludeFileEntry(entry.getName(), flags);
 			break;
-		case ICLanguageSettingEntry.MACRO_FILE:
+		case ICSettingEntry.MACRO_FILE:
 			entry = new CMacroFileEntry(entry.getName(), flags);
 			break;
-		case ICLanguageSettingEntry.LIBRARY_PATH:
+		case ICSettingEntry.LIBRARY_PATH:
 			entry = new CLibraryPathEntry(entry.getName(), flags);
 			break;
-		case ICLanguageSettingEntry.LIBRARY_FILE:
+		case ICSettingEntry.LIBRARY_FILE:
 			ICLibraryFileEntry libFile = (ICLibraryFileEntry)entry;
 			entry = new CLibraryFileEntry(entry.getName(),
 					flags,
@@ -303,21 +303,21 @@ public class CDataUtil {
 
 	public static ICSettingEntry createEntry(int kind, String name, String value, IPath[] exclusionPatterns, int flags, IPath srcPath, IPath srcRootPath, IPath srcPrefixMapping){
 		switch (kind){
-		case ICLanguageSettingEntry.INCLUDE_PATH:
+		case ICSettingEntry.INCLUDE_PATH:
 			return new CIncludePathEntry(name, flags);
-		case ICLanguageSettingEntry.MACRO:
+		case ICSettingEntry.MACRO:
 			return new CMacroEntry(name, value, flags);
-		case ICLanguageSettingEntry.INCLUDE_FILE:
+		case ICSettingEntry.INCLUDE_FILE:
 			return new CIncludeFileEntry(name, flags);
-		case ICLanguageSettingEntry.MACRO_FILE:
+		case ICSettingEntry.MACRO_FILE:
 			return new CMacroFileEntry(name, flags);
-		case ICLanguageSettingEntry.LIBRARY_PATH:
+		case ICSettingEntry.LIBRARY_PATH:
 			return new CLibraryPathEntry(name, flags);
-		case ICLanguageSettingEntry.LIBRARY_FILE:
+		case ICSettingEntry.LIBRARY_FILE:
 			return new CLibraryFileEntry(name, flags, srcPath, srcRootPath, srcPrefixMapping);
-		case ICLanguageSettingEntry.OUTPUT_PATH:
+		case ICSettingEntry.OUTPUT_PATH:
 			return new COutputEntry(name, exclusionPatterns, flags);
-		case ICLanguageSettingEntry.SOURCE_PATH:
+		case ICSettingEntry.SOURCE_PATH:
 			return new CSourceEntry(name, exclusionPatterns, flags);
 		}
 		throw new IllegalArgumentException();
@@ -583,10 +583,10 @@ public class CDataUtil {
 
 			if(addLang){
 				CLanguageData lData = factory.createLanguageData(cfgData, data, genId(data.getId()), des.getName(), des.getId(),
-						ICLanguageSettingEntry.INCLUDE_FILE
+						ICSettingEntry.INCLUDE_FILE
-						| ICLanguageSettingEntry.INCLUDE_PATH
+						| ICSettingEntry.INCLUDE_PATH
-						| ICLanguageSettingEntry.MACRO
+						| ICSettingEntry.MACRO
-						| ICLanguageSettingEntry.MACRO_FILE,
+						| ICSettingEntry.MACRO_FILE,
 						ctypeIds, true);
 				factory.link(data, lData);
 			}
@@ -778,11 +778,11 @@ public class CDataUtil {
 		ICSourceEntry entry;
 		if(absolute){
 			if(project != null)
-				entry = new CSourceEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED);
+				entry = new CSourceEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED);
 			else
-				entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED);
+				entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED);
 		} else {
-			entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED);
+			entry = new CSourceEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED);
 		}
 		return new ICSourceEntry[]{entry};
 	}
@@ -791,11 +791,11 @@ public class CDataUtil {
 		ICOutputEntry entry;
 		if(absolute){
 			if(project != null)
-				entry = new COutputEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED);
+				entry = new COutputEntry(project.getFullPath(), null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED);
 			else
-				entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED);
+				entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED);
 		} else {
-			entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSourceEntry.RESOLVED);
+			entry = new COutputEntry(Path.EMPTY, null, ICSettingEntry.VALUE_WORKSPACE_PATH | ICSettingEntry.RESOLVED);
 		}
 		return new ICOutputEntry[]{entry};
 	}

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java

@@ -23,6 +23,7 @@ import org.eclipse.cdt.core.settings.model.ICLibraryFileEntry;
 import org.eclipse.cdt.core.settings.model.ICLibraryPathEntry;
 import org.eclipse.cdt.core.settings.model.ICMacroEntry;
 import org.eclipse.cdt.core.settings.model.ICMacroFileEntry;
+import org.eclipse.cdt.core.settings.model.ICSettingEntry;
 
 public class EntryStore {
 	private KindBasedStore<ArrayList<ICLanguageSettingEntry>> fStore = new KindBasedStore<ArrayList<ICLanguageSettingEntry>>();
@@ -67,17 +68,17 @@ public class EntryStore {
 		if(list == null)
 			list = new ArrayList<ICLanguageSettingEntry>(0);
 		switch(kind){
-		case ICLanguageSettingEntry.INCLUDE_PATH:
+		case ICSettingEntry.INCLUDE_PATH:
 			return list.toArray(new ICIncludePathEntry[list.size()]);
-		case ICLanguageSettingEntry.INCLUDE_FILE:
+		case ICSettingEntry.INCLUDE_FILE:
 			return list.toArray(new ICIncludeFileEntry[list.size()]);
-		case ICLanguageSettingEntry.MACRO:
+		case ICSettingEntry.MACRO:
 			return list.toArray(new ICMacroEntry[list.size()]);
-		case ICLanguageSettingEntry.MACRO_FILE:
+		case ICSettingEntry.MACRO_FILE:
 			return list.toArray(new ICMacroFileEntry[list.size()]);
-		case ICLanguageSettingEntry.LIBRARY_PATH:
+		case ICSettingEntry.LIBRARY_PATH:
 			return list.toArray(new ICLibraryPathEntry[list.size()]);
-		case ICLanguageSettingEntry.LIBRARY_FILE:
+		case ICSettingEntry.LIBRARY_FILE:
 			return list.toArray(new ICLibraryFileEntry[list.size()]);
 		default:
 			throw new IllegalArgumentException();

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java

@@ -97,17 +97,17 @@ public class KindBasedStore<T> implements Cloneable {
 
 	private int kindToIndex(int kind){
 		switch (kind){
-		case ICLanguageSettingEntry.INCLUDE_PATH:
+		case ICSettingEntry.INCLUDE_PATH:
 			return INDEX_INCLUDE_PATH;
-		case ICLanguageSettingEntry.INCLUDE_FILE:
+		case ICSettingEntry.INCLUDE_FILE:
 			return INDEX_INCLUDE_FILE;
-		case ICLanguageSettingEntry.MACRO:
+		case ICSettingEntry.MACRO:
 			return INDEX_MACRO;
-		case ICLanguageSettingEntry.MACRO_FILE:
+		case ICSettingEntry.MACRO_FILE:
 			return INDEX_MACRO_FILE;
-		case ICLanguageSettingEntry.LIBRARY_PATH:
+		case ICSettingEntry.LIBRARY_PATH:
 			return INDEX_LIBRARY_PATH;
-		case ICLanguageSettingEntry.LIBRARY_FILE:
+		case ICSettingEntry.LIBRARY_FILE:
 			return INDEX_LIBRARY_FILE;
 		case ICSettingEntry.SOURCE_PATH:
 			if(INDEX_SOURCE_PATH < fEntryStorage.length)
@@ -132,17 +132,17 @@ public class KindBasedStore<T> implements Cloneable {
 	private int indexToKind(int index){
 		switch (index){
 		case INDEX_INCLUDE_PATH:
-			return ICLanguageSettingEntry.INCLUDE_PATH;
+			return ICSettingEntry.INCLUDE_PATH;
 		case INDEX_INCLUDE_FILE:
-			return ICLanguageSettingEntry.INCLUDE_FILE;
+			return ICSettingEntry.INCLUDE_FILE;
 		case INDEX_MACRO:
-			return ICLanguageSettingEntry.MACRO;
+			return ICSettingEntry.MACRO;
 		case INDEX_MACRO_FILE:
-			return ICLanguageSettingEntry.MACRO_FILE;
+			return ICSettingEntry.MACRO_FILE;
 		case INDEX_LIBRARY_PATH:
-			return ICLanguageSettingEntry.LIBRARY_PATH;
+			return ICSettingEntry.LIBRARY_PATH;
 		case INDEX_LIBRARY_FILE:
-			return ICLanguageSettingEntry.LIBRARY_FILE;
+			return ICSettingEntry.LIBRARY_FILE;
 		case INDEX_SOURCE_PATH:
 			return ICSettingEntry.SOURCE_PATH;
 		case INDEX_OUPUT_PATH:

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java

@@ -103,25 +103,25 @@ public class LanguageSettingEntriesSerializer {
 
 		
 		switch(kind){
-		case ICLanguageSettingEntry.INCLUDE_PATH:
+		case ICSettingEntry.INCLUDE_PATH:
 			return new CIncludePathEntry(name, flags);
-		case ICLanguageSettingEntry.INCLUDE_FILE:
+		case ICSettingEntry.INCLUDE_FILE:
 			return new CIncludeFileEntry(name, flags);
-		case ICLanguageSettingEntry.MACRO:
+		case ICSettingEntry.MACRO:
 			String value = el.getAttribute(ATTRIBUTE_VALUE);
 			return new CMacroEntry(name, value, flags);
-		case ICLanguageSettingEntry.MACRO_FILE:
+		case ICSettingEntry.MACRO_FILE:
 			return new CMacroFileEntry(name, flags);
-		case ICLanguageSettingEntry.LIBRARY_PATH:
+		case ICSettingEntry.LIBRARY_PATH:
 			return new CLibraryPathEntry(name, flags);
-		case ICLanguageSettingEntry.LIBRARY_FILE:
+		case ICSettingEntry.LIBRARY_FILE:
 			IPath srcPath = loadPath(el, ATTRIBUTE_SOURCE_ATTACHMENT_PATH);
 			IPath srcRootPath = loadPath(el, ATTRIBUTE_SOURCE_ATTACHMENT_ROOT_PATH);
 			IPath srcPrefixMapping = loadPath(el, ATTRIBUTE_SOURCE_ATTACHMENT_PREFIX_MAPPING);
 			return new CLibraryFileEntry(name, flags, srcPath, srcRootPath, srcPrefixMapping);
-		case ICLanguageSettingEntry.OUTPUT_PATH:
+		case ICSettingEntry.OUTPUT_PATH:
 			return new COutputEntry(name, loadExclusions(el), flags);
-		case ICLanguageSettingEntry.SOURCE_PATH:
+		case ICSettingEntry.SOURCE_PATH:
 			return new CSourceEntry(name, loadExclusions(el), flags);
 		}
 		return null;
@@ -183,16 +183,16 @@ public class LanguageSettingEntriesSerializer {
 		element.setAttribute(ATTRIBUTE_FLAGS, flags);
 		element.setAttribute(ATTRIBUTE_NAME, name);
 		switch(entry.getKind()){
-		case ICLanguageSettingEntry.MACRO:
+		case ICSettingEntry.MACRO:
 			String value = entry.getValue();
 			element.setAttribute(ATTRIBUTE_VALUE, value);
 			break;
-		case ICLanguageSettingEntry.SOURCE_PATH:
+		case ICSettingEntry.SOURCE_PATH:
-		case ICLanguageSettingEntry.OUTPUT_PATH:
+		case ICSettingEntry.OUTPUT_PATH:
 			IPath paths[] = ((ICExclusionPatternPathEntry)entry).getExclusionPatterns();
 			storeExclusions(element, paths);
 			break;
-		case ICLanguageSettingEntry.LIBRARY_FILE:
+		case ICSettingEntry.LIBRARY_FILE:
 			ICLibraryFileEntry libFile = (ICLibraryFileEntry)entry;
 			IPath path = libFile.getSourceAttachmentPath();
 			if(path != null)
@@ -210,21 +210,21 @@ public class LanguageSettingEntriesSerializer {
 	
 	public static String kindToString(int kind){
 		switch(kind){
-		case ICLanguageSettingEntry.INCLUDE_PATH:
+		case ICSettingEntry.INCLUDE_PATH:
 			return INCLUDE_PATH;
-		case ICLanguageSettingEntry.INCLUDE_FILE:
+		case ICSettingEntry.INCLUDE_FILE:
 			return INCLUDE_FILE;
-		case ICLanguageSettingEntry.MACRO:
+		case ICSettingEntry.MACRO:
 			return MACRO;
-		case ICLanguageSettingEntry.MACRO_FILE:
+		case ICSettingEntry.MACRO_FILE:
 			return MACRO_FILE;
-		case ICLanguageSettingEntry.LIBRARY_PATH:
+		case ICSettingEntry.LIBRARY_PATH:
 			return LIBRARY_PATH;
-		case ICLanguageSettingEntry.LIBRARY_FILE:
+		case ICSettingEntry.LIBRARY_FILE:
 			return LIBRARY_FILE;
-		case ICLanguageSettingEntry.SOURCE_PATH:
+		case ICSettingEntry.SOURCE_PATH:
 			return SOURCE_PATH;
-		case ICLanguageSettingEntry.OUTPUT_PATH:
+		case ICSettingEntry.OUTPUT_PATH:
 			return OUTPUT_PATH;
 		}
 		throw new IllegalArgumentException();
@@ -232,49 +232,49 @@ public class LanguageSettingEntriesSerializer {
 
 	public static int stringToKind(String kind){
 		if(INCLUDE_PATH.equals(kind))
-			return ICLanguageSettingEntry.INCLUDE_PATH;
+			return ICSettingEntry.INCLUDE_PATH;
 		if(INCLUDE_FILE.equals(kind))
-			return ICLanguageSettingEntry.INCLUDE_FILE;
+			return ICSettingEntry.INCLUDE_FILE;
 		if(MACRO.equals(kind))
-			return ICLanguageSettingEntry.MACRO;
+			return ICSettingEntry.MACRO;
 		if(MACRO_FILE.equals(kind))
-			return ICLanguageSettingEntry.MACRO_FILE;
+			return ICSettingEntry.MACRO_FILE;
 		if(LIBRARY_PATH.equals(kind))
-			return ICLanguageSettingEntry.LIBRARY_PATH;
+			return ICSettingEntry.LIBRARY_PATH;
 		if(LIBRARY_FILE.equals(kind))
-			return ICLanguageSettingEntry.LIBRARY_FILE;
+			return ICSettingEntry.LIBRARY_FILE;
 		if(SOURCE_PATH.equals(kind))
-			return ICLanguageSettingEntry.SOURCE_PATH;
+			return ICSettingEntry.SOURCE_PATH;
 		if(OUTPUT_PATH.equals(kind))
-			return ICLanguageSettingEntry.OUTPUT_PATH;
+			return ICSettingEntry.OUTPUT_PATH;
 		return 0;
 //		throw new UnsupportedOperationException();
 	}
 
 	public static String composeFlagsString(int flags){
 		StringBuffer buf = new StringBuffer();
-		if((flags & ICLanguageSettingEntry.BUILTIN) != 0){
+		if((flags & ICSettingEntry.BUILTIN) != 0){
 			buf.append(BUILTIN);
 		}
-		if((flags & ICLanguageSettingEntry.READONLY) != 0){
+		if((flags & ICSettingEntry.READONLY) != 0){
 			if(buf.length() != 0)
 				buf.append(FLAGS_SEPARATOR);
 			
 			buf.append(READONLY);
 		}
-		if((flags & ICLanguageSettingEntry.LOCAL) != 0){
+		if((flags & ICSettingEntry.LOCAL) != 0){
 			if(buf.length() != 0)
 				buf.append(FLAGS_SEPARATOR);
 			
 			buf.append(LOCAL);
 		}
-		if((flags & ICLanguageSettingEntry.VALUE_WORKSPACE_PATH) != 0){
+		if((flags & ICSettingEntry.VALUE_WORKSPACE_PATH) != 0){
 			if(buf.length() != 0)
 				buf.append(FLAGS_SEPARATOR);
 			
 			buf.append(VALUE_WORKSPACE_PATH);
 		}
-		if((flags & ICLanguageSettingEntry.RESOLVED) != 0){
+		if((flags & ICSettingEntry.RESOLVED) != 0){
 			if(buf.length() != 0)
 				buf.append(FLAGS_SEPARATOR);
 			
@@ -293,15 +293,15 @@ public class LanguageSettingEntriesSerializer {
 		while(tokenizer.hasMoreElements()){
 			f = tokenizer.nextToken();
 			if(BUILTIN.equals(f))
-				flags |= ICLanguageSettingEntry.BUILTIN; 
+				flags |= ICSettingEntry.BUILTIN; 
 			if(READONLY.equals(f))
-				flags |= ICLanguageSettingEntry.READONLY; 
+				flags |= ICSettingEntry.READONLY; 
 			if(LOCAL.equals(f))
-				flags |= ICLanguageSettingEntry.LOCAL; 
+				flags |= ICSettingEntry.LOCAL; 
 			if(VALUE_WORKSPACE_PATH.equals(f))
-				flags |= ICLanguageSettingEntry.VALUE_WORKSPACE_PATH; 
+				flags |= ICSettingEntry.VALUE_WORKSPACE_PATH; 
 			if(RESOLVED.equals(f))
-				flags |= ICLanguageSettingEntry.RESOLVED; 
+				flags |= ICSettingEntry.RESOLVED; 
 		}
 		
 		return flags;

core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java

@@ -37,7 +37,7 @@ class CSettingsRefInfo {
 	CSettingsRefInfo(ICStorageElement el) {
 		for (ICStorageElement child : el.getChildren()) {
 			String name = child.getName();
-			if(CRefSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER.equals(name)) {
+			if(CExternalSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER.equals(name)) {
 				CRefSettingsHolder h = new CRefSettingsHolder(child);
 				CContainerRef r = h.getContainerInfo();
 				fESHolderMap.put(r, h);
@@ -74,7 +74,7 @@ class CSettingsRefInfo {
 
 	void serialize(ICStorageElement element){
 		for (CRefSettingsHolder h : fESHolderMap.values()) {
-			ICStorageElement child = element.createChild(CRefSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER);
+			ICStorageElement child = element.createChild(CExternalSettingsHolder.ELEMENT_EXT_SETTINGS_CONTAINER);
 			h.serialize(child);
 		}
 	}

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java

@@ -36,21 +36,25 @@ public class ASTCompletionNode implements IASTCompletionNode {
 	}
 
 
+	@Override
 	public String getPrefix() {
 		return completionToken.getType() == IToken.tEOC ? "" : completionToken.getImage(); //$NON-NLS-1$
 	}
 
 
+	@Override
 	public int getLength() {
 		return completionToken.getLength();
 	}
 
 
+	@Override
 	public IASTName[] getNames() {
 		return names.toArray(new IASTName[names.size()]);
 	}
 
 
+	@Override
 	public IASTTranslationUnit getTranslationUnit() {
 		return translationUnit;
 	}

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java

@@ -20,6 +20,7 @@ public class ASTTypeMatcher implements IObjectMatcher {
 	/**
 	 * Returns <code>true</code> if the two objects are equal or represent the same type.
 	 */
+	@Override
 	public boolean isEquivalent(Object o1, Object o2) {
 		if (o1 == o2) {
 			return true;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java

@@ -476,14 +476,14 @@ public class ASTTypeUtil {
 				} else {
 					// Output reference, qualifier and typedef, then stop.
 					if (ref != null) {
-						types = (IType[]) ArrayUtil.append(IType.class, types, ref);
+						types = ArrayUtil.append(IType.class, types, ref);
 						ref= null;
 					}
 					if (cvq != null) {
-						types = (IType[]) ArrayUtil.append(IType.class, types, cvq);
+						types = ArrayUtil.append(IType.class, types, cvq);
 						cvq= null;
 					}
-					types = (IType[]) ArrayUtil.append(IType.class, types, type);
+					types = ArrayUtil.append(IType.class, types, type);
 					type= null; 
 				}
 			} else {
@@ -509,14 +509,14 @@ public class ASTTypeUtil {
 					} else {
 						// no reference, no cv qualifier: output reference and cv-qualifier
 						if (ref != null) {
-							types = (IType[]) ArrayUtil.append(IType.class, types, ref);
+							types = ArrayUtil.append(IType.class, types, ref);
 							ref= null;
 						}
 						if (cvq != null) {
-							types = (IType[]) ArrayUtil.append(IType.class, types, cvq);
+							types = ArrayUtil.append(IType.class, types, cvq);
 							cvq= null;
 						}
-						types = (IType[]) ArrayUtil.append(IType.class, types, type);
+						types = ArrayUtil.append(IType.class, types, type);
 					} 
 				}
 			}

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java

@@ -35,10 +35,12 @@ public interface IASTASMDeclaration extends IASTDeclaration {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTASMDeclaration copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTASMDeclaration copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java

@@ -54,6 +54,8 @@ public interface IASTBinaryTypeIdExpression extends IASTExpression {
 	 */
 	public void setOperand2(IASTTypeId typeId);
 
+	@Override
 	public IASTBinaryTypeIdExpression copy();
+	@Override
 	public IASTBinaryTypeIdExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java

@@ -21,10 +21,12 @@ public interface IASTBreakStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTBreakStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTBreakStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java

@@ -44,10 +44,12 @@ public interface IASTCaseStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTCaseStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTCaseStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java

@@ -91,11 +91,13 @@ public interface IASTConditionalExpression extends IASTExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTConditionalExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTConditionalExpression copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java

@@ -21,10 +21,12 @@ public interface IASTContinueStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTContinueStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTContinueStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java

@@ -22,10 +22,12 @@ public interface IASTDeclaration extends IASTNode {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTDeclaration copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTDeclaration copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java

@@ -42,11 +42,13 @@ public interface IASTDeclarationStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTDeclarationStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTDeclarationStatement copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java

@@ -24,10 +24,12 @@ public interface IASTDefaultStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTDefaultStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTDefaultStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java

@@ -66,11 +66,13 @@ public interface IASTDoStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTDoStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTDoStatement copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java

@@ -78,5 +78,6 @@ public interface IASTElaboratedTypeSpecifier extends IASTDeclSpecifier, IASTName
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTElaboratedTypeSpecifier copy();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java

@@ -75,11 +75,13 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
 		/**
 		 * @since 5.1
 		 */
+		@Override
 		public IASTEnumerator copy();
 
 		/**
 		 * @since 5.3
 		 */
+		@Override
 		public IASTEnumerator copy(CopyStyle style);
 
 	}
@@ -129,10 +131,12 @@ public interface IASTEnumerationSpecifier extends IASTDeclSpecifier, IASTNameOwn
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTEnumerationSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTEnumerationSpecifier copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java

@@ -73,10 +73,12 @@ public interface IASTExpression extends IASTInitializerClause {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java

@@ -42,10 +42,12 @@ public interface IASTExpressionStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTExpressionStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTExpressionStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java

@@ -45,10 +45,12 @@ public interface IASTFieldDeclarator extends IASTDeclarator {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTFieldDeclarator copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTFieldDeclarator copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java

@@ -83,11 +83,13 @@ public interface IASTFieldReference extends IASTExpression, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTFieldReference copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTFieldReference copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java

@@ -28,11 +28,13 @@ public interface IASTFileLocation extends IASTNodeLocation {
 	/**
 	 * Returns the offset within the file where this location starts.
 	 */
+	@Override
 	public int getNodeOffset();
 
 	/**
 	 * Returns the length of this location in terms of characters.
 	 */
+	@Override
 	public int getNodeLength();
 
     /**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java

@@ -116,10 +116,12 @@ public interface IASTForStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTForStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTForStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java

@@ -43,11 +43,13 @@ public interface IASTFunctionCallExpression extends IASTExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTFunctionCallExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTFunctionCallExpression copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java

@@ -22,10 +22,12 @@ public interface IASTFunctionDeclarator extends IASTDeclarator {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTFunctionDeclarator copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTFunctionDeclarator copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java

@@ -38,11 +38,13 @@ public interface IASTGotoStatement extends IASTStatement, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTGotoStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTGotoStatement copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java

@@ -42,10 +42,12 @@ public interface IASTIdExpression extends IASTExpression, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTIdExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTIdExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java

@@ -89,10 +89,12 @@ public interface IASTIfStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTIfStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTIfStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java

@@ -31,6 +31,7 @@ public interface IASTImplicitName extends IASTName {
 	 * Will not return null or a problem binding.
      * Implicit names are not generated unless they resolve to something.
 	 */
+	@Override
 	public IBinding resolveBinding();
 
 	/**
@@ -58,5 +59,6 @@ public interface IASTImplicitName extends IASTName {
 	 * 
 	 * @throws UnsupportedOperationException always
 	 */
+	@Override
 	IASTName copy() throws UnsupportedOperationException;
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java

@@ -26,10 +26,12 @@ public interface IASTInitializer extends IASTNode {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTInitializer copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTInitializer copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java

@@ -18,10 +18,12 @@ package org.eclipse.cdt.core.dom.ast;
  */
 public interface IASTInitializerClause extends IASTNode {
 	
+	@Override
 	IASTInitializerClause copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	IASTInitializerClause copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java

@@ -44,10 +44,12 @@ public interface IASTInitializerExpression extends IASTEqualsInitializer {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTInitializerExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTInitializerExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java

@@ -49,11 +49,13 @@ public interface IASTInitializerList extends IASTInitializer, IASTInitializerCla
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTInitializerList copy();
 	
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTInitializerList copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java

@@ -46,11 +46,13 @@ public interface IASTLabelStatement extends IASTStatement, IASTNameOwner {
     /**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTLabelStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTLabelStatement copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java

@@ -34,6 +34,7 @@ public interface IASTMacroExpansion extends IASTNodeLocation {
 	 * nodes within the same macro-expansion. However, it does not serve as an offset
 	 * into a file.
 	 */
+	@Override
 	public int getNodeOffset();
 
 	/**
@@ -41,6 +42,7 @@ public interface IASTMacroExpansion extends IASTNodeLocation {
 	 * with others from within the same macro-expansion. However, the length does not neccessarily
 	 * relate to a length in terms of characters.
 	 */
+	@Override
 	public int getNodeLength();
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java

@@ -30,6 +30,7 @@ public interface IASTMacroExpansionLocation extends IASTNodeLocation {
 	 * nodes within the same macro-expansion. However, it does not serve as an offset
 	 * into a file.
 	 */
+	@Override
 	public int getNodeOffset();
 
 	/**
@@ -37,5 +38,6 @@ public interface IASTMacroExpansionLocation extends IASTNodeLocation {
 	 * with others from within the same macro-expansion. However, the length does not neccessarily
 	 * relate to a length in terms of characters.
 	 */
+	@Override
 	public int getNodeLength();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java

@@ -43,5 +43,6 @@ public interface IASTNamedTypeSpecifier extends IASTDeclSpecifier, IASTNameOwner
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTNamedTypeSpecifier copy();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java

@@ -21,10 +21,12 @@ public interface IASTNullStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTNullStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTNullStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java

@@ -53,6 +53,7 @@ public interface IASTPreprocessorIncludeStatement extends IASTPreprocessorStatem
 	 * Returns whether this include directive was actually taken.
 	 * @since 4.0
 	 */
+	@Override
 	public boolean isActive();
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java

@@ -46,6 +46,7 @@ public interface IASTPreprocessorMacroDefinition extends IASTPreprocessorStateme
 	 * Returns whether this macro definition occurs in active code.
 	 * @since 5.1
 	 */
+	@Override
 	public boolean isActive();
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java

@@ -28,5 +28,6 @@ public interface IASTPreprocessorUndefStatement extends	IASTPreprocessorStatemen
 	 * Returns whether this macro definition occurs in active code.
 	 * @since 5.1
 	 */
+	@Override
 	public boolean isActive();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java

@@ -23,10 +23,12 @@ public interface IASTProblem extends IProblem, IASTNode {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTProblem copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTProblem copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java

@@ -22,10 +22,12 @@ public interface IASTProblemDeclaration extends IASTDeclaration, IASTProblemHold
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTProblemDeclaration copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTProblemDeclaration copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java

@@ -22,10 +22,12 @@ public interface IASTProblemExpression extends IASTExpression, IASTProblemHolder
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTProblemExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTProblemExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java

@@ -22,10 +22,12 @@ public interface IASTProblemStatement extends IASTStatement, IASTProblemHolder {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTProblemStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTProblemStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java

@@ -22,10 +22,12 @@ public interface IASTProblemTypeId extends IASTTypeId, IASTProblemHolder {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTProblemTypeId copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTProblemTypeId copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java

@@ -48,10 +48,12 @@ public interface IASTReturnStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTReturnStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTReturnStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java

@@ -105,6 +105,7 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTSimpleDeclSpecifier copy();
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java

@@ -69,10 +69,12 @@ public interface IASTSimpleDeclaration extends IASTDeclaration {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTSimpleDeclaration copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTSimpleDeclaration copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java

@@ -25,11 +25,13 @@ public interface IASTStatement extends IASTNode {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTStatement copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java

@@ -68,10 +68,12 @@ public interface IASTSwitchStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTSwitchStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTSwitchStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java

@@ -63,10 +63,12 @@ public interface IASTTypeId extends IASTNode {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTTypeId copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTTypeId copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java

@@ -169,10 +169,12 @@ public interface IASTTypeIdExpression extends IASTExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTTypeIdExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTTypeIdExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java

@@ -56,5 +56,6 @@ public interface IASTTypeIdInitializerExpression extends IASTExpression {
 	 */
 	public void setInitializer(IASTInitializer initializer);
 	
+	@Override
 	public IASTTypeIdInitializerExpression copy();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java

@@ -162,10 +162,12 @@ public interface IASTUnaryExpression extends IASTExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTUnaryExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTUnaryExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java

@@ -62,10 +62,12 @@ public interface IASTWhileStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IASTWhileStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IASTWhileStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java

@@ -25,5 +25,6 @@ public interface IParameter extends IVariable {
 	 * Inherited from {@link IVariable}, always returns <code>null</code>.
 	 * @since 5.1
 	 */
+	@Override
 	IValue getInitialValue();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java

@@ -47,10 +47,12 @@ public interface ICASTArrayDesignator extends ICASTDesignator {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTArrayDesignator copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTArrayDesignator copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java

@@ -99,10 +99,12 @@ public interface ICASTArrayModifier extends IASTArrayModifier {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTArrayModifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTArrayModifier copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java

@@ -23,10 +23,12 @@ public interface ICASTCompositeTypeSpecifier extends IASTCompositeTypeSpecifier,
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTCompositeTypeSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTCompositeTypeSpecifier copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java

@@ -24,6 +24,7 @@ public interface ICASTDeclSpecifier extends IASTDeclSpecifier {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTDeclSpecifier copy();
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java

@@ -57,11 +57,13 @@ public interface ICASTDesignatedInitializer extends IASTInitializer, IASTInitial
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTDesignatedInitializer copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTDesignatedInitializer copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java

@@ -23,10 +23,12 @@ public interface ICASTDesignator extends IASTNode {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTDesignator copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTDesignator copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java

@@ -25,10 +25,12 @@ public interface ICASTElaboratedTypeSpecifier extends
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTElaboratedTypeSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTElaboratedTypeSpecifier copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java

@@ -24,10 +24,12 @@ public interface ICASTEnumerationSpecifier extends ICASTDeclSpecifier,
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTEnumerationSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTEnumerationSpecifier copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java

@@ -46,10 +46,12 @@ public interface ICASTFieldDesignator extends ICASTDesignator {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTFieldDesignator copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTFieldDesignator copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java

@@ -24,10 +24,12 @@ public interface ICASTPointer extends IASTPointer {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTPointer copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTPointer copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java

@@ -24,11 +24,13 @@ public interface ICASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICAST
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTSimpleDeclSpecifier copy();
 	
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTSimpleDeclSpecifier copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java

@@ -27,10 +27,12 @@ public interface ICASTTypeIdInitializerExpression extends IASTTypeIdInitializerE
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTTypeIdInitializerExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTTypeIdInitializerExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java

@@ -24,10 +24,12 @@ public interface ICASTTypedefNameSpecifier extends IASTNamedTypeSpecifier, ICAST
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTTypedefNameSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTTypedefNameSpecifier copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java

@@ -33,10 +33,12 @@ public interface ICNodeFactory extends INodeFactory {
 
 	public ICASTArrayDesignator newArrayDesignator(IASTExpression exp);
 
+	@Override
 	public ICASTArrayModifier newArrayModifier(IASTExpression expr);
 	
 	public IGCCASTArrayRangeDesignator newArrayRangeDesignatorGCC(IASTExpression floor, IASTExpression ceiling);
 	
+	@Override
 	public ICASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name);
 	
 	/**
@@ -50,16 +52,20 @@ public interface ICNodeFactory extends INodeFactory {
 	 */
 	public ICASTDesignatedInitializer newDesignatedInitializer(IASTInitializerClause initializer);
 
+	@Override
 	public ICASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name);
 	
+	@Override
 	public ICASTEnumerationSpecifier newEnumerationSpecifier(IASTName name);
 
 	public ICASTFieldDesignator newFieldDesignator(IASTName name);
 
 	public ICASTKnRFunctionDeclarator newKnRFunctionDeclarator(IASTName[] parameterNames, IASTDeclaration[] parameterDeclarations);
 
+	@Override
 	public ICASTPointer newPointer();
 
+	@Override
 	public ICASTSimpleDeclSpecifier newSimpleDeclSpecifier();
 
 	/**
@@ -68,7 +74,9 @@ public interface ICNodeFactory extends INodeFactory {
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTSimpleDeclSpecifier newSimpleDeclSpecifierGCC(IASTExpression typeofExpression);
 
+	@Override
 	public ICASTTypedefNameSpecifier newTypedefNameSpecifier(IASTName name);
 
+	@Override
 	public ICASTTypeIdInitializerExpression newTypeIdInitializerExpression(IASTTypeId typeId, IASTInitializer initializer);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java

@@ -22,5 +22,6 @@ public interface ICPointerType extends IPointerType {
 	 * is this a restrict pointer
 	 * 
 	 */
+	@Override
 	boolean isRestrict();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java

@@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner;
  */
 public interface ICPPASTArraySubscriptExpression extends IASTArraySubscriptExpression, IASTImplicitNameOwner {
 
+	@Override
 	public ICPPASTArraySubscriptExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTArraySubscriptExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java

@@ -43,11 +43,13 @@ public interface ICPPASTBinaryExpression extends IASTBinaryExpression, IASTImpli
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTBinaryExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTBinaryExpression copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java

@@ -24,8 +24,10 @@ import org.eclipse.cdt.core.dom.ast.IASTNode;
 public interface ICPPASTCapture extends IASTNode, ICPPASTPackExpandable {
 	ASTNodeProperty IDENTIFIER = new ASTNodeProperty("ICPPASTCapture - IDENTIFIER [IASTName]"); //$NON-NLS-1$
 
+	@Override
 	ICPPASTCapture copy();
 	
+	@Override
 	ICPPASTCapture copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java

@@ -49,5 +49,6 @@ public interface ICPPASTCastExpression extends IASTCastExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTCastExpression copy();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java

@@ -52,11 +52,13 @@ public interface ICPPASTConstructorChainInitializer extends IASTInitializer, ICP
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTConstructorChainInitializer copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTConstructorChainInitializer copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java

@@ -42,11 +42,13 @@ public interface ICPPASTConstructorInitializer extends IASTInitializer {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTConstructorInitializer copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTConstructorInitializer copy(CopyStyle style);
 
 

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java

@@ -42,10 +42,12 @@ public interface ICPPASTConversionName extends IASTName {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTConversionName copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTConversionName copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java

@@ -70,11 +70,13 @@ public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTDeclSpecifier copy();
 	
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTDeclSpecifier copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java

@@ -76,11 +76,13 @@ public interface ICPPASTDeleteExpression extends IASTExpression, IASTImplicitNam
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTDeleteExpression copy();
 	
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTDeleteExpression copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java

@@ -34,11 +34,13 @@ public interface ICPPASTElaboratedTypeSpecifier extends
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTElaboratedTypeSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTElaboratedTypeSpecifier copy(CopyStyle style);
 
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java

@@ -25,11 +25,13 @@ public interface ICPPASTEnumerationSpecifier extends IASTEnumerationSpecifier, I
 	public static final ASTNodeProperty BASE_TYPE = new ASTNodeProperty(
 			"ICPPASTEnumerationSpecifier.BASE_TYPE [ICPPASTDeclSpecifier]"); //$NON-NLS-1$
 
+	@Override
 	public ICPPASTEnumerationSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTEnumerationSpecifier copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java

@@ -63,11 +63,13 @@ public interface ICPPASTExplicitTemplateInstantiation extends IASTDeclaration {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTExplicitTemplateInstantiation copy();
 	
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTExplicitTemplateInstantiation copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java

@@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner;
  */
 public interface ICPPASTExpressionList extends IASTExpressionList, IASTImplicitNameOwner {
 
+	@Override
 	public ICPPASTExpressionList copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTExpressionList copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java

@@ -40,11 +40,13 @@ public interface ICPPASTFieldReference extends IASTFieldReference, IASTImplicitN
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTFieldReference copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTFieldReference copy(CopyStyle style);
 
 	/**

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java

@@ -28,10 +28,12 @@ public interface ICPPASTForStatement extends IASTForStatement {
     /**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTForStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTForStatement copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java

@@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner;
  */
 public interface ICPPASTFunctionCallExpression extends IASTFunctionCallExpression, IASTImplicitNameOwner {
 
+	@Override
 	ICPPASTFunctionCallExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	ICPPASTFunctionCallExpression copy(CopyStyle style);
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java

@@ -46,5 +46,6 @@ public interface ICPPASTFunctionTryBlockDeclarator extends
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTFunctionTryBlockDeclarator copy();
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java

@@ -45,10 +45,12 @@ public interface ICPPASTIfStatement extends IASTIfStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTIfStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTIfStatement copy(CopyStyle style);
 }