From e7aa4a2154b590c787b4e975ae807b4b7f676406 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Sat, 7 Jan 2012 17:27:33 -0800
Subject: [PATCH] @Override annotations and redundant casts.

---
 .../cdt/core/browser/IQualifiedTypeName.java  |   1 +
 .../cdt/core/browser/IndexTypeInfo.java       |  34 ++++++
 .../cdt/core/browser/QualifiedTypeName.java   |  25 ++++
 .../eclipse/cdt/core/browser/TypeInfo.java    |  32 +++++
 .../cdt/core/browser/TypeReference.java       |  14 ++-
 .../cdt/core/browser/TypeSearchScope.java     |  22 ++++
 .../internal/core/browser/ASTTypeInfo.java    |  34 ++++++
 .../core/settings/model/util/CDataUtil.java   |  48 ++++----
 .../core/settings/model/util/EntryStore.java  |  13 +-
 .../settings/model/util/KindBasedStore.java   |  24 ++--
 .../LanguageSettingEntriesSerializer.java     |  76 ++++++------
 .../core/settings/model/CSettingsRefInfo.java |   4 +-
 .../cdt/core/dom/ast/ASTCompletionNode.java   |   4 +
 .../cdt/core/dom/ast/ASTTypeMatcher.java      |   1 +
 .../eclipse/cdt/core/dom/ast/ASTTypeUtil.java |  12 +-
 .../cdt/core/dom/ast/IASTASMDeclaration.java  |   2 +
 .../dom/ast/IASTBinaryTypeIdExpression.java   |   2 +
 .../cdt/core/dom/ast/IASTBreakStatement.java  |   2 +
 .../cdt/core/dom/ast/IASTCaseStatement.java   |   2 +
 .../dom/ast/IASTConditionalExpression.java    |   2 +
 .../core/dom/ast/IASTContinueStatement.java   |   2 +
 .../cdt/core/dom/ast/IASTDeclaration.java     |   2 +
 .../dom/ast/IASTDeclarationStatement.java     |   2 +
 .../core/dom/ast/IASTDefaultStatement.java    |   2 +
 .../cdt/core/dom/ast/IASTDoStatement.java     |   2 +
 .../dom/ast/IASTElaboratedTypeSpecifier.java  |   1 +
 .../dom/ast/IASTEnumerationSpecifier.java     |   4 +
 .../cdt/core/dom/ast/IASTExpression.java      |   2 +
 .../core/dom/ast/IASTExpressionStatement.java |   2 +
 .../cdt/core/dom/ast/IASTFieldDeclarator.java |   2 +
 .../cdt/core/dom/ast/IASTFieldReference.java  |   2 +
 .../cdt/core/dom/ast/IASTFileLocation.java    |   2 +
 .../cdt/core/dom/ast/IASTForStatement.java    |   2 +
 .../dom/ast/IASTFunctionCallExpression.java   |   2 +
 .../core/dom/ast/IASTFunctionDeclarator.java  |   2 +
 .../cdt/core/dom/ast/IASTGotoStatement.java   |   2 +
 .../cdt/core/dom/ast/IASTIdExpression.java    |   2 +
 .../cdt/core/dom/ast/IASTIfStatement.java     |   2 +
 .../cdt/core/dom/ast/IASTImplicitName.java    |   2 +
 .../cdt/core/dom/ast/IASTInitializer.java     |   2 +
 .../core/dom/ast/IASTInitializerClause.java   |   2 +
 .../dom/ast/IASTInitializerExpression.java    |   2 +
 .../cdt/core/dom/ast/IASTInitializerList.java |   2 +
 .../cdt/core/dom/ast/IASTLabelStatement.java  |   2 +
 .../cdt/core/dom/ast/IASTMacroExpansion.java  |   2 +
 .../dom/ast/IASTMacroExpansionLocation.java   |   2 +
 .../core/dom/ast/IASTNamedTypeSpecifier.java  |   1 +
 .../cdt/core/dom/ast/IASTNullStatement.java   |   2 +
 .../ast/IASTPreprocessorIncludeStatement.java |   1 +
 .../ast/IASTPreprocessorMacroDefinition.java  |   1 +
 .../ast/IASTPreprocessorUndefStatement.java   |   1 +
 .../eclipse/cdt/core/dom/ast/IASTProblem.java |   2 +
 .../core/dom/ast/IASTProblemDeclaration.java  |   2 +
 .../core/dom/ast/IASTProblemExpression.java   |   2 +
 .../core/dom/ast/IASTProblemStatement.java    |   2 +
 .../cdt/core/dom/ast/IASTProblemTypeId.java   |   2 +
 .../cdt/core/dom/ast/IASTReturnStatement.java |   2 +
 .../core/dom/ast/IASTSimpleDeclSpecifier.java |   1 +
 .../core/dom/ast/IASTSimpleDeclaration.java   |   2 +
 .../cdt/core/dom/ast/IASTStatement.java       |   2 +
 .../cdt/core/dom/ast/IASTSwitchStatement.java |   2 +
 .../eclipse/cdt/core/dom/ast/IASTTypeId.java  |   2 +
 .../core/dom/ast/IASTTypeIdExpression.java    |   2 +
 .../ast/IASTTypeIdInitializerExpression.java  |   1 +
 .../cdt/core/dom/ast/IASTUnaryExpression.java |   2 +
 .../cdt/core/dom/ast/IASTWhileStatement.java  |   2 +
 .../eclipse/cdt/core/dom/ast/IParameter.java  |   1 +
 .../core/dom/ast/c/ICASTArrayDesignator.java  |   2 +
 .../core/dom/ast/c/ICASTArrayModifier.java    |   2 +
 .../ast/c/ICASTCompositeTypeSpecifier.java    |   2 +
 .../core/dom/ast/c/ICASTDeclSpecifier.java    |   1 +
 .../dom/ast/c/ICASTDesignatedInitializer.java |   2 +
 .../cdt/core/dom/ast/c/ICASTDesignator.java   |   2 +
 .../ast/c/ICASTElaboratedTypeSpecifier.java   |   2 +
 .../dom/ast/c/ICASTEnumerationSpecifier.java  |   2 +
 .../core/dom/ast/c/ICASTFieldDesignator.java  |   2 +
 .../cdt/core/dom/ast/c/ICASTPointer.java      |   2 +
 .../dom/ast/c/ICASTSimpleDeclSpecifier.java   |   2 +
 .../c/ICASTTypeIdInitializerExpression.java   |   2 +
 .../dom/ast/c/ICASTTypedefNameSpecifier.java  |   2 +
 .../cdt/core/dom/ast/c/ICNodeFactory.java     |   8 ++
 .../cdt/core/dom/ast/c/ICPointerType.java     |   1 +
 .../cpp/ICPPASTArraySubscriptExpression.java  |   2 +
 .../dom/ast/cpp/ICPPASTBinaryExpression.java  |   2 +
 .../cdt/core/dom/ast/cpp/ICPPASTCapture.java  |   2 +
 .../dom/ast/cpp/ICPPASTCastExpression.java    |   1 +
 .../ICPPASTConstructorChainInitializer.java   |   2 +
 .../cpp/ICPPASTConstructorInitializer.java    |   2 +
 .../dom/ast/cpp/ICPPASTConversionName.java    |   2 +
 .../dom/ast/cpp/ICPPASTDeclSpecifier.java     |   2 +
 .../dom/ast/cpp/ICPPASTDeleteExpression.java  |   2 +
 .../cpp/ICPPASTElaboratedTypeSpecifier.java   |   2 +
 .../ast/cpp/ICPPASTEnumerationSpecifier.java  |   2 +
 .../ICPPASTExplicitTemplateInstantiation.java |   2 +
 .../dom/ast/cpp/ICPPASTExpressionList.java    |   2 +
 .../dom/ast/cpp/ICPPASTFieldReference.java    |   2 +
 .../core/dom/ast/cpp/ICPPASTForStatement.java |   2 +
 .../cpp/ICPPASTFunctionCallExpression.java    |   2 +
 .../ICPPASTFunctionTryBlockDeclarator.java    |   1 +
 .../core/dom/ast/cpp/ICPPASTIfStatement.java  |   2 +
 .../dom/ast/cpp/ICPPASTInitializerList.java   |   2 +
 .../ast/cpp/ICPPASTLinkageSpecification.java  |   3 +
 .../dom/ast/cpp/ICPPASTLiteralExpression.java |   2 +
 .../ast/cpp/ICPPASTNamedTypeSpecifier.java    |   2 +
 .../dom/ast/cpp/ICPPASTNamespaceAlias.java    |   2 +
 .../dom/ast/cpp/ICPPASTNewExpression.java     |   2 +
 .../core/dom/ast/cpp/ICPPASTOperatorName.java |   2 +
 .../dom/ast/cpp/ICPPASTPointerToMember.java   |   1 +
 .../dom/ast/cpp/ICPPASTQualifiedName.java     |   3 +
 .../ast/cpp/ICPPASTSimpleDeclSpecifier.java   |   2 +
 ...CPPASTSimpleTypeConstructorExpression.java |   2 +
 .../ICPPASTSimpleTypeTemplateParameter.java   |   2 +
 .../dom/ast/cpp/ICPPASTSwitchStatement.java   |   2 +
 .../ast/cpp/ICPPASTTemplateDeclaration.java   |   2 +
 .../core/dom/ast/cpp/ICPPASTTemplateId.java   |   2 +
 .../dom/ast/cpp/ICPPASTTemplateParameter.java |   2 +
 .../cpp/ICPPASTTemplateSpecialization.java    |   2 +
 ...ICPPASTTemplatedTypeTemplateParameter.java |   2 +
 .../dom/ast/cpp/ICPPASTTranslationUnit.java   |   2 +
 .../dom/ast/cpp/ICPPASTTryBlockStatement.java |   2 +
 .../dom/ast/cpp/ICPPASTTypeIdExpression.java  |   2 +
 .../ast/cpp/ICPPASTTypenameExpression.java    |   3 +
 .../dom/ast/cpp/ICPPASTUnaryExpression.java   |   2 +
 .../dom/ast/cpp/ICPPASTUsingDeclaration.java  |   2 +
 .../dom/ast/cpp/ICPPASTUsingDirective.java    |   2 +
 .../dom/ast/cpp/ICPPASTWhileStatement.java    |   2 +
 .../dom/ast/cpp/ICPPClassSpecialization.java  |   1 +
 .../cdt/core/dom/ast/cpp/ICPPFunction.java    |   9 +-
 .../cdt/core/dom/ast/cpp/ICPPNodeFactory.java |  28 +++++
 .../cpp/ICPPTemplateTemplateParameter.java    |   2 +
 .../ast/cpp/ICPPTemplateTypeParameter.java    |   1 +
 .../IGNUASTCompoundStatementExpression.java   |   2 +
 .../dom/ast/gnu/IGNUASTTypeIdExpression.java  |   1 +
 .../dom/ast/gnu/IGNUASTUnaryExpression.java   |   1 +
 .../cdt/core/dom/ast/gnu/c/GCCLanguage.java   |   2 +
 .../ast/gnu/c/ICASTKnRFunctionDeclarator.java |   2 +
 .../gnu/c/IGCCASTArrayRangeDesignator.java    |   2 +
 .../ast/gnu/c/IGCCASTSimpleDeclSpecifier.java |   2 +
 .../ast/gnu/cpp/IGPPASTBinaryExpression.java  |   1 +
 .../dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java |   1 +
 .../IGPPASTExplicitTemplateInstantiation.java |   1 +
 .../core/dom/ast/gnu/cpp/IGPPASTPointer.java  |   1 +
 .../ast/gnu/cpp/IGPPASTPointerToMember.java   |   1 +
 .../gnu/cpp/IGPPASTSimpleDeclSpecifier.java   |   1 +
 ...AbstractScannerExtensionConfiguration.java |  12 ++
 .../core/dom/parser/CLanguageKeywords.java    |   3 +
 ...AbstractCParserExtensionConfiguration.java |  12 ++
 ...stractCPPParserExtensionConfiguration.java |  17 +++
 .../export/AbstractExportProjectProvider.java |   1 +
 .../export/ExternalExportProjectProvider.java |   4 +
 .../core/parser/AbstractParserLogService.java |   2 +
 .../cdt/core/parser/ExtendedScannerInfo.java  |   3 +
 .../eclipse/cdt/core/parser/ITokenDuple.java  |   1 +
 .../eclipse/cdt/core/parser/ScannerInfo.java  |   6 +-
 .../cdt/core/parser/util/CharArrayMap.java    |   3 +-
 .../cdt/core/parser/util/CollectionUtils.java |   4 +
 .../cdt/core/parser/util/ObjectTable.java     |   4 +
 .../core/dom/parser/ASTAmbiguousNode.java     |   4 +-
 .../internal/core/dom/parser/ASTQueries.java  |   2 +-
 .../core/dom/parser/ASTTranslationUnit.java   |   4 +-
 .../core/dom/parser/c/CASTASMDeclaration.java |   6 +-
 .../dom/parser/c/CASTAmbiguousDeclarator.java |  19 ++-
 .../dom/parser/c/CASTAmbiguousExpression.java |  10 +-
 .../c/CASTAmbiguousParameterDeclaration.java  |  14 ++-
 .../dom/parser/c/CASTAmbiguousStatement.java  |   4 +-
 .../dom/parser/c/CASTArrayDeclarator.java     |   4 +-
 .../dom/parser/c/CASTArrayDesignator.java     |  11 +-
 .../core/dom/parser/c/CASTArrayModifier.java  |  39 ++++--
 .../parser/c/CASTArrayRangeDesignator.java    |  15 ++-
 .../c/CASTArraySubscriptExpression.java       |  24 +++-
 .../dom/parser/c/CASTBaseDeclSpecifier.java   |  28 +++--
 .../dom/parser/c/CASTBinaryExpression.java    |  29 +++--
 .../core/dom/parser/c/CASTBreakStatement.java |   4 +-
 .../core/dom/parser/c/CASTCaseStatement.java  |   9 +-
 .../core/dom/parser/c/CASTCastExpression.java |  20 +++-
 .../dom/parser/c/CASTCompoundStatement.java   |  20 ++--
 .../c/CASTCompoundStatementExpression.java    |  11 +-
 .../parser/c/CASTConditionalExpression.java   |  26 ++--
 .../dom/parser/c/CASTContinueStatement.java   |   4 +-
 .../parser/c/CASTDeclarationStatement.java    |   7 +-
 .../core/dom/parser/c/CASTDeclarator.java     |  30 +++--
 .../dom/parser/c/CASTDefaultStatement.java    |   4 +-
 .../parser/c/CASTDesignatedInitializer.java   |  21 +++-
 .../core/dom/parser/c/CASTDoStatement.java    |  15 ++-
 .../parser/c/CASTElaboratedTypeSpecifier.java |  14 ++-
 .../parser/c/CASTEnumerationSpecifier.java    |  18 ++-
 .../core/dom/parser/c/CASTEnumerator.java     |   2 +
 .../dom/parser/c/CASTEqualsInitializer.java   |   2 +
 .../core/dom/parser/c/CASTExpressionList.java |  20 +++-
 .../dom/parser/c/CASTExpressionStatement.java |   9 +-
 .../dom/parser/c/CASTFieldDeclarator.java     |   4 +-
 .../dom/parser/c/CASTFieldDesignator.java     |   7 +-
 .../core/dom/parser/c/CASTFieldReference.java |  28 +++--
 .../core/dom/parser/c/CASTForStatement.java   |  30 +++--
 .../parser/c/CASTFunctionCallExpression.java  |  18 ++-
 .../dom/parser/c/CASTFunctionDeclarator.java  |  15 ++-
 .../dom/parser/c/CASTFunctionDefinition.java  |  31 +++--
 .../core/dom/parser/c/CASTGotoStatement.java  |   7 +-
 .../core/dom/parser/c/CASTIdExpression.java   |  13 +-
 .../core/dom/parser/c/CASTIfStatement.java    |  21 +++-
 .../dom/parser/c/CASTInitializerList.java     |  10 +-
 .../parser/c/CASTKnRFunctionDeclarator.java   |   5 +
 .../core/dom/parser/c/CASTLabelStatement.java |  16 ++-
 .../dom/parser/c/CASTLiteralExpression.java   |  18 ++-
 .../internal/core/dom/parser/c/CASTName.java  |   2 +-
 .../core/dom/parser/c/CASTNullStatement.java  |   4 +-
 .../parser/c/CASTParameterDeclaration.java    |  13 +-
 .../core/dom/parser/c/CASTPointer.java        |  20 +++-
 .../dom/parser/c/CASTProblemDeclaration.java  |   2 +
 .../dom/parser/c/CASTProblemExpression.java   |   7 +-
 .../core/dom/parser/c/CASTProblemOwner.java   |   4 +-
 .../dom/parser/c/CASTProblemStatement.java    |   2 +
 .../dom/parser/c/CASTReturnStatement.java     |  13 +-
 .../dom/parser/c/CASTSimpleDeclSpecifier.java |  50 +++++---
 .../dom/parser/c/CASTSimpleDeclaration.java   |  19 ++-
 .../dom/parser/c/CASTSwitchStatement.java     |  15 ++-
 .../core/dom/parser/c/CASTTypeId.java         |  12 +-
 .../dom/parser/c/CASTTypeIdExpression.java    |  17 ++-
 .../c/CASTTypeIdInitializerExpression.java    |   3 +
 .../parser/c/CASTTypedefNameSpecifier.java    |  10 +-
 .../dom/parser/c/CASTUnaryExpression.java     |  18 ++-
 .../core/dom/parser/c/CASTWhileStatement.java |  15 ++-
 .../core/dom/parser/c/CArrayType.java         |  15 ++-
 .../core/dom/parser/c/CBasicType.java         |  15 ++-
 .../core/dom/parser/c/CBuiltinParameter.java  |  11 ++
 .../dom/parser/c/CCompositeTypeScope.java     |   8 +-
 .../core/dom/parser/c/CEnumeration.java       |  24 +++-
 .../core/dom/parser/c/CEnumerator.java        |  14 ++-
 .../internal/core/dom/parser/c/CField.java    |   2 +
 .../internal/core/dom/parser/c/CFunction.java |  38 ++++--
 .../core/dom/parser/c/CFunctionScope.java     |   6 +-
 .../core/dom/parser/c/CFunctionType.java      |  10 +-
 .../core/dom/parser/c/CKnRParameter.java      |  19 ++-
 .../core/dom/parser/c/CNodeFactory.java       |  65 ++++++++++
 .../core/dom/parser/c/CParameter.java         |  13 +-
 .../core/dom/parser/c/CQualifierType.java     |   7 ++
 .../internal/core/dom/parser/c/CScope.java    |  10 +-
 .../core/dom/parser/c/CStructure.java         |   4 +-
 .../internal/core/dom/parser/c/CVariable.java |   2 +-
 .../internal/core/dom/parser/c/CVisitor.java  |  10 +-
 .../parser/c/GCCASTSimpleDeclSpecifier.java   |   2 +
 .../core/dom/parser/c/GNUCSourceParser.java   |   6 +-
 .../AbstractCPPClassSpecializationScope.java  |  33 +++--
 .../dom/parser/cpp/CPPASTASMDeclaration.java  |   6 +-
 .../parser/cpp/CPPASTAmbiguousCondition.java  |   2 +
 .../parser/cpp/CPPASTAmbiguousDeclarator.java |  21 +++-
 .../parser/cpp/CPPASTAmbiguousExpression.java |  12 +-
 .../parser/cpp/CPPASTAmbiguousStatement.java  |   4 +-
 .../cpp/CPPASTAmbiguousTemplateArgument.java  |   5 +
 .../dom/parser/cpp/CPPASTArrayDeclarator.java |   4 +-
 .../parser/cpp/CPPASTBaseDeclSpecifier.java   |  48 +++++---
 .../dom/parser/cpp/CPPASTBaseSpecifier.java   |  23 +++-
 .../parser/cpp/CPPASTBinaryExpression.java    |  33 +++--
 .../cpp/CPPASTBinaryTypeIdExpression.java     |  21 +++-
 .../dom/parser/cpp/CPPASTBreakStatement.java  |   4 +-
 .../core/dom/parser/cpp/CPPASTCapture.java    |   9 ++
 .../dom/parser/cpp/CPPASTCaseStatement.java   |   9 +-
 .../parser/cpp/CPPASTCompoundStatement.java   |   4 +-
 .../CPPASTCompoundStatementExpression.java    |  11 +-
 .../cpp/CPPASTConditionalExpression.java      |  26 ++--
 .../CPPASTConstructorChainInitializer.java    |  24 +++-
 .../cpp/CPPASTConstructorInitializer.java     |  13 +-
 .../parser/cpp/CPPASTContinueStatement.java   |   4 +-
 .../dom/parser/cpp/CPPASTConversionName.java  |   7 ++
 .../cpp/CPPASTDeclarationStatement.java       |   9 +-
 .../core/dom/parser/cpp/CPPASTDeclarator.java |  36 ++++--
 .../parser/cpp/CPPASTDefaultStatement.java    |   4 +-
 .../parser/cpp/CPPASTDeleteExpression.java    |  26 ++--
 .../dom/parser/cpp/CPPASTDoStatement.java     |  15 ++-
 .../cpp/CPPASTElaboratedTypeSpecifier.java    |  14 ++-
 .../cpp/CPPASTEnumerationSpecifier.java       |  19 ++-
 .../core/dom/parser/cpp/CPPASTEnumerator.java |   2 +
 .../parser/cpp/CPPASTEqualsInitializer.java   |   2 +
 .../CPPASTExplicitTemplateInstantiation.java  |  13 +-
 .../dom/parser/cpp/CPPASTExpressionList.java  |  19 ++-
 .../parser/cpp/CPPASTExpressionStatement.java |   9 +-
 .../dom/parser/cpp/CPPASTFieldDeclarator.java |   7 +-
 .../dom/parser/cpp/CPPASTFieldReference.java  |  41 +++++--
 .../dom/parser/cpp/CPPASTForStatement.java    |  36 ++++--
 .../cpp/CPPASTFunctionCallExpression.java     |  21 +++-
 .../cpp/CPPASTFunctionWithTryBlock.java       |   4 +-
 .../dom/parser/cpp/CPPASTGotoStatement.java   |   7 +-
 .../dom/parser/cpp/CPPASTIdExpression.java    |  12 +-
 .../dom/parser/cpp/CPPASTIfStatement.java     |  28 +++--
 .../dom/parser/cpp/CPPASTImplicitName.java    |   2 +
 .../dom/parser/cpp/CPPASTInitializerList.java |  12 +-
 .../dom/parser/cpp/CPPASTLabelStatement.java  |  16 ++-
 .../parser/cpp/CPPASTLambdaExpression.java    |  18 ++-
 .../cpp/CPPASTLinkageSpecification.java       |  16 ++-
 .../core/dom/parser/cpp/CPPASTName.java       |   4 +-
 .../parser/cpp/CPPASTNamedTypeSpecifier.java  |  15 ++-
 .../dom/parser/cpp/CPPASTNamespaceAlias.java  |  13 +-
 .../parser/cpp/CPPASTNamespaceDefinition.java |  22 +++-
 .../dom/parser/cpp/CPPASTNewExpression.java   |  48 ++++++--
 .../dom/parser/cpp/CPPASTNullStatement.java   |   4 +-
 .../cpp/CPPASTPackExpansionExpression.java    |   8 ++
 .../dom/parser/cpp/CPPASTPointerToMember.java |   5 +-
 .../parser/cpp/CPPASTProblemDeclaration.java  |   2 +
 .../parser/cpp/CPPASTProblemExpression.java   |   7 +-
 .../dom/parser/cpp/CPPASTProblemOwner.java    |   4 +-
 .../parser/cpp/CPPASTProblemStatement.java    |   2 +
 .../dom/parser/cpp/CPPASTProblemTypeId.java   |   6 +
 .../dom/parser/cpp/CPPASTQualifiedName.java   |  17 ++-
 .../dom/parser/cpp/CPPASTReturnStatement.java |  13 +-
 .../parser/cpp/CPPASTSimpleDeclSpecifier.java |  48 ++++++--
 .../parser/cpp/CPPASTSimpleDeclaration.java   |   4 +-
 ...CPPASTSimpleTypeConstructorExpression.java |  23 +++-
 .../CPPASTSimpleTypeTemplateParameter.java    |  21 +++-
 .../cpp/CPPASTStaticAssertionDeclaration.java |   7 +-
 .../dom/parser/cpp/CPPASTSwitchStatement.java |  24 ++--
 .../parser/cpp/CPPASTTemplateDeclaration.java |   4 +-
 .../core/dom/parser/cpp/CPPASTTemplateId.java |  31 +++--
 .../cpp/CPPASTTemplateSpecialization.java     |  19 ++-
 .../CPPASTTemplatedTypeTemplateParameter.java |  28 +++--
 .../dom/parser/cpp/CPPASTTranslationUnit.java |   2 +-
 .../parser/cpp/CPPASTTryBlockStatement.java   |  19 ++-
 .../parser/cpp/CPPASTTypeIdExpression.java    |  15 ++-
 .../CPPASTTypeIdInitializerExpression.java    |   3 +
 .../parser/cpp/CPPASTTypenameExpression.java  |   9 +-
 .../dom/parser/cpp/CPPASTUnaryExpression.java |  25 ++--
 .../parser/cpp/CPPASTUsingDeclaration.java    |  15 ++-
 .../dom/parser/cpp/CPPASTUsingDirective.java  |   9 +-
 .../dom/parser/cpp/CPPASTVisibilityLabel.java |   6 +-
 .../dom/parser/cpp/CPPASTWhileStatement.java  |  18 ++-
 .../core/dom/parser/cpp/CPPArrayType.java     |  16 ++-
 .../core/dom/parser/cpp/CPPBaseClause.java    |  11 +-
 .../core/dom/parser/cpp/CPPBasicType.java     |  14 +++
 .../dom/parser/cpp/CPPBuiltinParameter.java   |  44 +++++--
 .../core/dom/parser/cpp/CPPClassInstance.java |   4 +
 .../core/dom/parser/cpp/CPPClassScope.java    |  12 +-
 .../parser/cpp/CPPClassSpecialization.java    |  17 +++
 .../core/dom/parser/cpp/CPPClassTemplate.java |   4 +-
 ...CPPClassTemplatePartialSpecialization.java |   6 +
 .../core/dom/parser/cpp/CPPClassType.java     |  44 ++++++-
 .../core/dom/parser/cpp/CPPClosureType.java   |  37 ++++++
 .../parser/cpp/CPPDeferredClassInstance.java  |   8 ++
 .../core/dom/parser/cpp/CPPEnumScope.java     |   1 +
 .../core/dom/parser/cpp/CPPEnumeration.java   |  37 ++++--
 .../core/dom/parser/cpp/CPPEnumerator.java    |  30 +++--
 .../core/dom/parser/cpp/CPPField.java         |  10 +-
 .../parser/cpp/CPPFieldSpecialization.java    |  22 +++-
 .../core/dom/parser/cpp/CPPFunction.java      |  61 +++++++---
 .../dom/parser/cpp/CPPFunctionInstance.java   |   4 +
 .../parser/cpp/CPPFunctionSpecialization.java |  19 ++-
 .../dom/parser/cpp/CPPFunctionTemplate.java   |  35 ++++--
 .../CPPFunctionTemplateSpecialization.java    |   5 +
 .../core/dom/parser/cpp/CPPFunctionType.java  |  16 ++-
 .../dom/parser/cpp/CPPImplicitMethod.java     |  11 +-
 .../cpp/CPPLambdaExpressionParameter.java     |  36 ++++--
 .../core/dom/parser/cpp/CPPMethod.java        |  13 +-
 .../dom/parser/cpp/CPPMethodInstance.java     |   9 +-
 .../parser/cpp/CPPMethodSpecialization.java   |   7 ++
 .../dom/parser/cpp/CPPMethodTemplate.java     |   9 +-
 .../cpp/CPPMethodTemplateSpecialization.java  |   7 ++
 .../core/dom/parser/cpp/CPPNamespace.java     |  38 ++++--
 .../dom/parser/cpp/CPPNamespaceAlias.java     |  36 ++++--
 .../dom/parser/cpp/CPPNamespaceScope.java     |   6 +
 .../core/dom/parser/cpp/CPPNodeFactory.java   | 113 ++++++++++++++++++
 .../core/dom/parser/cpp/CPPParameter.java     |  49 ++++++--
 .../dom/parser/cpp/CPPParameterPackType.java  |  10 +-
 .../cpp/CPPParameterSpecialization.java       |  18 ++-
 .../parser/cpp/CPPPointerToMemberType.java    |   1 +
 .../core/dom/parser/cpp/CPPQualifierType.java |  16 ++-
 .../core/dom/parser/cpp/CPPReferenceType.java |  11 +-
 .../core/dom/parser/cpp/CPPScope.java         |  10 +-
 .../core/dom/parser/cpp/CPPScopeMapper.java   |  21 +++-
 .../dom/parser/cpp/CPPSpecialization.java     |  19 ++-
 .../dom/parser/cpp/CPPTemplateArgument.java   |   8 ++
 .../dom/parser/cpp/CPPTemplateDefinition.java |   6 +-
 .../dom/parser/cpp/CPPTemplateParameter.java  |  20 +++-
 .../parser/cpp/CPPTemplateParameterMap.java   |   5 +
 .../core/dom/parser/cpp/CPPTemplateScope.java |   3 +
 .../cpp/CPPTemplateTemplateParameter.java     |   2 +-
 .../CPPTemplateTemplateParameterScope.java    |   1 +
 .../parser/cpp/CPPTemplateTypeParameter.java  |   8 +-
 .../core/dom/parser/cpp/CPPTypedef.java       |   4 +-
 .../parser/cpp/CPPTypedefSpecialization.java  |   7 +-
 .../dom/parser/cpp/CPPUnknownBinding.java     |  36 ++++--
 .../core/dom/parser/cpp/CPPUnknownClass.java  |  38 ++++--
 .../parser/cpp/CPPUnknownClassInstance.java   |   1 +
 .../dom/parser/cpp/CPPUnknownConstructor.java |   7 ++
 .../dom/parser/cpp/CPPUnknownFunction.java    |  15 +++
 .../dom/parser/cpp/CPPUsingDeclaration.java   |  35 ++++--
 .../CPPUsingDeclarationSpecialization.java    |   1 +
 .../dom/parser/cpp/CPPUsingDirective.java     |   3 +
 .../core/dom/parser/cpp/CPPVariable.java      |   4 +-
 .../core/dom/parser/cpp/ClassTypeHelper.java  |  14 +--
 .../dom/parser/cpp/GNUCPPSourceParser.java    |   4 +-
 .../parser/cpp/GPPASTSimpleDeclSpecifier.java |   6 +-
 .../cpp/ICPPClassSpecializationScope.java     |   1 +
 .../parser/cpp/ICPPDeferredClassInstance.java |   1 +
 .../cpp/ICPPInternalClassTypeMixinHost.java   |   3 +-
 .../cpp/ICPPInternalNamespaceScope.java       |   1 +
 .../cpp/semantics/AutoTypeResolver.java       |  25 ++++
 .../parser/cpp/semantics/CPPFunctionSet.java  |   7 ++
 .../parser/cpp/semantics/CPPSemantics.java    |  20 ++--
 .../parser/cpp/semantics/CPPTemplates.java    |   2 +-
 .../dom/parser/cpp/semantics/CPPVisitor.java  |   8 +-
 .../parser/cpp/semantics/FunctionSetType.java |   1 +
 .../cpp/semantics/InitializerListType.java    |   1 +
 .../dom/parser/cpp/semantics/UniqueType.java  |   1 +
 .../changegenerator/ChangeGenerator.java      |   2 +-
 .../internal/core/index/CPPTypedefClone.java  |  12 ++
 .../DefaultFragmentBindingComparator.java     |   1 +
 .../cdt/internal/core/index/EmptyCIndex.java  |  32 +++++
 .../core/index/IIndexFragmentBinding.java     |   3 +
 .../core/index/IIndexFragmentFile.java        |   1 +
 .../cdt/internal/core/index/IIndexScope.java  |   2 +
 .../internal/core/index/IndexChangeEvent.java |   6 +
 .../cdt/internal/core/index/IndexFactory.java |   2 +-
 .../core/index/IndexerStateEvent.java         |   1 +
 .../internal/core/index/WritableCIndex.java   |  19 +++
 .../composite/AbstractCompositeFactory.java   |   3 +
 .../composite/CompositeIndexBinding.java      |   9 ++
 .../core/index/composite/CompositeType.java   |   1 +
 .../composite/CompositeTypeContainer.java     |   1 +
 .../index/composite/c/CCompositesFactory.java |   4 +
 .../composite/c/CompositeCCompositeScope.java |   7 ++
 .../composite/c/CompositeCEnumeration.java    |   4 +
 .../composite/c/CompositeCEnumerator.java     |   2 +
 .../index/composite/c/CompositeCField.java    |   1 +
 .../index/composite/c/CompositeCFunction.java |   9 ++
 .../composite/c/CompositeCParameter.java      |   6 +
 .../composite/c/CompositeCStructure.java      |   6 +
 .../index/composite/c/CompositeCTypedef.java  |   3 +
 .../index/composite/c/CompositeCVariable.java |   6 +
 .../composite/cpp/CPPCompositesFactory.java   |   4 +
 .../composite/cpp/CompositeCPPBinding.java    |   2 +
 .../cpp/CompositeCPPClassInstance.java        |   4 +
 .../composite/cpp/CompositeCPPClassScope.java |   8 ++
 .../cpp/CompositeCPPClassSpecialization.java  |   4 +
 .../CompositeCPPClassSpecializationScope.java |  14 +++
 ...CPPClassTemplatePartialSpecialization.java |   7 ++
 ...tePartialSpecializationSpecialization.java |   9 ++
 .../composite/cpp/CompositeCPPClassType.java  |  19 +++
 .../CompositeCPPDeferredClassInstance.java    |  10 ++
 .../composite/cpp/CompositeCPPEnumScope.java  |   5 +
 .../cpp/CompositeCPPEnumeration.java          |   7 ++
 .../composite/cpp/CompositeCPPEnumerator.java |   2 +
 .../composite/cpp/CompositeCPPField.java      |   3 +
 .../cpp/CompositeCPPFieldSpecialization.java  |   3 +
 .../composite/cpp/CompositeCPPFunction.java   |  15 +++
 .../cpp/CompositeCPPFunctionInstance.java     |   7 ++
 .../CompositeCPPFunctionSpecialization.java   |   3 +
 .../cpp/CompositeCPPFunctionTemplate.java     |   4 +
 ...siteCPPFunctionTemplateSpecialization.java |   4 +
 .../composite/cpp/CompositeCPPMethod.java     |   7 ++
 .../cpp/CompositeCPPMethodInstance.java       |   7 ++
 .../cpp/CompositeCPPMethodSpecialization.java |   7 ++
 .../cpp/CompositeCPPMethodTemplate.java       |   7 ++
 ...positeCPPMethodTemplateSpecialization.java |   7 ++
 .../composite/cpp/CompositeCPPNamespace.java  |   3 +
 .../cpp/CompositeCPPNamespaceAlias.java       |   4 +
 .../cpp/CompositeCPPNamespaceScope.java       |   8 ++
 .../composite/cpp/CompositeCPPParameter.java  |   2 +
 .../CompositeCPPParameterSpecialization.java  |   3 +
 .../CompositeCPPTemplateNonTypeParameter.java |   6 +
 ...CompositeCPPTemplateTemplateParameter.java |  25 ++++
 .../CompositeCPPTemplateTypeParameter.java    |   9 ++
 .../composite/cpp/CompositeCPPTypedef.java    |   3 +
 .../CompositeCPPTypedefSpecialization.java    |   3 +
 .../cpp/CompositeCPPUnknownBinding.java       |   2 +
 .../cpp/CompositeCPPUnknownClassInstance.java |   1 +
 .../cpp/CompositeCPPUnknownClassType.java     |  14 +++
 .../cpp/CompositeCPPUsingDeclaration.java     |   3 +-
 ...siteCPPUsingDeclarationSpecialization.java |   3 +
 .../composite/cpp/CompositeCPPVariable.java   |   8 ++
 .../index/provider/IndexProviderManager.java  |   1 +
 .../provider/ReadOnlyPDOMProviderBridge.java  |   2 +
 ...tandaloneIndexerFallbackReaderFactory.java |   4 +
 .../core/parser/CodeReaderCacheEntry.java     |   1 +
 .../core/parser/CodeReaderFactoryAdapter.java |   4 +
 .../internal/core/parser/EmptyIterator.java   |   9 +-
 .../parser/scanner/ASTPreprocessorNode.java   |  64 +++++++++-
 .../core/parser/scanner/ILexerLog.java        |   2 +
 .../parser/scanner/InactiveCodeToken.java     |   2 +
 .../core/parser/scanner/LocationCtx.java      |   3 +
 .../parser/scanner/MacroExpansionStep.java    |   5 +
 .../scanner/MultiMacroExpansionExplorer.java  |   7 ++
 .../internal/core/parser/scanner/Token.java   |  10 ++
 .../util/ContentAssistMatcherFactory.java     |   6 +
 .../internal/core/parser/util/Profiler.java   |   2 +
 .../cdt/internal/core/pdom/WritablePDOM.java  |   1 +
 .../cdt/internal/core/pdom/db/BTree.java      |   4 +
 .../internal/core/pdom/db/DBProperties.java   |   7 ++
 .../core/pdom/db/TypeMarshalBuffer.java       |  15 +++
 .../internal/core/pdom/dom/ApplyVisitor.java  |   4 +
 .../internal/core/pdom/dom/FindBinding.java   |   6 +
 .../internal/core/pdom/dom/IPDOMBinding.java  |   1 +
 .../pdom/dom/MacroContainerCollector.java     |   2 +
 .../core/pdom/dom/MacroContainerFinder.java   |   2 +
 .../dom/MacroContainerPatternCollector.java   |   2 +
 .../core/pdom/dom/NamedNodeCollector.java     |   4 +
 .../internal/core/pdom/dom/PDOMBinding.java   |  10 ++
 .../dom/PDOMFragmentBindingComparator.java    |   1 +
 .../internal/core/pdom/dom/PDOMInclude.java   |  13 ++
 .../cdt/internal/core/pdom/dom/PDOMMacro.java |  34 ++++++
 .../core/pdom/dom/PDOMMacroContainer.java     |  10 ++
 .../pdom/dom/PDOMMacroDefinitionName.java     |  18 +++
 .../core/pdom/dom/PDOMMacroReferenceName.java |  23 ++++
 .../cdt/internal/core/pdom/dom/PDOMName.java  |  23 ++++
 .../cdt/internal/core/pdom/dom/PDOMNode.java  |   3 +
 .../PDOMProjectIndexLocationConverter.java    |   2 +
 .../core/pdom/dom/c/PDOMCEnumeration.java     |   6 +
 .../core/pdom/dom/c/PDOMCEnumerator.java      |   2 +
 .../internal/core/pdom/dom/c/PDOMCField.java  |   1 +
 .../core/pdom/dom/c/PDOMCFunction.java        |   9 ++
 .../core/pdom/dom/c/PDOMCLinkageFactory.java  |   2 +
 .../core/pdom/dom/c/PDOMCParameter.java       |  16 +++
 .../core/pdom/dom/c/PDOMCStructure.java       |  15 +++
 .../core/pdom/dom/c/PDOMCVariable.java        |   6 +
 .../core/pdom/dom/cpp/IPDOMCPPEnumType.java   |   1 +
 .../core/pdom/dom/cpp/PDOMCPPBase.java        |  10 ++
 .../core/pdom/dom/cpp/PDOMCPPBinding.java     |   2 +
 .../pdom/dom/cpp/PDOMCPPClassInstance.java    |   4 +
 .../core/pdom/dom/cpp/PDOMCPPClassScope.java  |  14 +++
 .../dom/cpp/PDOMCPPClassSpecialization.java   |  16 +++
 .../cpp/PDOMCPPClassSpecializationScope.java  |   1 +
 ...CPPClassTemplatePartialSpecialization.java |   8 ++
 .../core/pdom/dom/cpp/PDOMCPPClassType.java   |  15 +++
 .../dom/cpp/PDOMCPPDeferredClassInstance.java |  41 +++++--
 .../core/pdom/dom/cpp/PDOMCPPEnumScope.java   |   9 ++
 .../core/pdom/dom/cpp/PDOMCPPEnumeration.java |  10 ++
 .../core/pdom/dom/cpp/PDOMCPPEnumerator.java  |   2 +
 .../core/pdom/dom/cpp/PDOMCPPField.java       |   3 +
 .../dom/cpp/PDOMCPPFieldSpecialization.java   |  11 ++
 .../core/pdom/dom/cpp/PDOMCPPFunction.java    |  16 +++
 .../pdom/dom/cpp/PDOMCPPFunctionInstance.java |   4 +
 .../cpp/PDOMCPPFunctionSpecialization.java    |  15 +++
 .../pdom/dom/cpp/PDOMCPPFunctionTemplate.java |   5 +
 ...PDOMCPPFunctionTemplateSpecialization.java |   4 +
 .../pdom/dom/cpp/PDOMCPPLinkageFactory.java   |   2 +
 .../pdom/dom/cpp/PDOMCPPMethodInstance.java   |   7 ++
 .../dom/cpp/PDOMCPPMethodSpecialization.java  |   7 ++
 .../pdom/dom/cpp/PDOMCPPMethodTemplate.java   |   7 ++
 .../PDOMCPPMethodTemplateSpecialization.java  |   7 ++
 .../core/pdom/dom/cpp/PDOMCPPNamespace.java   |  15 ++-
 .../pdom/dom/cpp/PDOMCPPNamespaceAlias.java   |   4 +
 .../core/pdom/dom/cpp/PDOMCPPParameter.java   |  22 ++++
 .../cpp/PDOMCPPParameterSpecialization.java   |  10 ++
 .../pdom/dom/cpp/PDOMCPPSpecialization.java   |   4 +
 .../cpp/PDOMCPPTemplateNonTypeParameter.java  |  16 +++
 .../cpp/PDOMCPPTemplateTemplateParameter.java |  28 +++++
 .../dom/cpp/PDOMCPPTemplateTypeParameter.java |  11 ++
 .../dom/cpp/PDOMCPPTypedefSpecialization.java |   3 +
 .../pdom/dom/cpp/PDOMCPPUnknownBinding.java   |   4 +-
 .../dom/cpp/PDOMCPPUnknownClassInstance.java  |   2 +
 .../pdom/dom/cpp/PDOMCPPUnknownClassType.java |  39 ++++--
 .../pdom/dom/cpp/PDOMCPPUsingDeclaration.java |   5 +-
 ...PDOMCPPUsingDeclarationSpecialization.java |   3 +
 .../pdom/dom/cpp/PDOMCPPUsingDirective.java   |   5 +
 .../core/pdom/dom/cpp/PDOMCPPVariable.java    |   8 ++
 .../core/pdom/dom/cpp/PDOMClassUtil.java      |   8 ++
 .../pdom/export/GeneratePDOMApplication.java  |  10 ++
 .../core/pdom/indexer/PDOMFastIndexer.java    |   2 +
 .../core/pdom/indexer/PDOMNullIndexer.java    |   2 +
 .../core/pdom/indexer/PDOMUpdateTask.java     |   4 +
 ...ectIndexerIncludeResolutionHeuristics.java |   1 +
 .../core/pdom/indexer/TodoTaskUpdater.java    |   1 +
 .../indexer/TranslationUnitCollector.java     |   1 +
 .../pdom/indexer/TriggerNotificationTask.java |   4 +
 .../utils/org/eclipse/cdt/utils/Addr32.java   |  13 ++
 .../org/eclipse/cdt/utils/Addr32Factory.java  |   8 ++
 .../utils/org/eclipse/cdt/utils/Addr64.java   |  13 ++
 .../org/eclipse/cdt/utils/Addr64Factory.java  |   8 ++
 .../org/eclipse/cdt/utils/BinaryFile.java     |   4 +
 .../cdt/utils/BinaryObjectAdapter.java        |  10 ++
 .../cdt/utils/DefaultCygwinToolFactory.java   |   1 +
 .../cdt/utils/DefaultGnuToolFactory.java      |   4 +
 .../utils/org/eclipse/cdt/utils/Symbol.java   |  10 ++
 .../cdt/utils/coff/CodeViewReader.java        |   2 +
 .../coff/parser/CygwinPEBinaryObject.java     |   1 +
 .../utils/coff/parser/PEBinaryArchive.java    |   1 +
 .../cdt/utils/coff/parser/PEParser.java       |   5 +
 .../cdt/utils/debug/dwarf/DwarfReader.java    |   2 +
 .../cdt/utils/debug/stabs/StabsReader.java    |   2 +
 .../cdt/utils/debug/tools/DebugDump.java      |  16 +++
 .../cdt/utils/debug/tools/DebugSym.java       |   1 +
 .../utils/debug/tools/DebugSymsRequestor.java |  16 +++
 .../utils/org/eclipse/cdt/utils/elf/Elf.java  |   2 +
 .../cdt/utils/elf/SymbolSortCompare.java      |   1 +
 .../utils/elf/parser/ElfBinaryArchive.java    |   1 +
 .../cdt/utils/elf/parser/ElfParser.java       |   5 +
 .../utils/elf/parser/GNUElfBinaryObject.java  |   1 +
 .../org/eclipse/cdt/utils/macho/MachO.java    |   3 +
 .../org/eclipse/cdt/utils/macho/MachO64.java  |   3 +
 .../macho/parser/MachOBinaryArchive.java      |   1 +
 .../macho/parser/MachOBinaryArchive64.java    |   1 +
 .../cdt/utils/macho/parser/MachOParser.java   |   5 +
 .../cdt/utils/macho/parser/MachOParser64.java |   5 +
 .../utils/som/parser/SOMBinaryArchive.java    |   1 +
 .../cdt/utils/som/parser/SOMBinaryObject.java |   1 +
 .../cdt/utils/som/parser/SOMParser.java       |   5 +
 .../cdt/utils/xcoff/parser/XCOFF32Parser.java |   5 +
 .../xcoff/parser/XCOFFBinaryArchive.java      |   1 +
 .../utils/xcoff/parser/XCOFFBinaryObject.java |   1 +
 596 files changed, 4724 insertions(+), 922 deletions(-)

diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java
index 9b0e5c796d6..ba2a99528e9 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IQualifiedTypeName.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java
index c7d2db1cacc..76c201a9858 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/IndexTypeInfo.java
+++ b/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();
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java
index 12f19d65ca7..7bd9bcc90ac 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/QualifiedTypeName.java
+++ b/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;
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java
index b2058fb5738..a4c11b4d278 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeInfo.java
+++ b/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();
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java
index 4fcbd1f18a3..81be7d9b210 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeReference.java
+++ b/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;
     }
 }
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java
index 1d3a9c8e02a..181607da0cb 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/core/browser/TypeSearchScope.java
+++ b/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();
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java
index dd2bcf27f8b..4c890273466 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/ASTTypeInfo.java
+++ b/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();
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java
index f7565fcabfc..f6fc1d35fc9 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/CDataUtil.java
+++ b/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
-						| ICLanguageSettingEntry.INCLUDE_PATH
-						| ICLanguageSettingEntry.MACRO
-						| ICLanguageSettingEntry.MACRO_FILE,
+						ICSettingEntry.INCLUDE_FILE
+						| ICSettingEntry.INCLUDE_PATH
+						| ICSettingEntry.MACRO
+						| 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};
 	}
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java
index b795b3e8de5..076ddd75cbd 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/EntryStore.java
+++ b/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();
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java
index 3ced074d468..abe7357b868 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/KindBasedStore.java
+++ b/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:
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java
index a889fa9f68f..67c88706764 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/LanguageSettingEntriesSerializer.java
+++ b/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 ICLanguageSettingEntry.OUTPUT_PATH:
+		case ICSettingEntry.SOURCE_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;
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java
index 4ad6b180bc0..5bb8f290845 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CSettingsRefInfo.java
+++ b/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);
 		}
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java
index baa316c70b0..b9bd2a0b0cd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTCompletionNode.java
+++ b/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;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java
index 4901899be61..9705a2da9c1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeMatcher.java
+++ b/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;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java
index e65c1f82ab6..cd6693c48f6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/ASTTypeUtil.java
+++ b/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);
 					} 
 				}
 			}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java
index dc8c67af5ab..0ec7865b919 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTASMDeclaration.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java
index 6f0624bbeac..e43f0b4756c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBinaryTypeIdExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java
index 1dc73d44d02..280e7d185f2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTBreakStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java
index 52eb6c38d98..bc2a47204ea 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTCaseStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java
index 2290a205ffd..edfe26cacc2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTConditionalExpression.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java
index 2653f336abf..68ca0313abb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTContinueStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java
index 712c3bcb0dc..69d1f60d13f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclaration.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java
index cda8805e846..3646c7b0e0f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclarationStatement.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java
index fbcff0fc4c9..c58c80f80f0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDefaultStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java
index 9bd63ca8e51..2cfc7582a46 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDoStatement.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java
index 0737acce6e5..9b6f7879f84 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTElaboratedTypeSpecifier.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java
index 515e126f2cd..db16a75e72f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTEnumerationSpecifier.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java
index 9c38baed2cd..c5b548b3238 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java
index f745cc2629b..5d2a951c03b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTExpressionStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java
index c07b1f612e5..52ebc25457f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldDeclarator.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java
index 0f380df8d70..36d43ae27e6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFieldReference.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java
index f3a85ea5187..9e7ab27a51c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFileLocation.java
+++ b/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();
 
     /**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
index 83dcc637943..4b4634c6251 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTForStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java
index d6f26ef178d..ac3e387af3b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionCallExpression.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java
index 8b9a687fd28..70bbb3f460c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTFunctionDeclarator.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java
index 6fb715963a6..29eaec67a21 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTGotoStatement.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java
index afb6f2e5202..838b56f3a98 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIdExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java
index 11faa3f8b08..ba040b734a8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTIfStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java
index 3756816d45a..1f22ba47f6a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTImplicitName.java
+++ b/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;
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java
index 3d394b4f132..4684dc536ba 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializer.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java
index 1199ab83241..8243d6a663c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerClause.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java
index 4dc413bdf9a..7de70794e85 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java
index a4fdb2b84a3..412d61e7d58 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTInitializerList.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java
index 68290dea2b1..e856f4c5de6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLabelStatement.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
index 15bd17cf24f..afbf2d4b8be 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansion.java
+++ b/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();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java
index d5d0d710298..4edf83d7dcf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTMacroExpansionLocation.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java
index 17fbf27f116..06079daeb77 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNamedTypeSpecifier.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java
index b3e7a8cbccf..3e1ac165c3d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTNullStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java
index 4cf5ca99645..a3b29a8e594 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorIncludeStatement.java
+++ b/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();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java
index 64ab382c073..693cc8fe32f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorMacroDefinition.java
+++ b/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();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java
index 8524afc5520..e479ec909a6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTPreprocessorUndefStatement.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java
index fcb42f6e0c2..9906c152a54 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblem.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java
index bd23de9370b..9179487a073 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemDeclaration.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java
index 12d679045de..cee135c89e2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java
index b019a9b69c2..2c0e197c72c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java
index c87b4e2ad8b..6f80ccc40ac 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTProblemTypeId.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java
index 2f015c3b106..9a5e1d6266b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTReturnStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java
index f9fe7e36048..aa2cf3b3561 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclSpecifier.java
+++ b/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();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java
index c306d561790..668fce1f490 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSimpleDeclaration.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java
index 8340c43605d..eab95eb8392 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTStatement.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java
index c515d50c74f..d98fbf5b7ed 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTSwitchStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java
index 5f297e428d7..9161a767800 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeId.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java
index 7614957effd..f62f4313551 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java
index b14626cc687..e46da278b5e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTTypeIdInitializerExpression.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java
index 1677d06e0a1..7af56b5f991 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTUnaryExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java
index ba64a78776b..77dbe1ed089 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTWhileStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java
index 7c59f1479fc..6b96a2f8de9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IParameter.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java
index 63ca49b1a92..f1a460525eb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayDesignator.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java
index 386bbdd8a39..2dedeac2302 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTArrayModifier.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java
index 2bd039803e0..95a2dd0f31e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTCompositeTypeSpecifier.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java
index 1665ac244b7..14ba0dc05b3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDeclSpecifier.java
+++ b/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();
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java
index 7f6fbc3c315..aacfdab36d1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignatedInitializer.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java
index 567b4d3fbfd..59606cd7fcb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTDesignator.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java
index 6638e61c18a..1230f774b6c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTElaboratedTypeSpecifier.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java
index 8ffd70a56db..704f4fc9804 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTEnumerationSpecifier.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java
index 3b0c8b3ff1d..5efadb4bf8a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTFieldDesignator.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java
index 03d0314ad83..2b0df4a1b27 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTPointer.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java
index 8bfbc7a65af..ad6d8553207 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java
index 6f31a0f8eeb..fdbe18184d5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypeIdInitializerExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java
index 3206ef68694..e3187db6ef4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICASTTypedefNameSpecifier.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java
index da6e5c4ce89..d8637c81ec9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICNodeFactory.java
+++ b/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);
 }
\ No newline at end of file
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java
index 49e598380b3..4db773eb9ee 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/c/ICPointerType.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java
index 285e4547c02..0168f8cb828 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTArraySubscriptExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java
index b1bf7a0e199..6f7e75df787 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTBinaryExpression.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java
index e579e3c6d11..de263711268 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCapture.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java
index 1b0597bf177..717d788641a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCastExpression.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java
index 890501281d0..89aea7607d1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorChainInitializer.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java
index 02308e5f3a8..06b7039541c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConstructorInitializer.java
+++ b/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);
 
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java
index 0af83088fdf..ab3523e7e88 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTConversionName.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java
index c3f9584e2be..16567e54292 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java
index 55fc3fdb996..d28d9316313 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTDeleteExpression.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java
index fc965e02b71..d343e8088d7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTElaboratedTypeSpecifier.java
+++ b/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);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java
index d4744fda95a..0910d79f7c9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTEnumerationSpecifier.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java
index 3adecb972ea..1f9f0095a6c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExplicitTemplateInstantiation.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java
index 0393e524063..3c8cca4cbf8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTExpressionList.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java
index 03a06174cbe..9e1a55b47ea 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFieldReference.java
+++ b/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);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java
index fb5281dd524..ae47d0d8b67 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTForStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java
index 985dfe12840..2898b98af9d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionCallExpression.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
index ffc45aa2df2..e5d8af0d57b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTFunctionTryBlockDeclarator.java
+++ b/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();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java
index b92519009d3..49aeb1c9f62 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTIfStatement.java
+++ b/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);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java
index 141fbfca63e..2dc1d7b2c4f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java
@@ -21,10 +21,12 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializerList;
  */
 public interface ICPPASTInitializerList extends IASTInitializerList, ICPPASTPackExpandable {
 
+	@Override
 	ICPPASTInitializerList copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	ICPPASTInitializerList copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java
index d1e6aab720c..6f4450f157a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLinkageSpecification.java
@@ -57,15 +57,18 @@ public interface ICPPASTLinkageSpecification extends IASTDeclaration, IASTDeclar
 	 * @param declaration
 	 *            <code>IASTDeclaration</code>
 	 */
+	@Override
 	public void addDeclaration(IASTDeclaration declaration);
 	
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTLinkageSpecification copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTLinkageSpecification copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java
index f1f8f8856ac..e93a7e76a7c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTLiteralExpression.java
@@ -45,10 +45,12 @@ public interface ICPPASTLiteralExpression extends IASTLiteralExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTLiteralExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTLiteralExpression copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java
index 92b0bac98b1..884c2b2f077 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamedTypeSpecifier.java
@@ -40,11 +40,13 @@ public interface ICPPASTNamedTypeSpecifier extends IASTNamedTypeSpecifier,
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTNamedTypeSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTNamedTypeSpecifier copy(CopyStyle style);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java
index a01bf8c6c53..146c9d79512 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNamespaceAlias.java
@@ -72,11 +72,13 @@ public interface ICPPASTNamespaceAlias extends IASTDeclaration, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTNamespaceAlias copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTNamespaceAlias copy(CopyStyle style);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java
index af0d7b76706..6c466746c56 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTNewExpression.java
@@ -74,11 +74,13 @@ public interface ICPPASTNewExpression extends IASTExpression, IASTImplicitNameOw
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTNewExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTNewExpression copy(CopyStyle style);
 
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java
index 403a4bd6094..344960f2a06 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTOperatorName.java
@@ -23,10 +23,12 @@ public interface ICPPASTOperatorName extends IASTName {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTOperatorName copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTOperatorName copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java
index 3f8c82d5307..b84858e4d84 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTPointerToMember.java
@@ -46,6 +46,7 @@ public interface ICPPASTPointerToMember extends IASTPointer, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTPointerToMember copy();
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java
index ea1eae11229..d5c72f49e73 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTQualifiedName.java
@@ -47,6 +47,7 @@ public interface ICPPASTQualifiedName extends IASTName, IASTNameOwner {
 	 * The last name is often semantically significant.
 	 * 
 	 */
+	@Override
 	public IASTName getLastName();
 	
 	/**
@@ -74,10 +75,12 @@ public interface ICPPASTQualifiedName extends IASTName, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTQualifiedName copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTQualifiedName copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java
index f4de4049c8b..fde6289ad40 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java
@@ -23,11 +23,13 @@ public interface ICPPASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICP
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTSimpleDeclSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTSimpleDeclSpecifier copy(CopyStyle style);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java
index 12e1dcbd208..0b15cd95447 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeConstructorExpression.java
@@ -53,11 +53,13 @@ public interface ICPPASTSimpleTypeConstructorExpression extends IASTExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTSimpleTypeConstructorExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTSimpleTypeConstructorExpression copy(CopyStyle style);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java
index 01ffd316f2d..34ccc93a17d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSimpleTypeTemplateParameter.java
@@ -86,10 +86,12 @@ public interface ICPPASTSimpleTypeTemplateParameter extends ICPPASTTemplateParam
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTSimpleTypeTemplateParameter copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTSimpleTypeTemplateParameter copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java
index 87753ab4ca0..e97f618e8f2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTSwitchStatement.java
@@ -53,10 +53,12 @@ public interface ICPPASTSwitchStatement extends IASTSwitchStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTSwitchStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTSwitchStatement copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java
index af99c09645f..7ef6c4e6661 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateDeclaration.java
@@ -94,10 +94,12 @@ public interface ICPPASTTemplateDeclaration extends IASTDeclaration {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTemplateDeclaration copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTemplateDeclaration copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java
index 5f379d33fa5..147bcbc4962 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateId.java
@@ -87,11 +87,13 @@ public interface ICPPASTTemplateId extends IASTName, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTemplateId copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTemplateId copy(CopyStyle style);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java
index 98d731a4204..d1e4a69d408 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateParameter.java
@@ -31,10 +31,12 @@ public interface ICPPASTTemplateParameter extends IASTNode {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTemplateParameter copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTemplateParameter copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java
index 7dae09c69ec..e6fd269b0e5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplateSpecialization.java
@@ -45,10 +45,12 @@ public interface ICPPASTTemplateSpecialization extends IASTDeclaration {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTemplateSpecialization copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTemplateSpecialization copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java
index dc285516c86..ff40b2ac774 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTemplatedTypeTemplateParameter.java
@@ -63,11 +63,13 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends ICPPASTTemplatePa
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTemplatedTypeTemplateParameter copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTemplatedTypeTemplateParameter copy(CopyStyle style);
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java
index ac1d24e5a0d..2c8c4a3a725 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTranslationUnit.java
@@ -30,10 +30,12 @@ public interface ICPPASTTranslationUnit extends IASTTranslationUnit {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTranslationUnit copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTranslationUnit copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java
index 5cba5dac7c1..c367cdf8ea6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTryBlockStatement.java
@@ -67,11 +67,13 @@ public interface ICPPASTTryBlockStatement extends IASTStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTryBlockStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTryBlockStatement copy(CopyStyle style);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java
index 985f77caf75..f5f4f32c1ed 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypeIdExpression.java
@@ -31,10 +31,12 @@ public interface ICPPASTTypeIdExpression extends IASTTypeIdExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTypeIdExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTTypeIdExpression copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java
index 2123f9ab9be..94d54fe9e48 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTTypenameExpression.java
@@ -71,6 +71,7 @@ public interface ICPPASTTypenameExpression extends ICPPASTSimpleTypeConstructorE
 	 * @param expressionList
 	 *            <code>IASTExpression</code>
 	 */
+	@Override
 	public void setInitialValue(IASTExpression expressionList);
 
 	/**
@@ -78,11 +79,13 @@ public interface ICPPASTTypenameExpression extends ICPPASTSimpleTypeConstructorE
 	 * 
 	 * @return <code>IASTExpression</code>
 	 */
+	@Override
 	public IASTExpression getInitialValue();
 	
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTTypenameExpression copy();
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java
index d6ef6b705a5..db93cccbd88 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java
@@ -39,10 +39,12 @@ public interface ICPPASTUnaryExpression extends IASTUnaryExpression, IASTImplici
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTUnaryExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTUnaryExpression copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java
index cb5dfc9e57d..146b3153ccd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDeclaration.java
@@ -61,10 +61,12 @@ public interface ICPPASTUsingDeclaration extends IASTDeclaration, IASTNameOwner
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTUsingDeclaration copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTUsingDeclaration copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java
index 6591412b6e3..63898bbc283 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTUsingDirective.java
@@ -52,11 +52,13 @@ public interface ICPPASTUsingDirective extends IASTDeclaration, IASTNameOwner {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTUsingDirective copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTUsingDirective copy(CopyStyle style);
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java
index d73108b7d51..f068d05de17 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTWhileStatement.java
@@ -54,10 +54,12 @@ public interface ICPPASTWhileStatement extends IASTWhileStatement {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPASTWhileStatement copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICPPASTWhileStatement copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java
index 540197cef52..597770da991 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPClassSpecialization.java
@@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IBinding;
  */
 public interface ICPPClassSpecialization extends ICPPSpecialization, ICPPClassType {
 	
+	@Override
 	ICPPClassType getSpecializedBinding();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java
index 23893ba0fa1..8c5f0ceef41 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPFunction.java
@@ -30,7 +30,8 @@ public interface ICPPFunction extends IFunction, ICPPBinding {
     /**
      * is this an inline function
      */
-    public boolean isInline();
+    @Override
+	public boolean isInline();
     
     /**
      * Returns whether this function is declared as extern "C".
@@ -49,12 +50,14 @@ public interface ICPPFunction extends IFunction, ICPPBinding {
      * {@inheritDoc}
 	 * @since 5.1
 	 */
-    public ICPPFunctionType getType();
+    @Override
+	public ICPPFunctionType getType();
     
     /**
 	 * @since 5.2
 	 */
-    public ICPPParameter[] getParameters();
+    @Override
+	public ICPPParameter[] getParameters();
     
     /**
      * @since 5.2
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
index f002e328c31..d0ec04341c8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPNodeFactory.java
@@ -41,8 +41,10 @@ public interface ICPPNodeFactory extends INodeFactory {
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public ICPPASTArrayDeclarator newArrayDeclarator(IASTName name);
 	
+	@Override
 	public ICPPASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr, IASTExpression subscript);
 	
 	/**
@@ -52,6 +54,7 @@ public interface ICPPNodeFactory extends INodeFactory {
 	
 	public ICPPASTBaseSpecifier newBaseSpecifier(IASTName name, int visibility, boolean isVirtual);
 	
+	@Override
 	public ICPPASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTExpression expr2);
 	
 	/**
@@ -69,10 +72,12 @@ public interface ICPPNodeFactory extends INodeFactory {
 	 */
 	public ICPPASTCapture newCapture();
 	
+	@Override
 	public ICPPASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand);
 	
 	public ICPPASTCatchHandler newCatchHandler(IASTDeclaration decl, IASTStatement body);
 
+	@Override
 	public ICPPASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name);
 	
 	/**
@@ -102,10 +107,12 @@ public interface ICPPNodeFactory extends INodeFactory {
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public ICPPASTDeclarator newDeclarator(IASTName name);
 	
 	public ICPPASTDeleteExpression newDeleteExpression(IASTExpression operand);
 
+	@Override
 	public ICPPASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name);
 
 	/**
@@ -121,13 +128,16 @@ public interface ICPPNodeFactory extends INodeFactory {
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation newExplicitTemplateInstantiationGPP(IASTDeclaration declaration);
 
+	@Override
 	public ICPPASTExpressionList newExpressionList();
 	
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public ICPPASTFieldDeclarator newFieldDeclarator(IASTName name, IASTExpression bitFieldSize);
 	
+	@Override
 	public ICPPASTFieldReference newFieldReference(IASTName name, IASTExpression owner);
 	
 	public ICPPASTForStatement newForStatement();
@@ -135,22 +145,27 @@ public interface ICPPNodeFactory extends INodeFactory {
 	public ICPPASTForStatement newForStatement(IASTStatement init, IASTDeclaration condition,
 			IASTExpression iterationExpression, IASTStatement body);
 	
+	@Override
 	public ICPPASTForStatement newForStatement(IASTStatement init, IASTExpression condition,
 			IASTExpression iterationExpression, IASTStatement body);
 	
 	/**
 	 * @deprecated Replaced by {@link #newFunctionCallExpression(IASTExpression, IASTInitializerClause[])}.
 	 */
+	@Override
 	@Deprecated
 	public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList);
 	
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTInitializerClause[] arguments);
 	
+	@Override
 	public ICPPASTFunctionDeclarator newFunctionDeclarator(IASTName name);
 	
+	@Override
 	public ICPPASTFunctionDefinition newFunctionDefinition(IASTDeclSpecifier declSpecifier,
 			IASTFunctionDeclarator declarator, IASTStatement bodyStatement);
 	
@@ -161,11 +176,13 @@ public interface ICPPNodeFactory extends INodeFactory {
 	
 	public ICPPASTIfStatement newIfStatement(IASTDeclaration condition, IASTStatement then, IASTStatement elseClause);
 
+	@Override
 	public ICPPASTIfStatement newIfStatement(IASTExpression condition, IASTStatement then, IASTStatement elseClause);
 
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public ICPPASTInitializerList newInitializerList();
 	
 	/**
@@ -175,6 +192,7 @@ public interface ICPPNodeFactory extends INodeFactory {
 
 	public ICPPASTLinkageSpecification newLinkageSpecification(String literal);
 
+	@Override
 	public ICPPASTLiteralExpression newLiteralExpression(int kind, String rep);
 	
 	public ICPPASTNamespaceAlias newNamespaceAlias(IASTName alias, IASTName qualifiedName);
@@ -200,6 +218,7 @@ public interface ICPPNodeFactory extends INodeFactory {
 	 */
 	public ICPPASTPackExpansionExpression newPackExpansionExpression(IASTExpression pattern);
 	
+	@Override
 	public ICPPASTParameterDeclaration newParameterDeclaration(IASTDeclSpecifier declSpec, IASTDeclarator declarator);
 
 	/**
@@ -242,6 +261,7 @@ public interface ICPPNodeFactory extends INodeFactory {
 	 */
 	public IASTReturnStatement newReturnStatement(IASTInitializerClause retValue);
 
+	@Override
 	public ICPPASTSimpleDeclSpecifier newSimpleDeclSpecifier();
 
 	/**
@@ -273,6 +293,7 @@ public interface ICPPNodeFactory extends INodeFactory {
 
 	public ICPPASTSwitchStatement newSwitchStatement(IASTDeclaration controller, IASTStatement body);
 
+	@Override
 	public ICPPASTSwitchStatement newSwitchStatement(IASTExpression controlloer, IASTStatement body);
 	
 	public ICPPASTTemplateDeclaration newTemplateDeclaration(IASTDeclaration declaration);
@@ -286,6 +307,7 @@ public interface ICPPNodeFactory extends INodeFactory {
 	/**
 	 * @deprecated Replaced by {@link #newTranslationUnit(IScanner)}.
 	 */
+	@Override
 	@Deprecated
 	public ICPPASTTranslationUnit newTranslationUnit();
 
@@ -295,17 +317,21 @@ public interface ICPPNodeFactory extends INodeFactory {
 	 * @scanner the preprocessor the translation unit interacts with.
 	 * @since 5.2
 	 */
+	@Override
 	public ICPPASTTranslationUnit newTranslationUnit(IScanner scanner);
 	
 	public ICPPASTTryBlockStatement newTryBlockStatement(IASTStatement body);
 	
+	@Override
 	public ICPPASTNamedTypeSpecifier newTypedefNameSpecifier(IASTName name);
 
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public ICPPASTTypeId newTypeId(IASTDeclSpecifier declSpecifier, IASTDeclarator declarator);
 	
+	@Override
 	public ICPPASTTypeIdExpression newTypeIdExpression(int operator, IASTTypeId typeId);
 
 	/**
@@ -314,6 +340,7 @@ public interface ICPPNodeFactory extends INodeFactory {
 	@Deprecated
 	public ICPPASTTypenameExpression newTypenameExpression(IASTName qualifiedName, IASTExpression expr, boolean isTemplate);
 
+	@Override
 	public ICPPASTUnaryExpression newUnaryExpression(int operator, IASTExpression operand);
 
 	public ICPPASTUsingDeclaration newUsingDeclaration(IASTName name);
@@ -326,5 +353,6 @@ public interface ICPPNodeFactory extends INodeFactory {
 
 	public ICPPASTWhileStatement newWhileStatement(IASTDeclaration condition, IASTStatement body);
 	
+	@Override
 	public ICPPASTWhileStatement newWhileStatement(IASTExpression condition, IASTStatement body);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java
index 90801b4d4ac..e86fa831fa2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTemplateParameter.java
@@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IType;
  */
 public interface ICPPTemplateTemplateParameter extends ICPPTemplateParameter, ICPPClassTemplate {
 
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters();
 	
 	/**
@@ -36,5 +37,6 @@ public interface ICPPTemplateTemplateParameter extends ICPPTemplateParameter, IC
 	 * 
 	 * @since 5.1
 	 */
+	@Override
 	public boolean isSameType(IType type);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java
index ca78643bc97..0c494c5bc52 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPTemplateTypeParameter.java
@@ -33,5 +33,6 @@ public interface ICPPTemplateTypeParameter extends ICPPTemplateParameter, IType
 	 * 
 	 * @since 5.1
 	 */
+	@Override
 	public boolean isSameType(IType type);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java
index 6990d2188b3..fccaed20501 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTCompoundStatementExpression.java
@@ -49,10 +49,12 @@ public interface IGNUASTCompoundStatementExpression extends IASTExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGNUASTCompoundStatementExpression copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IGNUASTCompoundStatementExpression copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java
index 89987eb3b6e..6d934b3f0f3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java
@@ -44,5 +44,6 @@ public interface IGNUASTTypeIdExpression extends IASTTypeIdExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGNUASTTypeIdExpression copy();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java
index 86be3b62afe..e1573bb2ae2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java
@@ -24,5 +24,6 @@ public interface IGNUASTUnaryExpression extends IASTUnaryExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGNUASTUnaryExpression copy();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java
index f92d0611008..bb22d42ff5a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/GCCLanguage.java
@@ -55,10 +55,12 @@ public class GCCLanguage extends AbstractCLikeLanguage {
 		return super.getAdapter(adapter);
 	}
 	
+	@Override
 	public String getId() {
 		return ID; 
 	}
 
+	@Override
 	public int getLinkageID() {
 		return ILinkage.C_LINKAGE_ID;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java
index 7bc8b0fde85..d5d2c07bed2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/ICASTKnRFunctionDeclarator.java
@@ -78,10 +78,12 @@ public interface ICASTKnRFunctionDeclarator extends IASTFunctionDeclarator {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public ICASTKnRFunctionDeclarator copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public ICASTKnRFunctionDeclarator copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java
index 31750550de2..cae2ac013c4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTArrayRangeDesignator.java
@@ -72,10 +72,12 @@ public interface IGCCASTArrayRangeDesignator extends ICASTDesignator {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGCCASTArrayRangeDesignator copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IGCCASTArrayRangeDesignator copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java
index 9c4b5b1717e..21462ad6aa2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java
@@ -57,10 +57,12 @@ public interface IGCCASTSimpleDeclSpecifier extends ICASTSimpleDeclSpecifier {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGCCASTSimpleDeclSpecifier copy();
 
 	/**
 	 * @since 5.3
 	 */
+	@Override
 	public IGCCASTSimpleDeclSpecifier copy(CopyStyle style);
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java
index 152fd297ed0..5336a2b409d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java
@@ -41,6 +41,7 @@ public interface IGPPASTBinaryExpression extends ICPPASTBinaryExpression {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGPPASTBinaryExpression copy();
 
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java
index f95edf9008a..9650c5cfc63 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java
@@ -25,5 +25,6 @@ public interface IGPPASTDeclSpecifier extends IASTDeclSpecifier {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGPPASTDeclSpecifier copy();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java
index fbaedb9da24..87300b8545f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java
@@ -41,5 +41,6 @@ public interface IGPPASTExplicitTemplateInstantiation extends
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGPPASTExplicitTemplateInstantiation copy();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java
index a3920683fc6..0c8c914f42c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java
@@ -21,5 +21,6 @@ public interface IGPPASTPointer extends IASTPointer {
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGPPASTPointer copy();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java
index 18e97ab3af0..cc4feb7a0fc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java
@@ -21,5 +21,6 @@ public interface IGPPASTPointerToMember extends IGPPASTPointer, ICPPASTPointerTo
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGPPASTPointerToMember copy();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java
index 3db6a29fe56..3f0ee07f146 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java
@@ -39,6 +39,7 @@ public interface IGPPASTSimpleDeclSpecifier extends IGPPASTDeclSpecifier, ICPPAS
 	/**
 	 * @since 5.1
 	 */
+	@Override
 	public IGPPASTSimpleDeclSpecifier copy();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java
index debfb193ba5..e9ec9210087 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/AbstractScannerExtensionConfiguration.java
@@ -37,9 +37,11 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 			fExpansion= expansion;
 		}
 		
+		@Override
 		public char[] getSignature() {
 			return fSignature;
 		}
+		@Override
 		public char[] getExpansion() {
 			return fExpansion;
 		}
@@ -51,6 +53,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration#support$InIdentifiers()
 	 */
+	@Override
 	public boolean support$InIdentifiers() {
 		return false;
 	}
@@ -59,6 +62,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportAtSignInIdentifiers() {
 		return false;
 	}
@@ -68,6 +72,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportUTFLiterals() {
 		return true;
 	}
@@ -77,6 +82,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportSlashPercentComments() {
 		return false;
 	}
@@ -84,6 +90,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration#supportAdditionalNumericLiteralSuffixes()
 	 */
+	@Override
 	public char[] supportAdditionalNumericLiteralSuffixes() {
 		return null;
 	}
@@ -91,18 +98,22 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.IScannerExtensionConfiguration#supportMinAndMaxOperators()
 	 */
+	@Override
 	public boolean supportMinAndMaxOperators() {
 		return false;
 	}
 
+	@Override
 	public CharArrayIntMap getAdditionalPreprocessorKeywords() {
 		return fAddPreprocessorKeywords;
 	}
 	
+	@Override
 	public CharArrayIntMap getAdditionalKeywords() {
 		return fAddKeywords;
 	}
 
+	@Override
 	public IMacro[] getAdditionalMacros() {
 		if (fAddMacros == null) {
 			if (fAddMacroList == null) {
@@ -190,6 +201,7 @@ public abstract class AbstractScannerExtensionConfiguration implements IScannerE
 	/**
 	 * @deprecated see {@link IScannerExtensionConfiguration#initializeMacroValuesTo1()}
 	 */
+	@Override
 	@Deprecated
 	public boolean initializeMacroValuesTo1() {
 		return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java
index cb54e9cd27c..51a89884fbc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/CLanguageKeywords.java
@@ -49,6 +49,7 @@ public class CLanguageKeywords implements ICLanguageKeywords {
 		this.config = config;
 	}
 	
+	@Override
 	public String[] getKeywords() {
 		if (keywords == null) {
 			Set<String> keywordSet = new HashSet<String>(KeywordSets.getKeywords(KeywordSetKey.KEYWORDS, language));
@@ -64,6 +65,7 @@ public class CLanguageKeywords implements ICLanguageKeywords {
 		return keywords;
 	}
 	
+	@Override
 	public String[] getBuiltinTypes() {
 		if (builtinTypes == null) {
 			Set<String> types = KeywordSets.getKeywords(KeywordSetKey.TYPES, language);
@@ -72,6 +74,7 @@ public class CLanguageKeywords implements ICLanguageKeywords {
 		return builtinTypes;
 	}
 
+	@Override
 	public String[] getPreprocessorKeywords() {
 		if (preprocessorKeywords == null) {
 			Set<String> keywords = new HashSet<String>(KeywordSets.getKeywords(KeywordSetKey.PP_DIRECTIVE, language));
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java
index 2589220e106..27c97674c41 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/AbstractCParserExtensionConfiguration.java
@@ -25,6 +25,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportAlignOfUnaryExpression()
 	 */
+	@Override
 	public boolean supportAlignOfUnaryExpression() {
 		return false;
 	}
@@ -32,6 +33,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportAttributeSpecifiers()
 	 */
+	@Override
 	public boolean supportAttributeSpecifiers() {
 		return false;
 	}
@@ -39,6 +41,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportDeclspecSpecifiers()
 	 */
+	@Override
 	public boolean supportDeclspecSpecifiers() {
 		return false;
 	}
@@ -46,6 +49,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportGCCOtherBuiltinSymbols()
 	 */
+	@Override
 	public boolean supportGCCOtherBuiltinSymbols() {
 		return false;
 	}
@@ -53,6 +57,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportGCCStyleDesignators()
 	 */
+	@Override
 	public boolean supportGCCStyleDesignators() {
 		return false;
 	}
@@ -60,6 +65,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportKnRC()
 	 */
+	@Override
 	public boolean supportKnRC() {
 		return false;
 	}
@@ -67,6 +73,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportStatementsInExpressions()
 	 */
+	@Override
 	public boolean supportStatementsInExpressions() {
 		return false;
 	}
@@ -74,6 +81,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#supportTypeofUnaryExpressions()
 	 */
+	@Override
 	public boolean supportTypeofUnaryExpressions() {
 		return false;
 	}
@@ -81,6 +89,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.c.ICParserExtensionConfiguration#getBuiltinSymbolProvider()
 	 */
+	@Override
 	public IBuiltinBindingsProvider getBuiltinBindingsProvider() {
 		return new GCCBuiltinSymbolProvider(ParserLanguage.C, supportGCCOtherBuiltinSymbols());
 	}
@@ -89,6 +98,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportParameterInfoBlock() {
 		return false;
 	}
@@ -97,6 +107,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportExtendedSizeofOperator() {
 		return false;
 	}
@@ -105,6 +116,7 @@ public abstract class AbstractCParserExtensionConfiguration implements ICParserE
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportFunctionStyleAssembler() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java
index 20b8b98a1d9..07f3913ca02 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/AbstractCPPParserExtensionConfiguration.java
@@ -26,6 +26,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#allowRestrictPointerOperators()
 	 */
+	@Override
 	public boolean allowRestrictPointerOperators() {
 		return false;
 	}
@@ -33,6 +34,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportAlignOfUnaryExpression()
 	 */
+	@Override
 	public boolean supportAlignOfUnaryExpression() {
 		return false;
 	}
@@ -40,6 +42,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportAttributeSpecifiers()
 	 */
+	@Override
 	public boolean supportAttributeSpecifiers() {
 		return false;
 	}
@@ -47,6 +50,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportComplexNumbers()
 	 */
+	@Override
 	public boolean supportComplexNumbers() {
 		return false;
 	}
@@ -54,6 +58,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportDeclspecSpecifiers()
 	 */
+	@Override
 	public boolean supportDeclspecSpecifiers() {
 		return false;
 	}
@@ -61,6 +66,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportExtendedTemplateSyntax()
 	 */
+	@Override
 	public boolean supportExtendedTemplateSyntax() {
 		return false;
 	}
@@ -68,6 +74,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportGCCOtherBuiltinSymbols()
 	 */
+	@Override
 	public boolean supportGCCOtherBuiltinSymbols() {
 		return false;
 	}
@@ -75,6 +82,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportKnRC()
 	 */
+	@Override
 	public boolean supportKnRC() {
 		return false;
 	}
@@ -82,6 +90,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportLongLongs()
 	 */
+	@Override
 	public boolean supportLongLongs() {
 		return false;
 	}
@@ -89,6 +98,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportMinAndMaxOperators()
 	 */
+	@Override
 	public boolean supportMinAndMaxOperators() {
 		return false;
 	}
@@ -96,6 +106,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportRestrictKeyword()
 	 */
+	@Override
 	public boolean supportRestrictKeyword() {
 		return false;
 	}
@@ -103,6 +114,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportStatementsInExpressions()
 	 */
+	@Override
 	public boolean supportStatementsInExpressions() {
 		return false;
 	}
@@ -110,6 +122,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#supportTypeofUnaryExpressions()
 	 */
+	@Override
 	public boolean supportTypeofUnaryExpressions() {
 		return false;
 	}
@@ -118,6 +131,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportParameterInfoBlock() {
 		return false;
 	}
@@ -126,6 +140,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportExtendedSizeofOperator() {
 		return false;
 	}
@@ -134,6 +149,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	public boolean supportFunctionStyleAssembler() {
 		return false;
 	}
@@ -141,6 +157,7 @@ public abstract class AbstractCPPParserExtensionConfiguration implements ICPPPar
 	/*
 	 * @see org.eclipse.cdt.core.dom.parser.cpp.ICPPParserExtensionConfiguration#getBuiltinBindingsProvider()
 	 */
+	@Override
 	public IBuiltinBindingsProvider getBuiltinBindingsProvider() {
 		return new GCCBuiltinSymbolProvider(ParserLanguage.CPP, supportGCCOtherBuiltinSymbols());
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java
index 6156ab8ddac..fe3ca770572 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/AbstractExportProjectProvider.java
@@ -48,6 +48,7 @@ public abstract class AbstractExportProjectProvider implements IExportProjectPro
 	/*
 	 * @see org.eclipse.cdt.core.index.export.IExportProjectProvider#setApplicationArguments(java.lang.String[])
 	 */
+	@Override
 	public void setApplicationArguments(String[] arguments) {
 		this.appArguments= arguments.clone();
 		this.arguments= Collections.unmodifiableMap(CLIUtil.parseToMap(arguments));
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java
index d0180819be1..5bcfcf05be3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/export/ExternalExportProjectProvider.java
@@ -74,6 +74,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
 	 * (non-Javadoc)
 	 * @see org.eclipse.cdt.core.index.export.IProjectForExportManager#createProject(java.util.Map)
 	 */
+	@Override
 	public ICProject createProject() throws CoreException {
 		// -source
 		File source= new File(getSingleString(OPT_SOURCE));
@@ -115,6 +116,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
 		final ICProject newProject[] = new ICProject[1];
 
 		ws.run(new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				IWorkspace workspace= ResourcesPlugin.getWorkspace();
 				IProject project= workspace.getRoot().getProject("__prebuilt_index_temp__" + System.currentTimeMillis()); //$NON-NLS-1$
@@ -181,6 +183,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
 	/*
 	 * @see org.eclipse.cdt.core.index.export.IExportProjectProvider#getLocationConverter(org.eclipse.cdt.core.model.ICProject)
 	 */
+	@Override
 	public IIndexLocationConverter getLocationConverter(final ICProject cproject) {
 		return new ResourceContainerRelativeLocationConverter(content);
 	}
@@ -188,6 +191,7 @@ public class ExternalExportProjectProvider extends AbstractExportProjectProvider
 	/*
 	 * @see org.eclipse.cdt.core.index.export.IExportProjectProvider#getExportProperties()
 	 */
+	@Override
 	public Map<String, String> getExportProperties() {
 		Map<String, String> properties= new HashMap<String, String>();
 		Date now= Calendar.getInstance().getTime();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java
index 64650e13a17..4841d81b535 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/AbstractParserLogService.java
@@ -24,6 +24,7 @@ public abstract class AbstractParserLogService implements IParserLogService {
 		return new ParserLogServiceWrapper(log);
 	}
 	
+	@Override
 	public void traceLog(String message) {
 	}
 
@@ -46,6 +47,7 @@ public abstract class AbstractParserLogService implements IParserLogService {
 	public void errorLog(String message) {
 	}
 
+	@Override
 	public boolean isTracing(){
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java
index 22ffa0c17f9..92be2a93c94 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ExtendedScannerInfo.java
@@ -63,6 +63,7 @@ public class ExtendedScannerInfo extends ScannerInfo implements IExtendedScanner
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.parser.IExtendedScannerInfo#getMacroFiles()
 	 */
+	@Override
 	public String[] getMacroFiles() {
 		if (macroFiles == null)
 			return EMPTY_STRING_ARRAY;
@@ -72,6 +73,7 @@ public class ExtendedScannerInfo extends ScannerInfo implements IExtendedScanner
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.parser.IExtendedScannerInfo#getIncludeFiles()
 	 */
+	@Override
 	public String[] getIncludeFiles() {
 		if (includeFiles == null)
 			return EMPTY_STRING_ARRAY;
@@ -81,6 +83,7 @@ public class ExtendedScannerInfo extends ScannerInfo implements IExtendedScanner
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.parser.IExtendedScannerInfo#getLocalIncludePath()
 	 */
+	@Override
 	public String[] getLocalIncludePath() {
 		if (localIncludePaths == null)
 			return EMPTY_STRING_ARRAY;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java
index 51fa91c3aef..5c8d957b0b6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java
@@ -33,6 +33,7 @@ public interface ITokenDuple {
 	public int getSegmentCount();
 	
 	public abstract Iterator<IToken> iterator();
+	@Override
 	public abstract String toString();
 	public char [] toCharArray();
 			
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java
index fe4e415a9ec..cab4145565e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ScannerInfo.java
@@ -38,14 +38,16 @@ public class ScannerInfo implements IScannerInfo {
 	/* (non-Javadoc)
      * @see org.eclipse.cdt.core.parser.IScannerInfo#getDefinedSymbols()
      */
-    public Map<String, String> getDefinedSymbols() {
+    @Override
+	public Map<String, String> getDefinedSymbols() {
         return definedSymbols;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.parser.IScannerInfo#getIncludePaths()
      */
-    public String[] getIncludePaths() {
+    @Override
+	public String[] getIncludePaths() {
         return includePaths;
     }
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java
index 55d6a80a95d..b471eda38d1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CharArrayMap.java
@@ -109,7 +109,8 @@ public final class CharArrayMap<V> {
         }
         
         
-        public int compareTo(Key other) {
+        @Override
+		public int compareTo(Key other) {
         	char[] b1 = buffer, b2 = other.buffer;
         	
         	for(int i = start, j = other.start; i < b1.length && j < b2.length; i++, j++) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java
index b8d9a6c1494..4ada6ff99f4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/CollectionUtils.java
@@ -36,12 +36,15 @@ public final class CollectionUtils {
 		return new Iterator<T>() {	
 			ListIterator<T> iterator = list.listIterator(list.size());
 			
+			@Override
 			public boolean hasNext() {
 				return iterator.hasPrevious();
 			}
+			@Override
 			public T next() {
 				return iterator.previous();
 			}
+			@Override
 			public void remove() {
 				throw new UnsupportedOperationException("remove() not supported"); //$NON-NLS-1$
 			}
@@ -80,6 +83,7 @@ public final class CollectionUtils {
 			throw new NullPointerException("iter parameter is null"); //$NON-NLS-1$
 			
 		return new Iterable<T>() {
+			@Override
 			public Iterator<T> iterator() {
 				return iter;
 			}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
index ba5e8d456d0..5d4a3216080 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/util/ObjectTable.java
@@ -167,14 +167,17 @@ public abstract class ObjectTable<T> extends HashTable implements Iterable<T> {
 	/**
 	 * @since 5.4
 	 */
+	@Override
 	public Iterator<T> iterator() {
 		return new Iterator<T>() {
 			int nextIndex;
 
+			@Override
 			public boolean hasNext() {
 				return nextIndex < size();
 			}
 
+			@Override
 			public T next() {
 				T element = keyAt(nextIndex);
 				if (element == null) {
@@ -184,6 +187,7 @@ public abstract class ObjectTable<T> extends HashTable implements Iterable<T> {
 				return element;
 			}
 
+			@Override
 			public void remove() {
 				throw new UnsupportedOperationException();
 			}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java
index de919e198f2..107c0b498f1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTAmbiguousNode.java
@@ -39,13 +39,13 @@ public abstract class ASTAmbiguousNode extends ASTNode  {
 		public int visit(IASTName name) {
 			if (name != null) {
 				namesPos++;
-				names = (IASTName[]) ArrayUtil.append(IASTName.class, names, name);
+				names = ArrayUtil.append(IASTName.class, names, name);
 			}
 			return PROCESS_CONTINUE;
 		}
 
 		public IASTName[] getNames() {
-			names = (IASTName[]) ArrayUtil.trimAt(IASTName.class, names, namesPos);
+			names = ArrayUtil.trimAt(IASTName.class, names, namesPos);
 			return names;
 		}
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java
index fa2fb6e9a8c..eccb9bf1a2c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTQueries.java
@@ -137,7 +137,7 @@ public class ASTQueries {
 					active[j++]= d;
 				}
 			}
-			active= (IASTDeclaration[]) ArrayUtil.trimAt(IASTDeclaration.class, active, j-1);
+			active= ArrayUtil.trimAt(IASTDeclaration.class, active, j-1);
 		}
 		return active;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java
index 3eb3a5561f6..a64776cf43e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/ASTTranslationUnit.java
@@ -91,7 +91,7 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat
 		if (d != null) {
 			d.setParent(this);
 			d.setPropertyInParent(OWNED_DECLARATION);
-			fAllDeclarations = (IASTDeclaration[]) ArrayUtil.appendAt(IASTDeclaration.class,
+			fAllDeclarations = ArrayUtil.appendAt(IASTDeclaration.class,
 					fAllDeclarations, ++fLastDeclaration, d);
 			fActiveDeclarations= null;
 		}
@@ -110,7 +110,7 @@ public abstract class ASTTranslationUnit extends ASTNode implements IASTTranslat
 	@Override
 	public final IASTDeclaration[] getDeclarations(boolean includeInactive) {
 		if (includeInactive) {
-			fAllDeclarations= (IASTDeclaration[]) ArrayUtil.trimAt(IASTDeclaration.class,
+			fAllDeclarations= ArrayUtil.trimAt(IASTDeclaration.class,
 					fAllDeclarations, fLastDeclaration);
 			return fAllDeclarations;
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java
index ad142186219..d4d5e6d835b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTASMDeclaration.java
@@ -29,10 +29,12 @@ public class CASTASMDeclaration extends ASTNode implements IASTASMDeclaration {
 		setAssembly(assembly);
 	}
 
+	@Override
 	public CASTASMDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTASMDeclaration copy(CopyStyle style) {
 		CASTASMDeclaration copy = new CASTASMDeclaration();
 		copy.assembly = assembly == null ? null : assembly.clone();
@@ -43,12 +45,14 @@ public class CASTASMDeclaration extends ASTNode implements IASTASMDeclaration {
 		return copy;
 	}
 
+	@Override
 	public String getAssembly() {
         if( assembly == null ) return ""; //$NON-NLS-1$
         return new String( assembly );
     }
 
-    public void setAssembly(String assembly) {
+    @Override
+	public void setAssembly(String assembly) {
         assertNotFrozen();
         this.assembly = assembly == null ? null : assembly.toCharArray();
     }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java
index aeac8d8dedd..4279aec37cf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousDeclarator.java
@@ -51,17 +51,19 @@ public class CASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTAmb
 		}
 	}
 
+	@Override
 	public void addDeclarator(IASTDeclarator d) {
         assertNotFrozen();
     	if (d != null) {
-    		dtors = (IASTDeclarator[]) ArrayUtil.appendAt(IASTDeclarator.class, dtors, ++dtorPos, d);
+    		dtors = ArrayUtil.appendAt(IASTDeclarator.class, dtors, ++dtorPos, d);
     		d.setParent(this);
 			d.setPropertyInParent(SUBDECLARATOR);
     	}
     }
 
-    public IASTDeclarator[] getDeclarators() {
-    	dtors = (IASTDeclarator[]) ArrayUtil.trimAt(IASTDeclarator.class, dtors, dtorPos ); 
+    @Override
+	public IASTDeclarator[] getDeclarators() {
+    	dtors = ArrayUtil.trimAt(IASTDeclarator.class, dtors, dtorPos ); 
         return dtors;
     }
 
@@ -70,50 +72,61 @@ public class CASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTAmb
         return getDeclarators();
     }
 
+	@Override
 	public IASTInitializer getInitializer() {
 		return dtors[0].getInitializer();
 	}
 
+	@Override
 	public IASTName getName() {
 		return dtors[0].getName();
 	}
 
+	@Override
 	public IASTDeclarator getNestedDeclarator() {
 		return dtors[0].getNestedDeclarator();
 	}
 
+	@Override
 	public IASTPointerOperator[] getPointerOperators() {
 		return dtors[0].getPointerOperators();
 	}
 	
+	@Override
 	public int getRoleForName(IASTName name) {
 		return dtors[0].getRoleForName(name);
 	}
 
+	@Override
 	public void addPointerOperator(IASTPointerOperator operator) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public void setInitializer(IASTInitializer initializer) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public void setName(IASTName name) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public void setNestedDeclarator(IASTDeclarator nested) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public IASTDeclarator copy() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public IASTDeclarator copy(CopyStyle style) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java
index 6a98477782b..df951fc272c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousExpression.java
@@ -28,17 +28,19 @@ public class CASTAmbiguousExpression extends ASTAmbiguousNode implements IASTAmb
 			addExpression(e);
 	}
 
+	@Override
 	public void addExpression(IASTExpression e) {
         assertNotFrozen();
     	if (e != null) {
-    		expressions = (IASTExpression[]) ArrayUtil.appendAt( IASTExpression.class, expressions, ++expressionsPos, e );
+    		expressions = ArrayUtil.appendAt( IASTExpression.class, expressions, ++expressionsPos, e );
     		e.setParent(this);
 			e.setPropertyInParent(SUBEXPRESSION);
     	}
     }
 
-    public IASTExpression[] getExpressions() {
-    	expressions = (IASTExpression[]) ArrayUtil.trimAt( IASTExpression.class, expressions, expressionsPos ); 
+    @Override
+	public IASTExpression[] getExpressions() {
+    	expressions = ArrayUtil.trimAt( IASTExpression.class, expressions, expressionsPos ); 
         return expressions;
     }
 
@@ -47,10 +49,12 @@ public class CASTAmbiguousExpression extends ASTAmbiguousNode implements IASTAmb
         return getExpressions();
     }
 
+	@Override
 	public IASTExpression copy() {
 		throw new UnsupportedOperationException();
 	}
     
+	@Override
 	public IASTExpression copy(CopyStyle style) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java
index 0b6133f6c73..1a930d55fbf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousParameterDeclaration.java
@@ -38,10 +38,11 @@ public class CASTAmbiguousParameterDeclaration extends ASTAmbiguousNode implemen
 			addParameterDeclaration(d);
 	}
 
+	@Override
 	public void addParameterDeclaration(IASTParameterDeclaration d) {
         assertNotFrozen();
     	if (d != null) {
-    		paramDecls = (IASTParameterDeclaration[]) ArrayUtil.appendAt(IASTParameterDeclaration.class, paramDecls, ++declPos, d);
+    		paramDecls = ArrayUtil.appendAt(IASTParameterDeclaration.class, paramDecls, ++declPos, d);
     		d.setParent(this);
 			d.setPropertyInParent(SUBDECLARATION);
     	}
@@ -56,8 +57,9 @@ public class CASTAmbiguousParameterDeclaration extends ASTAmbiguousNode implemen
 		}
 	}
 
-    public IASTParameterDeclaration[] getParameterDeclarations() {
-    	paramDecls = (IASTParameterDeclaration[]) ArrayUtil.trimAt(IASTParameterDeclaration.class, paramDecls, declPos ); 
+    @Override
+	public IASTParameterDeclaration[] getParameterDeclarations() {
+    	paramDecls = ArrayUtil.trimAt(IASTParameterDeclaration.class, paramDecls, declPos ); 
         return paramDecls;
     }
 
@@ -66,28 +68,34 @@ public class CASTAmbiguousParameterDeclaration extends ASTAmbiguousNode implemen
         return getParameterDeclarations();
     }
 
+	@Override
 	public IASTDeclSpecifier getDeclSpecifier() {
 		return paramDecls[0].getDeclSpecifier();
 	}
 
+	@Override
 	public IASTDeclarator getDeclarator() {
 		return paramDecls[0].getDeclarator();
 	}
 
+	@Override
 	public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public void setDeclarator(IASTDeclarator declarator) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public IASTParameterDeclaration copy() {
 		throw new UnsupportedOperationException();
 	}
 	
+	@Override
 	public IASTParameterDeclaration copy(CopyStyle style) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java
index 770f8175087..1c85de5bb5b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTAmbiguousStatement.java
@@ -73,7 +73,7 @@ public class CASTAmbiguousStatement extends ASTAmbiguousNode implements IASTAmbi
 	public void addStatement(IASTStatement s) {
         assertNotFrozen();
     	if (s != null) {
-    		stmts = (IASTStatement[]) ArrayUtil.appendAt( IASTStatement.class, stmts, ++stmtsPos, s );
+    		stmts = ArrayUtil.appendAt( IASTStatement.class, stmts, ++stmtsPos, s );
     		s.setParent(this);
 			s.setPropertyInParent(STATEMENT);
     	}
@@ -81,7 +81,7 @@ public class CASTAmbiguousStatement extends ASTAmbiguousNode implements IASTAmbi
 
     @Override
 	public IASTStatement[] getStatements() {
-        stmts = (IASTStatement[]) ArrayUtil.trimAt( IASTStatement.class, stmts, stmtsPos );
+        stmts = ArrayUtil.trimAt( IASTStatement.class, stmts, stmtsPos );
     	return stmts;
     }
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java
index 93a9726c953..6c45aeb7425 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDeclarator.java
@@ -57,7 +57,7 @@ public class CASTArrayDeclarator extends CASTDeclarator implements IASTArrayDecl
 	public IASTArrayModifier[] getArrayModifiers() {
         if (arrayMods == null)
         	return IASTArrayModifier.EMPTY_ARRAY;
-        arrayMods = (IASTArrayModifier[]) ArrayUtil.trimAt(IASTArrayModifier.class,
+        arrayMods = ArrayUtil.trimAt(IASTArrayModifier.class,
         		arrayMods, arrayModsPos);
         return arrayMods;
  
@@ -69,7 +69,7 @@ public class CASTArrayDeclarator extends CASTDeclarator implements IASTArrayDecl
     	if (arrayModifier != null) {
     		arrayModifier.setParent(this);
 			arrayModifier.setPropertyInParent(ARRAY_MODIFIER);
-            arrayMods = (IASTArrayModifier[]) ArrayUtil.appendAt(IASTArrayModifier.class, arrayMods,
+            arrayMods = ArrayUtil.appendAt(IASTArrayModifier.class, arrayMods,
             		++arrayModsPos, arrayModifier);    		
     	}
     }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java
index 384181d0d6c..8335c471d2c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayDesignator.java
@@ -35,10 +35,12 @@ public class CASTArrayDesignator extends ASTNode implements
 		setSubscriptExpression(exp);
 	}
 
+	@Override
 	public CASTArrayDesignator copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTArrayDesignator copy(CopyStyle style) {
 		CASTArrayDesignator copy = new CASTArrayDesignator(exp == null ? null : exp.copy(style));
 		copy.setOffsetAndLength(this);
@@ -48,11 +50,13 @@ public class CASTArrayDesignator extends ASTNode implements
 		return copy;
 	}
 	
-    public IASTExpression getSubscriptExpression() {
+    @Override
+	public IASTExpression getSubscriptExpression() {
         return exp;
     }
 
-    public void setSubscriptExpression(IASTExpression value) {
+    @Override
+	public void setSubscriptExpression(IASTExpression value) {
         assertNotFrozen();
         exp = value;
         if(value != null) {
@@ -79,7 +83,8 @@ public class CASTArrayDesignator extends ASTNode implements
 		return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == exp )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java
index 71879af4e2f..e57ecbc271a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayModifier.java
@@ -37,10 +37,12 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA
 		setConstantExpression(exp);
 	}
 
+	@Override
 	public CASTArrayModifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTArrayModifier copy(CopyStyle style) {
 		CASTArrayModifier copy = new CASTArrayModifier(exp == null ? null : exp.copy(style));
 		copy.setOffsetAndLength(this);
@@ -55,11 +57,13 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA
 		return copy;
 	}
 	
-    public IASTExpression getConstantExpression() {
+    @Override
+	public IASTExpression getConstantExpression() {
         return exp;
     }
 
-    public void setConstantExpression(IASTExpression expression) {
+    @Override
+	public void setConstantExpression(IASTExpression expression) {
         assertNotFrozen();
         this.exp = expression;
         if(expression != null) {
@@ -68,47 +72,57 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA
         }
     }
 	
+	@Override
 	public boolean isConst() {
         return isConst;
     }
 
-    public boolean isStatic() {
+    @Override
+	public boolean isStatic() {
         return isStatic;
     }
 
-    public boolean isRestrict() {
+    @Override
+	public boolean isRestrict() {
         return isRestrict;
     }
 
-    public boolean isVolatile() {
+    @Override
+	public boolean isVolatile() {
         return isVolatile;
     }
 
-    public void setConst(boolean value) {
+    @Override
+	public void setConst(boolean value) {
         assertNotFrozen();
         this.isConst = value;
     }
 
-    public void setVolatile(boolean value) {
+    @Override
+	public void setVolatile(boolean value) {
         assertNotFrozen();
         this.isVolatile = value;
     }
 
-    public void setRestrict(boolean value) {
+    @Override
+	public void setRestrict(boolean value) {
         assertNotFrozen();
         this.isRestrict = value;
     }
 
-    public void setStatic(boolean value) {
+    @Override
+	public void setStatic(boolean value) {
         assertNotFrozen();
         this.isStatic = value;
     }
 
-    public boolean isVariableSized() {
+    @Override
+	public boolean isVariableSized() {
         return isVarSized;
     }
 
-    public void setVariableSized(boolean value) {
+    @Override
+	public void setVariableSized(boolean value) {
         assertNotFrozen();
         isVarSized = value;
     }
@@ -131,7 +145,8 @@ public class CASTArrayModifier extends ASTNode implements ICASTArrayModifier, IA
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == exp )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java
index 84cf3d16635..f248e614109 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArrayRangeDesignator.java
@@ -35,10 +35,12 @@ public class CASTArrayRangeDesignator extends ASTNode implements
 		setRangeCeiling(ceiling);
 	}
 
+	@Override
 	public CASTArrayRangeDesignator copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTArrayRangeDesignator copy(CopyStyle style) {
 		CASTArrayRangeDesignator copy = new CASTArrayRangeDesignator();
 		copy.setRangeFloor(floor == null ? null : floor.copy(style));
@@ -50,11 +52,13 @@ public class CASTArrayRangeDesignator extends ASTNode implements
 		return copy;
 	}
 	
+	@Override
 	public IASTExpression getRangeFloor() {
         return this.floor;
     }
 
-    public void setRangeFloor(IASTExpression expression) {
+    @Override
+	public void setRangeFloor(IASTExpression expression) {
         assertNotFrozen();
         floor = expression;
         if(expression != null) {
@@ -63,11 +67,13 @@ public class CASTArrayRangeDesignator extends ASTNode implements
         }
     }
 
-    public IASTExpression getRangeCeiling() {
+    @Override
+	public IASTExpression getRangeCeiling() {
         return ceiling;        
     }
 
-    public void setRangeCeiling(IASTExpression expression) {
+    @Override
+	public void setRangeCeiling(IASTExpression expression) {
         assertNotFrozen();
         ceiling = expression;
         if(expression != null) {
@@ -96,7 +102,8 @@ public class CASTArrayRangeDesignator extends ASTNode implements
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == floor )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java
index adbeef10a4b..292ab6d1957 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTArraySubscriptExpression.java
@@ -40,10 +40,12 @@ public class CASTArraySubscriptExpression extends ASTNode implements
 		setSubscriptExpression(subscript);
 	}
 
+	@Override
 	public CASTArraySubscriptExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTArraySubscriptExpression copy(CopyStyle style) {
 		CASTArraySubscriptExpression copy = new CASTArraySubscriptExpression();
 		copy.setArrayExpression(array == null ? null : array.copy(style));
@@ -55,11 +57,13 @@ public class CASTArraySubscriptExpression extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getArrayExpression() {
         return array;
     }
 
-    public void setArrayExpression(IASTExpression expression) {
+    @Override
+	public void setArrayExpression(IASTExpression expression) {
         assertNotFrozen();
         array = expression;
         if(expression != null) {
@@ -68,11 +72,13 @@ public class CASTArraySubscriptExpression extends ASTNode implements
         }
     }
 
-    public IASTExpression getSubscriptExpression() {
+    @Override
+	public IASTExpression getSubscriptExpression() {
         return subscript;
     }
 
-    public void setSubscriptExpression(IASTExpression expression) {
+    @Override
+	public void setSubscriptExpression(IASTExpression expression) {
         assertNotFrozen();
         this.subscript = expression;
         if(expression != null) {
@@ -81,10 +87,12 @@ public class CASTArraySubscriptExpression extends ASTNode implements
         }
     }
 
-    public IASTInitializerClause getArgument() {
+    @Override
+	public IASTInitializerClause getArgument() {
 		return getSubscriptExpression();
 	}
 
+	@Override
 	public void setArgument(IASTInitializerClause expression) {
 		if (expression instanceof IASTExpression) {
 			setSubscriptExpression((IASTExpression) expression);
@@ -116,7 +124,8 @@ public class CASTArraySubscriptExpression extends ASTNode implements
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == array )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
@@ -131,7 +140,8 @@ public class CASTArraySubscriptExpression extends ASTNode implements
         }
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		IType t = getArrayExpression().getExpressionType();
 		t = CVisitor.unwrapTypedefs(t);
 		if (t instanceof IPointerType)
@@ -141,10 +151,12 @@ public class CASTArraySubscriptExpression extends ASTNode implements
 		return t;
     }
 
+	@Override
 	public boolean isLValue() {
 		return true;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return ValueCategory.LVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java
index e4bcbe5bca7..86d7f355079 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBaseDeclSpecifier.java
@@ -26,47 +26,57 @@ public abstract class CASTBaseDeclSpecifier extends ASTNode implements ICASTDecl
     protected boolean isInline;
 
     
+	@Override
 	public boolean isRestrict() {
         return isRestrict;
     }
 
-    public int getStorageClass() {
+    @Override
+	public int getStorageClass() {
         return storageClass;
     }
 
-    public boolean isConst() {
+    @Override
+	public boolean isConst() {
         return isConst;
     }
 
-    public boolean isVolatile() {
+    @Override
+	public boolean isVolatile() {
         return isVolatile;
     }
 
-    public boolean isInline() {
+    @Override
+	public boolean isInline() {
         return isInline;
     }
     
-    public void setStorageClass(int storageClass) {
+    @Override
+	public void setStorageClass(int storageClass) {
         assertNotFrozen();
         this.storageClass = storageClass;
     }
 
-    public void setConst(boolean value) {
+    @Override
+	public void setConst(boolean value) {
         assertNotFrozen();
         this.isConst = value;
     }
     
-    public void setVolatile(boolean value) {
+    @Override
+	public void setVolatile(boolean value) {
         assertNotFrozen();
         this.isVolatile = value;
     }
     
-    public void setRestrict(boolean value) {
+    @Override
+	public void setRestrict(boolean value) {
         assertNotFrozen();
         this.isRestrict = value;
     }
     
-    public void setInline(boolean value) {
+    @Override
+	public void setInline(boolean value) {
         assertNotFrozen();
         this.isInline = value;
     }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java
index dd4519af63c..085c2ecd08a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBinaryExpression.java
@@ -44,10 +44,12 @@ public class CASTBinaryExpression extends ASTNode implements
 		setOperand2(operand2);
 	}
 	
+	@Override
 	public CASTBinaryExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTBinaryExpression copy(CopyStyle style) {
 		CASTBinaryExpression copy = new CASTBinaryExpression();
 		copy.op = op;
@@ -60,31 +62,37 @@ public class CASTBinaryExpression extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public int getOperator() {
         return op;
     }
 
-    public IASTExpression getOperand1() {
+    @Override
+	public IASTExpression getOperand1() {
         return operand1;
     }
 
-    public IASTExpression getOperand2() {
+    @Override
+	public IASTExpression getOperand2() {
         return operand2;
     }
 
-    public IASTInitializerClause getInitOperand2() {
+    @Override
+	public IASTInitializerClause getInitOperand2() {
         return operand2;
 	}
 
 	/**
      * @param op An op_X field from {@link IASTBinaryExpression}
      */
-    public void setOperator(int op) {
+    @Override
+	public void setOperator(int op) {
         assertNotFrozen();
         this.op = op;
     }
 
-    public void setOperand1(IASTExpression expression) {
+    @Override
+	public void setOperand1(IASTExpression expression) {
         assertNotFrozen();
         operand1 = expression;
         if (expression != null) {
@@ -93,7 +101,8 @@ public class CASTBinaryExpression extends ASTNode implements
 		}
     }
 
-    public void setOperand2(IASTExpression expression) {
+    @Override
+	public void setOperand2(IASTExpression expression) {
         assertNotFrozen();
         operand2 = expression;
         if (expression != null) {
@@ -186,7 +195,8 @@ public class CASTBinaryExpression extends ASTNode implements
 	}
 
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == operand1 )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
@@ -201,7 +211,8 @@ public class CASTBinaryExpression extends ASTNode implements
         }
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
         final int op = getOperator();
         final IType t1= CVisitor.unwrapTypedefs(getOperand1().getExpressionType());
     	final IType t2= CVisitor.unwrapTypedefs(getOperand2().getExpressionType());
@@ -248,6 +259,7 @@ public class CASTBinaryExpression extends ASTNode implements
 				(type.isVolatile() ? CPointerType.IS_VOLATILE : 0));
 	}
     
+	@Override
 	public boolean isLValue() {
 		switch (getOperator()) {
 		case op_assign:
@@ -266,6 +278,7 @@ public class CASTBinaryExpression extends ASTNode implements
 		return false;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java
index d3a88bab4c4..3aefeac8f18 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTBreakStatement.java
@@ -41,10 +41,12 @@ public class CASTBreakStatement extends ASTNode implements IASTBreakStatement {
         return true;
     }
     
-    public CASTBreakStatement copy() {
+    @Override
+	public CASTBreakStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTBreakStatement copy(CopyStyle style) {
 		CASTBreakStatement copy = new CASTBreakStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java
index 98ed38a8545..b22164b200c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCaseStatement.java
@@ -33,10 +33,12 @@ public class CASTCaseStatement extends ASTNode implements IASTCaseStatement, IAS
 		setExpression(expression);
 	}
 	
+	@Override
 	public CASTCaseStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTCaseStatement copy(CopyStyle style) {
 		CASTCaseStatement copy = new CASTCaseStatement(expression == null ? null : expression.copy());
 		copy.setOffsetAndLength(this);
@@ -46,11 +48,13 @@ public class CASTCaseStatement extends ASTNode implements IASTCaseStatement, IAS
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getExpression() {
         return expression;
     }
 
-    public void setExpression(IASTExpression expression) {
+    @Override
+	public void setExpression(IASTExpression expression) {
         assertNotFrozen();
         this.expression = expression;
         if (expression != null) {
@@ -80,7 +84,8 @@ public class CASTCaseStatement extends ASTNode implements IASTCaseStatement, IAS
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == expression )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java
index 69b7e6e32b7..ff2ac45fe11 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCastExpression.java
@@ -39,10 +39,12 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I
 		setTypeId(typeId);
 	}
 	
+	@Override
 	public CASTCastExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTCastExpression copy(CopyStyle style) {
 		CASTCastExpression copy = new CASTCastExpression();
 		copy.setTypeId(typeId == null ? null : typeId.copy(style));
@@ -55,20 +57,24 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I
 		return copy;
 	}
 
+	@Override
 	public int getOperator() {
         return operator;
     }
 
-    public void setOperator(int value) {
+    @Override
+	public void setOperator(int value) {
         assertNotFrozen();
         this.operator = value;
     }
 
-    public IASTExpression getOperand() {
+    @Override
+	public IASTExpression getOperand() {
         return operand;
     }
 
-    public void setOperand(IASTExpression expression) {
+    @Override
+	public void setOperand(IASTExpression expression) {
         assertNotFrozen();
         operand = expression;
         if (expression != null) {
@@ -77,6 +83,7 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I
 		}
     }
     
+	@Override
 	public void setTypeId(IASTTypeId typeId) {
         assertNotFrozen();
         this.typeId = typeId;
@@ -86,7 +93,8 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I
 		}
     }
 
-    public IASTTypeId getTypeId() {
+    @Override
+	public IASTTypeId getTypeId() {
         return typeId;
     }
 
@@ -116,6 +124,7 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I
         return true;
     }
     
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == operand) {
 			other.setPropertyInParent(child.getPropertyInParent());
@@ -124,15 +133,18 @@ public class CASTCastExpression extends ASTNode implements IASTCastExpression, I
 		} 
 	}
     
+	@Override
 	public IType getExpressionType() {
         IASTTypeId id= getTypeId();
         return CVisitor.createType(id.getAbstractDeclarator());
     }
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java
index 446625861d9..874bc35b21d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatement.java
@@ -28,10 +28,12 @@ public class CASTCompoundStatement extends ASTNode implements IASTCompoundStatem
     private IASTStatement [] statements = null;
     private IScope scope = null;
 
-    public CASTCompoundStatement copy() {
+    @Override
+	public CASTCompoundStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
     
+	@Override
 	public CASTCompoundStatement copy(CopyStyle style) {
 		CASTCompoundStatement copy = new CASTCompoundStatement();
 		for (IASTStatement statement : getStatements())
@@ -43,21 +45,24 @@ public class CASTCompoundStatement extends ASTNode implements IASTCompoundStatem
 		return copy;
 	}
 
-    public IASTStatement[] getStatements() {
+    @Override
+	public IASTStatement[] getStatements() {
         if (statements == null) return IASTStatement.EMPTY_STATEMENT_ARRAY;
-        return (IASTStatement[]) ArrayUtil.trim(IASTStatement.class, statements);
+        return ArrayUtil.trim(IASTStatement.class, statements);
     }
 
-    public void addStatement(IASTStatement statement) {
+    @Override
+	public void addStatement(IASTStatement statement) {
         assertNotFrozen();
-        statements = (IASTStatement[]) ArrayUtil.append(IASTStatement.class, statements, statement);
+        statements = ArrayUtil.append(IASTStatement.class, statements, statement);
         if (statement != null) {
         	statement.setParent(this);
         	statement.setPropertyInParent(NESTED_STATEMENT);
         }
     }
 
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         if (scope == null)
             scope = new CScope(this, EScopeKind.eLocal);
         return scope;
@@ -86,7 +91,8 @@ public class CASTCompoundStatement extends ASTNode implements IASTCompoundStatem
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (statements == null) return;
         for (int i = 0; i < statements.length; ++i) {
             if (statements[i] == child) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java
index 43008679d9c..0dae9369d99 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTCompoundStatementExpression.java
@@ -36,10 +36,12 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC
 		setCompoundStatement(statement);
 	}
 	
+	@Override
 	public CASTCompoundStatementExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTCompoundStatementExpression copy(CopyStyle style) {
 		CASTCompoundStatementExpression copy = new CASTCompoundStatementExpression();
 		copy.setCompoundStatement(statement == null ? null : statement.copy(style));
@@ -50,11 +52,13 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC
 		return copy;
 	}
 
+	@Override
 	public IASTCompoundStatement getCompoundStatement() {
         return statement;
     }
 
-    public void setCompoundStatement(IASTCompoundStatement statement) {
+    @Override
+	public void setCompoundStatement(IASTCompoundStatement statement) {
         assertNotFrozen();
         this.statement = statement;
         if (statement != null) {
@@ -84,7 +88,8 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC
         return true;
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		IASTCompoundStatement compound = getCompoundStatement();
 		IASTStatement[] statements = compound.getStatements();
 		if (statements.length > 0) {
@@ -95,6 +100,7 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
 	}
 
+	@Override
 	public boolean isLValue() {
 		IASTCompoundStatement compound = getCompoundStatement();
 		IASTStatement[] statements = compound.getStatements();
@@ -106,6 +112,7 @@ public class CASTCompoundStatementExpression extends ASTNode implements IGNUASTC
 		return false;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java
index 69774aed6f8..e44f92c83e3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTConditionalExpression.java
@@ -41,10 +41,12 @@ public class CASTConditionalExpression extends ASTNode implements
 		setNegativeResultExpression(negative);
 	}
 	
+	@Override
 	public CASTConditionalExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTConditionalExpression copy(CopyStyle style) {
 		CASTConditionalExpression copy = new CASTConditionalExpression();
 		copy.setLogicalConditionExpression(condition == null ? null : condition.copy(style));
@@ -57,11 +59,13 @@ public class CASTConditionalExpression extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getLogicalConditionExpression() {
         return condition;
     }
 
-    public void setLogicalConditionExpression(IASTExpression expression) {
+    @Override
+	public void setLogicalConditionExpression(IASTExpression expression) {
         assertNotFrozen();
         condition = expression;
         if (expression != null) {
@@ -70,11 +74,13 @@ public class CASTConditionalExpression extends ASTNode implements
 		}
     }
 
-    public IASTExpression getPositiveResultExpression() {
+    @Override
+	public IASTExpression getPositiveResultExpression() {
         return positive;
     }
 
-    public void setPositiveResultExpression(IASTExpression expression) {
+    @Override
+	public void setPositiveResultExpression(IASTExpression expression) {
         assertNotFrozen();
         this.positive = expression;
         if (expression != null) {
@@ -83,11 +89,13 @@ public class CASTConditionalExpression extends ASTNode implements
 		}
     }
 
-    public IASTExpression getNegativeResultExpression() {
+    @Override
+	public IASTExpression getNegativeResultExpression() {
         return negative;
     }
 
-    public void setNegativeResultExpression(IASTExpression expression) {
+    @Override
+	public void setNegativeResultExpression(IASTExpression expression) {
         assertNotFrozen();
         this.negative = expression;
         if (expression != null) {
@@ -119,7 +127,8 @@ public class CASTConditionalExpression extends ASTNode implements
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == condition )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
@@ -140,7 +149,8 @@ public class CASTConditionalExpression extends ASTNode implements
         }
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		IASTExpression positiveExpression = getPositiveResultExpression();
 		if (positiveExpression == null) {
 			positiveExpression= getLogicalConditionExpression();
@@ -152,10 +162,12 @@ public class CASTConditionalExpression extends ASTNode implements
 		return t2;
 	}
     
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java
index 0edff204ad1..a1dfa309ece 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTContinueStatement.java
@@ -39,10 +39,12 @@ public class CASTContinueStatement extends ASTNode implements IASTContinueStatem
         return true;
     }
     
-    public CASTContinueStatement copy() {
+    @Override
+	public CASTContinueStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTContinueStatement copy(CopyStyle style) {
 		CASTContinueStatement copy = new CASTContinueStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java
index 2c1055f195c..d09045f102f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarationStatement.java
@@ -35,10 +35,12 @@ public class CASTDeclarationStatement extends ASTNode implements IASTDeclaration
 	}
 
 	
+	@Override
 	public CASTDeclarationStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTDeclarationStatement copy(CopyStyle style) {
 		CASTDeclarationStatement copy = new CASTDeclarationStatement();
 		copy.setDeclaration(declaration == null ? null : declaration.copy(style));
@@ -49,11 +51,13 @@ public class CASTDeclarationStatement extends ASTNode implements IASTDeclaration
 		return copy;
 	}
 
+	@Override
 	public IASTDeclaration getDeclaration() {
         return declaration;
     }
 
-    public void setDeclaration(IASTDeclaration declaration) {
+    @Override
+	public void setDeclaration(IASTDeclaration declaration) {
         assertNotFrozen();
         this.declaration = declaration;
         if (declaration != null) {
@@ -82,6 +86,7 @@ public class CASTDeclarationStatement extends ASTNode implements IASTDeclaration
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == declaration) {
 			other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java
index ad2d0cda805..2b6e8bf4943 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDeclarator.java
@@ -51,10 +51,12 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig
 		setName(name);
 	}
 	
+	@Override
 	public CASTDeclarator copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTDeclarator copy(CopyStyle style) {
 		CASTDeclarator copy = new CASTDeclarator();
 		copyBaseDeclarator(copy, style);
@@ -74,25 +76,30 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig
 	}
 	
 	
+	@Override
 	public IASTPointerOperator[] getPointerOperators() {
         if (pointerOps == null) return IASTPointerOperator.EMPTY_ARRAY;
-        pointerOps = (IASTPointerOperator[]) ArrayUtil.trimAt(IASTPointerOperator.class, pointerOps, pointerOpsPos);
+        pointerOps = ArrayUtil.trimAt(IASTPointerOperator.class, pointerOps, pointerOpsPos);
         return pointerOps;
     }
 
-    public IASTDeclarator getNestedDeclarator() {
+    @Override
+	public IASTDeclarator getNestedDeclarator() {
         return nestedDeclarator;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
-    public IASTInitializer getInitializer() {
+    @Override
+	public IASTInitializer getInitializer() {
         return initializer;
     }
 
-    public void setInitializer(IASTInitializer initializer) {
+    @Override
+	public void setInitializer(IASTInitializer initializer) {
         assertNotFrozen();
         this.initializer = initializer;
         if (initializer != null) {
@@ -101,16 +108,18 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig
 		}
     }
 
-    public void addPointerOperator(IASTPointerOperator operator) {
+    @Override
+	public void addPointerOperator(IASTPointerOperator operator) {
         assertNotFrozen();
     	if (operator != null) {
     		operator.setParent(this);
     		operator.setPropertyInParent(POINTER_OPERATOR);
-    		pointerOps = (IASTPointerOperator[]) ArrayUtil.appendAt(IASTPointerOperator.class, pointerOps, ++pointerOpsPos, operator);
+    		pointerOps = ArrayUtil.appendAt(IASTPointerOperator.class, pointerOps, ++pointerOpsPos, operator);
     	}
     }
 
-    public void setNestedDeclarator(IASTDeclarator nested) {
+    @Override
+	public void setNestedDeclarator(IASTDeclarator nested) {
         assertNotFrozen();
         this.nestedDeclarator = nested;
         if (nested != null) {
@@ -119,7 +128,8 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig
 		}
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -176,6 +186,7 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig
 		return true;
     }
 	
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (n == this.name) {
 			IASTNode getParent = getParent();
@@ -226,6 +237,7 @@ public class CASTDeclarator extends ASTNode implements IASTDeclarator, IASTAmbig
 		return r_unclear;
 	}
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
         if (child == nestedDeclarator) {
             other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java
index c8f11013496..8b8277b434d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDefaultStatement.java
@@ -39,10 +39,12 @@ public class CASTDefaultStatement extends ASTNode implements IASTDefaultStatemen
         return true;
     }
     
-    public CASTDefaultStatement copy() {
+    @Override
+	public CASTDefaultStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTDefaultStatement copy(CopyStyle style) {
 		CASTDefaultStatement copy = new CASTDefaultStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java
index edfee77e35c..98426ffa7e6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDesignatedInitializer.java
@@ -40,10 +40,12 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
 		setOperand(init);
 	}
 
+	@Override
 	public CASTDesignatedInitializer copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTDesignatedInitializer copy(CopyStyle style) {
 		CASTDesignatedInitializer copy = new CASTDesignatedInitializer(rhs == null ? null
 				: rhs.copy(style));
@@ -56,28 +58,32 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
 		return copy;
 	}
 
+	@Override
 	public void addDesignator(ICASTDesignator designator) {
         assertNotFrozen();
     	if (designator != null) {
     		designator.setParent(this);
     		designator.setPropertyInParent(DESIGNATOR);
-    		designators = (ICASTDesignator[]) ArrayUtil.appendAt( ICASTDesignator.class, designators, ++designatorsPos, designator );
+    		designators = ArrayUtil.appendAt( ICASTDesignator.class, designators, ++designatorsPos, designator );
     	}
     }
 
     
-    public ICASTDesignator[] getDesignators() {
+    @Override
+	public ICASTDesignator[] getDesignators() {
         if( designators == null ) return ICASTDesignatedInitializer.EMPTY_DESIGNATOR_ARRAY;
-        designators = (ICASTDesignator[]) ArrayUtil.trimAt( ICASTDesignator.class, designators, designatorsPos );
+        designators = ArrayUtil.trimAt( ICASTDesignator.class, designators, designatorsPos );
         return designators;
     }
 
     
     
-    public IASTInitializerClause getOperand() {
+    @Override
+	public IASTInitializerClause getOperand() {
         return rhs;
 	}
 
+	@Override
 	public void setOperand(IASTInitializerClause operand) {
         assertNotFrozen();
         this.rhs = operand;
@@ -87,6 +93,7 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
 		}
 	}
 
+	@Override
 	@Deprecated
 	public IASTInitializer getOperandInitializer() {
 		if (rhs instanceof IASTInitializer) {
@@ -101,7 +108,8 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
         return null;
     }
 
-    @Deprecated
+    @Override
+	@Deprecated
     public void setOperandInitializer(IASTInitializer rhs) {
     	if (rhs instanceof IASTEqualsInitializer) {
     		setOperand(((IASTEqualsInitializer) rhs).getInitializerClause());
@@ -137,7 +145,8 @@ public class CASTDesignatedInitializer extends ASTNode implements ICASTDesignate
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
     	if (child == rhs) {
     		other.setPropertyInParent(child.getPropertyInParent());
     		other.setParent(child.getParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java
index cf9a4b921fd..03014d200eb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTDoStatement.java
@@ -36,10 +36,12 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb
 		setCondition(condition);
 	}
 
+	@Override
 	public CASTDoStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTDoStatement copy(CopyStyle style) {
 		CASTDoStatement copy = new CASTDoStatement();
 		copy.setBody(body == null ? null : body.copy(style));
@@ -51,11 +53,13 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb
 		return copy;
 	}
 
+	@Override
 	public IASTStatement getBody() {
         return body;
     }
  
-    public void setBody(IASTStatement body) {
+    @Override
+	public void setBody(IASTStatement body) {
         assertNotFrozen();
         this.body = body;
         if (body != null) {
@@ -65,12 +69,14 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb
     }
 
 
-    public IASTExpression getCondition() {
+    @Override
+	public IASTExpression getCondition() {
         return condition;
     }
 
 
-    public void setCondition(IASTExpression condition) {
+    @Override
+	public void setCondition(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -100,7 +106,8 @@ public class CASTDoStatement extends ASTNode implements IASTDoStatement, IASTAmb
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( body == child )
         {
             other.setPropertyInParent( body.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java
index 49a78944aec..6d76acc21f9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTElaboratedTypeSpecifier.java
@@ -43,10 +43,12 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement
 		setName(name);
 	}
 
+	@Override
 	public CASTElaboratedTypeSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTElaboratedTypeSpecifier copy(CopyStyle style) {
 		CASTElaboratedTypeSpecifier copy = new CASTElaboratedTypeSpecifier(kind, name == null
 				? null : name.copy(style));
@@ -57,20 +59,24 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement
 		return copy;
 	}
 
+	@Override
 	public int getKind() {
         return kind;
     }
 
-    public void setKind(int value) {
+    @Override
+	public void setKind(int value) {
         assertNotFrozen();
         this.kind = value;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -99,6 +105,7 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n ) {
 		if( n != name ) return r_unclear;
 		
@@ -122,6 +129,7 @@ public class CASTElaboratedTypeSpecifier extends CASTBaseDeclSpecifier implement
 		return r_reference;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		IBinding[] result= CVisitor.findBindingsForContentAssist(n, isPrefix);
 		int nextPos= 0;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java
index 33459d9f031..d601733693d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerationSpecifier.java
@@ -35,10 +35,12 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier
 		setName(name);
 	}
 
+	@Override
 	public CASTEnumerationSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTEnumerationSpecifier copy(CopyStyle style) {
 		CASTEnumerationSpecifier copy = new CASTEnumerationSpecifier();
 		copyEnumerationSpecifier(copy, style);
@@ -56,6 +58,7 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier
 	}
 	
 	
+	@Override
 	public boolean startValueComputation() {
 		if (valuesComputed)
 			return false;
@@ -64,19 +67,21 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier
 		return true;
 	}
 
+	@Override
 	public void addEnumerator(IASTEnumerator enumerator) {
         assertNotFrozen();
     	if (enumerator != null) {
     		enumerator.setParent(this);
 			enumerator.setPropertyInParent(ENUMERATOR);
-    		enumerators = (IASTEnumerator[]) ArrayUtil.appendAt( IASTEnumerator.class, enumerators, ++enumeratorsPos, enumerator );
+    		enumerators = ArrayUtil.appendAt( IASTEnumerator.class, enumerators, ++enumeratorsPos, enumerator );
     	}
     }
 
     
-    public IASTEnumerator[] getEnumerators() {        
+    @Override
+	public IASTEnumerator[] getEnumerators() {        
         if( enumerators == null ) return IASTEnumerator.EMPTY_ENUMERATOR_ARRAY;
-        enumerators = (IASTEnumerator[]) ArrayUtil.trimAt( IASTEnumerator.class, enumerators, enumeratorsPos );
+        enumerators = ArrayUtil.trimAt( IASTEnumerator.class, enumerators, enumeratorsPos );
         return enumerators;
     }
 
@@ -84,7 +89,8 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier
     private int enumeratorsPos=-1;
 
  
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -93,7 +99,8 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier
 		}
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
@@ -121,6 +128,7 @@ public class CASTEnumerationSpecifier extends CASTBaseDeclSpecifier
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n ) {
 		if( this.name == n  )
 			return r_definition;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java
index ae177dd50df..b5706d94dac 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEnumerator.java
@@ -27,10 +27,12 @@ public class CASTEnumerator extends ASTEnumerator {
 		super(name, value);
 	}
 	
+	@Override
 	public CASTEnumerator copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTEnumerator copy(CopyStyle style) {
 		CASTEnumerator copy = new CASTEnumerator();
 		copyAbstractEnumerator(copy, style);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java
index 3adfd1895f3..e699e9c2282 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTEqualsInitializer.java
@@ -25,10 +25,12 @@ public class CASTEqualsInitializer extends ASTEqualsInitializer {
 		super(arg);
 	}
 
+	@Override
 	public CASTEqualsInitializer copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTEqualsInitializer copy(CopyStyle style) {
 		IASTInitializerClause arg = getInitializerClause();
 		CASTEqualsInitializer copy = new CASTEqualsInitializer(arg == null ? null : arg.copy(style));
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java
index f9ae206921a..8182750f5fb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionList.java
@@ -29,10 +29,12 @@ import org.eclipse.cdt.internal.core.dom.parser.ProblemType;
 public class CASTExpressionList extends ASTNode implements IASTExpressionList,
         IASTAmbiguityParent {
 
+	@Override
 	public CASTExpressionList copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTExpressionList copy(CopyStyle style) {
 		CASTExpressionList copy = new CASTExpressionList();
 		for(IASTExpression expr : getExpressions())
@@ -44,15 +46,17 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList,
 		return copy;
 	}
 	
-    public IASTExpression[] getExpressions() {
+    @Override
+	public IASTExpression[] getExpressions() {
         if (expressions == null)
             return IASTExpression.EMPTY_EXPRESSION_ARRAY;
-        return (IASTExpression[]) ArrayUtil.trim( IASTExpression.class, expressions );
+        return ArrayUtil.trim( IASTExpression.class, expressions );
     }
 
-    public void addExpression(IASTExpression expression) {
+    @Override
+	public void addExpression(IASTExpression expression) {
         assertNotFrozen();
-        expressions = (IASTExpression[]) ArrayUtil.append( IASTExpression.class, expressions, expression );
+        expressions = ArrayUtil.append( IASTExpression.class, expressions, expression );
         if(expression != null) {
         	expression.setParent(this);
     		expression.setPropertyInParent(NESTED_EXPRESSION);
@@ -92,7 +96,8 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList,
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( expressions == null ) return;
         for (int i = 0; i < expressions.length; ++i) {
             if (child == expressions[i]) {
@@ -103,7 +108,8 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList,
         }
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
     	for (int i = expressions.length-1; i >= 0; i--) {
     		IASTExpression expr= expressions[i];
     		if (expr != null)
@@ -112,6 +118,7 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList,
     	return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
     }
 
+	@Override
 	public boolean isLValue() {
     	for (int i = expressions.length-1; i >= 0; i--) {
     		IASTExpression expr= expressions[i];
@@ -121,6 +128,7 @@ public class CASTExpressionList extends ASTNode implements IASTExpressionList,
     	return false;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java
index 7518341f860..55e5daf039e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTExpressionStatement.java
@@ -34,10 +34,12 @@ public class CASTExpressionStatement extends ASTNode implements
 		setExpression(expression);
 	}
 
+	@Override
 	public CASTExpressionStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTExpressionStatement copy(CopyStyle style) {
 		CASTExpressionStatement copy = new CASTExpressionStatement();
 		copy.setExpression(expression == null ? null : expression.copy(style));
@@ -48,11 +50,13 @@ public class CASTExpressionStatement extends ASTNode implements
 		return copy;
 	}
 	
+	@Override
 	public IASTExpression getExpression() {
         return expression;
     }
 
-    public void setExpression(IASTExpression expression) {
+    @Override
+	public void setExpression(IASTExpression expression) {
         assertNotFrozen();
         this.expression = expression;
         if (expression != null) {
@@ -91,7 +95,8 @@ public class CASTExpressionStatement extends ASTNode implements
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (child == expression) {
             other.setPropertyInParent(child.getPropertyInParent());
             other.setParent(child.getParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java
index cca54bc845a..4624d5cb1d9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDeclarator.java
@@ -47,12 +47,14 @@ public class CASTFieldDeclarator extends CASTDeclarator implements IASTFieldDecl
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getBitFieldSize() {
         return bitFieldSize;
     }
 
 
-    public void setBitFieldSize(IASTExpression size) {
+    @Override
+	public void setBitFieldSize(IASTExpression size) {
         assertNotFrozen();
         bitFieldSize = size;
         if (size != null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java
index 567324b2ab7..7d8a6edf8e0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldDesignator.java
@@ -34,10 +34,12 @@ public class CASTFieldDesignator extends ASTNode implements ICASTFieldDesignator
 		setName(name);
 	}
 	
+	@Override
 	public CASTFieldDesignator copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTFieldDesignator copy(CopyStyle style) {
 		CASTFieldDesignator copy = new CASTFieldDesignator(name == null ? null : name.copy(style));
 		copy.setOffsetAndLength(this);
@@ -47,11 +49,13 @@ public class CASTFieldDesignator extends ASTNode implements ICASTFieldDesignator
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -77,6 +81,7 @@ public class CASTFieldDesignator extends ASTNode implements ICASTFieldDesignator
         return true;
     }
     
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return CVisitor.findBindingsForContentAssist(n, isPrefix);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java
index 93f6f5d5dc5..094e90b0f39 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFieldReference.java
@@ -51,10 +51,12 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
 		this.ptr = ptr;
 	}
 	
+	@Override
 	public CASTFieldReference copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTFieldReference copy(CopyStyle style) {
 		CASTFieldReference copy = new CASTFieldReference();
 		copy.setFieldOwner(owner == null ? null : owner.copy(style));
@@ -67,11 +69,13 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getFieldOwner() {
         return owner;
     }
 
-    public void setFieldOwner(IASTExpression expression) {
+    @Override
+	public void setFieldOwner(IASTExpression expression) {
         assertNotFrozen();
         this.owner = expression;
         if (expression != null) {
@@ -80,11 +84,13 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
 		}
     }
 
-    public IASTName getFieldName() {
+    @Override
+	public IASTName getFieldName() {
         return name;
     }
 
-    public void setFieldName(IASTName name) {
+    @Override
+	public void setFieldName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -93,11 +99,13 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
 		}
     }
 
-    public boolean isPointerDereference() {
+    @Override
+	public boolean isPointerDereference() {
         return ptr;
     }
 
-    public void setIsPointerDereference(boolean value) {
+    @Override
+	public void setIsPointerDereference(boolean value) {
         assertNotFrozen();
         ptr = value;
     }
@@ -125,13 +133,15 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n ) {
 		if( n  == this.name )
 			return r_reference;
 		return r_unclear;
 	}
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == owner)
         {
             other.setPropertyInParent( child.getPropertyInParent() );
@@ -140,7 +150,8 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
         }
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
         IBinding binding = getFieldName().resolveBinding();
 		if (binding instanceof IVariable) {
 			return ((IVariable)binding).getType();
@@ -149,6 +160,7 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
     }
 
     
+	@Override
 	public boolean isLValue() {
 		if (isPointerDereference())
 			return true;
@@ -156,10 +168,12 @@ public class CASTFieldReference extends ASTNode implements IASTFieldReference, I
 		return getFieldOwner().isLValue();
 	}
 
+	@Override
 	public final ValueCategory getValueCategory() {
 		return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return CVisitor.findBindingsForContentAssist(n, isPrefix);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java
index 12ffbeda5ad..0fb9f9aa28a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTForStatement.java
@@ -43,10 +43,12 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA
     	setBody(body);
 	}
 
+	@Override
 	public CASTForStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTForStatement copy(CopyStyle style) {
 		CASTForStatement copy = new CASTForStatement();
 		copyForStatement(copy, style);
@@ -65,11 +67,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA
 		copy.setOffsetAndLength(this);
 	}
 	
+	@Override
 	public IASTExpression getConditionExpression() {
         return condition;
     }
 
-    public void setConditionExpression(IASTExpression condition) {
+    @Override
+	public void setConditionExpression(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -78,11 +82,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA
 		}
     }
 
-    public IASTExpression getIterationExpression() {
+    @Override
+	public IASTExpression getIterationExpression() {
         return iterationExpression;
     }
 
-    public void setIterationExpression(IASTExpression iterator) {
+    @Override
+	public void setIterationExpression(IASTExpression iterator) {
         assertNotFrozen();
         this.iterationExpression = iterator;
         if (iterator != null) {
@@ -91,11 +97,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA
 		}
     }
     
-    public IASTStatement getInitializerStatement() {
+    @Override
+	public IASTStatement getInitializerStatement() {
         return init;
     }
 
-    public void setInitializerStatement(IASTStatement statement) {
+    @Override
+	public void setInitializerStatement(IASTStatement statement) {
         assertNotFrozen();
         init = statement;
         if (statement != null) {
@@ -103,11 +111,13 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA
 			statement.setPropertyInParent(INITIALIZER);
 		}
     }
-    public IASTStatement getBody() {
+    @Override
+	public IASTStatement getBody() {
         return body;
     }
 
-    public void setBody(IASTStatement statement) {
+    @Override
+	public void setBody(IASTStatement statement) {
         assertNotFrozen();
         body = statement;
         if (statement != null) {
@@ -116,7 +126,8 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA
 		}
     }
 
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         if( scope == null )
             scope = new CScope( this, EScopeKind.eLocal);
         return scope;
@@ -147,7 +158,8 @@ public class CASTForStatement extends ASTNode implements IASTForStatement, IASTA
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( body == child )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java
index efd9268ac22..ad9a34be1b3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionCallExpression.java
@@ -45,10 +45,12 @@ public class CASTFunctionCallExpression extends ASTNode implements
 		setArguments(args);
 	}
 
+	@Override
 	public CASTFunctionCallExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTFunctionCallExpression copy(CopyStyle style) {
 		IASTInitializerClause[] args = null;
 		if (fArguments.length > 0) {
@@ -67,6 +69,7 @@ public class CASTFunctionCallExpression extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public void setFunctionNameExpression(IASTExpression expression) {
         assertNotFrozen();
         this.functionName = expression;
@@ -76,15 +79,18 @@ public class CASTFunctionCallExpression extends ASTNode implements
 		}
     }
 
-    public IASTExpression getFunctionNameExpression() {
+    @Override
+	public IASTExpression getFunctionNameExpression() {
         return functionName;
     }
 
+	@Override
 	public IASTInitializerClause[] getArguments() {
         return fArguments;
     }
 
-    public void setArguments(IASTInitializerClause[] arguments) {
+    @Override
+	public void setArguments(IASTInitializerClause[] arguments) {
         assertNotFrozen();
         if (arguments == null) {
         	fArguments= IASTExpression.EMPTY_EXPRESSION_ARRAY;
@@ -121,7 +127,8 @@ public class CASTFunctionCallExpression extends ASTNode implements
 		return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
 		if (child == functionName) {
 			other.setPropertyInParent(child.getPropertyInParent());
 			other.setParent(child.getParent());
@@ -136,6 +143,7 @@ public class CASTFunctionCallExpression extends ASTNode implements
 		}
 	}
 
+	@Override
 	public IType getExpressionType() {
 		IType type = getFunctionNameExpression().getExpressionType();
 		while (type instanceof ITypeContainer)
@@ -145,14 +153,17 @@ public class CASTFunctionCallExpression extends ASTNode implements
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
 	}
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return ValueCategory.PRVALUE;
 	}
 	
+	@Override
 	@Deprecated
     public IASTExpression getParameterExpression() {
     	if (fArguments.length == 0)
@@ -175,6 +186,7 @@ public class CASTFunctionCallExpression extends ASTNode implements
         return result;
     }
 
+	@Override
 	@Deprecated
     public void setParameterExpression(IASTExpression expression) {
         assertNotFrozen();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java
index cc20ba0dfe3..72e03dc67d1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDeclarator.java
@@ -60,26 +60,30 @@ public class CASTFunctionDeclarator extends CASTDeclarator implements IASTStanda
 		return copy;
 	}
 	
+	@Override
 	public IASTParameterDeclaration[] getParameters() {
         if( parameters == null ) return IASTParameterDeclaration.EMPTY_PARAMETERDECLARATION_ARRAY;
-        parameters = (IASTParameterDeclaration[]) ArrayUtil.trimAt( IASTParameterDeclaration.class, parameters, parametersPos );
+        parameters = ArrayUtil.trimAt( IASTParameterDeclaration.class, parameters, parametersPos );
         return parameters;
     }
 
-    public void addParameterDeclaration(IASTParameterDeclaration parameter) {
+    @Override
+	public void addParameterDeclaration(IASTParameterDeclaration parameter) {
         assertNotFrozen();
     	if (parameter != null) {
     		parameter.setParent(this);
 			parameter.setPropertyInParent(FUNCTION_PARAMETER);
-    		parameters = (IASTParameterDeclaration[]) ArrayUtil.appendAt( IASTParameterDeclaration.class, parameters, ++parametersPos, parameter );
+    		parameters = ArrayUtil.appendAt( IASTParameterDeclaration.class, parameters, ++parametersPos, parameter );
     	}        
     }
 
-    public boolean takesVarArgs() {
+    @Override
+	public boolean takesVarArgs() {
         return varArgs;
     }
 
-    public void setVarArgs(boolean value) {
+    @Override
+	public void setVarArgs(boolean value) {
         assertNotFrozen();
         varArgs = value;
     }
@@ -109,6 +113,7 @@ public class CASTFunctionDeclarator extends CASTDeclarator implements IASTStanda
         super.replace(child, other);
 	}
 	
+	@Override
 	public IScope getFunctionScope() {
         if (scope != null)
             return scope;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java
index 3cda61a2d81..6947035e1cf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTFunctionDefinition.java
@@ -21,6 +21,7 @@ import org.eclipse.cdt.core.dom.ast.IASTStatement;
 import org.eclipse.cdt.core.dom.ast.IScope;
 import org.eclipse.cdt.core.dom.ast.c.ICFunctionScope;
 import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
+import org.eclipse.cdt.internal.core.dom.parser.ASTQueries;
 import org.eclipse.cdt.internal.core.dom.parser.IASTAmbiguityParent;
 
 /**
@@ -43,18 +44,20 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin
     	setBody(bodyStatement);
 	}
 
+	@Override
 	public CASTFunctionDefinition copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTFunctionDefinition copy(CopyStyle style) {
 		CASTFunctionDefinition copy = new CASTFunctionDefinition();
 		copy.setDeclSpecifier(declSpecifier == null ? null : declSpecifier.copy(style));
 		
 		if (declarator != null) {
-			IASTDeclarator outer = CVisitor.findOutermostDeclarator(declarator);
+			IASTDeclarator outer = ASTQueries.findOutermostDeclarator(declarator);
 			outer = outer.copy(style);
-			copy.setDeclarator((IASTFunctionDeclarator) CVisitor.findTypeRelevantDeclarator(outer));
+			copy.setDeclarator((IASTFunctionDeclarator) ASTQueries.findTypeRelevantDeclarator(outer));
 		}	
 		
 		copy.setBody(bodyStatement == null ? null : bodyStatement.copy(style));
@@ -66,11 +69,13 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin
 		return copy;
 	}
 	
+	@Override
 	public IASTDeclSpecifier getDeclSpecifier() {
         return declSpecifier;
     }
 
-    public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
+    @Override
+	public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
         assertNotFrozen();
         declSpecifier = declSpec;
         if (declSpec != null) {
@@ -79,25 +84,29 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin
 		}
     }
 
-    public IASTFunctionDeclarator getDeclarator() {
+    @Override
+	public IASTFunctionDeclarator getDeclarator() {
         return declarator;
     }
 
-    public void setDeclarator(IASTFunctionDeclarator declarator) {
+    @Override
+	public void setDeclarator(IASTFunctionDeclarator declarator) {
         assertNotFrozen();
         this.declarator = declarator;
         if (declarator != null) {
-        	IASTDeclarator outerDtor= CVisitor.findOutermostDeclarator(declarator);
+        	IASTDeclarator outerDtor= ASTQueries.findOutermostDeclarator(declarator);
         	outerDtor.setParent(this);
         	outerDtor.setPropertyInParent(DECLARATOR);
 		}
     }
 
-    public IASTStatement getBody() {
+    @Override
+	public IASTStatement getBody() {
         return bodyStatement;
     }
 
-    public void setBody(IASTStatement statement) {
+    @Override
+	public void setBody(IASTStatement statement) {
         assertNotFrozen();
         bodyStatement = statement;
         if (statement != null) {
@@ -106,6 +115,7 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin
 		}
     }
 
+	@Override
 	public IScope getScope() {
 		if (scope == null)
 			scope = new CFunctionScope(this);
@@ -123,7 +133,7 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin
 		}
         
         if (declSpecifier != null && !declSpecifier.accept(action)) return false;
-        final IASTDeclarator outerDtor= CVisitor.findOutermostDeclarator(declarator);
+        final IASTDeclarator outerDtor= ASTQueries.findOutermostDeclarator(declarator);
         if (outerDtor != null && !outerDtor.accept(action)) return false;
         if (bodyStatement != null && !bodyStatement.accept(action)) return false;
       
@@ -137,7 +147,8 @@ public class CASTFunctionDefinition extends ASTNode implements IASTFunctionDefin
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (bodyStatement == child) {
             other.setPropertyInParent(bodyStatement.getPropertyInParent());
             other.setParent(bodyStatement.getParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java
index b8434f3a55c..a9b0317631d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTGotoStatement.java
@@ -30,10 +30,12 @@ public class CASTGotoStatement extends ASTNode implements IASTGotoStatement {
 		setName(name);
 	}
 
+	@Override
 	public CASTGotoStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTGotoStatement copy(CopyStyle style) {
 		CASTGotoStatement copy = new CASTGotoStatement(name == null ? null : name.copy(style));
 		copy.setOffsetAndLength(this);
@@ -43,11 +45,13 @@ public class CASTGotoStatement extends ASTNode implements IASTGotoStatement {
 		return copy;
 	}
 	
+	@Override
 	public IASTName getName() {
         return this.name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
        this.name = name;
        if (name != null) {
@@ -77,6 +81,7 @@ public class CASTGotoStatement extends ASTNode implements IASTGotoStatement {
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( n == name ) return r_reference;
 		return r_unclear;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java
index 6f2d3ae1acd..78ec3a7a3b2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIdExpression.java
@@ -46,10 +46,12 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC
 		setName(name);
 	}
 
+	@Override
 	public CASTIdExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTIdExpression copy(CopyStyle style) {
 		CASTIdExpression copy = new CASTIdExpression(name == null ? null : name.copy(style));
 		copy.setOffsetAndLength(this);
@@ -59,11 +61,13 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -94,11 +98,13 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( n == name )	return r_reference;
 		return r_unclear;
 	}
 	
+	@Override
 	public IType getExpressionType() {
 		IBinding binding = getName().resolveBinding();
 		try {
@@ -120,15 +126,18 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
 	}
 	
+	@Override
 	public boolean isLValue() {
 		return true;
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return ValueCategory.LVALUE;
 	}
 
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		IBinding[] bindings = CVisitor.findBindingsForContentAssist(n, isPrefix);
 
@@ -138,6 +147,6 @@ public class CASTIdExpression extends ASTNode implements IASTIdExpression, IASTC
 			}
 		}
 		
-		return (IBinding[]) ArrayUtil.removeNulls(IBinding.class, bindings);
+		return ArrayUtil.removeNulls(IBinding.class, bindings);
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java
index 3f036955cad..5c07fd3cd93 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTIfStatement.java
@@ -45,10 +45,12 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb
 		setElseClause(elseClause);
 	}
 
+	@Override
 	public CASTIfStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTIfStatement copy(CopyStyle style) {
 		CASTIfStatement copy = new CASTIfStatement();
 		copy.setConditionExpression(condition == null ? null : condition.copy(style));
@@ -61,11 +63,13 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb
 		return copy;
 	}
 	
+	@Override
 	public IASTExpression getConditionExpression() {
         return condition;
     }
 
-    public void setConditionExpression(IASTExpression condition) {
+    @Override
+	public void setConditionExpression(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -74,11 +78,13 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb
 		}
     }
 
-    public IASTStatement getThenClause() {
+    @Override
+	public IASTStatement getThenClause() {
         return thenClause;
     }
 
-    public void setThenClause(IASTStatement thenClause) {
+    @Override
+	public void setThenClause(IASTStatement thenClause) {
         assertNotFrozen();
         this.thenClause = thenClause;
         if (thenClause != null) {
@@ -87,11 +93,13 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb
 		}
     }
 
-    public IASTStatement getElseClause() {
+    @Override
+	public IASTStatement getElseClause() {
         return elseClause;
     }
 
-    public void setElseClause(IASTStatement elseClause) {
+    @Override
+	public void setElseClause(IASTStatement elseClause) {
         assertNotFrozen();
         this.elseClause = elseClause;
         if (elseClause != null) {
@@ -155,7 +163,8 @@ public class CASTIfStatement extends ASTNode implements IASTIfStatement, IASTAmb
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( thenClause == child )
         {
             other.setParent( child.getParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java
index 795ab6cca03..134fbfb2e65 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTInitializerList.java
@@ -32,10 +32,12 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList,
     private int initializersPos=-1;
     private int actualSize;
 
+	@Override
 	public CASTInitializerList copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTInitializerList copy(CopyStyle style) {
 		CASTInitializerList copy = new CASTInitializerList();
 		for (IASTInitializerClause initializer : getClauses())
@@ -48,10 +50,12 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList,
 		return copy;
 	}
 	
+	@Override
 	public int getSize() {
 		return actualSize;
 	}
 
+	@Override
 	public IASTInitializerClause[] getClauses() {
 		if (initializers == null)
 			return IASTExpression.EMPTY_EXPRESSION_ARRAY;
@@ -59,6 +63,7 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList,
 		return initializers;
 	}
 
+	@Override
 	@Deprecated
 	public IASTInitializer[] getInitializers() {
 		IASTInitializerClause[] clauses= getClauses();
@@ -80,16 +85,18 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList,
 		return inits;
 	}
 
+	@Override
 	public void addClause(IASTInitializerClause d) {
         assertNotFrozen();
     	if (d != null) {
-    		initializers = (IASTInitializerClause[]) ArrayUtil.appendAt( IASTInitializerClause.class, initializers, ++initializersPos, d );
+    		initializers = ArrayUtil.appendAt( IASTInitializerClause.class, initializers, ++initializersPos, d );
     		d.setParent(this);
 			d.setPropertyInParent(NESTED_INITIALIZER);
     	}
     	actualSize++;
     }
 
+	@Override
 	@Deprecated
 	public void addInitializer(IASTInitializer d) {
         assertNotFrozen();
@@ -126,6 +133,7 @@ public class CASTInitializerList extends ASTNode implements IASTInitializerList,
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (initializers != null) {
 			for (int i = 0; i < initializers.length; ++i) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java
index db49f4ce404..429d70fd358 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTKnRFunctionDeclarator.java
@@ -71,6 +71,7 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn
 		return copy;
 	}
 
+	@Override
 	public void setParameterNames(IASTName[] names) {
         assertNotFrozen();
 		parameterNames = names;
@@ -85,11 +86,13 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn
 	}
 
 
+	@Override
 	public IASTName[] getParameterNames() {
 		return parameterNames;
 	}
 
 
+	@Override
 	public void setParameterDeclarations(IASTDeclaration[] decls) {
         assertNotFrozen();
 		parameterDeclarations = decls;
@@ -104,6 +107,7 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn
 	}
 
 
+	@Override
 	public IASTDeclaration[] getParameterDeclarations() {
 		return parameterDeclarations;
 	}
@@ -125,6 +129,7 @@ public class CASTKnRFunctionDeclarator extends CASTDeclarator implements ICASTKn
 		return super.postAccept(action);
 	}
 	
+	@Override
 	public IASTDeclarator getDeclaratorForParameterName(IASTName name) {
 		boolean found=false;
 		for(int i=0; i<parameterNames.length; i++) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java
index 4743fe80c28..376bbc29041 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLabelStatement.java
@@ -36,10 +36,12 @@ public class CASTLabelStatement extends ASTNode implements IASTLabelStatement, I
 		setNestedStatement(nestedStatement);
 	}
 	
+	@Override
 	public CASTLabelStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTLabelStatement copy(CopyStyle style) {
 		CASTLabelStatement copy = new CASTLabelStatement();
 		copy.setName(name == null ? null : name.copy(style));
@@ -51,11 +53,13 @@ public class CASTLabelStatement extends ASTNode implements IASTLabelStatement, I
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -86,16 +90,19 @@ public class CASTLabelStatement extends ASTNode implements IASTLabelStatement, I
     }
 
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( n == name )	return r_declaration;
 		return r_unclear;
 	}
     
-    public IASTStatement getNestedStatement() {
+    @Override
+	public IASTStatement getNestedStatement() {
         return nestedStatement;
     }
 
-    public void setNestedStatement(IASTStatement s) {
+    @Override
+	public void setNestedStatement(IASTStatement s) {
         assertNotFrozen();
         nestedStatement = s;
         if (s != null) {
@@ -104,7 +111,8 @@ public class CASTLabelStatement extends ASTNode implements IASTLabelStatement, I
 		}
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == nestedStatement )
         {
             other.setParent( this );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java
index a410c76a0d4..ec632f68e43 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTLiteralExpression.java
@@ -38,10 +38,12 @@ public class CASTLiteralExpression extends ASTNode implements IASTLiteralExpress
 		this.value = value;
 	}
 	
+	@Override
 	public CASTLiteralExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTLiteralExpression copy(CopyStyle style) {
 		CASTLiteralExpression copy = new CASTLiteralExpression(kind, value == null ? null : value.clone());
 		copy.setOffsetAndLength(this);
@@ -51,20 +53,24 @@ public class CASTLiteralExpression extends ASTNode implements IASTLiteralExpress
 		return copy;
 	}
 
+	@Override
 	public int getKind() {
         return kind;
     }
 
-    public void setKind(int value) {
+    @Override
+	public void setKind(int value) {
         assertNotFrozen();
         kind = value;
     }
 
-    public char[] getValue() {
+    @Override
+	public char[] getValue() {
     	return value;
     }
 
-    public void setValue(char[] value) {
+    @Override
+	public void setValue(char[] value) {
         assertNotFrozen();
     	this.value= value;
     }
@@ -93,6 +99,7 @@ public class CASTLiteralExpression extends ASTNode implements IASTLiteralExpress
         return true;
     }
     
+	@Override
 	public IType getExpressionType() {
 		switch (getKind()) {
 		case IASTLiteralExpression.lk_char_constant:
@@ -109,10 +116,12 @@ public class CASTLiteralExpression extends ASTNode implements IASTLiteralExpress
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
 	}
 	
+	@Override
 	public boolean isLValue() {
 		return getKind() == IASTLiteralExpression.lk_string_literal;
 	}
 
+	@Override
 	public final ValueCategory getValueCategory() {
 		return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE;
 	}
@@ -175,7 +184,8 @@ public class CASTLiteralExpression extends ASTNode implements IASTLiteralExpress
     /**
      * @deprecated, use {@link #setValue(char[])}, instead.
      */
-    @Deprecated
+    @Override
+	@Deprecated
 	public void setValue(String value) {
         assertNotFrozen();
         this.value = value.toCharArray();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java
index d031f684cbd..3e7e8115e28 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTName.java
@@ -258,7 +258,7 @@ public class CASTName extends ASTNode implements IASTName, IASTCompletionContext
 				bindings[i]= null;
 			}
 		}
-		return (IBinding[])ArrayUtil.removeNulls(IBinding.class, bindings);
+		return ArrayUtil.removeNulls(IBinding.class, bindings);
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java
index e220493a4b2..b9001d3087b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTNullStatement.java
@@ -39,10 +39,12 @@ public class CASTNullStatement extends ASTNode implements IASTNullStatement {
         return true;
     }
     
-    public CASTNullStatement copy() {
+    @Override
+	public CASTNullStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTNullStatement copy(CopyStyle style) {
 		CASTNullStatement copy = new CASTNullStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java
index 7d5778013fd..11bf3f16ec4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTParameterDeclaration.java
@@ -36,10 +36,12 @@ public class CASTParameterDeclaration extends ASTNode implements IASTParameterDe
 		setDeclarator(declarator);
 	}
 
+	@Override
 	public CASTParameterDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTParameterDeclaration copy(CopyStyle style) {
 		CASTParameterDeclaration copy = new CASTParameterDeclaration();
 		copy.setDeclSpecifier(declSpec == null ? null : declSpec.copy(style));
@@ -51,15 +53,18 @@ public class CASTParameterDeclaration extends ASTNode implements IASTParameterDe
 		return copy;
 	}
 	
+	@Override
 	public IASTDeclSpecifier getDeclSpecifier() {
         return declSpec;
     }
 
-    public IASTDeclarator getDeclarator() {
+    @Override
+	public IASTDeclarator getDeclarator() {
         return declarator;
     }
 
-    public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
+    @Override
+	public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
         assertNotFrozen();
         this.declSpec = declSpec;
         if (declSpec != null) {
@@ -68,7 +73,8 @@ public class CASTParameterDeclaration extends ASTNode implements IASTParameterDe
 		}
     }
 
-    public void setDeclarator(IASTDeclarator declarator) {
+    @Override
+	public void setDeclarator(IASTDeclarator declarator) {
         assertNotFrozen();
         this.declarator = declarator;
         if (declarator != null) {
@@ -99,6 +105,7 @@ public class CASTParameterDeclaration extends ASTNode implements IASTParameterDe
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
         if (child == declarator) {
             other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java
index 40d3e3b8b20..eaae82ec5c1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTPointer.java
@@ -21,10 +21,12 @@ public class CASTPointer extends ASTNode implements ICASTPointer {
     private boolean isVolatile;
     private boolean isConst;
 
-    public CASTPointer copy() {
+    @Override
+	public CASTPointer copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTPointer copy(CopyStyle style) {
 		CASTPointer copy = new CASTPointer();
 		copy.isRestrict = isRestrict;
@@ -37,29 +39,35 @@ public class CASTPointer extends ASTNode implements ICASTPointer {
 		return copy;
 	}
     
+	@Override
 	public boolean isRestrict() {
         return isRestrict;
     }
 
-    public void setRestrict(boolean value) {
+    @Override
+	public void setRestrict(boolean value) {
         assertNotFrozen();
         isRestrict = value;
     }
 
-    public boolean isConst() {
+    @Override
+	public boolean isConst() {
         return isConst;
     }
 
-    public boolean isVolatile() {
+    @Override
+	public boolean isVolatile() {
         return isVolatile;
     }
 
-    public void setConst(boolean value) {
+    @Override
+	public void setConst(boolean value) {
         assertNotFrozen();
         isConst = value;
     }
 
-    public void setVolatile(boolean value) {
+    @Override
+	public void setVolatile(boolean value) {
         assertNotFrozen();
         isVolatile = value;
     }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemDeclaration.java
index 06f3a4f97ee..7168cdc483f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemDeclaration.java
@@ -30,10 +30,12 @@ public class CASTProblemDeclaration extends CASTProblemOwner implements
 		super(problem);
 	}
 
+	@Override
 	public CASTProblemDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTProblemDeclaration copy(CopyStyle style) {
 		CASTProblemDeclaration copy = new CASTProblemDeclaration();
 		copyBaseProblem(copy, style);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemExpression.java
index 0accd8ef4b4..5ba07cc8fa8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemExpression.java
@@ -29,10 +29,12 @@ public class CASTProblemExpression extends CASTProblemOwner implements IASTProbl
 		super(problem);
 	}
 
+	@Override
 	public CASTProblemExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTProblemExpression copy(CopyStyle style) {
 		CASTProblemExpression copy = new CASTProblemExpression();
 		copyBaseProblem(copy, style);
@@ -62,14 +64,17 @@ public class CASTProblemExpression extends CASTProblemOwner implements IASTProbl
         return true;
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
     }
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public ValueCategory getValueCategory() {
 		return ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemOwner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemOwner.java
index e965035a503..9de06ce5a97 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemOwner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemOwner.java
@@ -35,11 +35,13 @@ abstract class CASTProblemOwner extends ASTNode implements IASTProblemHolder {
 		copy.setOffsetAndLength(this);
 	}
 	
+	@Override
 	public IASTProblem getProblem() {
         return problem;
     }
     
-    public void setProblem(IASTProblem p) {
+    @Override
+	public void setProblem(IASTProblem p) {
         assertNotFrozen();
         problem = p;
         if (p != null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemStatement.java
index 57e30e100a1..93183e88ae0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTProblemStatement.java
@@ -28,10 +28,12 @@ public class CASTProblemStatement extends CASTProblemOwner implements IASTProble
 		super(problem);
 	}
 
+	@Override
 	public CASTProblemStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTProblemStatement copy(CopyStyle style) {
 		CASTProblemStatement copy = new CASTProblemStatement();
 		copyBaseProblem(copy, style);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java
index 8aa50c8cd9d..eb5154298e9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTReturnStatement.java
@@ -32,10 +32,12 @@ public class CASTReturnStatement extends ASTNode implements
 		setReturnValue(retValue);
 	}
 	
+	@Override
 	public CASTReturnStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTReturnStatement copy(CopyStyle style) {
 		CASTReturnStatement copy = new CASTReturnStatement(retValue == null ? null
 				: retValue.copy(style));
@@ -46,11 +48,13 @@ public class CASTReturnStatement extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getReturnValue() {
         return retValue;
     }
 
-    public void setReturnValue(IASTExpression returnValue) {
+    @Override
+	public void setReturnValue(IASTExpression returnValue) {
         assertNotFrozen();
         retValue = returnValue;
         if (returnValue != null) {
@@ -59,10 +63,12 @@ public class CASTReturnStatement extends ASTNode implements
 		}
     }
 
-    public IASTInitializerClause getReturnArgument() {
+    @Override
+	public IASTInitializerClause getReturnArgument() {
     	return getReturnValue();
 	}
 
+	@Override
 	public void setReturnArgument(IASTInitializerClause returnValue) {
 		if (returnValue instanceof IASTExpression) {
 			setReturnValue((IASTExpression) returnValue);
@@ -91,7 +97,8 @@ public class CASTReturnStatement extends ASTNode implements
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == retValue )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java
index eb449a9b22d..fae6dae27d8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclSpecifier.java
@@ -32,10 +32,12 @@ public class CASTSimpleDeclSpecifier extends CASTBaseDeclSpecifier implements IC
     private boolean imaginary=false;
 	private IASTExpression fDeclTypeExpression;
 
-    public CASTSimpleDeclSpecifier copy() {
+    @Override
+	public CASTSimpleDeclSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
     
+	@Override
 	public CASTSimpleDeclSpecifier copy(CopyStyle style) {
 		CASTSimpleDeclSpecifier copy = new CASTSimpleDeclSpecifier();
 		copySimpleDeclSpec(copy, style);
@@ -59,32 +61,39 @@ public class CASTSimpleDeclSpecifier extends CASTBaseDeclSpecifier implements IC
 			copy.setDeclTypeExpression(fDeclTypeExpression.copy(style));
     }
     
-    public int getType() {
+    @Override
+	public int getType() {
         return simpleType;
     }
 
-    public boolean isSigned() {
+    @Override
+	public boolean isSigned() {
         return isSigned;
     }
 
-    public boolean isUnsigned() {
+    @Override
+	public boolean isUnsigned() {
         return isUnsigned;
     }
 
-    public boolean isShort() {
+    @Override
+	public boolean isShort() {
         return isShort;
     }
 
-    public boolean isLong() {
+    @Override
+	public boolean isLong() {
         return isLong;
     }
     
-    public void setType(int type) {
+    @Override
+	public void setType(int type) {
         assertNotFrozen();
         simpleType = type;
     }
     
-    public void setType(Kind kind) {
+    @Override
+	public void setType(Kind kind) {
     	setType(getType(kind));
     }
     
@@ -111,31 +120,37 @@ public class CASTSimpleDeclSpecifier extends CASTBaseDeclSpecifier implements IC
     	return t_unspecified;
     }
     
-    public void setShort(boolean value) {
+    @Override
+	public void setShort(boolean value) {
         assertNotFrozen();
         isShort = value;
     }
     
-    public void setLong(boolean value) {
+    @Override
+	public void setLong(boolean value) {
         assertNotFrozen();
         isLong = value;
     }
     
-    public void setUnsigned(boolean value) {
+    @Override
+	public void setUnsigned(boolean value) {
         assertNotFrozen();
         isUnsigned = value;
     }
     
-    public void setSigned(boolean value) {
+    @Override
+	public void setSigned(boolean value) {
         assertNotFrozen();
         isSigned = value;
     }
 
-    public boolean isLongLong() {
+    @Override
+	public boolean isLongLong() {
         return longlong;
     }
 
-    public void setLongLong(boolean value) {
+    @Override
+	public void setLongLong(boolean value) {
         assertNotFrozen();
         longlong = value;
     }
@@ -163,28 +178,34 @@ public class CASTSimpleDeclSpecifier extends CASTBaseDeclSpecifier implements IC
         return true;
     }
 
+	@Override
 	public boolean isComplex() {
 		return complex;
 	}
 
+	@Override
 	public void setComplex(boolean value) {
         assertNotFrozen();
 		this.complex = value;
 	}
 
+	@Override
 	public boolean isImaginary() {
 		return imaginary;
 	}
 
+	@Override
 	public void setImaginary(boolean value) {
         assertNotFrozen();
 		this.imaginary = value;		
 	}
 
+	@Override
 	public IASTExpression getDeclTypeExpression() {
 		return fDeclTypeExpression;
 	}
 
+	@Override
 	public void setDeclTypeExpression(IASTExpression expression) {
         assertNotFrozen();
         fDeclTypeExpression= expression;
@@ -194,6 +215,7 @@ public class CASTSimpleDeclSpecifier extends CASTBaseDeclSpecifier implements IC
         }
 	}
 	
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == fDeclTypeExpression) {
 			other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java
index 46b1d5933d0..3f2f375d1b6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSimpleDeclaration.java
@@ -36,10 +36,12 @@ public class CASTSimpleDeclaration extends ASTNode implements IASTSimpleDeclarat
 		setDeclSpecifier(declSpecifier);
 	}
 
+	@Override
 	public CASTSimpleDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTSimpleDeclaration copy(CopyStyle style) {
 		CASTSimpleDeclaration copy = new CASTSimpleDeclaration();
 		copy.setDeclSpecifier(declSpecifier == null ? null : declSpecifier.copy(style));
@@ -54,27 +56,31 @@ public class CASTSimpleDeclaration extends ASTNode implements IASTSimpleDeclarat
 		return copy;
 	}
 	
+	@Override
 	public IASTDeclSpecifier getDeclSpecifier() {
         return declSpecifier;
     }
 
-    public IASTDeclarator[] getDeclarators() {
+    @Override
+	public IASTDeclarator[] getDeclarators() {
         if (declarators == null)
         	return IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
-        declarators = (IASTDeclarator[]) ArrayUtil.trimAt(IASTDeclarator.class, declarators, declaratorsPos);
+        declarators = ArrayUtil.trimAt(IASTDeclarator.class, declarators, declaratorsPos);
         return declarators;
     }
     
-    public void addDeclarator(IASTDeclarator d) {
+    @Override
+	public void addDeclarator(IASTDeclarator d) {
         assertNotFrozen();
     	if (d != null) {
     		d.setParent(this);
 			d.setPropertyInParent(DECLARATOR);
-    		declarators = (IASTDeclarator[]) ArrayUtil.appendAt(IASTDeclarator.class, declarators, ++declaratorsPos, d);    		
+    		declarators = ArrayUtil.appendAt(IASTDeclarator.class, declarators, ++declaratorsPos, d);    		
     	}
     }
     
-    public void setDeclSpecifier(IASTDeclSpecifier declSpecifier) {
+    @Override
+	public void setDeclSpecifier(IASTDeclSpecifier declSpecifier) {
         assertNotFrozen();
         this.declSpecifier = declSpecifier;
         if (declSpecifier != null) {
@@ -111,7 +117,8 @@ public class CASTSimpleDeclaration extends ASTNode implements IASTSimpleDeclarat
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
     	if (declSpecifier == child) {
 			other.setParent(child.getParent());
 			other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java
index 1b64b469161..49ed5ec00fc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTSwitchStatement.java
@@ -36,10 +36,12 @@ public class CASTSwitchStatement extends ASTNode implements
 		setBody(body);
 	}
 	
+	@Override
 	public CASTSwitchStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTSwitchStatement copy(CopyStyle style) {
 		CASTSwitchStatement copy = new CASTSwitchStatement();
 		copy.setControllerExpression(controller == null ? null : controller.copy(style));
@@ -51,11 +53,13 @@ public class CASTSwitchStatement extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getControllerExpression() {
         return controller;
     }
 
-    public void setControllerExpression(IASTExpression controller) {
+    @Override
+	public void setControllerExpression(IASTExpression controller) {
         assertNotFrozen();
         this.controller = controller;
         if (controller != null) {
@@ -64,11 +68,13 @@ public class CASTSwitchStatement extends ASTNode implements
 		}
     }
 
-    public IASTStatement getBody() {
+    @Override
+	public IASTStatement getBody() {
         return body;
     }
 
-    public void setBody(IASTStatement body) {
+    @Override
+	public void setBody(IASTStatement body) {
         assertNotFrozen();
         this.body = body;
         if (body != null) {
@@ -99,7 +105,8 @@ public class CASTSwitchStatement extends ASTNode implements
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( body == child )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java
index b25f08429d1..3c9ceb40d1a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeId.java
@@ -32,10 +32,12 @@ public class CASTTypeId extends ASTNode implements IASTTypeId {
 		setAbstractDeclarator(declarator);
 	}
 	
+	@Override
 	public CASTTypeId copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTTypeId copy(CopyStyle style) {
 		CASTTypeId copy = new CASTTypeId();
 		copy.setDeclSpecifier(declSpecifier == null ? null : declSpecifier.copy(style));
@@ -47,11 +49,13 @@ public class CASTTypeId extends ASTNode implements IASTTypeId {
 		return copy;
 	}
 
+	@Override
 	public IASTDeclSpecifier getDeclSpecifier() {
         return declSpecifier;
     }
 
-    public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
+    @Override
+	public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
         assertNotFrozen();
         this.declSpecifier = declSpec;
         if (declSpec != null) {
@@ -60,11 +64,13 @@ public class CASTTypeId extends ASTNode implements IASTTypeId {
 		}
     }
 
-    public IASTDeclarator getAbstractDeclarator() {
+    @Override
+	public IASTDeclarator getAbstractDeclarator() {
         return declarator;
     }
 
-    public void setAbstractDeclarator(IASTDeclarator abstractDeclarator) {
+    @Override
+	public void setAbstractDeclarator(IASTDeclarator abstractDeclarator) {
         assertNotFrozen();
         declarator = abstractDeclarator;
         if (abstractDeclarator != null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java
index c816c14fd93..9fd6650f0bd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdExpression.java
@@ -34,10 +34,12 @@ public class CASTTypeIdExpression extends ASTNode implements IASTTypeIdExpressio
 		setTypeId(typeId);
 	}
 	
+	@Override
 	public CASTTypeIdExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTTypeIdExpression copy(CopyStyle style) {
 		CASTTypeIdExpression copy = new CASTTypeIdExpression(op, typeId == null ? null
 				: typeId.copy(style));
@@ -48,16 +50,19 @@ public class CASTTypeIdExpression extends ASTNode implements IASTTypeIdExpressio
 		return copy;
 	}
 
+	@Override
 	public int getOperator() {
         return op;
     }
 
-    public void setOperator(int value) {
+    @Override
+	public void setOperator(int value) {
         assertNotFrozen();
         this.op = value;
     }
 
-    public void setTypeId(IASTTypeId typeId) {
+    @Override
+	public void setTypeId(IASTTypeId typeId) {
        assertNotFrozen();
        this.typeId = typeId;
        if (typeId != null) {
@@ -66,7 +71,8 @@ public class CASTTypeIdExpression extends ASTNode implements IASTTypeIdExpressio
 		}
     }
 
-    public IASTTypeId getTypeId() {
+    @Override
+	public IASTTypeId getTypeId() {
         return typeId;
     }
 
@@ -92,17 +98,20 @@ public class CASTTypeIdExpression extends ASTNode implements IASTTypeIdExpressio
         return true;
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
     	if (getOperator() == op_sizeof) {
 			return CVisitor.get_SIZE_T(this);
 		}
     	return CVisitor.createType(typeId.getAbstractDeclarator());
     }
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public ValueCategory getValueCategory() {
 		return ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java
index 02d99fe3d6f..ca900a27959 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypeIdInitializerExpression.java
@@ -32,16 +32,19 @@ public class CASTTypeIdInitializerExpression extends ASTTypeIdInitializerExpress
 		super(typeId, initializer);
 	}
 
+	@Override
 	public CASTTypeIdInitializerExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CASTTypeIdInitializerExpression copy(CopyStyle style) {
 		CASTTypeIdInitializerExpression copy = new CASTTypeIdInitializerExpression();
 		initializeCopy(copy, style);
 		return copy;
 	}
 
+	@Override
 	public IType getExpressionType() {
 		return CVisitor.createType(getTypeId().getAbstractDeclarator());
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java
index 9a72ff0ef4d..4ad2bad2fe8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTTypedefNameSpecifier.java
@@ -36,10 +36,12 @@ public class CASTTypedefNameSpecifier extends CASTBaseDeclSpecifier implements
 		setName(name);
 	}
 
+	@Override
 	public CASTTypedefNameSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTTypedefNameSpecifier copy(CopyStyle style) {
 		CASTTypedefNameSpecifier copy = new CASTTypedefNameSpecifier(name == null ? null
 				: name.copy(style));
@@ -50,11 +52,13 @@ public class CASTTypedefNameSpecifier extends CASTBaseDeclSpecifier implements
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return name;
     }
    
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -83,11 +87,13 @@ public class CASTTypedefNameSpecifier extends CASTBaseDeclSpecifier implements
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( n == name )	return r_reference;
 		return r_unclear;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		IBinding[] bindings = CVisitor.findBindingsForContentAssist(n, isPrefix);
 
@@ -97,6 +103,6 @@ public class CASTTypedefNameSpecifier extends CASTBaseDeclSpecifier implements
 			}
 		}
 		
-		return (IBinding[]) ArrayUtil.removeNulls(IBinding.class, bindings);
+		return ArrayUtil.removeNulls(IBinding.class, bindings);
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java
index ab1fe112d4a..bed10b3ca86 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTUnaryExpression.java
@@ -39,10 +39,12 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
 		setOperand(operand);
 	}
 
+	@Override
 	public CASTUnaryExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTUnaryExpression copy(CopyStyle style) {
 		CASTUnaryExpression copy = new CASTUnaryExpression(operator, operand == null ? null
 				: operand.copy(style));
@@ -53,20 +55,24 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
 		return copy;
 	}
 
+	@Override
 	public int getOperator() {
         return operator;
     }
 
-    public void setOperator(int value) {
+    @Override
+	public void setOperator(int value) {
         assertNotFrozen();
         this.operator = value;
     }
 
-    public IASTExpression getOperand() {
+    @Override
+	public IASTExpression getOperand() {
         return operand;
     }
 
-    public void setOperand(IASTExpression expression) {
+    @Override
+	public void setOperand(IASTExpression expression) {
         assertNotFrozen();
         operand = expression;
         if (expression != null) {
@@ -97,7 +103,8 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == operand )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
@@ -106,6 +113,7 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
         }
     }
     
+	@Override
 	public IType getExpressionType() {
 		int op = getOperator();
 		if (op == op_sizeof) {
@@ -133,6 +141,7 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
 		return exprType; // return the original
 	}
 
+	@Override
 	public boolean isLValue() {
 		switch (getOperator()) {
 		case op_bracketedPrimary:
@@ -146,6 +155,7 @@ public class CASTUnaryExpression extends ASTNode implements IASTUnaryExpression,
 		}
 	}
 	
+	@Override
 	public final ValueCategory getValueCategory() {
 		return isLValue() ? ValueCategory.LVALUE : ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java
index 95d7732e478..ba564d57f3a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CASTWhileStatement.java
@@ -36,10 +36,12 @@ public class CASTWhileStatement extends ASTNode implements IASTWhileStatement, I
 		setBody(body);
 	}
 
+	@Override
 	public CASTWhileStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CASTWhileStatement copy(CopyStyle style) {
 		CASTWhileStatement copy = new CASTWhileStatement();
 		copy.setCondition(condition == null ? null : condition.copy(style));
@@ -51,11 +53,13 @@ public class CASTWhileStatement extends ASTNode implements IASTWhileStatement, I
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getCondition() {
         return condition;
     }
 
-    public void setCondition(IASTExpression condition) {
+    @Override
+	public void setCondition(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -64,11 +68,13 @@ public class CASTWhileStatement extends ASTNode implements IASTWhileStatement, I
 		}
     }
 
-    public IASTStatement getBody() {
+    @Override
+	public IASTStatement getBody() {
         return body;
     }
 
-    public void setBody(IASTStatement body) {
+    @Override
+	public void setBody(IASTStatement body) {
         assertNotFrozen();
         this.body = body;
         if (body != null) {
@@ -99,7 +105,8 @@ public class CASTWhileStatement extends ASTNode implements IASTWhileStatement, I
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( body == child )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java
index b365705c897..45206d6f036 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CArrayType.java
@@ -54,7 +54,8 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
 		isVariableSized= val;
 	}
 
-    public boolean isSameType(IType obj) {
+    @Override
+	public boolean isSameType(IType obj) {
         if (obj == this)
             return true;
         if (obj instanceof ITypedef)
@@ -85,10 +86,12 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IArrayType#getType()
 	 */
+	@Override
 	public IType getType() {
 		return type;
 	}
 	
+	@Override
 	public void setType(IType t) {
 	    this.type = t;
 	}
@@ -102,27 +105,33 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
 		sizeExpression= mod.getConstantExpression();
 	}
 
+	@Override
 	public boolean isConst() {
 		return isConst;
 	}
 
+	@Override
 	public boolean isRestrict() {
 		return isRestrict;
 	}
 
+	@Override
 	public boolean isVolatile() {
 		return isVolatile;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return isStatic;
 	}
 
+	@Override
 	public boolean isVariableLength() {
 		return isVariableSized;
 	}
 
-    public IValue getSize() {
+    @Override
+	public IValue getSize() {
     	if (value != Value.NOT_INITIALIZED)
     		return value;
     	
@@ -149,6 +158,7 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
 	}
 
 	
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.ARRAY;
 		int flags= 0;
@@ -207,6 +217,7 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
 		return result;
 	}
 	
+	@Override
 	@Deprecated
     public IASTExpression getArraySizeExpression() {
         if (sizeExpression != null)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java
index d559b71bba2..55b569cac09 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBasicType.java
@@ -78,34 +78,42 @@ public class CBasicType implements ICBasicType, ISerializableType {
 		}
 	}
 
+	@Override
 	public Kind getKind() {
 		return fKind;
 	}
 	
+	@Override
 	public int getModifiers() {
 		return fModifiers;
 	}
 
+	@Override
 	public boolean isSigned() {
 		return (fModifiers & IS_SIGNED) != 0;
 	}
 
+	@Override
 	public boolean isUnsigned() {
 		return (fModifiers & IS_UNSIGNED) != 0;
 	}
 
+	@Override
 	public boolean isShort() {
 		return (fModifiers & IS_SHORT) != 0;
 	}
 
+	@Override
 	public boolean isLong() {
 		return (fModifiers & IS_LONG) != 0;
 	}
 
+	@Override
 	public boolean isLongLong() {
 		return (fModifiers & IS_LONG_LONG) != 0;
 	}
 
+	@Override
 	public boolean isSameType(IType obj) {
 		if (obj == this)
 			return true;
@@ -139,7 +147,8 @@ public class CBasicType implements ICBasicType, ISerializableType {
         return t;
     }
 
-    @Deprecated
+    @Override
+	@Deprecated
 	public IASTExpression getValue() {
 		return value;
 	}
@@ -147,6 +156,7 @@ public class CBasicType implements ICBasicType, ISerializableType {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.c.ICBasicType#isComplex()
 	 */
+	@Override
 	public boolean isComplex() {
 		return (fModifiers & IS_COMPLEX) != 0;
 	}
@@ -154,10 +164,12 @@ public class CBasicType implements ICBasicType, ISerializableType {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.c.ICBasicType#isImaginary()
 	 */
+	@Override
 	public boolean isImaginary() {
 		return (fModifiers & IS_IMAGINARY) != 0;
 	}
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		final int kind= getKind().ordinal();
 		final int shiftedKind=  kind * ITypeMarshalBuffer.FLAG1;
@@ -184,6 +196,7 @@ public class CBasicType implements ICBasicType, ISerializableType {
 		return new CBasicType(Kind.values()[kind], modifiers);
 	}
 
+	@Override
 	@Deprecated
 	public int getType() {
 		switch (fKind) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBuiltinParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBuiltinParameter.java
index 94c5c7bc0c1..cc3493e6127 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBuiltinParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CBuiltinParameter.java
@@ -43,46 +43,57 @@ public class CBuiltinParameter extends PlatformObject implements IParameter {
 		this.type = type;
 	}
 	
+	@Override
 	public IType getType() {
 		return type;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
 
+	@Override
 	public boolean isExtern() {
 		return false;
 	}
 
+	@Override
 	public boolean isAuto() {
 		return false;
 	}
 
+	@Override
 	public boolean isRegister() {
 		return false;
 	}
 
+	@Override
 	public String getName() {
 		return ""; //$NON-NLS-1$
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return CharArrayUtils.EMPTY;
 	}
 
+	@Override
 	public IScope getScope() {
 		return null;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.C_LINKAGE;
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		return null;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java
index 569b8aff86f..5a80e30e0a7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CCompositeTypeScope.java
@@ -39,7 +39,8 @@ public class CCompositeTypeScope extends CScope implements ICCompositeTypeScope
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.c.ICCompositeTypeScope#getBinding(char[])
      */
-    public IBinding getBinding( char[] name ) {
+    @Override
+	public IBinding getBinding( char[] name ) {
         return super.getBinding( NAMESPACE_TYPE_OTHER, name );
     }
 
@@ -58,14 +59,15 @@ public class CCompositeTypeScope extends CScope implements ICCompositeTypeScope
             if( b == null ) continue;
             try {
                 if( b.getScope() == this )
-                    result = (IBinding[]) ArrayUtil.append( IBinding.class, result, b );
+                    result = ArrayUtil.append( IBinding.class, result, b );
             } catch ( DOMException e ) {
             }
         }
             
-        return (IBinding[]) ArrayUtil.trim( IBinding.class, result );
+        return ArrayUtil.trim( IBinding.class, result );
     }
 
+	@Override
 	public ICompositeType getCompositeType() {
 		ICASTCompositeTypeSpecifier compSpec = (ICASTCompositeTypeSpecifier) getPhysicalNode();
 		IBinding binding = compSpec.getName().resolveBinding();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java
index 3bf43a32038..e0fdf88dd99 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumeration.java
@@ -74,7 +74,8 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
         declarations = tmp;
     }
     
-    public IASTNode getPhysicalNode() {
+    @Override
+	public IASTNode getPhysicalNode() {
         if (definition != null)
             return definition;
         
@@ -95,13 +96,15 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
      */
-    public String getName() {
+    @Override
+	public String getName() {
         if (definition != null)
             return definition.toString();
         
         return declarations[0].toString();
     }
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
         if (definition != null)
             return definition.toCharArray();
         
@@ -111,7 +114,8 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
      */
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         return CVisitor.getContainingScope(definition != null ? definition : declarations[0].getParent());
     }
 
@@ -129,7 +133,8 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IEnumeration#getEnumerators()
      */
-    public IEnumerator[] getEnumerators() {
+    @Override
+	public IEnumerator[] getEnumerators() {
         if (definition == null) {
             checkForDefinition();
             if (definition == null)
@@ -154,7 +159,8 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType)
      */
-    public boolean isSameType(IType type) {
+    @Override
+	public boolean isSameType(IType type) {
         if (type == this)
             return true;
         if (type instanceof ITypedef || type instanceof IIndexBinding)
@@ -163,18 +169,22 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
         return false;
     }
     
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.C_LINKAGE;
 	}
 
+	@Override
 	public IASTNode[] getDeclarations() {
 		return declarations;
 	}
 
+	@Override
 	public IASTNode getDefinition() {
 		return definition;
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		IASTNode node= definition;
 		if (node == null && declarations != null && declarations.length > 0) {
@@ -189,6 +199,7 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
 		return getName();
 	}
 	
+	@Override
 	public long getMinValue() {
 		if (fMinValue != null)
 			return fMinValue.longValue();
@@ -211,6 +222,7 @@ public class CEnumeration extends PlatformObject implements IEnumeration, ICInte
 		return minValue;
 	}
 
+	@Override
 	public long getMaxValue() {
 		if (fMaxValue != null)
 			return fMaxValue.longValue();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java
index dd1a7c1c05a..5155944da3b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CEnumerator.java
@@ -35,6 +35,7 @@ public class CEnumerator extends PlatformObject implements IEnumerator {
         public CEnumeratorProblem(IASTNode node, int id, char[] arg) {
             super(node, id, arg);
         }
+		@Override
 		public IValue getValue() {
 			return Value.UNKNOWN;
 		}
@@ -54,38 +55,45 @@ public class CEnumerator extends PlatformObject implements IEnumerator {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
      */
-    public String getName() {
+    @Override
+	public String getName() {
         return enumeratorName.toString();
     }
 
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
         return enumeratorName.toCharArray();
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
      */
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         return CVisitor.getContainingScope(enumeratorName.getParent());
     }
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType()
 	 */
+	@Override
 	public IType getType() {
 		return (IType) getOwner();
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.C_LINKAGE;
 	}
 
+	@Override
 	public IBinding getOwner() {
 	    IASTEnumerator etor = (IASTEnumerator) enumeratorName.getParent();
 		IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) etor.getParent();
 		return enumSpec.getName().resolveBinding();
 	}
 
+	@Override
 	public IValue getValue() {
 		IASTNode parent= enumeratorName.getParent();
 		if (parent instanceof ASTEnumerator) 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java
index 35fca520f1c..1485032958d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CField.java
@@ -26,6 +26,7 @@ public class CField extends CVariable implements IField {
 			fOwner = owner;
 		}
 
+		@Override
 		public ICompositeType getCompositeTypeOwner() {
 			return fOwner;
 		}
@@ -35,6 +36,7 @@ public class CField extends CVariable implements IField {
 		super(name);
 	}
 
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		ICCompositeTypeScope scope = (ICCompositeTypeScope) getScope();
 		return scope.getCompositeType();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java
index 0624d1fac92..62ef92945e8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunction.java
@@ -62,11 +62,12 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 					&& ASTQueries.findOutermostDeclarator(declarator).getParent() instanceof IASTFunctionDefinition) {
 				definition = (IASTFunctionDeclarator) declarator;
 			} else {
-				declarators = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, declarators, declarator);
+				declarators = ArrayUtil.append(IASTDeclarator.class, declarators, declarator);
 			}
 		}
 	}
 	
+	@Override
 	public IASTDeclarator getPhysicalNode() {
 		if (definition != null)
 			return definition;
@@ -75,6 +76,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 		return null;
 	}
 
+	@Override
 	public void addDeclarator(IASTDeclarator fnDeclarator) {
 		if (!fnDeclarator.isActive())
 			return;
@@ -100,7 +102,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 	        if( tu != null ){
 	            CVisitor.getDeclarations( tu, this );
 	        }
-			declarators = (IASTDeclarator[]) ArrayUtil.trim(IASTDeclarator.class, declarators);
+			declarators = ArrayUtil.trim(IASTDeclarator.class, declarators);
 	        bits |= FULLY_RESOLVED;
 	        bits &= ~RESOLUTION_IN_PROGRESS;
 	    }
@@ -109,6 +111,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IFunction#getParameters()
 	 */
+	@Override
 	public IParameter[] getParameters() {
 		int j=-1;
 		int len = declarators != null ? declarators.length : 0;
@@ -162,10 +165,12 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
 	 */
+	@Override
 	public String getName() {
 		return getASTName().toString();
 	}
 	
+	@Override
 	public char[] getNameCharArray(){
 		return getASTName().toCharArray();
 	}
@@ -177,6 +182,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
 	 */
+	@Override
 	public IScope getScope() {
 	    IASTDeclarator dtor = getPhysicalNode();
 		if (dtor != null)
@@ -187,6 +193,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IFunction#getFunctionScope()
 	 */
+	@Override
 	public IScope getFunctionScope() {
 		if (definition != null) {
 			IASTFunctionDefinition def = (IASTFunctionDefinition) definition.getParent();
@@ -195,7 +202,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 		return null;
 	}
 
-    public IFunctionType getType() {
+    @Override
+	public IFunctionType getType() {
 		if (type == null) {
 			type = createType();
 		}
@@ -329,11 +337,13 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IFunction#isStatic()
      */
-    public boolean isStatic() {
+    @Override
+	public boolean isStatic() {
     	return isStatic(true);
     }
     
-    public boolean isStatic(boolean resolveAll) {
+    @Override
+	public boolean isStatic(boolean resolveAll) {
         if( resolveAll && (bits & FULLY_RESOLVED) == 0 ){
             resolveAllDeclarations();
         }
@@ -371,7 +381,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 	}
 	
 
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
     	return isExtern(true);
     }
     
@@ -383,7 +394,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
     }
 
 
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         if( (bits & FULLY_RESOLVED) == 0 ){
             resolveAllDeclarations();
         }
@@ -391,7 +403,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
     }
 
   
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         if( (bits & FULLY_RESOLVED) == 0 ){
             resolveAllDeclarations();
         }
@@ -399,7 +412,8 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
     }
 
  
-    public boolean isInline() {
+    @Override
+	public boolean isInline() {
         if( (bits & FULLY_RESOLVED) == 0 ){
             resolveAllDeclarations();
         }
@@ -431,6 +445,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
     }
 
 
+	@Override
 	public boolean takesVarArgs() {
 		if ((bits & FULLY_RESOLVED) == 0) {
 			resolveAllDeclarations();
@@ -452,6 +467,7 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 		return false;
 	}
 
+	@Override
 	public void setFullyResolved(boolean resolved) {
 		if( resolved )
 			bits |= FULLY_RESOLVED;
@@ -459,18 +475,22 @@ public class CFunction extends PlatformObject implements IFunction, ICInternalFu
 			bits &= ~FULLY_RESOLVED;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.C_LINKAGE;
 	}
 
+	@Override
 	public IASTNode[] getDeclarations() {
 		return declarators;
 	}
 
+	@Override
 	public IASTNode getDefinition() {
 		return definition;
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java
index 61ed52b7dd0..802a92f1c92 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionScope.java
@@ -31,11 +31,13 @@ public class CFunctionScope extends CScope implements ICFunctionScope {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.c.ICFunctionScope#getBinding(char[])
      */
-    public IBinding getBinding( char[] name ) {
+    @Override
+	public IBinding getBinding( char[] name ) {
         return super.getBinding( NAMESPACE_TYPE_OTHER, name );
     }
 
     
+	@Override
 	public IScope getBodyScope(){
 	    IASTNode node = getPhysicalNode();
 	    IASTStatement statement = ((IASTFunctionDefinition)node).getBody();
@@ -59,7 +61,7 @@ public class CFunctionScope extends CScope implements ICFunctionScope {
 		            result = (ILabel[]) ArrayUtil.append( ILabel.class, result, binding );
 		    }
 	    }
-	    return (ILabel[]) ArrayUtil.trim( ILabel.class, result );
+	    return ArrayUtil.trim( ILabel.class, result );
 	}
 	
 	static private class FindLabelsAction extends ASTVisitor {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java
index bf49918cb5b..e50497f3f96 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CFunctionType.java
@@ -27,7 +27,8 @@ public class CFunctionType implements IFunctionType, ISerializableType {
         this.parameters = types;
     }
 
-    public boolean isSameType( IType o ){
+    @Override
+	public boolean isSameType( IType o ){
         if( o == this )
             return true;
         if( o instanceof ITypedef )
@@ -50,14 +51,16 @@ public class CFunctionType implements IFunctionType, ISerializableType {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getReturnType()
      */
-    public IType getReturnType() {
+    @Override
+	public IType getReturnType() {
         return returnType;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getParameterTypes()
      */
-    public IType[] getParameterTypes() {
+    @Override
+	public IType[] getParameterTypes() {
         return parameters;
     }
 
@@ -72,6 +75,7 @@ public class CFunctionType implements IFunctionType, ISerializableType {
         return t;
     }
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.FUNCTION_TYPE;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java
index 212ab0662cf..f125cc60292 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CKnRParameter.java
@@ -42,6 +42,7 @@ public class CKnRParameter extends PlatformObject implements IParameter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#getType()
 	 */
+	@Override
 	public IType getType() {
 		IASTDeclSpecifier declSpec = null;
 		if (declaration instanceof IASTSimpleDeclaration)
@@ -61,6 +62,7 @@ public class CKnRParameter extends PlatformObject implements IParameter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
 	 */
+	@Override
 	public String getName() {
 		return name.toString();
 	}
@@ -68,6 +70,7 @@ public class CKnRParameter extends PlatformObject implements IParameter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
 	 */
+	@Override
 	public char[] getNameCharArray() {
 		return name.toCharArray();
 	}
@@ -75,6 +78,7 @@ public class CKnRParameter extends PlatformObject implements IParameter {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
 	 */
+	@Override
 	public IScope getScope() {
 		return CVisitor.getContainingScope( declaration );
 	}
@@ -89,21 +93,24 @@ public class CKnRParameter extends PlatformObject implements IParameter {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic()
      */
-    public boolean isStatic() {
+    @Override
+	public boolean isStatic() {
         return false;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern()
      */
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         return false;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto()
      */
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         if( declaration instanceof IASTSimpleDeclaration )
             return ((IASTSimpleDeclaration)declaration).getDeclSpecifier().getStorageClass() == IASTDeclSpecifier.sc_auto;
         return false;
@@ -112,20 +119,24 @@ public class CKnRParameter extends PlatformObject implements IParameter {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister()
      */
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         if( declaration instanceof IASTSimpleDeclaration )
             return ((IASTSimpleDeclaration)declaration).getDeclSpecifier().getStorageClass() == IASTDeclSpecifier.sc_register;
         return false;
     }
     
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.C_LINKAGE;
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		return CVisitor.findEnclosingFunction(declaration);
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java
index d915d91162c..9a08e1e2431 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CNodeFactory.java
@@ -95,38 +95,47 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory {
 		return DEFAULT_INSTANCE;
 	}
 	
+	@Override
 	public IASTArrayDeclarator newArrayDeclarator(IASTName name) {
 		return new CASTArrayDeclarator(name);
 	}
 	
+	@Override
 	public ICASTArrayDesignator newArrayDesignator(IASTExpression exp) {
 		return new CASTArrayDesignator(exp);
 	}
 	
+	@Override
 	public ICASTArrayModifier newArrayModifier(IASTExpression expr) {
 		return new CASTArrayModifier(expr);
 	}
 	
+	@Override
 	public IGCCASTArrayRangeDesignator newArrayRangeDesignatorGCC(IASTExpression floor, IASTExpression ceiling) {
 		return new CASTArrayRangeDesignator(floor, ceiling);
 	}
 	
+	@Override
 	public IASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr, IASTExpression subscript) {
 		return new CASTArraySubscriptExpression(arrayExpr, subscript);
 	}
 	
+	@Override
 	public IASTASMDeclaration newASMDeclaration(String assembly) {
 		return new CASTASMDeclaration(assembly);
 	}
 	
+	@Override
 	public IASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTExpression expr2) {
 		return new CASTBinaryExpression(op, expr1, expr2);
 	}
 	
+	@Override
 	public IASTBreakStatement newBreakStatement() {
 		return new CASTBreakStatement();
 	}
 	
+	@Override
 	public IASTCaseStatement newCaseStatement(IASTExpression expression) {
 		return new CASTCaseStatement(expression);
 	}
@@ -134,38 +143,47 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory {
 	/**
 	 * @param operator  
 	 */
+	@Override
 	public IASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand) {
 		return new CASTCastExpression(typeId, operand);
 	}
 
+	@Override
 	public ICASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name) {
 		return new CASTCompositeTypeSpecifier(key, name);
 	}
 	
+	@Override
 	public IASTCompoundStatement newCompoundStatement() {
 		return new CASTCompoundStatement();
 	}
 	
+	@Override
 	public IASTConditionalExpression newConditionalExpession(IASTExpression condition, IASTExpression positive, IASTExpression negative) {
 		return new CASTConditionalExpression(condition, positive, negative);
 	}
 	
+	@Override
 	public IASTContinueStatement newContinueStatement() {
 		return new CASTContinueStatement();
 	}
 	
+	@Override
 	public IASTDeclarationStatement newDeclarationStatement(IASTDeclaration declaration) {
 		return new CASTDeclarationStatement(declaration);
 	}
 	
+	@Override
 	public IASTDeclarator newDeclarator(IASTName name) {
 		return new CASTDeclarator(name);
 	}
 	
+	@Override
 	public IASTDefaultStatement newDefaultStatement() {
 		return new CASTDefaultStatement();
 	}
 	
+	@Override
 	@Deprecated
 	public ICASTDesignatedInitializer newDesignatedInitializer(IASTInitializer operandInitializer) {
 		CASTDesignatedInitializer result = new CASTDesignatedInitializer();
@@ -173,55 +191,68 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory {
 		return result;
 	}
 	
+	@Override
 	public ICASTDesignatedInitializer newDesignatedInitializer(IASTInitializerClause clause) {
 		return new CASTDesignatedInitializer(clause);
 	}
 	
+	@Override
 	public IASTDoStatement newDoStatement(IASTStatement body, IASTExpression condition) {
 		return new CASTDoStatement(body, condition);
 	}
 	
+	@Override
 	public ICASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name) {
 		return new CASTElaboratedTypeSpecifier(kind, name);
 	}
 	
+	@Override
 	public ICASTEnumerationSpecifier newEnumerationSpecifier(IASTName name) {
 		return new CASTEnumerationSpecifier(name);
 	}
 	
+	@Override
 	public IASTEnumerator newEnumerator(IASTName name, IASTExpression value) {
 		return new CASTEnumerator(name, value);
 	}
 	
+	@Override
 	public IASTEqualsInitializer newEqualsInitializer(IASTInitializerClause initClause) {
 		return new CASTEqualsInitializer(initClause);
 	}
 	
+	@Override
 	public IASTExpressionList newExpressionList() {
 		return new CASTExpressionList();
 	}
 	
+	@Override
 	public IASTExpressionStatement newExpressionStatement(IASTExpression expr) {
 		return new CASTExpressionStatement(expr);
 	}
 
+	@Override
 	public IASTFieldDeclarator newFieldDeclarator(IASTName name, IASTExpression bitFieldSize) {
 		return new CASTFieldDeclarator(name, bitFieldSize);
 	}
 
+	@Override
 	public ICASTFieldDesignator newFieldDesignator(IASTName name) {
 		return new CASTFieldDesignator(name);
 	}
 
+	@Override
 	public IASTFieldReference newFieldReference(IASTName name, IASTExpression owner) {
 		return new CASTFieldReference(name, owner);
 	}
 	
+	@Override
 	public IASTForStatement newForStatement(IASTStatement init, IASTExpression condition,
 			IASTExpression iterationExpression, IASTStatement body) {
 		return new CASTForStatement(init, condition, iterationExpression, body);
 	}
 	
+	@Override
 	@Deprecated
 	public IASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList) {
 		CASTFunctionCallExpression result = new CASTFunctionCallExpression(idExpr, null);
@@ -229,117 +260,145 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory {
 		return result;
 	}
 	
+	@Override
 	public IASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTInitializerClause[] arguments) {
 		return new CASTFunctionCallExpression(idExpr, arguments);
 	}
 	
+	@Override
 	public IASTStandardFunctionDeclarator newFunctionDeclarator(IASTName name) {
 		return new CASTFunctionDeclarator(name);
 	}
 	
+	@Override
 	public IASTFunctionDefinition newFunctionDefinition(IASTDeclSpecifier declSpecifier,
 			IASTFunctionDeclarator declarator, IASTStatement bodyStatement) {
 		return new CASTFunctionDefinition(declSpecifier, declarator, bodyStatement);
 	}
 	
+	@Override
 	public IGNUASTCompoundStatementExpression newGNUCompoundStatementExpression(IASTCompoundStatement compoundStatement) {
 		return new CASTCompoundStatementExpression(compoundStatement);
 	}
 	
+	@Override
 	public IASTGotoStatement newGotoStatement(IASTName name) {
 		return new CASTGotoStatement(name);
 	}
 	
+	@Override
 	public IASTIdExpression newIdExpression(IASTName name) {
 		return new CASTIdExpression(name);
 	}
 	
+	@Override
 	public IASTIfStatement newIfStatement(IASTExpression expr, IASTStatement thenStat, IASTStatement elseClause) {
 		return new CASTIfStatement(expr, thenStat, elseClause);
 	}
 	
+	@Override
 	@Deprecated
 	public  org.eclipse.cdt.core.dom.ast.IASTInitializerExpression newInitializerExpression(IASTExpression expression) {
 		return new CASTInitializerExpression(expression);
 	}
 	
+	@Override
 	public IASTInitializerList newInitializerList() {
 		return new CASTInitializerList();
 	}
 	
+	@Override
 	public ICASTKnRFunctionDeclarator newKnRFunctionDeclarator(IASTName[] parameterNames, IASTDeclaration[] parameterDeclarations) {
 		return new CASTKnRFunctionDeclarator(parameterNames, parameterDeclarations);
 	}
 	
+	@Override
 	public IASTLabelStatement newLabelStatement(IASTName name, IASTStatement nestedStatement) {
 		return new CASTLabelStatement(name, nestedStatement);
 	}
 	
+	@Override
 	public IASTLiteralExpression newLiteralExpression(int kind, String rep) {
 		return new CASTLiteralExpression(kind, rep.toCharArray());
 	}
 	
+	@Override
 	public IASTName newName() {
 		return new CASTName();
 	}
 	
+	@Override
 	public IASTName newName(char[] name) {
 		return new CASTName(name);
 	}
 	
+	@Override
 	public IASTNullStatement newNullStatement() {
 		return new CASTNullStatement();
 	}
 	
+	@Override
 	public IASTParameterDeclaration newParameterDeclaration(IASTDeclSpecifier declSpec, IASTDeclarator declarator) {
 		return new CASTParameterDeclaration(declSpec, declarator);
 	}
 	
+	@Override
 	public ICASTPointer newPointer() {
 		return new CASTPointer();
 	}
 	
+	@Override
 	public IASTProblem newProblem(int id, char[] arg, boolean error) {
 		return new CASTProblem(id, arg, error);
 	}
 	
+	@Override
 	public IASTProblemDeclaration newProblemDeclaration(IASTProblem problem) {
 		return new CASTProblemDeclaration(problem);
 	}
 	
+	@Override
 	public IASTProblemExpression newProblemExpression(IASTProblem problem) {
 		return new CASTProblemExpression(problem);
 	}
 	
+	@Override
 	public IASTProblemStatement newProblemStatement(IASTProblem problem) {
 		return new CASTProblemStatement(problem);
 	}
 	
+	@Override
 	public IASTReturnStatement newReturnStatement(IASTExpression retValue) {
 		return new CASTReturnStatement(retValue);
 	}
 	
+	@Override
 	public IASTSimpleDeclaration newSimpleDeclaration(IASTDeclSpecifier declSpecifier) {
 		return new CASTSimpleDeclaration(declSpecifier);
 	}
 	
+	@Override
 	public ICASTSimpleDeclSpecifier newSimpleDeclSpecifier() {
 		return new CASTSimpleDeclSpecifier();
 	}
 	
+	@Override
 	@Deprecated 
 	public org.eclipse.cdt.core.dom.ast.gnu.c.IGCCASTSimpleDeclSpecifier newSimpleDeclSpecifierGCC(IASTExpression typeofExpression) {
 		return new GCCASTSimpleDeclSpecifier(typeofExpression);
 	}
 	
+	@Override
 	public IASTSwitchStatement newSwitchStatement(IASTExpression controller, IASTStatement body) {
 		return new CASTSwitchStatement(controller, body);
 	}
 	
+	@Override
 	public IASTTranslationUnit newTranslationUnit() {
 		return newTranslationUnit(null);
 	}
 
+	@Override
 	public IASTTranslationUnit newTranslationUnit(IScanner scanner) {
 		CASTTranslationUnit tu = new CASTTranslationUnit();
 		
@@ -353,26 +412,32 @@ public class CNodeFactory extends NodeFactory implements ICNodeFactory {
 		return tu;
 	}
 
+	@Override
 	public ICASTTypedefNameSpecifier newTypedefNameSpecifier(IASTName name) {
 		return new CASTTypedefNameSpecifier(name);
 	}
 
+	@Override
 	public IASTTypeId newTypeId(IASTDeclSpecifier declSpecifier, IASTDeclarator declarator) {
 		return new CASTTypeId(declSpecifier, declarator);
 	}
 
+	@Override
 	public IASTTypeIdExpression newTypeIdExpression(int operator, IASTTypeId typeId) {
 		return new CASTTypeIdExpression(operator, typeId);
 	}
 
+	@Override
 	public ICASTTypeIdInitializerExpression newTypeIdInitializerExpression(IASTTypeId typeId, IASTInitializer initializer) {
 		return new CASTTypeIdInitializerExpression(typeId, initializer);
 	}
 
+	@Override
 	public IASTUnaryExpression newUnaryExpression(int operator, IASTExpression operand) {
 		return new CASTUnaryExpression(operator, operand);
 	}
 
+	@Override
 	public IASTWhileStatement newWhileStatement(IASTExpression condition, IASTStatement body) {
 		return new CASTWhileStatement(condition, body);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java
index 4fac804d4cf..48452cd8ea5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CParameter.java
@@ -56,6 +56,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#getType()
 	 */
 
+	@Override
 	public IType getType() {
 		if (type == null && declarations[0].getParent() instanceof IASTDeclarator)
 			type = CVisitor.createType((IASTDeclarator) declarations[0].getParent());
@@ -85,6 +86,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 * 
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
 	 */
+	@Override
 	public String getName() {
 		IASTName name = getPrimaryDeclaration();
 		if (name != null)
@@ -92,6 +94,7 @@ public class CParameter extends PlatformObject implements IParameter {
 		return CVisitor.EMPTY_STRING;
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		IASTName name = getPrimaryDeclaration();
 		if (name != null)
@@ -104,6 +107,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 * 
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
 	 */
+	@Override
 	public IScope getScope() {
 		// IASTParameterDeclaration or IASTSimpleDeclaration
 		for (IASTName declaration : declarations) {
@@ -131,7 +135,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 */
 	public void addDeclaration(IASTName name) {
 		if (name != null && name.isActive())
-			declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name);
+			declarations = ArrayUtil.append(IASTName.class, declarations, name);
 	}
 
 	/*
@@ -139,6 +143,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 * 
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic()
 	 */
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
@@ -148,6 +153,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 * 
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern()
 	 */
+	@Override
 	public boolean isExtern() {
 		return false;
 	}
@@ -157,6 +163,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 * 
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto()
 	 */
+	@Override
 	public boolean isAuto() {
 		return hasStorageClass(IASTDeclSpecifier.sc_auto);
 	}
@@ -166,6 +173,7 @@ public class CParameter extends PlatformObject implements IParameter {
 	 * 
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister()
 	 */
+	@Override
 	public boolean isRegister() {
 		return hasStorageClass(IASTDeclSpecifier.sc_register);
 	}
@@ -191,10 +199,12 @@ public class CParameter extends PlatformObject implements IParameter {
 		return false;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.C_LINKAGE;
 	}
 
+	@Override
 	public IBinding getOwner() {
 		if (declarations == null || declarations.length == 0)
 			return null;
@@ -202,6 +212,7 @@ public class CParameter extends PlatformObject implements IParameter {
 		return CVisitor.findEnclosingFunction(declarations[0]);
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java
index 6d0889f167d..1dae663aef2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CQualifierType.java
@@ -51,6 +51,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali
 		this.isRestrict = isRestrict;
 	}
 	
+	@Override
 	public boolean isSameType(IType obj) {
 	    if (obj == this)
 	        return true;
@@ -73,6 +74,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isConst()
 	 */
+	@Override
 	public boolean isConst() {
 		return isConst;
 	}
@@ -80,6 +82,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isVolatile()
 	 */
+	@Override
 	public boolean isVolatile() {
 		return isVolatile;
 	}
@@ -87,6 +90,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.c.ICQualifierType#isRestrict()
 	 */
+	@Override
 	public boolean isRestrict() {
 		return isRestrict; 
 	}
@@ -117,10 +121,12 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali
 		return new ProblemType(ISemanticProblem.TYPE_UNRESOLVED_NAME);
 	}
 	
+	@Override
 	public IType getType() {
 		return type;
 	}
 
+	@Override
 	public void setType(IType t) {
 	    type = t;
 	}
@@ -136,6 +142,7 @@ public class CQualifierType implements ICQualifierType, ITypeContainer, ISeriali
         return t;
     }
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.CVQUALIFIER;
 		if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java
index 4e9b526a4b6..581d9ed3d22 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CScope.java
@@ -148,7 +148,7 @@ public class CScope implements ICScope, IASTInternalScope {
                 prop == IASTCompositeTypeSpecifier.TYPE_NAME ||
                 prop == IASTDeclarator.DECLARATOR_NAME) {
                 if (CharArrayUtils.equals(n.toCharArray(), name))
-                    result = (IASTName[]) ArrayUtil.append(IASTName.class, result, n);    
+                    result = ArrayUtil.append(IASTName.class, result, n);    
             }
             
             return PROCESS_CONTINUE; 
@@ -162,7 +162,7 @@ public class CScope implements ICScope, IASTInternalScope {
         }
 
         public IASTName[] getNames() {
-            return (IASTName[]) ArrayUtil.trim(IASTName.class, result);
+            return ArrayUtil.trim(IASTName.class, result);
         }
     }
     
@@ -221,7 +221,7 @@ public class CScope implements ICScope, IASTInternalScope {
 				if (n == name)
 					return;
 			}
-			final IASTName[] newNames= (IASTName[]) ArrayUtil.append(IASTName.class, names, name);
+			final IASTName[] newNames= ArrayUtil.append(IASTName.class, names, name);
 			if (newNames != names)
 				map.put(nchars, newNames);
 		} else {
@@ -392,13 +392,13 @@ public class CScope implements ICScope, IASTInternalScope {
 						}
 					}
 					if (b != null) {
-						result = (IBinding[]) ArrayUtil.append(IBinding.class, result, b);
+						result = ArrayUtil.append(IBinding.class, result, b);
 					}
 				}
 			}
 		}
 
-        return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+        return ArrayUtil.trim(IBinding.class, result);
     }
     
     /**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java
index ca2cb5b2d0d..a6f23ab423e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CStructure.java
@@ -150,7 +150,7 @@ public class CStructure extends PlatformObject implements ICompositeType, ICInte
 		}
 		ICASTCompositeTypeSpecifier compSpec = (ICASTCompositeTypeSpecifier) definition.getParent();
 		IField[] fields = collectFields(compSpec, null);
-		return (IField[]) ArrayUtil.trim(IField.class, fields);
+		return ArrayUtil.trim(IField.class, fields);
 	}
 
 	private IField[] collectFields(ICASTCompositeTypeSpecifier compSpec, IField[] fields) {
@@ -251,7 +251,7 @@ public class CStructure extends PlatformObject implements ICompositeType, ICInte
 			declarations[0] = decl;
 			decl = first;
 		}
-		declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, decl);
+		declarations = ArrayUtil.append(IASTName.class, declarations, decl);
 	}
 
 	@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java
index 0a9eee1138e..9492c5dc544 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVariable.java
@@ -51,7 +51,7 @@ public class CVariable extends PlatformObject implements IInternalVariable, ICIn
 
 	public void addDeclaration(IASTName name) {
 		if (name != null && name.isActive()) {
-			declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name);
+			declarations = ArrayUtil.append(IASTName.class, declarations, name);
 		}
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
index ef1504c09e4..68a1410a18b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/CVisitor.java
@@ -631,10 +631,10 @@ public class CVisitor extends ASTQueries {
 		IField[] fields = ct.getFields();
 		for (IField field : fields) {
 			if (matcher.match(field.getNameCharArray())) {
-		        result = (IBinding[]) ArrayUtil.append(IBinding.class, result, field);
+		        result = ArrayUtil.append(IBinding.class, result, field);
 		    }
 		}
-		return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+		return ArrayUtil.trim(IBinding.class, result);
 	}
 	
 	static IType getPtrDiffType(IASTBinaryExpression expr) {
@@ -1087,7 +1087,7 @@ public class CVisitor extends ASTQueries {
 					final char[] n= b.getNameCharArray();
 					// consider binding only if no binding with the same name was found in another scope.
 					if (!handled.containsKey(n)) {
-						result= (IBinding[]) ArrayUtil.append(IBinding.class, result, b);
+						result= ArrayUtil.append(IBinding.class, result, b);
 					}
 				}
 				// store names of bindings
@@ -1099,7 +1099,7 @@ public class CVisitor extends ASTQueries {
 			scope= scope.getParent();
 		}
 		
-		return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+		return ArrayUtil.trim(IBinding.class, result);
 	}
 
 	private static IBinding externalBinding(IASTTranslationUnit tu, IASTName name) {
@@ -1488,7 +1488,7 @@ public class CVisitor extends ASTQueries {
 			} catch (DOMException e) {
 	        }
         }
-        return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+        return ArrayUtil.trim(IBinding.class, result);
     }
     
 	private static IBinding[] findBindingForContentAssist(ICASTFieldDesignator fd, boolean isPrefix) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java
index f7c3f785e58..722ebb435fb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GCCASTSimpleDeclSpecifier.java
@@ -42,10 +42,12 @@ public class GCCASTSimpleDeclSpecifier extends CASTSimpleDeclSpecifier implement
 		return copy;
 	}
 
+	@Override
 	public void setTypeofExpression(IASTExpression expr) {
 		setDeclTypeExpression(expr);
 	}
 
+	@Override
 	public IASTExpression getTypeofExpression() {
 		return getDeclTypeExpression();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
index fc43de3fe4d..2819243d5d6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/c/GNUCSourceParser.java
@@ -342,9 +342,9 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
         			markBeforDtor= null;
         			dtor= addInitializer(e, declOption);
         		}
-        		declarators= (IASTDeclarator[]) ArrayUtil.append( IASTDeclarator.class, declarators, dtor);
+        		declarators= ArrayUtil.append( IASTDeclarator.class, declarators, dtor);
         	}
-        	declarators= (IASTDeclarator[]) ArrayUtil.removeNulls( IASTDeclarator.class, declarators );
+        	declarators= ArrayUtil.removeNulls( IASTDeclarator.class, declarators );
         }
         
         final int lt1= LTcatchEOF(1);
@@ -1543,7 +1543,7 @@ public class GNUCSourceParser extends AbstractGNUSourceCodeParser {
 						}
 					}
 
-					parmDeclarations = (IASTDeclaration[]) ArrayUtil.removeNulls( IASTDeclaration.class, parmDeclarations );
+					parmDeclarations = ArrayUtil.removeNulls( IASTDeclaration.class, parmDeclarations );
 		            ICASTKnRFunctionDeclarator functionDecltor = nodeFactory.newKnRFunctionDeclarator(parmNames, parmDeclarations);
 		            ((ASTNode) functionDecltor).setOffsetAndLength(startOffset, endOffset-startOffset);
 		            return functionDecltor;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
index 77aadcda2b9..8e12dcb703b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/AbstractCPPClassSpecializationScope.java
@@ -51,18 +51,22 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 		this.specialClass= specialization;
 	}
 
+	@Override
 	public ICPPClassType getOriginalClassType() {
 		return specialClass.getSpecializedBinding();
 	}
 		
+	@Override
 	public final IBinding getBinding(IASTName name, boolean resolve) {
 		return getBinding(name, resolve, IIndexFileSet.EMPTY);
 	}
 
+	@Override
 	public final IBinding[] getBindings(IASTName name, boolean resolve, boolean prefix) {
 		return getBindings(name, resolve, prefix, IIndexFileSet.EMPTY);
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean forceResolve, IIndexFileSet fileSet) {
 		char[] c = name.getLookupKey();
 		
@@ -80,12 +84,13 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
     	
 		IBinding[] specs = new IBinding[0];
 		for (IBinding binding : bindings) {
-			specs = (IBinding[]) ArrayUtil.append(IBinding.class, specs, specialClass.specializeMember(binding));
+			specs = ArrayUtil.append(IBinding.class, specs, specialClass.specializeMember(binding));
 		}
-		specs = (IBinding[]) ArrayUtil.trim(IBinding.class, specs);
+		specs = ArrayUtil.trim(IBinding.class, specs);
     	return CPPSemantics.resolveAmbiguities(name, specs);
 	}
 
+	@Override
 	final public IBinding[] getBindings(IASTName name, boolean forceResolve, boolean prefixLookup,
 			IIndexFileSet fileSet) {
 		return getBindings(name, forceResolve, prefixLookup, fileSet, true);
@@ -111,15 +116,17 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 			} else {
 				binding= specialClass.specializeMember(binding);
 			}
-			result = (IBinding[]) ArrayUtil.append(IBinding.class, result, binding);
+			result = ArrayUtil.append(IBinding.class, result, binding);
 		}
-		return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+		return ArrayUtil.trim(IBinding.class, result);
 	}
 	
+	@Override
 	public ICPPClassSpecialization getClassType() {
 		return specialClass;
 	}
 	
+	@Override
 	public ICPPBase[] getBases() {
 		if (fBases == null) {
 			ICPPBase[] result = null;
@@ -133,14 +140,14 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 					if (origClass instanceof ICPPTemplateParameter && ((ICPPTemplateParameter) origClass).isParameterPack()) {
 						IType[] specClasses= CPPTemplates.instantiateTypes(new IType[]{new CPPParameterPackType((IType) origClass)}, tpmap, -1, specialClass);
 						if (specClasses.length == 1 && specClasses[0] instanceof ICPPParameterPackType) {
-							result= (ICPPBase[]) ArrayUtil.append(ICPPBase.class, result, base);
+							result= ArrayUtil.append(ICPPBase.class, result, base);
 						} else {
 							for (IType specClass : specClasses) {
 								ICPPBase specBase = base.clone();
 								specClass = SemanticUtil.getUltimateType(specClass, false);
 								if (specClass instanceof IBinding && !(specClass instanceof IProblemBinding)) {
 									specBase.setBaseClass((IBinding) specClass);
-									result = (ICPPBase[]) ArrayUtil.append(ICPPBase.class, result, specBase);
+									result = ArrayUtil.append(ICPPBase.class, result, specBase);
 								}
 							}
 						}
@@ -153,10 +160,10 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 						if (specClass instanceof IBinding && !(specClass instanceof IProblemBinding)) {
 							specBase.setBaseClass((IBinding) specClass);
 						}
-						result = (ICPPBase[]) ArrayUtil.append(ICPPBase.class, result, specBase);
+						result = ArrayUtil.append(ICPPBase.class, result, specBase);
 					}
 				}
-				result= (ICPPBase[]) ArrayUtil.trim(ICPPBase.class, result);
+				result= ArrayUtil.trim(ICPPBase.class, result);
 				fBases= result;
 				return result;
 			}
@@ -176,11 +183,13 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 		return newArray;
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		ICPPField[] fields= specialClass.getSpecializedBinding().getDeclaredFields();
 		return specializeMembers(fields);
 	}
 	
+	@Override
 	public ICPPMethod[] getImplicitMethods() {
 		ICPPClassScope origClassScope= (ICPPClassScope) specialClass.getSpecializedBinding().getCompositeScope();
 		if (origClassScope == null) {
@@ -190,32 +199,38 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 		return specializeMembers(methods);
 	}
 
+	@Override
 	public IName getScopeName() {
 		if (specialClass instanceof ICPPInternalBinding)
 			return (IASTName) ((ICPPInternalBinding) specialClass).getDefinition();
 		return null;
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		ICPPConstructor[] ctors= specialClass.getSpecializedBinding().getConstructors();
 		return specializeMembers(ctors);
 	}
 		
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		ICPPMethod[] bindings = specialClass.getSpecializedBinding().getDeclaredMethods();
 		return specializeMembers(bindings);
 	}
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		ICPPClassType[] bindings = specialClass.getSpecializedBinding().getNestedClasses();
 		return specializeMembers(bindings);
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		// not yet supported
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 
+	@Override
 	public IScope getParent() throws DOMException {
 		IBinding binding= specialClass.getOwner();
 		if (binding instanceof ICPPClassType) {
@@ -227,6 +242,7 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 		return getOriginalClassType().getScope();
 	}
 
+	@Override
 	public IBinding[] find(String name) {
 		return CPPSemantics.findBindings(this, name, false);
 	}
@@ -237,6 +253,7 @@ public class AbstractCPPClassSpecializationScope implements ICPPClassSpecializat
 		return name != null ? name.toString() : String.valueOf(specialClass);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eClassType;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java
index ea800d4ad32..715ff2b1ff6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTASMDeclaration.java
@@ -27,10 +27,12 @@ public class CPPASTASMDeclaration extends ASTNode implements IASTASMDeclaration
 		setAssembly(assembly);
 	}
 
+	@Override
 	public CPPASTASMDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTASMDeclaration copy(CopyStyle style) {
 		CPPASTASMDeclaration copy = new CPPASTASMDeclaration();
 		copy.assembly = assembly.clone();
@@ -41,13 +43,15 @@ public class CPPASTASMDeclaration extends ASTNode implements IASTASMDeclaration
 		return copy;
 	}
 
+	@Override
 	public String getAssembly() {
         if( assembly == null ) 
         	return ""; //$NON-NLS-1$
         return new String( assembly );
     }
 
-    public void setAssembly(String assembly) {
+    @Override
+	public void setAssembly(String assembly) {
         assertNotFrozen();
         this.assembly = assembly.toCharArray();
     }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java
index 10d411031b4..f47bcda4a3a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousCondition.java
@@ -49,10 +49,12 @@ public class CPPASTAmbiguousCondition extends ASTAmbiguousNode implements IASTAm
 		}
 	}
 
+	@Override
 	public IASTExpression copy() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public IASTExpression copy(CopyStyle style) {
 		throw new UnsupportedOperationException();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java
index b71dddcfa55..d7d03003e05 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousDeclarator.java
@@ -63,25 +63,29 @@ public class CPPASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTA
     	}
 	}
 
+	@Override
 	public IASTDeclarator copy() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public IASTDeclarator copy(CopyStyle style) {
 		throw new UnsupportedOperationException();
 	}
     
+	@Override
 	public void addDeclarator(IASTDeclarator d) {
         assertNotFrozen();
     	if (d != null) {
-    		dtors = (IASTDeclarator[]) ArrayUtil.appendAt(IASTDeclarator.class, dtors, ++dtorPos, d);
+    		dtors = ArrayUtil.appendAt(IASTDeclarator.class, dtors, ++dtorPos, d);
     		d.setParent(this);
 			d.setPropertyInParent(SUBDECLARATOR);
     	}
     }
 
-    public IASTDeclarator[] getDeclarators() {
-    	dtors = (IASTDeclarator[]) ArrayUtil.trimAt(IASTDeclarator.class, dtors, dtorPos ); 
+    @Override
+	public IASTDeclarator[] getDeclarators() {
+    	dtors = ArrayUtil.trimAt(IASTDeclarator.class, dtors, dtorPos ); 
         return dtors;
     }
 
@@ -90,50 +94,61 @@ public class CPPASTAmbiguousDeclarator extends ASTAmbiguousNode implements IASTA
         return getDeclarators();
     }
 
+	@Override
 	public IASTInitializer getInitializer() {
 		return fInitializer;
 	}
 
+	@Override
 	public IASTName getName() {
 		return dtors[0].getName();
 	}
 
+	@Override
 	public IASTDeclarator getNestedDeclarator() {
 		return dtors[0].getNestedDeclarator();
 	}
 
+	@Override
 	public IASTPointerOperator[] getPointerOperators() {
 		return dtors[0].getPointerOperators();
 	}
 	
+	@Override
 	public int getRoleForName(IASTName name) {
 		return dtors[0].getRoleForName(name);
 	}
 
+	@Override
 	public void addPointerOperator(IASTPointerOperator operator) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public void setInitializer(IASTInitializer initializer) {
 		// store the initializer until the ambiguity is resolved
 		fInitializer= initializer;
 	}
 
+	@Override
 	public void setName(IASTName name) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public void setNestedDeclarator(IASTDeclarator nested) {
         assertNotFrozen();
 		Assert.isLegal(false);
 	}
 
+	@Override
 	public boolean declaresParameterPack() {
 		return false;
 	}
 
+	@Override
 	public void setDeclaresParameterPack(boolean val) {
         assertNotFrozen();
 		Assert.isLegal(false);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java
index 04ba1474987..22b6a6175f3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousExpression.java
@@ -29,25 +29,29 @@ public class CPPASTAmbiguousExpression extends ASTAmbiguousNode implements
 	}
 
     
-    public IASTExpression copy() {
+    @Override
+	public IASTExpression copy() {
 		throw new UnsupportedOperationException();
 	}
     
+	@Override
 	public IASTExpression copy(CopyStyle style) {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public void addExpression(IASTExpression e) {
         assertNotFrozen();
     	if (e != null) {
-    		exp = (IASTExpression[]) ArrayUtil.appendAt( IASTExpression.class, exp, ++expPos, e );
+    		exp = ArrayUtil.appendAt( IASTExpression.class, exp, ++expPos, e );
     		e.setParent(this);
 			e.setPropertyInParent(SUBEXPRESSION);
     	}
     }
 
-    public IASTExpression[] getExpressions() {
-        exp = (IASTExpression[]) ArrayUtil.trimAt( IASTExpression.class, exp, expPos );
+    @Override
+	public IASTExpression[] getExpressions() {
+        exp = ArrayUtil.trimAt( IASTExpression.class, exp, expPos );
     	return exp;
     }
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java
index ec2cad3207a..ab68e647d17 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousStatement.java
@@ -84,7 +84,7 @@ public class CPPASTAmbiguousStatement extends ASTAmbiguousNode implements
 	public void addStatement(IASTStatement s) {
         assertNotFrozen();
     	if (s != null) {
-    		stmts = (IASTStatement[]) ArrayUtil.appendAt( IASTStatement.class, stmts, ++stmtsPos, s );
+    		stmts = ArrayUtil.appendAt( IASTStatement.class, stmts, ++stmtsPos, s );
     		s.setParent(this);
 			s.setPropertyInParent(STATEMENT);
     	}
@@ -92,7 +92,7 @@ public class CPPASTAmbiguousStatement extends ASTAmbiguousNode implements
 
     @Override
 	public IASTStatement[] getStatements() {
-        stmts = (IASTStatement[]) ArrayUtil.trimAt( IASTStatement.class, stmts, stmtsPos );
+        stmts = ArrayUtil.trimAt( IASTStatement.class, stmts, stmtsPos );
     	return stmts;
     }
     
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java
index 480e4f2282c..f6deabd115f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTAmbiguousTemplateArgument.java
@@ -84,10 +84,12 @@ public class CPPASTAmbiguousTemplateArgument extends ASTAmbiguousNode implements
 	}
 
 
+	@Override
 	public IASTNode copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public IASTNode copy(CopyStyle style) {
 
 		int sizeOfNodes = fNodes.size();
@@ -111,16 +113,19 @@ public class CPPASTAmbiguousTemplateArgument extends ASTAmbiguousNode implements
 		return fNodes.toArray(new IASTNode[fNodes.size()]);
 	}
 
+	@Override
 	public void addTypeId(IASTTypeId typeId) {
         assertNotFrozen();
 		addNode(typeId);
 	}
 	
+	@Override
 	public void addIdExpression(IASTIdExpression idExpression) {
         assertNotFrozen();
 		addNode(idExpression);
 	}
 
+	@Override
 	public void addIdExpression(IASTExpression idExpression) {
         assertNotFrozen();
 		addNode(idExpression);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java
index fc77f9b4215..a5bec51cd8f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTArrayDeclarator.java
@@ -58,7 +58,7 @@ public class CPPASTArrayDeclarator extends CPPASTDeclarator implements ICPPASTAr
 	public IASTArrayModifier[] getArrayModifiers() {
         if (arrayMods == null)
         	return IASTArrayModifier.EMPTY_ARRAY;
-        arrayMods = (IASTArrayModifier[]) ArrayUtil.trimAt(IASTArrayModifier.class,
+        arrayMods = ArrayUtil.trimAt(IASTArrayModifier.class,
         		arrayMods, arrayModsPos);
         return arrayMods;
     }
@@ -67,7 +67,7 @@ public class CPPASTArrayDeclarator extends CPPASTDeclarator implements ICPPASTAr
 	public void addArrayModifier(IASTArrayModifier arrayModifier) {
         assertNotFrozen();
     	if (arrayModifier != null) {
-    		arrayMods = (IASTArrayModifier[]) ArrayUtil.appendAt(IASTArrayModifier.class, arrayMods,
+    		arrayMods = ArrayUtil.appendAt(IASTArrayModifier.class, arrayMods,
     				++arrayModsPos, arrayModifier);
     		arrayModifier.setParent(this);
 			arrayModifier.setPropertyInParent(ARRAY_MODIFIER);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java
index e832fe370cb..189abc2122c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseDeclSpecifier.java
@@ -29,74 +29,90 @@ public abstract class CPPASTBaseDeclSpecifier extends ASTNode implements ICPPAST
     private boolean virtual;
     private boolean explicit;
     
-    public boolean isFriend() {
+    @Override
+	public boolean isFriend() {
         return friend;
     }
 
-    public int getStorageClass() {
+    @Override
+	public int getStorageClass() {
         return sc;
     }
 
-    public void setStorageClass(int storageClass) {
+    @Override
+	public void setStorageClass(int storageClass) {
         assertNotFrozen();
         sc = storageClass;
     }
 
-    public boolean isConst() {
+    @Override
+	public boolean isConst() {
         return isConst;
     }
 
-    public void setConst(boolean value) {
+    @Override
+	public void setConst(boolean value) {
         assertNotFrozen();
         isConst = value;
     }
 
-    public boolean isVolatile() {
+    @Override
+	public boolean isVolatile() {
         return isVolatile;
     }
 
-    public void setVolatile(boolean value) {
+    @Override
+	public void setVolatile(boolean value) {
         assertNotFrozen();
         isVolatile = value;
     }
 
-    public boolean isRestrict() {
+    @Override
+	public boolean isRestrict() {
         return isRestrict;
     }
 
-    public void setRestrict(boolean value) {
+    @Override
+	public void setRestrict(boolean value) {
         assertNotFrozen();
         isRestrict = value;
     }
 
-    public boolean isInline() {
+    @Override
+	public boolean isInline() {
         return inline;
     }
 
-    public void setInline(boolean value) {
+    @Override
+	public void setInline(boolean value) {
         assertNotFrozen();
         this.inline = value;
     }
 
-    public void setFriend(boolean value) {
+    @Override
+	public void setFriend(boolean value) {
         assertNotFrozen();
         friend = value;
     }
 
-    public boolean isVirtual() {
+    @Override
+	public boolean isVirtual() {
         return virtual;
     }
 
-    public void setVirtual(boolean value) {
+    @Override
+	public void setVirtual(boolean value) {
         assertNotFrozen();
         virtual = value;
     }
 
-    public boolean isExplicit() {
+    @Override
+	public boolean isExplicit() {
         return explicit;
     }
 
-    public void setExplicit(boolean value) {
+    @Override
+	public void setExplicit(boolean value) {
         assertNotFrozen();
         this.explicit = value;
     }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java
index bcd6f147c78..56feb529af0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBaseSpecifier.java
@@ -48,10 +48,12 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier
 		setName(name);
 	}
 
+	@Override
 	public CPPASTBaseSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTBaseSpecifier copy(CopyStyle style) {
 		CPPASTBaseSpecifier copy = new CPPASTBaseSpecifier(name == null ? null : name.copy(style));
 		copy.isVirtual = isVirtual;
@@ -64,29 +66,35 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier
 		return copy;
 	}
 	
+	@Override
 	public boolean isVirtual() {
         return isVirtual;
     }
 
-    public void setVirtual(boolean value) {
+    @Override
+	public void setVirtual(boolean value) {
         assertNotFrozen();
         isVirtual = value;
     }
 
-    public int getVisibility() {
+    @Override
+	public int getVisibility() {
         return visibility;
     }
 
-    public void setVisibility(int visibility) {
+    @Override
+	public void setVisibility(int visibility) {
         assertNotFrozen();
         this.visibility = visibility;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -114,11 +122,13 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (name == n) return r_reference;
 		return r_unclear;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 		List<IBinding> filtered = new ArrayList<IBinding>();
@@ -146,15 +156,18 @@ public class CPPASTBaseSpecifier extends ASTNode implements ICPPASTBaseSpecifier
 		return filtered.toArray(new IBinding[filtered.size()]);
 	}
 
+	@Override
 	public boolean isPackExpansion() {
 		return fIsPackExpansion;
 	}
 
+	@Override
 	public void setIsPackExpansion(boolean val) {
 		assertNotFrozen();
 		fIsPackExpansion= val;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java
index d22b8228c4a..8b04d2b0929 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryExpression.java
@@ -55,10 +55,12 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		setInitOperand2(operand2);
 	}
 
+	@Override
 	public CPPASTBinaryExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTBinaryExpression copy(CopyStyle style) {
 		CPPASTBinaryExpression copy = new CPPASTBinaryExpression();
 		copy.op = op;
@@ -71,30 +73,36 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		return copy;
 	}
 
+	@Override
 	public int getOperator() {
         return op;
     }
 
-    public IASTExpression getOperand1() {
+    @Override
+	public IASTExpression getOperand1() {
         return operand1;
     }
 
-    public IASTInitializerClause getInitOperand2() {
+    @Override
+	public IASTInitializerClause getInitOperand2() {
     	return operand2;
     }
 
-    public IASTExpression getOperand2() {
+    @Override
+	public IASTExpression getOperand2() {
     	if (operand2 instanceof IASTExpression)
     		return (IASTExpression) operand2;
     	return null;
     }
 
-    public void setOperator(int op) {
+    @Override
+	public void setOperator(int op) {
         assertNotFrozen();
         this.op = op;
     }
 
-    public void setOperand1(IASTExpression expression) {
+    @Override
+	public void setOperand1(IASTExpression expression) {
         assertNotFrozen();
         operand1 = expression;
         if (expression != null) {
@@ -112,13 +120,15 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		}
     }
 
-    public void setOperand2(IASTExpression expression) {
+    @Override
+	public void setOperand2(IASTExpression expression) {
     	setInitOperand2(expression);
     }
 
     /**
      * @see org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner#getImplicitNames()
      */
+	@Override
 	public IASTImplicitName[] getImplicitNames() {
 		if (implicitNames == null) {
 			ICPPFunction overload = getOverload();
@@ -233,6 +243,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		return true;
 	}
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == operand1) {
 			other.setPropertyInParent(child.getPropertyInParent());
@@ -246,21 +257,24 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		}
 	}
 
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
     	if (type == null) {
     		type= createExpressionType();
     	}
     	return type;
     }
 
-    public ICPPFunction getOverload() {
+    @Override
+	public ICPPFunction getOverload() {
     	if (overload != UNINITIALIZED_FUNCTION)
     		return overload;
     	
     	return overload = CPPSemantics.findOverloadedOperator(this);
     }
 
-    public ValueCategory getValueCategory() {
+    @Override
+	public ValueCategory getValueCategory() {
     	ICPPFunction op = getOverload();
 		if (op != null) {
 			return valueCategoryFromFunctionCall(op);
@@ -294,6 +308,7 @@ public class CPPASTBinaryExpression extends ASTNode implements ICPPASTBinaryExpr
 		return PRVALUE;
     }
     
+	@Override
 	public boolean isLValue() {
 		return getValueCategory() == LVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java
index 85fb6d4d8b8..ba3230b8fbd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBinaryTypeIdExpression.java
@@ -36,10 +36,12 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT
 		setOperand2(typeId2);
 	}
 
+	@Override
 	public CPPASTBinaryTypeIdExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTBinaryTypeIdExpression copy(CopyStyle style) {
 		CPPASTBinaryTypeIdExpression copy = new CPPASTBinaryTypeIdExpression(fOperator, 
 				fOperand1 == null ? null : fOperand1.copy(),
@@ -51,16 +53,19 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT
 		return copy;
 	}
 
+	@Override
 	public Operator getOperator() {
         return fOperator;
     }
 
-    public void setOperator(Operator value) {
+    @Override
+	public void setOperator(Operator value) {
         assertNotFrozen();
         fOperator = value;
     }
 
-    public void setOperand1(IASTTypeId typeId) {
+    @Override
+	public void setOperand1(IASTTypeId typeId) {
     	assertNotFrozen();
        	fOperand1 = typeId;
        	if (typeId != null) {
@@ -69,7 +74,8 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT
        	} 
     }
 
-    public void setOperand2(IASTTypeId typeId) {
+    @Override
+	public void setOperand2(IASTTypeId typeId) {
     	assertNotFrozen();
        	fOperand2 = typeId;
        	if (typeId != null) {
@@ -78,11 +84,13 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT
        	} 
     }
 
-    public IASTTypeId getOperand1() {
+    @Override
+	public IASTTypeId getOperand1() {
     	return fOperand1;
     }
 
-    public IASTTypeId getOperand2() {
+    @Override
+	public IASTTypeId getOperand2() {
     	return fOperand2;
     }
 
@@ -107,6 +115,7 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT
         return true;
     }
     
+	@Override
 	public IType getExpressionType() {
 		switch (getOperator()) {
 		case __is_base_of:
@@ -115,10 +124,12 @@ public class CPPASTBinaryTypeIdExpression extends ASTNode implements IASTBinaryT
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
 	}
 	
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 
+	@Override
 	public ValueCategory getValueCategory() {
 		return isLValue() ? LVALUE : PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java
index adb97f5e7de..f498af4e8ec 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTBreakStatement.java
@@ -39,10 +39,12 @@ public class CPPASTBreakStatement extends ASTNode implements IASTBreakStatement
         return true;
     }
 
-    public CPPASTBreakStatement copy() {
+    @Override
+	public CPPASTBreakStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTBreakStatement copy(CopyStyle style) {
 		CPPASTBreakStatement copy = new CPPASTBreakStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java
index c747442d292..7fc7e052082 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCapture.java
@@ -26,10 +26,12 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture {
 	public CPPASTCapture() {
 	}
 
+	@Override
 	public CPPASTCapture copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTCapture copy(CopyStyle style) {
 		final CPPASTCapture result = new CPPASTCapture();
 		if (fIdentifier != null)
@@ -43,18 +45,22 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture {
 		return result;
 	}
 
+	@Override
 	public boolean capturesThisPointer() {
 		return fIdentifier == null;
 	}
 
+	@Override
 	public boolean isByReference() {
 		return fByReference;
 	}
 
+	@Override
 	public boolean isPackExpansion() {
 		return fPackExpansion;
 	}
 
+	@Override
 	public IASTName getIdentifier() {
 		return fIdentifier;
 	}
@@ -78,6 +84,7 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture {
         return true;
     }
 
+	@Override
 	public void setIdentifier(IASTName identifier) {
 		assertNotFrozen();
 		if (identifier != null) {
@@ -87,11 +94,13 @@ public class CPPASTCapture extends ASTNode implements ICPPASTCapture {
 		fIdentifier= identifier;
 	}
 
+	@Override
 	public void setIsByReference(boolean value) {
 		assertNotFrozen();
 		fByReference= value;
 	}
 
+	@Override
 	public void setIsPackExpansion(boolean val) {
 		assertNotFrozen();
 		fPackExpansion= val;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java
index dd1aa171540..f4decd6ba3c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCaseStatement.java
@@ -31,10 +31,12 @@ public class CPPASTCaseStatement extends ASTNode implements IASTCaseStatement, I
 		setExpression(expression);
 	}
 	
+	@Override
 	public CPPASTCaseStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTCaseStatement copy(CopyStyle style) {
 		CPPASTCaseStatement copy = new CPPASTCaseStatement(expression == null ? null
 				: expression.copy(style));
@@ -45,11 +47,13 @@ public class CPPASTCaseStatement extends ASTNode implements IASTCaseStatement, I
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getExpression() {
         return expression;
     }
 
-    public void setExpression(IASTExpression expression) {
+    @Override
+	public void setExpression(IASTExpression expression) {
         assertNotFrozen();
         this.expression = expression;
         if (expression != null) {
@@ -79,7 +83,8 @@ public class CPPASTCaseStatement extends ASTNode implements IASTCaseStatement, I
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == expression )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java
index 4eb7e05307f..2f833ac037c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatement.java
@@ -49,13 +49,13 @@ public class CPPASTCompoundStatement extends ASTNode
 	public IASTStatement[] getStatements() {
         if (statements == null)
         	return IASTStatement.EMPTY_STATEMENT_ARRAY;
-        return (IASTStatement[]) ArrayUtil.trim(IASTStatement.class, statements);
+        return ArrayUtil.trim(IASTStatement.class, statements);
     }
 
     @Override
 	public void addStatement(IASTStatement statement) {
         assertNotFrozen();
-        statements = (IASTStatement[]) ArrayUtil.append(IASTStatement.class, statements, statement);
+        statements = ArrayUtil.append(IASTStatement.class, statements, statement);
         if (statement != null) {
 			statement.setParent(this);
 			statement.setPropertyInParent(NESTED_STATEMENT);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java
index 18d9622561b..ed34988f7ae 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTCompoundStatementExpression.java
@@ -39,10 +39,12 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS
 		setCompoundStatement(statement);
 	}
 
+	@Override
 	public CPPASTCompoundStatementExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTCompoundStatementExpression copy(CopyStyle style) {
 		CPPASTCompoundStatementExpression copy = new CPPASTCompoundStatementExpression();
 		copy.setCompoundStatement(statement == null ? null : statement.copy(style));
@@ -53,11 +55,13 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS
 		return copy;
 	}
 
+	@Override
 	public IASTCompoundStatement getCompoundStatement() {
         return statement;
     }
 
-    public void setCompoundStatement(IASTCompoundStatement statement) {
+    @Override
+	public void setCompoundStatement(IASTCompoundStatement statement) {
         assertNotFrozen();
         this.statement = statement;
         if (statement != null) {
@@ -88,7 +92,8 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS
         return true;
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		IASTCompoundStatement compound = getCompoundStatement();
 		IASTStatement[] statements = compound.getStatements();
 		if (statements.length > 0) {
@@ -99,10 +104,12 @@ public class CPPASTCompoundStatementExpression extends ASTNode implements IGNUAS
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
 	}
     
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 
+	@Override
 	public ValueCategory getValueCategory() {
 		return PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java
index fd23c12c611..4a04e12b956 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConditionalExpression.java
@@ -63,10 +63,12 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio
     	setNegativeResultExpression(negative);
 	}
 
+	@Override
 	public CPPASTConditionalExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTConditionalExpression copy(CopyStyle style) {
 		CPPASTConditionalExpression copy = new CPPASTConditionalExpression();
 		copy.setLogicalConditionExpression(fCondition == null ? null : fCondition.copy(style));
@@ -79,11 +81,13 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getLogicalConditionExpression() {
         return fCondition;
     }
 
-    public void setLogicalConditionExpression(IASTExpression expression) {
+    @Override
+	public void setLogicalConditionExpression(IASTExpression expression) {
         assertNotFrozen();
         fCondition = expression;
         if (expression != null) {
@@ -92,11 +96,13 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio
 		}
     }
 
-    public IASTExpression getPositiveResultExpression() {
+    @Override
+	public IASTExpression getPositiveResultExpression() {
         return fPositive;
     }
 
-    public void setPositiveResultExpression(IASTExpression expression) {
+    @Override
+	public void setPositiveResultExpression(IASTExpression expression) {
         assertNotFrozen();
         this.fPositive = expression;
         if (expression != null) {
@@ -105,11 +111,13 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio
 		}
     }
 
-    public IASTExpression getNegativeResultExpression() {
+    @Override
+	public IASTExpression getNegativeResultExpression() {
         return fNegative;
     }
 
-    public void setNegativeResultExpression(IASTExpression expression) {
+    @Override
+	public void setNegativeResultExpression(IASTExpression expression) {
         assertNotFrozen();
         this.fNegative = expression;
         if (expression != null) {
@@ -141,6 +149,7 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == fCondition) {
 			other.setPropertyInParent(child.getPropertyInParent());
@@ -159,16 +168,19 @@ public class CPPASTConditionalExpression extends ASTNode implements IASTConditio
 		}
 	}
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
     	evaluate();
     	return fType;
     }
     
-    public ValueCategory getValueCategory() {
+    @Override
+	public ValueCategory getValueCategory() {
     	evaluate();
     	return fValueCategory;
     }
     
+	@Override
 	public boolean isLValue() {
 		return getValueCategory() == LVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java
index 1915f311ca1..a07965123db 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorChainInitializer.java
@@ -59,10 +59,12 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
 		setInitializer(initializer);
 	}
 
+	@Override
 	public CPPASTConstructorChainInitializer copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTConstructorChainInitializer copy(CopyStyle style) {
 		CPPASTConstructorChainInitializer copy = new CPPASTConstructorChainInitializer();
 		copy.setMemberInitializerId(name == null ? null : name.copy(style));
@@ -75,11 +77,13 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTName getMemberInitializerId() {
         return name;
     }
 
-    public void setMemberInitializerId(IASTName name) {
+    @Override
+	public void setMemberInitializerId(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -88,11 +92,13 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
 		}
     }
 
-    public IASTInitializer getInitializer() {
+    @Override
+	public IASTInitializer getInitializer() {
         return initializer;
     }
 
-    public void setInitializer(IASTInitializer init) {
+    @Override
+	public void setInitializer(IASTInitializer init) {
         assertNotFrozen();
         initializer = init;
         if (init != null) {
@@ -130,12 +136,14 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
         return true;
     }
 
-    public int getRoleForName(IASTName n) {
+    @Override
+	public int getRoleForName(IASTName n) {
         if (name == n)
             return r_reference;
         return r_unclear;
     }
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 
@@ -155,7 +163,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
 				bindings[i] = null;
 			}
 		}
-		return (IBinding[]) ArrayUtil.removeNulls(IBinding.class, bindings);
+		return ArrayUtil.removeNulls(IBinding.class, bindings);
 	}
 
 	private CharArraySet getBaseClasses(IASTName name) {
@@ -176,15 +184,18 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
 		return result;
 	}
 
+	@Override
 	public boolean isPackExpansion() {
 		return fIsPackExpansion;
 	}
 
+	@Override
 	public void setIsPackExpansion(boolean val) {
 		assertNotFrozen();
 		fIsPackExpansion= val;
 	}
 
+	@Override
 	@Deprecated
     public IASTExpression getInitializerValue() {
         if (initializer == null || initializer instanceof IASTExpression) {
@@ -202,6 +213,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
         return null;
     }
 
+	@Override
 	@Deprecated
     public void setInitializerValue(IASTExpression expression) {
         assertNotFrozen();
@@ -223,6 +235,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
 	/**
 	 * @see IASTImplicitNameOwner#getImplicitNames()
 	 */
+	@Override
 	public IASTImplicitName[] getImplicitNames() {
 		if (implicitNames == null) {
 			ICPPConstructor ctor = CPPSemantics.findImplicitlyCalledConstructor(this);
@@ -243,6 +256,7 @@ public class CPPASTConstructorChainInitializer extends ASTNode implements
     	return implicitNames;  
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java
index 2328a97b62a..71592128bef 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConstructorInitializer.java
@@ -36,10 +36,12 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons
 		setArguments(args);
 	}
 
+	@Override
 	public CPPASTConstructorInitializer copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTConstructorInitializer copy(CopyStyle style) {
 		IASTInitializerClause[] args = null;
 		if (fArguments != null) {
@@ -56,11 +58,13 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons
 		return copy;
 	}
 
+	@Override
 	public IASTInitializerClause[] getArguments() {
         return fArguments;
     }
 
-    public void setArguments(IASTInitializerClause[] arguments) {
+    @Override
+	public void setArguments(IASTInitializerClause[] arguments) {
         assertNotFrozen();
         if (arguments == null) {
         	fArguments= IASTExpression.EMPTY_EXPRESSION_ARRAY;
@@ -94,6 +98,7 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons
 		return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		for (int i = 0; i < fArguments.length; ++i) {
 			if (child == fArguments[i]) {
@@ -104,7 +109,8 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons
 		}
 	}
 
-    @Deprecated
+    @Override
+	@Deprecated
 	public IASTExpression getExpression() {
     	if (fArguments.length == 0)
     		return null;
@@ -126,7 +132,8 @@ public class CPPASTConstructorInitializer extends ASTNode implements ICPPASTCons
         return result;
     }
 
-    @Deprecated
+    @Override
+	@Deprecated
 	public void setExpression(IASTExpression expression) {
         assertNotFrozen();
         if (expression == null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java
index 9b52fa5c27e..0d1915fbcbe 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTContinueStatement.java
@@ -38,10 +38,12 @@ public class CPPASTContinueStatement extends ASTNode implements IASTContinueStat
         return true;
     }
     
-    public CPPASTContinueStatement copy() {
+    @Override
+	public CPPASTContinueStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTContinueStatement copy(CopyStyle style) {
 		CPPASTContinueStatement copy = new CPPASTContinueStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java
index a87f638d44e..06bbcb610f0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTConversionName.java
@@ -36,10 +36,12 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve
 		setTypeId(typeId);
 	}
 	
+	@Override
 	public CPPASTConversionName copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTConversionName copy(CopyStyle style) {
 		CPPASTConversionName copy = new CPPASTConversionName();
 		copy.setTypeId(typeId == null ? null : typeId.copy(style));
@@ -50,10 +52,12 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve
 		return copy;
 	}
 
+	@Override
 	public IASTTypeId getTypeId() {
 		return typeId;
 	}
 
+	@Override
 	public void setTypeId(IASTTypeId typeId) {
         assertNotFrozen();
 		this.typeId=typeId;
@@ -96,6 +100,7 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve
 		return CPPVisitor.createBinding(this);
 	}
 
+	@Override
 	public char[] toCharArray() {
 		if (fName == null) {
 			IType t= null;
@@ -123,10 +128,12 @@ public class CPPASTConversionName extends CPPASTNameBase implements ICPPASTConve
 		return name;
 	}
 
+	@Override
 	public char[] getSimpleID() {
 		return toCharArray();
 	}
 	
+	@Override
 	public char[] getLookupKey() {
 		return Keywords.cOPERATOR;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java
index b8c631fec0e..85298da6dd9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarationStatement.java
@@ -31,10 +31,12 @@ public class CPPASTDeclarationStatement extends ASTNode
 		setDeclaration(declaration);
 	}
 
+	@Override
 	public CPPASTDeclarationStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTDeclarationStatement copy(CopyStyle style) {
 		CPPASTDeclarationStatement copy = new CPPASTDeclarationStatement();
 		copy.setDeclaration(declaration == null ? null : declaration.copy(style));
@@ -45,11 +47,13 @@ public class CPPASTDeclarationStatement extends ASTNode
 		return copy;
 	}
 
+	@Override
 	public IASTDeclaration getDeclaration() {
         return declaration;
     }
 
-    public void setDeclaration(IASTDeclaration declaration) {
+    @Override
+	public void setDeclaration(IASTDeclaration declaration) {
         assertNotFrozen();
         this.declaration = declaration;
         if (declaration != null) {
@@ -78,7 +82,8 @@ public class CPPASTDeclarationStatement extends ASTNode
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (declaration == child) {
             other.setParent(child.getParent());
             other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java
index 46f458c35de..ffc5ed762b2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeclarator.java
@@ -61,10 +61,12 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST
 		setInitializer(initializer);
 	}
 
-    public CPPASTDeclarator copy() {
+    @Override
+	public CPPASTDeclarator copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTDeclarator copy(CopyStyle style) {
 		CPPASTDeclarator copy = new CPPASTDeclarator();
 		copyBaseDeclarator(copy, style);
@@ -84,29 +86,35 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST
 		copy.setOffsetAndLength(this);
     }
 
+	@Override
 	public boolean declaresParameterPack() {
 		return isPackExpansion;
 	}
 
+	@Override
 	public IASTPointerOperator[] getPointerOperators() {
         if (pointerOps == null) return IASTPointerOperator.EMPTY_ARRAY;
-        pointerOps = (IASTPointerOperator[]) ArrayUtil.trim(IASTPointerOperator.class, pointerOps);
+        pointerOps = ArrayUtil.trim(IASTPointerOperator.class, pointerOps);
         return pointerOps;
     }
 
-    public IASTDeclarator getNestedDeclarator() {
+    @Override
+	public IASTDeclarator getNestedDeclarator() {
         return nested;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
-    public IASTInitializer getInitializer() {
+    @Override
+	public IASTInitializer getInitializer() {
         return initializer;
     }
 
-    public void setInitializer(IASTInitializer initializer) {
+    @Override
+	public void setInitializer(IASTInitializer initializer) {
         assertNotFrozen();
         this.initializer = initializer;
         if (initializer != null) {
@@ -115,16 +123,18 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST
 		}
     }
 
-    public void addPointerOperator(IASTPointerOperator operator) {
+    @Override
+	public void addPointerOperator(IASTPointerOperator operator) {
         assertNotFrozen();
     	if (operator != null) {
     		operator.setParent(this);
 			operator.setPropertyInParent(POINTER_OPERATOR);
-    		pointerOps = (IASTPointerOperator[]) ArrayUtil.append(IASTPointerOperator.class, pointerOps, operator);
+    		pointerOps = ArrayUtil.append(IASTPointerOperator.class, pointerOps, operator);
     	}
     }
 
-    public void setNestedDeclarator(IASTDeclarator nested) {
+    @Override
+	public void setNestedDeclarator(IASTDeclarator nested) {
         assertNotFrozen();
         this.nested = nested;
         if (nested != null) {
@@ -133,7 +143,8 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST
 		}
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -142,7 +153,8 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST
 		}
     }
 
-    public void setDeclaresParameterPack(boolean val) {
+    @Override
+	public void setDeclaresParameterPack(boolean val) {
     	assertNotFrozen();
     	isPackExpansion= val;
 	}
@@ -196,6 +208,7 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST
 		return initializer == null || initializer.accept(action);
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		// 3.1.2
         IASTNode parent = ASTQueries.findOutermostDeclarator(this).getParent();
@@ -257,6 +270,7 @@ public class CPPASTDeclarator extends ASTNode implements ICPPASTDeclarator, IAST
 	/**
 	 * @see IASTImplicitNameOwner#getImplicitNames()
 	 */
+	@Override
 	public IASTImplicitName[] getImplicitNames() {
 		if (implicitNames == null) {
 			ICPPConstructor ctor = CPPSemantics.findImplicitlyCalledConstructor(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java
index a66f576b058..a9e33954eb1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDefaultStatement.java
@@ -38,10 +38,12 @@ public class CPPASTDefaultStatement extends ASTNode implements IASTDefaultStatem
         return true;
     }
     
-    public CPPASTDefaultStatement copy() {
+    @Override
+	public CPPASTDefaultStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTDefaultStatement copy(CopyStyle style) {
 		CPPASTDefaultStatement copy = new CPPASTDefaultStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java
index d3919e89cd2..269a6587aac 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDeleteExpression.java
@@ -44,10 +44,12 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr
 		setOperand(from.operand);
 	}
 	
+	@Override
 	public CPPASTDeleteExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTDeleteExpression copy(CopyStyle style) {
 		CPPASTDeleteExpression copy = new CPPASTDeleteExpression(operand == null ? null
 				: operand.copy(style));
@@ -60,11 +62,13 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getOperand() {
         return operand;
     }
 
-    public void setOperand(IASTExpression expression) {
+    @Override
+	public void setOperand(IASTExpression expression) {
         assertNotFrozen();
         operand = expression;
         if (expression != null) {
@@ -73,28 +77,33 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr
 		}
     }
 
-    public void setIsGlobal(boolean global) {
+    @Override
+	public void setIsGlobal(boolean global) {
         assertNotFrozen();
         isGlobal = global;
     }
 
-    public boolean isGlobal() {
+    @Override
+	public boolean isGlobal() {
         return isGlobal;
     }
 
-    public void setIsVectored(boolean vectored) {
+    @Override
+	public void setIsVectored(boolean vectored) {
         assertNotFrozen();
         isVectored = vectored;
     }
 
-    public boolean isVectored() {
+    @Override
+	public boolean isVectored() {
         return isVectored;
     }
 
     /**
      * Try to resolve both the destructor and operator delete.
      */
-    public IASTImplicitName[] getImplicitNames() {
+    @Override
+	public IASTImplicitName[] getImplicitNames() {
     	if (implicitNames == null) {
 	    	List<IASTImplicitName> names = new ArrayList<IASTImplicitName>();
 	    	
@@ -158,14 +167,17 @@ public class CPPASTDeleteExpression extends ASTNode implements ICPPASTDeleteExpr
         return true;
     }
 
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
     	return CPPSemantics.VOID_TYPE;
     }
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 
+	@Override
 	public ValueCategory getValueCategory() {
 		return PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java
index fb39ce06645..b9942a34ce4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTDoStatement.java
@@ -35,10 +35,12 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA
 		setCondition(condition);
 	}
 
+	@Override
 	public CPPASTDoStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTDoStatement copy(CopyStyle style) {
 		CPPASTDoStatement copy = new CPPASTDoStatement();
 		copy.setBody(body == null ? null : body.copy(style));
@@ -50,11 +52,13 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA
 		return copy;
 	}
 
+	@Override
 	public IASTStatement getBody() {
         return body;
     }
 
-    public void setBody(IASTStatement body) {
+    @Override
+	public void setBody(IASTStatement body) {
         assertNotFrozen();
         this.body = body;
         if (body != null) {
@@ -63,11 +67,13 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA
 		}
     }
 
-    public IASTExpression getCondition() {
+    @Override
+	public IASTExpression getCondition() {
         return condition;
     }
 
-    public void setCondition(IASTExpression condition) {
+    @Override
+	public void setCondition(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -97,7 +103,8 @@ public class CPPASTDoStatement extends ASTNode implements IASTDoStatement, IASTA
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( body == child )
         {
             other.setPropertyInParent( body.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java
index c914b5cae9e..a849ef06555 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTElaboratedTypeSpecifier.java
@@ -39,10 +39,12 @@ public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier
 		setName(name);
 	}
 
+	@Override
 	public CPPASTElaboratedTypeSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTElaboratedTypeSpecifier copy(CopyStyle style) {
 		CPPASTElaboratedTypeSpecifier copy = new CPPASTElaboratedTypeSpecifier(kind, name == null
 				? null : name.copy(style));
@@ -53,20 +55,24 @@ public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier
 		return copy;
 	}
 
+	@Override
 	public int getKind() {
         return kind;
     }
 
-    public void setKind(int value) {
+    @Override
+	public void setKind(int value) {
         assertNotFrozen();
         this.kind = value;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -95,10 +101,12 @@ public class CPPASTElaboratedTypeSpecifier extends CPPASTBaseDeclSpecifier
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		return getRoleForName(n, true);
 	}
 	
+	@Override
 	public int getRoleForName(IASTName n, boolean allowResolution) {
 		if (n != name) return r_unclear;
 		
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
index 8aa0add5bab..9da28755ffa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerationSpecifier.java
@@ -45,10 +45,12 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
 		setBaseType(baseType);
 	}
 	
+	@Override
 	public CPPASTEnumerationSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTEnumerationSpecifier copy(CopyStyle style) {
 		CPPASTEnumerationSpecifier copy = new CPPASTEnumerationSpecifier(fIsScoped, fName == null
 				? null : fName.copy(style), fBaseType == null ? null : fBaseType.copy(style));
@@ -62,6 +64,7 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
 		return copy;
 	}
 	
+	@Override
 	public boolean startValueComputation() {
 		if (fValuesComputed)
 			return false;
@@ -70,23 +73,26 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
 		return true;
 	}
 
+	@Override
 	public void addEnumerator(IASTEnumerator enumerator) {
         assertNotFrozen();
 		if (enumerator != null) {
 			enumerator.setParent(this);
 			enumerator.setPropertyInParent(ENUMERATOR);
-			fItems = (IASTEnumerator[]) ArrayUtil.appendAt( IASTEnumerator.class, fItems, ++fItemPos, enumerator );
+			fItems = ArrayUtil.appendAt( IASTEnumerator.class, fItems, ++fItemPos, enumerator );
 		}
 	}
 
+	@Override
 	public IASTEnumerator[] getEnumerators() {
 		if (fItems == null)
 			return IASTEnumerator.EMPTY_ENUMERATOR_ARRAY;
 		
-		fItems = (IASTEnumerator[]) ArrayUtil.trimAt(IASTEnumerator.class, fItems, fItemPos);
+		fItems = ArrayUtil.trimAt(IASTEnumerator.class, fItems, fItemPos);
 		return fItems;
 	}
 
+	@Override
 	public void setName(IASTName name) {
         assertNotFrozen();
 		fName = name;
@@ -96,6 +102,7 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
 		}
 	}
 
+	@Override
 	public IASTName getName() {
 		return fName;
 	}
@@ -130,21 +137,25 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
 		return true;
 	}
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (fName == n)
 			return isOpaque() ? r_declaration : r_definition;
 		return r_unclear;
 	}
 
+	@Override
 	public void setIsScoped(boolean isScoped) {
 		assertNotFrozen();
 		fIsScoped= isScoped;
 	}
 
+	@Override
 	public boolean isScoped() {
 		return fIsScoped;
 	}
 
+	@Override
 	public void setBaseType(ICPPASTDeclSpecifier baseType) {
 		assertNotFrozen();
 		fBaseType= baseType;
@@ -154,19 +165,23 @@ public class CPPASTEnumerationSpecifier extends CPPASTBaseDeclSpecifier
 		}
 	}
 
+	@Override
 	public ICPPASTDeclSpecifier getBaseType() {
 		return fBaseType;
 	}
 
+	@Override
 	public void setIsOpaque(boolean isOpaque) {
 		assertNotFrozen();
 		fIsOpaque= isOpaque;
 	}
 
+	@Override
 	public boolean isOpaque() {
 		return fIsOpaque;
 	}
 
+	@Override
 	public ICPPScope getScope() {
 		if (isOpaque())
 			return null;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java
index 0a0cda93d37..fdd9fef35d6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEnumerator.java
@@ -28,10 +28,12 @@ public class CPPASTEnumerator extends ASTEnumerator {
 		super(name, value);
 	}
 	
+	@Override
 	public CPPASTEnumerator copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTEnumerator copy(CopyStyle style) {
 		CPPASTEnumerator copy = new CPPASTEnumerator();
 		copyAbstractEnumerator(copy, style);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java
index 7c14d0e8f7a..14009a09773 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTEqualsInitializer.java
@@ -25,10 +25,12 @@ public class CPPASTEqualsInitializer extends ASTEqualsInitializer {
 		super(arg);
 	}
 
+	@Override
 	public CPPASTEqualsInitializer copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTEqualsInitializer copy(CopyStyle style) {
 		IASTInitializerClause arg = getInitializerClause();
 		CPPASTEqualsInitializer copy = new CPPASTEqualsInitializer(arg == null ? null
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java
index 1042f1c79f4..4311194512b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExplicitTemplateInstantiation.java
@@ -35,10 +35,12 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements
 		setDeclaration(declaration);
 	}
 
+	@Override
 	public CPPASTExplicitTemplateInstantiation copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTExplicitTemplateInstantiation copy(CopyStyle style) {
 		CPPASTExplicitTemplateInstantiation copy = new CPPASTExplicitTemplateInstantiation();
 		copy.setDeclaration(declaration == null ? null : declaration.copy(style));
@@ -50,11 +52,13 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTDeclaration getDeclaration() {
         return declaration;
     }
 
-    public void setDeclaration(IASTDeclaration declaration) {
+    @Override
+	public void setDeclaration(IASTDeclaration declaration) {
         assertNotFrozen();
         this.declaration = declaration;
         if (declaration != null) {
@@ -64,10 +68,12 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements
     }
 
     
-    public int getModifier() {
+    @Override
+	public int getModifier() {
 		return modifier;
 	}
 
+	@Override
 	public void setModifier(int mod) {
 		assertNotFrozen();
 		modifier= mod;
@@ -96,7 +102,8 @@ public class CPPASTExplicitTemplateInstantiation extends ASTNode implements
     }
 
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( declaration == child )
         {
             other.setParent( child.getParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java
index 07a6f167683..d9f20c075ef 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionList.java
@@ -52,10 +52,12 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi
 	private IASTImplicitName[] implicitNames;
 	private ICPPFunction[] overloads = null;
 	
+	@Override
 	public CPPASTExpressionList copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTExpressionList copy(CopyStyle style) {
 		CPPASTExpressionList copy = new CPPASTExpressionList();
 		for(IASTExpression expr : getExpressions())
@@ -67,12 +69,14 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi
 		return copy;
 	}
 	
+	@Override
 	public IASTExpression[] getExpressions() {
         if (expressions == null) return IASTExpression.EMPTY_EXPRESSION_ARRAY;
-        return (IASTExpression[]) ArrayUtil.trim(IASTExpression.class, expressions);
+        return ArrayUtil.trim(IASTExpression.class, expressions);
     }
 
-    public void addExpression(IASTExpression expression) {
+    @Override
+	public void addExpression(IASTExpression expression) {
         assertNotFrozen();
 		expressions = ArrayUtil.append(expressions, expression);
         if (expression != null) {
@@ -144,8 +148,9 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi
 		return implicitNames;
 	}
 
-    public IASTImplicitName[] getImplicitNames() {
-    	return (IASTImplicitName[])ArrayUtil.removeNulls(IASTImplicitName.class, computeImplicitNames());
+    @Override
+	public IASTImplicitName[] getImplicitNames() {
+    	return ArrayUtil.removeNulls(IASTImplicitName.class, computeImplicitNames());
     }
 
     private ICPPFunction[] getOverloads() {
@@ -187,7 +192,8 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi
     	return overloads;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (expressions == null) return;
         for (int i = 0; i < expressions.length; ++i) {
             if (child == expressions[i]) {
@@ -198,6 +204,7 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi
         }
     }
     
+	@Override
 	public IType getExpressionType() {
 		ICPPFunction[] overloads = getOverloads();
 		if (overloads.length > 0) {
@@ -216,6 +223,7 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi
     	return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
 	}
     
+	@Override
 	public ValueCategory getValueCategory() {
 		ICPPFunction[] overloads = getOverloads();
 		if (overloads.length > 0) {
@@ -233,6 +241,7 @@ public class CPPASTExpressionList extends ASTNode implements ICPPASTExpressionLi
     	return PRVALUE;
 	}
 	
+	@Override
 	public boolean isLValue() {
 		return getValueCategory() == LVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java
index 33089f6f1cc..538a1070851 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTExpressionStatement.java
@@ -32,10 +32,12 @@ public class CPPASTExpressionStatement extends ASTNode implements
 		setExpression(expression);
 	}
 
+	@Override
 	public CPPASTExpressionStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTExpressionStatement copy(CopyStyle style) {
 		CPPASTExpressionStatement copy = new CPPASTExpressionStatement();
 		copy.setExpression(expression == null ? null : expression.copy(style));
@@ -46,11 +48,13 @@ public class CPPASTExpressionStatement extends ASTNode implements
 		return copy;
 	}
 	
+	@Override
 	public IASTExpression getExpression() {
         return expression;
     }
 
-    public void setExpression(IASTExpression expression) {
+    @Override
+	public void setExpression(IASTExpression expression) {
         assertNotFrozen();
         this.expression = expression;
         if (expression != null) {
@@ -79,7 +83,8 @@ public class CPPASTExpressionStatement extends ASTNode implements
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (child == expression) {
             other.setPropertyInParent(child.getPropertyInParent());
             other.setParent(child.getParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java
index f8735fea823..6c0da203f24 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldDeclarator.java
@@ -54,11 +54,13 @@ public class CPPASTFieldDeclarator extends CPPASTDeclarator implements
 		return copy;
 	}
 	 
+	@Override
 	public IASTExpression getBitFieldSize() {
         return bitField;
     }
 
-    public void setBitFieldSize(IASTExpression size) {
+    @Override
+	public void setBitFieldSize(IASTExpression size) {
         assertNotFrozen();
         this.bitField = size;
         if (size != null) {
@@ -75,7 +77,8 @@ public class CPPASTFieldDeclarator extends CPPASTDeclarator implements
 		return super.postAccept(action);
 	}
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == bitField )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java
index 7ca5e3f97f6..c55a50dd697 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFieldReference.java
@@ -71,10 +71,12 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
 		setFieldOwner(owner);
 	}
 	
+	@Override
 	public CPPASTFieldReference copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTFieldReference copy(CopyStyle style) {
 		CPPASTFieldReference copy = new CPPASTFieldReference();
 		copy.setFieldName(name == null ? null : name.copy(style));
@@ -88,20 +90,24 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
 		return copy;
 	}
 
+	@Override
 	public boolean isTemplate() {
         return isTemplate;
     }
 
-    public void setIsTemplate(boolean value) {
+    @Override
+	public void setIsTemplate(boolean value) {
         assertNotFrozen();
         isTemplate = value;
     }
 
-    public IASTExpression getFieldOwner() {
+    @Override
+	public IASTExpression getFieldOwner() {
         return owner;
     }
 
-    public void setFieldOwner(IASTExpression expression) {
+    @Override
+	public void setFieldOwner(IASTExpression expression) {
         assertNotFrozen();
         owner = expression;
         if (expression != null) {
@@ -110,11 +116,13 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
 		}
     }
 
-    public IASTName getFieldName() {
+    @Override
+	public IASTName getFieldName() {
         return name;
     }
 
-    public void setFieldName(IASTName name) {
+    @Override
+	public void setFieldName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -123,16 +131,19 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
 		}
     }
 
-    public boolean isPointerDereference() {
+    @Override
+	public boolean isPointerDereference() {
         return isDeref;
     }
 
-    public void setIsPointerDereference(boolean value) {
+    @Override
+	public void setIsPointerDereference(boolean value) {
         assertNotFrozen();
         isDeref = value;
     }
     
-    public IASTImplicitName[] getImplicitNames() {
+    @Override
+	public IASTImplicitName[] getImplicitNames() {
     	if (implicitNames == null) {
     		if (!isDeref)
     			return implicitNames = IASTImplicitName.EMPTY_NAME_ARRAY;
@@ -193,13 +204,15 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (n == name)
 			return r_reference;
 		return r_unclear;
 	}
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (child == owner) {
             other.setPropertyInParent(child.getPropertyInParent());
             other.setParent(child.getParent());
@@ -207,7 +220,8 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
         }
     }
 
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		IASTName name= getFieldName();
 		IBinding binding = name.resolvePreBinding();
 		try {
@@ -268,6 +282,7 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
 	}
 
     
+	@Override
 	public ValueCategory getValueCategory() {
 		IASTName name= getFieldName();
 		IBinding binding = name.resolvePreBinding();
@@ -291,10 +306,12 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
 		return PRVALUE;
 	}
 	
+	@Override
 	public boolean isLValue() {
 		return getValueCategory() == LVALUE;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 		List<IBinding> filtered = new ArrayList<IBinding>();
@@ -312,6 +329,7 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
 		return filtered.toArray(new IBinding[filtered.size()]);
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
@@ -320,7 +338,8 @@ public class CPPASTFieldReference extends ASTNode implements ICPPASTFieldReferen
      * For a pointer dereference expression e1->e2, return the type that e1 ultimately evaluates to
      * after chaining overloaded class member access operators <code>operator->()</code> calls.
      */
-    public IType getFieldOwnerType() {
+    @Override
+	public IType getFieldOwnerType() {
     	return getFieldOwnerType(null);
     }
     
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java
index 2a76cd25f59..ca4c3e7b2bf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTForStatement.java
@@ -53,10 +53,12 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
     	setBody(body);
 	}
 
-    public CPPASTForStatement copy() {
+    @Override
+	public CPPASTForStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
     
+	@Override
 	public CPPASTForStatement copy(CopyStyle style) {
 		CPPASTForStatement copy = new CPPASTForStatement();
 		copy.setInitializerStatement(init == null ? null : init.copy(style));
@@ -72,11 +74,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getConditionExpression() {
         return condition;
     }
 
-    public void setConditionExpression(IASTExpression condition) {
+    @Override
+	public void setConditionExpression(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -86,11 +90,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
 		}
     }
 
-    public IASTExpression getIterationExpression() {
+    @Override
+	public IASTExpression getIterationExpression() {
         return iterationExpression;
     }
 
-    public void setIterationExpression(IASTExpression iterator) {
+    @Override
+	public void setIterationExpression(IASTExpression iterator) {
         assertNotFrozen();
         this.iterationExpression = iterator;
         if (iterator != null) {
@@ -99,11 +105,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
 		}
     }
 
-    public IASTStatement getBody() {
+    @Override
+	public IASTStatement getBody() {
         return body;
     }
 
-    public void setBody(IASTStatement statement) {
+    @Override
+	public void setBody(IASTStatement statement) {
         assertNotFrozen();
         body = statement;
         if (statement != null) {
@@ -112,7 +120,8 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
 		}
     }
 
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         if (scope == null)
             scope = new CPPBlockScope(this);
         return scope;
@@ -143,6 +152,7 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
         return true;
     }
     
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (body == child) {
 			other.setPropertyInParent(child.getPropertyInParent());
@@ -165,11 +175,13 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
 		}
 	}
 
-    public IASTStatement getInitializerStatement() {
+    @Override
+	public IASTStatement getInitializerStatement() {
         return init;
     }
 
-    public void setInitializerStatement(IASTStatement statement) {
+    @Override
+	public void setInitializerStatement(IASTStatement statement) {
         assertNotFrozen();
         init = statement;
         if (statement != null) {
@@ -178,7 +190,8 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
 		}
     }
 
-    public void setConditionDeclaration(IASTDeclaration d) {
+    @Override
+	public void setConditionDeclaration(IASTDeclaration d) {
         assertNotFrozen();
         condDeclaration = d;
         if (d != null) {
@@ -188,7 +201,8 @@ public class CPPASTForStatement extends ASTNode implements ICPPASTForStatement,
 		}
     }
 
-    public IASTDeclaration getConditionDeclaration() {
+    @Override
+	public IASTDeclaration getConditionDeclaration() {
         return condDeclaration;
     }
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java
index 89a49353461..1dc12637de6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionCallExpression.java
@@ -66,10 +66,12 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
 		setArguments(args);
 	}
 
+	@Override
 	public CPPASTFunctionCallExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTFunctionCallExpression copy(CopyStyle style) {
 		IASTInitializerClause[] args = null;
 		if (fArguments.length > 0) {
@@ -88,10 +90,12 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
 		return copy;
 	}
 	
-    public IASTExpression getFunctionNameExpression() {
+    @Override
+	public IASTExpression getFunctionNameExpression() {
         return functionName;
     }
 
+	@Override
 	public void setFunctionNameExpression(IASTExpression expression) {
         assertNotFrozen();
         this.functionName = expression;
@@ -101,11 +105,13 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
 		}
     }
 	
+	@Override
 	public IASTInitializerClause[] getArguments() {
         return fArguments;
     }
 
-    public void setArguments(IASTInitializerClause[] arguments) {
+    @Override
+	public void setArguments(IASTInitializerClause[] arguments) {
         assertNotFrozen();
         if (arguments == null) {
         	fArguments= IASTExpression.EMPTY_EXPRESSION_ARRAY;
@@ -118,7 +124,8 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
 		}
     }
 
-    public IASTImplicitName[] getImplicitNames() {
+    @Override
+	public IASTImplicitName[] getImplicitNames() {
     	if (implicitNames == null) {
     		ICPPFunction overload = getOperator();
 			if (overload == null)
@@ -206,6 +213,7 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == functionName) {
 			other.setPropertyInParent(child.getPropertyInParent());
@@ -247,7 +255,8 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
     	return overload;
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		// Handle explicit type conversion in functional notation.
     	IType t= isExplicitTypeConversion();
     	if (t != null) {
@@ -290,10 +299,12 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
 		return null;
 	}
 
+	@Override
 	public boolean isLValue() {
     	return getValueCategory() == LVALUE;
 	}
     
+	@Override
 	public ValueCategory getValueCategory() {
 		if (isExplicitTypeConversion() != null) 
 			return PRVALUE;
@@ -317,6 +328,7 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
 		return ValueCategory.PRVALUE;
     }
 	
+	@Override
 	@Deprecated
     public IASTExpression getParameterExpression() {
     	if (fArguments.length == 0)
@@ -339,6 +351,7 @@ public class CPPASTFunctionCallExpression extends ASTNode implements
         return result;
     }
 
+	@Override
 	@Deprecated
     public void setParameterExpression(IASTExpression expression) {
         assertNotFrozen();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java
index b95e03c33d8..8fde74f3faf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTFunctionWithTryBlock.java
@@ -69,7 +69,7 @@ public class CPPASTFunctionWithTryBlock extends CPPASTFunctionDefinition impleme
 	public void addCatchHandler(ICPPASTCatchHandler statement) {
         assertNotFrozen();
     	if (statement != null) {
-    		catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.appendAt(ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement);
+    		catchHandlers = ArrayUtil.appendAt(ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement);
     		statement.setParent(this);
 			statement.setPropertyInParent(CATCH_HANDLER);
     	}
@@ -78,7 +78,7 @@ public class CPPASTFunctionWithTryBlock extends CPPASTFunctionDefinition impleme
     @Override
 	public ICPPASTCatchHandler[] getCatchHandlers() {
         if (catchHandlers == null) return ICPPASTCatchHandler.EMPTY_CATCHHANDLER_ARRAY;
-        catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.trimAt(ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos);
+        catchHandlers = ArrayUtil.trimAt(ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos);
         return catchHandlers;
     }
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java
index c94ba46e218..e5fdfdfb9b1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTGotoStatement.java
@@ -30,10 +30,12 @@ public class CPPASTGotoStatement extends ASTNode implements IASTGotoStatement {
 		setName(name);
 	}
 
+	@Override
 	public CPPASTGotoStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTGotoStatement copy(CopyStyle style) {
 		CPPASTGotoStatement copy = new CPPASTGotoStatement(name == null ? null : name.copy(style));
 		copy.setOffsetAndLength(this);
@@ -43,11 +45,13 @@ public class CPPASTGotoStatement extends ASTNode implements IASTGotoStatement {
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return this.name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
        this.name = name;
        if (name != null) {
@@ -77,6 +81,7 @@ public class CPPASTGotoStatement extends ASTNode implements IASTGotoStatement {
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( name == n ) return r_reference;
 		return r_unclear;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java
index 2bf8610b171..0508e3df4a7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIdExpression.java
@@ -62,10 +62,12 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP
 		setName(name);
 	}
 
+	@Override
 	public CPPASTIdExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTIdExpression copy(CopyStyle style) {
 		CPPASTIdExpression copy = new CPPASTIdExpression(name == null ? null : name.copy());
 		copy.setOffsetAndLength(this);
@@ -75,11 +77,13 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -110,11 +114,13 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (name == n) return r_reference;
 		return r_unclear;
 	}
 
+	@Override
 	public IType getExpressionType() {
         IBinding binding = name.resolvePreBinding();
         if (binding instanceof CPPFunctionSet)
@@ -208,10 +214,12 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP
 		return fTransformedExpression != null;
 	}
 
+	@Override
 	public boolean isLValue() {
 		return getValueCategory() == LVALUE;
 	}
 	
+	@Override
 	public ValueCategory getValueCategory() {
         IBinding binding = name.resolvePreBinding();
         if (checkForTransformation(binding)) {
@@ -226,6 +234,7 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP
 		return ValueCategory.PRVALUE;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		return CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 	}
@@ -235,6 +244,7 @@ public class CPPASTIdExpression extends ASTNode implements IASTIdExpression, ICP
 		return name != null ? name.toString() : "<unnamed>"; //$NON-NLS-1$
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java
index 8231405c7ef..0ccfbb1d42e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTIfStatement.java
@@ -47,10 +47,12 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA
 		setElseClause(elseClause);
 	}
     
-    public CPPASTIfStatement copy() {
+    @Override
+	public CPPASTIfStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTIfStatement copy(CopyStyle style) {
 		CPPASTIfStatement copy = new CPPASTIfStatement();
 		copy.setConditionDeclaration(condDecl == null ? null : condDecl.copy(style));
@@ -64,11 +66,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA
 		return copy;
 	}
     
+	@Override
 	public IASTExpression getConditionExpression() {
         return condition;
     }
 
-    public void setConditionExpression(IASTExpression condition) {
+    @Override
+	public void setConditionExpression(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -78,11 +82,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA
 		}
     }
 
-    public IASTStatement getThenClause() {
+    @Override
+	public IASTStatement getThenClause() {
         return thenClause;
     }
 
-    public void setThenClause(IASTStatement thenClause) {
+    @Override
+	public void setThenClause(IASTStatement thenClause) {
         assertNotFrozen();
         this.thenClause = thenClause;
         if (thenClause != null) {
@@ -91,11 +97,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA
 		}
     }
 
-    public IASTStatement getElseClause() {
+    @Override
+	public IASTStatement getElseClause() {
         return elseClause;
     }
 
-    public void setElseClause(IASTStatement elseClause) {
+    @Override
+	public void setElseClause(IASTStatement elseClause) {
         assertNotFrozen();
         this.elseClause = elseClause;
         if (elseClause != null) {
@@ -162,6 +170,7 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA
         return true;
     }
     
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (thenClause == child) {
 			other.setParent(child.getParent());
@@ -180,11 +189,13 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA
 		}
 	}
 
-    public IASTDeclaration getConditionDeclaration() {
+    @Override
+	public IASTDeclaration getConditionDeclaration() {
         return condDecl;
     }
 
-    public void setConditionDeclaration(IASTDeclaration d) {
+    @Override
+	public void setConditionDeclaration(IASTDeclaration d) {
         assertNotFrozen();
         condDecl = d;
         if (d != null) {
@@ -194,6 +205,7 @@ public class CPPASTIfStatement extends ASTNode implements ICPPASTIfStatement, IA
 		}
     }
     
+	@Override
 	public IScope getScope() {
 		if( scope == null )
             scope = new CPPBlockScope( this );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java
index 691e88ba554..165ea9a8835 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTImplicitName.java
@@ -48,6 +48,7 @@ public class CPPASTImplicitName extends CPPASTName implements IASTImplicitName {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public boolean isAlternate() {
 		return alternate;
 	}
@@ -128,6 +129,7 @@ public class CPPASTImplicitName extends CPPASTName implements IASTImplicitName {
 		this.isOperator = isOperator;
 	}
 
+	@Override
 	public boolean isOperator() {
 		return isOperator;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java
index 4e524147a97..c1da21d6927 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTInitializerList.java
@@ -32,10 +32,12 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer
     private int actualSize;
 	private boolean fIsPackExpansion;
     
+	@Override
 	public CPPASTInitializerList copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTInitializerList copy(CopyStyle style) {
 		CPPASTInitializerList copy = new CPPASTInitializerList();
 		for (IASTInitializerClause initializer : getClauses())
@@ -49,10 +51,12 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer
 		return copy;
 	}
 
+	@Override
 	public int getSize() {
 		return actualSize;
 	}
 	
+	@Override
 	public IASTInitializerClause[] getClauses() {
 		if (initializers == null)
 			return IASTExpression.EMPTY_EXPRESSION_ARRAY;
@@ -60,6 +64,7 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer
 		return initializers;
 	}
 
+	@Override
 	@Deprecated
 	public IASTInitializer[] getInitializers() {
 		IASTInitializerClause[] clauses= getClauses();
@@ -81,16 +86,18 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer
 		return inits;
 	}
     
+	@Override
 	public void addClause(IASTInitializerClause d) {
         assertNotFrozen();
     	if (d != null) {
-    		initializers = (IASTInitializerClause[]) ArrayUtil.appendAt( IASTInitializerClause.class, initializers, ++initializersPos, d );
+    		initializers = ArrayUtil.appendAt( IASTInitializerClause.class, initializers, ++initializersPos, d );
     		d.setParent(this);
 			d.setPropertyInParent(NESTED_INITIALIZER);
     	}
     	actualSize++;
     }
 
+	@Override
 	@Deprecated
 	public void addInitializer(IASTInitializer d) {
         assertNotFrozen();
@@ -124,15 +131,18 @@ public class CPPASTInitializerList extends ASTNode implements ICPPASTInitializer
 		return true;
     }
 
+	@Override
 	public boolean isPackExpansion() {
 		return fIsPackExpansion;
 	}
 
+	@Override
 	public void setIsPackExpansion(boolean val) {
 		assertNotFrozen();
 		fIsPackExpansion= val;
 	}
 	
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (initializers != null) {
 			for (int i = 0; i < initializers.length; ++i) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java
index 8a520b62496..9d4af23a843 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLabelStatement.java
@@ -36,10 +36,12 @@ public class CPPASTLabelStatement extends ASTNode implements
 		setNestedStatement(nestedStatement);
 	}
 	
+	@Override
 	public CPPASTLabelStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTLabelStatement copy(CopyStyle style) {
 		CPPASTLabelStatement copy = new CPPASTLabelStatement();
 		copy.setName(name == null ? null : name.copy(style));
@@ -51,11 +53,13 @@ public class CPPASTLabelStatement extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -86,16 +90,19 @@ public class CPPASTLabelStatement extends ASTNode implements
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( n == name ) return r_declaration;
 		return r_unclear;
 	}
 
-    public IASTStatement getNestedStatement() {
+    @Override
+	public IASTStatement getNestedStatement() {
         return nestedStatement;
     }
 
-    public void setNestedStatement(IASTStatement s) {
+    @Override
+	public void setNestedStatement(IASTStatement s) {
         assertNotFrozen();
         nestedStatement = s;
         if (s != null) {
@@ -104,7 +111,8 @@ public class CPPASTLabelStatement extends ASTNode implements
 		}
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == nestedStatement )
         {
             other.setParent( this );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java
index 5da8b25b7b5..ff0d4456a7f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLambdaExpression.java
@@ -43,10 +43,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IASTExpression#copy()
 	 */
+	@Override
 	public CPPASTLambdaExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTLambdaExpression copy(CopyStyle style) {
 		CPPASTLambdaExpression result = new CPPASTLambdaExpression();
 		result.fCaptureDefault = fCaptureDefault;
@@ -71,10 +73,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
 		return result;
 	}
 
-    public IASTImplicitName[] getImplicitNames() {
+    @Override
+	public IASTImplicitName[] getImplicitNames() {
     	return new IASTImplicitName[] {getFunctionCallOperatorName()};
     }
 
+	@Override
 	public IASTImplicitName getClosureTypeName() {
 		if (fClosureTypeName == null) {
     		final CPPClosureType closureType = getExpressionType();
@@ -88,6 +92,7 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
 		return fClosureTypeName;
 	}
 
+	@Override
 	public IASTImplicitName getFunctionCallOperatorName() {
 		if (fImplicitFunctionCallName == null) {
     		final CPPClosureType closureType = getExpressionType();
@@ -140,24 +145,29 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
         return true;
     }
 
+	@Override
 	public IASTCompoundStatement getBody() {
 		return fBody;
 	}
 
+	@Override
 	public CaptureDefault getCaptureDefault() {
 		return fCaptureDefault;
 	}
 
+	@Override
 	public ICPPASTCapture[] getCaptures() {
 		if (fCaptures == null)
 			return NO_CAPTURES;
 		return fCaptures= ArrayUtil.trim(fCaptures);
 	}
 
+	@Override
 	public ICPPASTFunctionDeclarator getDeclarator() {
 		return fDeclarator;
 	}
 
+	@Override
 	public void addCapture(ICPPASTCapture capture) {
 		assertNotFrozen();
 		capture.setParent(this);
@@ -169,6 +179,7 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
 		}
 	}
 
+	@Override
 	public void setBody(IASTCompoundStatement body) {
 		assertNotFrozen();
 		body.setParent(this);
@@ -176,10 +187,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
 		fBody= body;
 	}
 
+	@Override
 	public void setCaptureDefault(CaptureDefault value) {
 		fCaptureDefault= value;
 	}
 
+	@Override
 	public void setDeclarator(ICPPASTFunctionDeclarator dtor) {
 		assertNotFrozen();
 		dtor.setParent(this);
@@ -187,6 +200,7 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
 		fDeclarator= dtor;
 	}
 
+	@Override
 	public CPPClosureType getExpressionType() {
 		if (fClosureType == null)
 			fClosureType= new CPPClosureType(this);
@@ -194,10 +208,12 @@ public class CPPASTLambdaExpression extends ASTNode implements ICPPASTLambdaExpr
 		return fClosureType;
 	}
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public ValueCategory getValueCategory() {
 		return ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java
index f8657377a39..7a5b2a3c690 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTLinkageSpecification.java
@@ -37,10 +37,12 @@ public class CPPASTLinkageSpecification extends ASTNode implements
 		this.fLiteral = literal;
 	}
 	
+	@Override
 	public CPPASTLinkageSpecification copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTLinkageSpecification copy(CopyStyle style) {
 		CPPASTLinkageSpecification copy = new CPPASTLinkageSpecification(fLiteral);
 		for (IASTDeclaration declaration : getDeclarations())
@@ -52,24 +54,28 @@ public class CPPASTLinkageSpecification extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public String getLiteral() {
         return fLiteral;
     }
 
-    public void setLiteral(String value) {
+    @Override
+	public void setLiteral(String value) {
         assertNotFrozen();
         this.fLiteral = value;
     }
 
+	@Override
 	public final void addDeclaration(IASTDeclaration decl) {
 		if (decl != null) {
 			decl.setParent(this);
 			decl.setPropertyInParent(OWNED_DECLARATION);
-			fAllDeclarations = (IASTDeclaration[]) ArrayUtil.appendAt( IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl);
+			fAllDeclarations = ArrayUtil.appendAt( IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl);
 			fActiveDeclarations= null;
 		}
 	}
 
+	@Override
 	public final IASTDeclaration[] getDeclarations() {
 		IASTDeclaration[] active= fActiveDeclarations;
 		if (active == null) {
@@ -79,9 +85,10 @@ public class CPPASTLinkageSpecification extends ASTNode implements
 		return active;
 	}
 
+	@Override
 	public final IASTDeclaration[] getDeclarations(boolean includeInactive) {
 		if (includeInactive) {
-			fAllDeclarations= (IASTDeclaration[]) ArrayUtil.trimAt(IASTDeclaration.class, fAllDeclarations, fLastDeclaration);
+			fAllDeclarations= ArrayUtil.trimAt(IASTDeclaration.class, fAllDeclarations, fLastDeclaration);
 			return fAllDeclarations;
 		}
 		return getDeclarations();
@@ -109,7 +116,8 @@ public class CPPASTLinkageSpecification extends ASTNode implements
         return true;
     }
 
-    public final void replace(IASTNode child, IASTNode other) {
+    @Override
+	public final void replace(IASTNode child, IASTNode other) {
 		assert child.isActive() == other.isActive();
 		for (int i = 0; i <= fLastDeclaration; ++i) {
 			if (fAllDeclarations[i] == child) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java
index 54dd18bef60..2456a54e4fc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTName.java
@@ -111,7 +111,7 @@ public class CPPASTName extends CPPASTNameBase implements ICPPASTCompletionConte
 					}
 				}
 			}
-			return (IBinding[])ArrayUtil.removeNulls(IBinding.class, bindings);
+			return ArrayUtil.removeNulls(IBinding.class, bindings);
 		}
 		return null;
 	}
@@ -142,7 +142,7 @@ public class CPPASTName extends CPPASTNameBase implements ICPPASTCompletionConte
 				bindings[i]= null;
 			}
 		}
-		return (IBinding[])ArrayUtil.removeNulls(IBinding.class, bindings);
+		return ArrayUtil.removeNulls(IBinding.class, bindings);
 	}
 
     @Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java
index deeaa049047..e95210e6519 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamedTypeSpecifier.java
@@ -40,10 +40,12 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements
 		setName(name);
 	}
 
+	@Override
 	public CPPASTNamedTypeSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTNamedTypeSpecifier copy(CopyStyle style) {
 		CPPASTNamedTypeSpecifier copy = new CPPASTNamedTypeSpecifier(name == null ? null
 				: name.copy(style));
@@ -55,21 +57,25 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements
 		return copy;
 	}
 	
+	@Override
 	public boolean isTypename() {
         return typename;
     }
 
-    public void setIsTypename(boolean value) {
+    @Override
+	public void setIsTypename(boolean value) {
         assertNotFrozen();
         typename = value;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -106,12 +112,14 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements
         return true;
     }
 	
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (n == name)
 			return r_reference;
 		return r_unclear;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 		List<IBinding> filtered = new ArrayList<IBinding>();
@@ -129,6 +137,7 @@ public class CPPASTNamedTypeSpecifier extends CPPASTBaseDeclSpecifier implements
 		return filtered.toArray(new IBinding[filtered.size()]);
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java
index ab4e44113a3..524fdf37ea8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceAlias.java
@@ -27,10 +27,12 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli
 		setMappingName(qualifiedName);
 	}
 
+	@Override
 	public CPPASTNamespaceAlias copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTNamespaceAlias copy(CopyStyle style) {
 		CPPASTNamespaceAlias copy = new CPPASTNamespaceAlias(
 				alias == null ? null : alias.copy(style),
@@ -42,11 +44,13 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli
 		return copy;
 	}
 	
+	@Override
 	public IASTName getAlias() {
         return alias;
     }
 
-    public void setAlias(IASTName name) {
+    @Override
+	public void setAlias(IASTName name) {
         assertNotFrozen();
         this.alias = name;
         if (name != null) {
@@ -55,11 +59,13 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli
 		}
     }
 
-    public IASTName getMappingName() {
+    @Override
+	public IASTName getMappingName() {
         return qualifiedName;
     }
 
-    public void setMappingName(IASTName qualifiedName) {
+    @Override
+	public void setMappingName(IASTName qualifiedName) {
         assertNotFrozen();
         this.qualifiedName = qualifiedName;
         if (qualifiedName != null) {
@@ -91,6 +97,7 @@ public class CPPASTNamespaceAlias extends ASTNode implements ICPPASTNamespaceAli
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (alias == n) return r_definition;
 		if (qualifiedName == n) return r_reference;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java
index 313befcca06..718073ea8d8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNamespaceDefinition.java
@@ -41,10 +41,12 @@ public class CPPASTNamespaceDefinition extends ASTNode
 		setName(name);
 	}
 
+	@Override
 	public CPPASTNamespaceDefinition copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTNamespaceDefinition copy(CopyStyle style) {
 		CPPASTNamespaceDefinition copy =
 				new CPPASTNamespaceDefinition(fName == null ? null : fName.copy(style));
@@ -59,11 +61,13 @@ public class CPPASTNamespaceDefinition extends ASTNode
 		return copy;
 	}
 
+	@Override
 	public IASTName getName() {
         return fName;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.fName = name;
         if (name != null) {
@@ -72,24 +76,28 @@ public class CPPASTNamespaceDefinition extends ASTNode
 		}
     }
     
+	@Override
 	public void setIsInline(boolean isInline) {
 		assertNotFrozen();
 		fIsInline= isInline;
 	}
 
+	@Override
 	public boolean isInline() {
 		return fIsInline;
 	}
 
+	@Override
 	public final void addDeclaration(IASTDeclaration decl) {
 		if (decl != null) {
 			decl.setParent(this);
 			decl.setPropertyInParent(OWNED_DECLARATION);
-			fAllDeclarations = (IASTDeclaration[]) ArrayUtil.appendAt(IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl);
+			fAllDeclarations = ArrayUtil.appendAt(IASTDeclaration.class, fAllDeclarations, ++fLastDeclaration, decl);
 			fActiveDeclarations= null;
 		}
 	}
 
+	@Override
 	public final IASTDeclaration[] getDeclarations() {
 		IASTDeclaration[] active= fActiveDeclarations;
 		if (active == null) {
@@ -99,15 +107,17 @@ public class CPPASTNamespaceDefinition extends ASTNode
 		return active;
 	}
 
+	@Override
 	public final IASTDeclaration[] getDeclarations(boolean includeInactive) {
 		if (includeInactive) {
-			fAllDeclarations= (IASTDeclaration[]) ArrayUtil.trimAt(IASTDeclaration.class, fAllDeclarations, fLastDeclaration);
+			fAllDeclarations= ArrayUtil.trimAt(IASTDeclaration.class, fAllDeclarations, fLastDeclaration);
 			return fAllDeclarations;
 		}
 		return getDeclarations();
 	}
 
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
 	    return ((ICPPNamespace) fName.resolveBinding()).getNamespaceScope();
 	}
 
@@ -136,13 +146,15 @@ public class CPPASTNamespaceDefinition extends ASTNode
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (fName == n)
 			return r_definition;
 		return r_unclear;
 	}
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
 		assert child.isActive() == other.isActive();
 		for (int i = 0; i <= fLastDeclaration; ++i) {
 			if (fAllDeclarations[i] == child) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java
index 2e143721520..ef247f13265 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNewExpression.java
@@ -59,10 +59,12 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		setInitializer(initializer);
 	}
 	
+	@Override
 	public CPPASTNewExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTNewExpression copy(CopyStyle style) {
 		CPPASTNewExpression copy = new CPPASTNewExpression();
 		copy.setIsGlobal(isGlobal);
@@ -83,20 +85,24 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		return copy;
 	}
 
+	@Override
 	public boolean isGlobal() {
         return isGlobal;
     }
 
-    public void setIsGlobal(boolean value) {
+    @Override
+	public void setIsGlobal(boolean value) {
         assertNotFrozen();
         isGlobal = value;
     }
 
-    public IASTInitializerClause[] getPlacementArguments() {
+    @Override
+	public IASTInitializerClause[] getPlacementArguments() {
     	return placement;
     }
     
-    public void setPlacementArguments(IASTInitializerClause[] args) {
+    @Override
+	public void setPlacementArguments(IASTInitializerClause[] args) {
         assertNotFrozen();
         placement = args;
         if (args != null) {
@@ -107,11 +113,13 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		}
     }
 
-    public IASTInitializer getInitializer() {
+    @Override
+	public IASTInitializer getInitializer() {
         return initializer;
     }
 
-    public void setInitializer(IASTInitializer expression) {
+    @Override
+	public void setInitializer(IASTInitializer expression) {
         assertNotFrozen();
         initializer = expression;
         if (expression != null) {
@@ -120,11 +128,13 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		}
     }
 
-    public IASTTypeId getTypeId() {
+    @Override
+	public IASTTypeId getTypeId() {
         return typeId;
     }
 
-    public void setTypeId(IASTTypeId typeId) {
+    @Override
+	public void setTypeId(IASTTypeId typeId) {
         assertNotFrozen();
         this.typeId = typeId;
         if (typeId != null) {
@@ -133,11 +143,13 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		}
     }
 
-    public boolean isNewTypeId() {
+    @Override
+	public boolean isNewTypeId() {
         return isNewTypeId;
     }
 
-    public void setIsNewTypeId(boolean value) {
+    @Override
+	public void setIsNewTypeId(boolean value) {
         assertNotFrozen();
         isNewTypeId = value;
     }
@@ -145,7 +157,8 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
     /**
      * @see org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner#getImplicitNames()
      */
-    public IASTImplicitName[] getImplicitNames() {
+    @Override
+	public IASTImplicitName[] getImplicitNames() {
     	if (implicitNames == null) {
 			ICPPFunction operatorFunction = CPPSemantics.findOverloadedOperator(this);
 			if (operatorFunction == null || operatorFunction instanceof CPPImplicitFunction) {
@@ -166,6 +179,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 	 * Returns true if this expression is allocating an array.
 	 * @since 5.1
 	 */
+	@Override
 	public boolean isArrayAllocation() {
 		IASTTypeId typeId= getTypeId();
 		if (typeId != null) {
@@ -216,6 +230,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (placement != null) {
 			for (int i = 0; i < placement.length; ++i) {
@@ -228,7 +243,8 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		}
 	}
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		IType t= CPPVisitor.createType(getTypeId());
 		if (t instanceof IArrayType) {
 			t= ((IArrayType) t).getType();
@@ -236,14 +252,17 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		return new CPPPointerType(t);
     }
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public ValueCategory getValueCategory() {
 		return PRVALUE;
 	}
 
+	@Override
 	@Deprecated
 	public IASTExpression[] getNewTypeIdArrayExpressions() {
 		if (cachedArraySizes == null) {
@@ -265,7 +284,8 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
 		return cachedArraySizes;
 	}
 
-    @Deprecated
+    @Override
+	@Deprecated
     public void addNewTypeIdArrayExpression(IASTExpression expression) {
         assertNotFrozen();
     	Assert.isNotNull(typeId);
@@ -286,6 +306,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
     	((IASTArrayDeclarator) dtor).addArrayModifier(mod);
     }
 
+	@Override
 	@Deprecated
     public IASTExpression getNewPlacement() {
     	if (placement == null || placement.length == 0)
@@ -307,6 +328,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
         return result;
     }
 	
+	@Override
 	@Deprecated
     public void setNewPlacement(IASTExpression expression) {
         assertNotFrozen();
@@ -319,6 +341,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
         }
     }
     
+	@Override
 	@Deprecated
     public IASTExpression getNewInitializer() {
         if (initializer == null || initializer instanceof IASTExpression) {
@@ -338,6 +361,7 @@ public class CPPASTNewExpression extends ASTNode implements ICPPASTNewExpression
         return null;
     }
 
+	@Override
 	@Deprecated
     public void setNewInitializer(IASTExpression expression) {
         assertNotFrozen();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java
index 73458712b0c..c0799c22eae 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTNullStatement.java
@@ -38,10 +38,12 @@ public class CPPASTNullStatement extends ASTNode implements IASTNullStatement {
         return true;
     }
 
-    public CPPASTNullStatement copy() {
+    @Override
+	public CPPASTNullStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTNullStatement copy(CopyStyle style) {
 		CPPASTNullStatement copy = new CPPASTNullStatement();
 		copy.setOffsetAndLength(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java
index 3907dd7ccd4..825d7631fa7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPackExpansionExpression.java
@@ -31,6 +31,7 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac
 		setPattern(pattern);
 	}
 
+	@Override
 	public void setPattern(IASTExpression pattern) {
 		assertNotFrozen();
 		
@@ -41,14 +42,17 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac
 		}
 	}
 
+	@Override
 	public IASTExpression getPattern() {
 		return fPattern;
 	}
 	
+	@Override
 	public CPPASTPackExpansionExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTPackExpansionExpression copy(CopyStyle style) {
 		CPPASTPackExpansionExpression copy = new CPPASTPackExpansionExpression(fPattern.copy(style));
 		copy.setOffsetAndLength(this);
@@ -58,6 +62,7 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac
 		return copy;
 	}
 
+	@Override
 	public IType getExpressionType() {
 		final IType type = fPattern.getExpressionType();
 		if (type == null)
@@ -66,10 +71,12 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac
 		return new CPPParameterPackType(type);
 	}
 
+	@Override
 	public boolean isLValue() {
 		return fPattern.isLValue();
 	}
 	
+	@Override
 	public ValueCategory getValueCategory() {
 		return fPattern.getValueCategory();
 	}
@@ -92,6 +99,7 @@ public class CPPASTPackExpansionExpression extends ASTNode implements ICPPASTPac
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == fPattern) {
             other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java
index adbd9bc2d7e..f29967bd741 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTPointerToMember.java
@@ -44,6 +44,7 @@ public class CPPASTPointerToMember extends CPPASTPointer implements ICPPASTPoint
 		return copy;
 	}
 
+	@Override
 	public void setName(IASTName name) {
         assertNotFrozen();
         n = name;
@@ -54,7 +55,8 @@ public class CPPASTPointerToMember extends CPPASTPointer implements ICPPASTPoint
     }
 
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return n;
     }
 
@@ -74,6 +76,7 @@ public class CPPASTPointerToMember extends CPPASTPointer implements ICPPASTPoint
 		return true;	    
     }
 
+	@Override
 	public int getRoleForName(IASTName name ) {
 		if( name  == this.n )
 			return r_reference;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java
index 827d0254a6f..8464ac526e6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemDeclaration.java
@@ -28,10 +28,12 @@ public class CPPASTProblemDeclaration extends CPPASTProblemOwner implements IAST
 		super(problem);
 	}
 
+	@Override
 	public CPPASTProblemDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTProblemDeclaration copy(CopyStyle style) {
 		CPPASTProblemDeclaration copy = new CPPASTProblemDeclaration();
 		copyBaseProblem(copy, style);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java
index ed15e0d26aa..556aeb2ea24 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemExpression.java
@@ -28,10 +28,12 @@ public class CPPASTProblemExpression extends CPPASTProblemOwner implements IASTP
 		super(problem);
 	}
 
+	@Override
 	public CPPASTProblemExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTProblemExpression copy(CopyStyle style) {
 		CPPASTProblemExpression copy = new CPPASTProblemExpression();
 		copyBaseProblem(copy, style);
@@ -61,14 +63,17 @@ public class CPPASTProblemExpression extends CPPASTProblemOwner implements IASTP
         return true;
     }
     
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		return new ProblemType(ISemanticProblem.TYPE_UNKNOWN_FOR_EXPRESSION);
     }
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 
+	@Override
 	public ValueCategory getValueCategory() {
 		return ValueCategory.PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java
index 40ceefd5ee1..34faea7268c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemOwner.java
@@ -36,11 +36,13 @@ abstract class CPPASTProblemOwner extends ASTNode implements IASTProblemHolder {
 		copy.setOffsetAndLength(this);
 	}
 
+	@Override
 	public IASTProblem getProblem() {
         return problem;
     }
     
-    public void setProblem(IASTProblem p) {
+    @Override
+	public void setProblem(IASTProblem p) {
         assertNotFrozen();
         problem = p;
         if (p != null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java
index aa3f432a038..5e763e00830 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemStatement.java
@@ -28,10 +28,12 @@ public class CPPASTProblemStatement extends CPPASTProblemOwner implements IASTPr
 		super(problem);
 	}
 	
+	@Override
 	public CPPASTProblemStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTProblemStatement copy(CopyStyle style) {
 		CPPASTProblemStatement copy = new CPPASTProblemStatement();
 		copyBaseProblem(copy, style);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java
index 1d4f2dd61b3..ce13cbcab98 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTProblemTypeId.java
@@ -28,10 +28,12 @@ public class CPPASTProblemTypeId extends CPPASTProblemOwner implements IASTProbl
 		super(problem);
 	}
 
+	@Override
 	public CPPASTProblemTypeId copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTProblemTypeId copy(CopyStyle style) {
 		CPPASTProblemTypeId copy = new CPPASTProblemTypeId();
 		copyBaseProblem(copy, style);
@@ -60,17 +62,21 @@ public class CPPASTProblemTypeId extends CPPASTProblemOwner implements IASTProbl
         return true;
     }
 
+	@Override
 	public IASTDeclSpecifier getDeclSpecifier() {
 		return null;
 	}
 
+	@Override
 	public void setDeclSpecifier(IASTDeclSpecifier declSpec) {
 	}
 
+	@Override
 	public IASTDeclarator getAbstractDeclarator() {
 		return null;
 	}
 
+	@Override
 	public void setAbstractDeclarator(IASTDeclarator abstractDeclarator) {
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java
index 0314083f16a..68a6a9938aa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTQualifiedName.java
@@ -63,10 +63,12 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 	public CPPASTQualifiedName() {
 	}
 
+	@Override
 	public CPPASTQualifiedName copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTQualifiedName copy(CopyStyle style) {
 		CPPASTQualifiedName copy = new CPPASTQualifiedName();
 		for (IASTName name : getNames())
@@ -109,21 +111,23 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 	}
 
 
+	@Override
 	public void addName(IASTName name) {
         assertNotFrozen();
 		assert !(name instanceof ICPPASTQualifiedName);
 		if (name != null) {
-			names = (IASTName[]) ArrayUtil.appendAt(IASTName.class, names, ++namesPos, name);
+			names = ArrayUtil.appendAt(IASTName.class, names, ++namesPos, name);
 			name.setParent(this);
 			name.setPropertyInParent(SEGMENT_NAME);
 		}
 	}
 
+	@Override
 	public IASTName[] getNames() {
 		if (namesPos < 0)
 			return IASTName.EMPTY_NAME_ARRAY;
         
-		names = (IASTName[]) ArrayUtil.trimAt(IASTName.class, names, namesPos);
+		names = ArrayUtil.trimAt(IASTName.class, names, namesPos);
 		return names;
 	}
 
@@ -135,14 +139,17 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 		return names[namesPos];
 	}
 
+	@Override
 	public char[] getSimpleID() {
 		return names[namesPos].getSimpleID();
 	}
 	
+	@Override
 	public char[] getLookupKey() {
 		return names[namesPos].getLookupKey();
 	}
 	
+	@Override
 	public char[] toCharArray() {
 		if (signature == null) {
 			StringBuilder buf= new StringBuilder();
@@ -160,10 +167,12 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 		return signature;
 	}
 
+	@Override
 	public boolean isFullyQualified() {
 		return isFullyQualified;
 	}
 
+	@Override
 	public void setFullyQualified(boolean isFullyQualified) {
         assertNotFrozen();
 		this.isFullyQualified = isFullyQualified;
@@ -224,6 +233,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase
         return IASTNameOwner.r_unclear;
 	}
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		for (int i=0; i < namesPos; ++i) {
 			if (names[i] == n) 
@@ -238,6 +248,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 		return r_unclear;
 	}
 	
+	@Override
 	public boolean isConversionOrOperator() {
 		final IASTName lastName= getLastName();
 		if (lastName instanceof ICPPASTConversionName || lastName instanceof ICPPASTOperatorName) {
@@ -255,6 +266,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 		return false;
 	}
     
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 		
@@ -348,6 +360,7 @@ public class CPPASTQualifiedName extends CPPASTNameBase
 		return null;
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java
index 2e959841e14..b4865d47f60 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTReturnStatement.java
@@ -30,10 +30,12 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen
 		setReturnArgument(retValue);
 	}
 
+	@Override
 	public CPPASTReturnStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTReturnStatement copy(CopyStyle style) {
 		CPPASTReturnStatement copy = new CPPASTReturnStatement(retValue == null ? null
 				: retValue.copy(style));
@@ -44,10 +46,12 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen
 		return copy;
 	}
 
+	@Override
 	public IASTInitializerClause getReturnArgument() {
 		return retValue;
 	}
 	
+	@Override
 	public IASTExpression getReturnValue() {
         if (retValue instanceof IASTExpression) {
         	return (IASTExpression) retValue;
@@ -56,11 +60,13 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen
     }
 
 	
-    public void setReturnValue(IASTExpression returnValue) {
+    @Override
+	public void setReturnValue(IASTExpression returnValue) {
     	setReturnArgument(returnValue);
     }
     
-    public void setReturnArgument(IASTInitializerClause arg) {
+    @Override
+	public void setReturnArgument(IASTInitializerClause arg) {
         assertNotFrozen();
         retValue = arg;
         if (arg != null) {
@@ -94,7 +100,8 @@ public class CPPASTReturnStatement extends ASTNode implements IASTReturnStatemen
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (child == retValue) {
             other.setPropertyInParent(child.getPropertyInParent());
             other.setParent(child.getParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java
index 3ceeed83ac9..142990c2654 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclSpecifier.java
@@ -30,10 +30,12 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement
     private boolean isImaginary=false;
 	private IASTExpression fDeclTypeExpression;
 
-    public CPPASTSimpleDeclSpecifier copy() {
+    @Override
+	public CPPASTSimpleDeclSpecifier copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
     
+	@Override
 	public CPPASTSimpleDeclSpecifier copy(CopyStyle style) {
 		CPPASTSimpleDeclSpecifier copy = new CPPASTSimpleDeclSpecifier();
 		copySimpleDeclSpec(copy, style);
@@ -61,16 +63,19 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement
 	/**
      * @see org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier
      */
-    public int getType() {
+    @Override
+	public int getType() {
         return type;
     }
 
-    public void setType(int type) {
+    @Override
+	public void setType(int type) {
         assertNotFrozen();
         this.type = type;
     }
 
-    public void setType(Kind kind) {
+    @Override
+	public void setType(Kind kind) {
     	setType(getType(kind));
     }
     
@@ -100,73 +105,89 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement
     	return t_unspecified;
     }
     
-    public boolean isSigned() {
+    @Override
+	public boolean isSigned() {
         return isSigned;
     }
 
-    public boolean isUnsigned() {
+    @Override
+	public boolean isUnsigned() {
         return isUnsigned;
     }
 
-    public boolean isShort() {
+    @Override
+	public boolean isShort() {
         return isShort;
     }
 
-    public boolean isLong() {
+    @Override
+	public boolean isLong() {
         return isLong;
     }
 
-    public boolean isLongLong() {
+    @Override
+	public boolean isLongLong() {
 		return isLonglong;
 	}
 
+	@Override
 	public boolean isComplex() {
 		return isComplex;
 	}
 
+	@Override
 	public boolean isImaginary() {
 		return isImaginary;
 	}
 
+	@Override
 	public IASTExpression getDeclTypeExpression() {
 		return fDeclTypeExpression;
 	}
 
+	@Override
 	public void setSigned(boolean value) {
         assertNotFrozen();
         isSigned = value;
     }
 
-    public void setUnsigned(boolean value) {
+    @Override
+	public void setUnsigned(boolean value) {
         assertNotFrozen();
         isUnsigned = value;
     }
 
-    public void setLong(boolean value) {
+    @Override
+	public void setLong(boolean value) {
         assertNotFrozen();
         isLong = value;
     }
 
-    public void setShort(boolean value) {
+    @Override
+	public void setShort(boolean value) {
         assertNotFrozen();
         isShort = value;
     }
 
-    public void setLongLong(boolean value) {
+    @Override
+	public void setLongLong(boolean value) {
         assertNotFrozen();
         isLonglong = value;
 	}
 
+	@Override
 	public void setComplex(boolean value) {
         assertNotFrozen();
         isComplex = value;
 	}
 
+	@Override
 	public void setImaginary(boolean value) {
         assertNotFrozen();
         isImaginary = value;
 	}
 
+	@Override
 	public void setDeclTypeExpression(IASTExpression expression) {
         assertNotFrozen();
         fDeclTypeExpression = expression;
@@ -199,6 +220,7 @@ public class CPPASTSimpleDeclSpecifier extends CPPASTBaseDeclSpecifier implement
         return true;
     }
 
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (child == fDeclTypeExpression) {
 			other.setPropertyInParent(child.getPropertyInParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java
index 216dc28e910..1a47bc44936 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleDeclaration.java
@@ -59,7 +59,7 @@ public class CPPASTSimpleDeclaration extends ASTNode implements IASTSimpleDeclar
 	public IASTDeclarator[] getDeclarators() {
         if (declarators == null)
         	return IASTDeclarator.EMPTY_DECLARATOR_ARRAY;
-        declarators = (IASTDeclarator[]) ArrayUtil.trimAt(IASTDeclarator.class, declarators, declaratorsPos);
+        declarators = ArrayUtil.trimAt(IASTDeclarator.class, declarators, declaratorsPos);
         return declarators;
     }
     
@@ -67,7 +67,7 @@ public class CPPASTSimpleDeclaration extends ASTNode implements IASTSimpleDeclar
 	public void addDeclarator(IASTDeclarator d) {
         assertNotFrozen();
     	if (d != null) {
-    		declarators = (IASTDeclarator[]) ArrayUtil.appendAt(IASTDeclarator.class, declarators, ++declaratorsPos, d);
+    		declarators = ArrayUtil.appendAt(IASTDeclarator.class, declarators, ++declaratorsPos, d);
     		d.setParent(this);
 			d.setPropertyInParent(DECLARATOR);
     	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java
index 7b900ae9bea..3de4e3ef9c7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeConstructorExpression.java
@@ -40,10 +40,12 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
 		setInitializer(init);
 	}
 
+	@Override
 	public CPPASTSimpleTypeConstructorExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTSimpleTypeConstructorExpression copy(CopyStyle style) {
 		CPPASTSimpleTypeConstructorExpression copy = new CPPASTSimpleTypeConstructorExpression();
 		copy.setDeclSpecifier(fDeclSpec == null ? null : fDeclSpec.copy(style));
@@ -55,14 +57,17 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public ICPPASTDeclSpecifier getDeclSpecifier() {
 		return fDeclSpec;
 	}
 
+	@Override
 	public IASTInitializer getInitializer() {
 		return fInitializer;
 	}
 
+	@Override
 	public void setDeclSpecifier(ICPPASTDeclSpecifier declSpec) {
     	assertNotFrozen();
     	fDeclSpec = declSpec;
@@ -72,6 +77,7 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
     	}
     }
 
+	@Override
 	public void setInitializer(IASTInitializer initializer) {
     	assertNotFrozen();
     	fInitializer = initializer;
@@ -81,17 +87,20 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
     	}
     }
 
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
 		if (fType == null) {
 			fType= prvalueType(CPPVisitor.createType(fDeclSpec));
 		}
 		return fType;
 	}
 
+	@Override
 	public boolean isLValue() {
 		return false;
 	}
 	
+	@Override
 	public ValueCategory getValueCategory() {
 		return PRVALUE;
 	}
@@ -122,7 +131,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
         return true;
     }
 
-    @Deprecated
+    @Override
+	@Deprecated
     public int getSimpleType() {
     	IType type= getExpressionType();
     	if (type instanceof ICPPBasicType) {
@@ -158,7 +168,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
 		return t_unspecified;
     }
     
-    @Deprecated
+    @Override
+	@Deprecated
     public void setSimpleType(int value) {
 		CPPASTSimpleDeclSpecifier declspec = new CPPASTSimpleDeclSpecifier();
     	switch(value) {
@@ -206,7 +217,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
     	setDeclSpecifier(declspec);
     }
     
-    @Deprecated
+    @Override
+	@Deprecated
     public IASTExpression getInitialValue() {
     	if (fInitializer instanceof ICPPASTConstructorInitializer) {
     		return ((ICPPASTConstructorInitializer) fInitializer).getExpression();
@@ -214,7 +226,8 @@ public class CPPASTSimpleTypeConstructorExpression extends ASTNode implements
     	return null;
     }
     
-    @Deprecated
+    @Override
+	@Deprecated
     public void setInitialValue(IASTExpression expression) {
     	ICPPASTConstructorInitializer init= new CPPASTConstructorInitializer();
     	init.setExpression(expression);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java
index f500530f862..9a49b0576c5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSimpleTypeTemplateParameter.java
@@ -36,10 +36,12 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS
 		setDefaultType(typeId);
 	}
 	
+	@Override
 	public CPPASTSimpleTypeTemplateParameter copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTSimpleTypeTemplateParameter copy(CopyStyle style) {
 		CPPASTSimpleTypeTemplateParameter copy = new CPPASTSimpleTypeTemplateParameter();
 		copy.fUsesKeywordClass = fUsesKeywordClass;
@@ -53,29 +55,35 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS
 		return copy;
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return fIsParameterPack;
 	}
 
+	@Override
 	public void setIsParameterPack(boolean val) {
 		assertNotFrozen();
 		fIsParameterPack= val;
 	}
 
+	@Override
 	public int getParameterType() {
         return fUsesKeywordClass ? st_class : st_typename;
     }
 
-    public void setParameterType(int value) {
+    @Override
+	public void setParameterType(int value) {
         assertNotFrozen();
         fUsesKeywordClass = value == st_class;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return fName;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.fName = name;
         if (name != null) {
@@ -84,11 +92,13 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS
 		}
     }
 
-    public IASTTypeId getDefaultType() {
+    @Override
+	public IASTTypeId getDefaultType() {
         return fTypeId;
     }
 
-    public void setDefaultType(IASTTypeId typeId) {
+    @Override
+	public void setDefaultType(IASTTypeId typeId) {
         assertNotFrozen();
         this.fTypeId = typeId;
         if (typeId != null) {
@@ -118,6 +128,7 @@ public class CPPASTSimpleTypeTemplateParameter extends ASTNode implements ICPPAS
     	return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (n == fName)
 			return r_declaration;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java
index 6f2a8d8f461..fd3156c670f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTStaticAssertionDeclaration.java
@@ -36,19 +36,23 @@ public class CPPASTStaticAssertionDeclaration extends ASTNode implements ICPPAST
 		}
 	}
 	
+	@Override
 	public IASTExpression getCondition() {
 		return fCondition;
 	}
 
+	@Override
 	public ICPPASTLiteralExpression getMessage() {
 		return fMessage;
 	}
 
 
+	@Override
 	public CPPASTStaticAssertionDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTStaticAssertionDeclaration copy(CopyStyle style) {
 		final IASTExpression condCopy = fCondition == null ? null : fCondition.copy(style);
 		final ICPPASTLiteralExpression msgCopy = fMessage == null ? null : fMessage.copy(style);
@@ -80,7 +84,8 @@ public class CPPASTStaticAssertionDeclaration extends ASTNode implements ICPPAST
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
     	if (child == fCondition) {
     		fCondition= (IASTExpression) other;
     		other.setParent(child.getParent());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java
index 0b63cfc7854..85f983f029b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTSwitchStatement.java
@@ -44,10 +44,12 @@ public class CPPASTSwitchStatement extends ASTNode
 		setBody(body);
 	}
     
-    public CPPASTSwitchStatement copy() {
+    @Override
+	public CPPASTSwitchStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTSwitchStatement copy(CopyStyle style) {
 		CPPASTSwitchStatement copy = new CPPASTSwitchStatement();
 		copy.setControllerDeclaration(controllerDeclaration == null ?
@@ -62,11 +64,13 @@ public class CPPASTSwitchStatement extends ASTNode
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getControllerExpression() {
         return controllerExpression;
     }
 
-    public void setControllerExpression(IASTExpression controller) {
+    @Override
+	public void setControllerExpression(IASTExpression controller) {
         assertNotFrozen();
         this.controllerExpression = controller;
         if (controller != null) {
@@ -76,11 +80,13 @@ public class CPPASTSwitchStatement extends ASTNode
 		}
     }
 
-    public IASTStatement getBody() {
+    @Override
+	public IASTStatement getBody() {
         return body;
     }
     
-    public void setBody(IASTStatement body) {
+    @Override
+	public void setBody(IASTStatement body) {
         assertNotFrozen();
         this.body = body;
         if (body != null) {
@@ -112,7 +118,8 @@ public class CPPASTSwitchStatement extends ASTNode
         return true;
     }
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
 		if (body == child) {
 			other.setPropertyInParent(child.getPropertyInParent());
 			other.setParent(child.getParent());
@@ -126,11 +133,13 @@ public class CPPASTSwitchStatement extends ASTNode
 		}
 	}
 
-    public IASTDeclaration getControllerDeclaration() {
+    @Override
+	public IASTDeclaration getControllerDeclaration() {
         return controllerDeclaration;
     }
 
-    public void setControllerDeclaration(IASTDeclaration d) {
+    @Override
+	public void setControllerDeclaration(IASTDeclaration d) {
         assertNotFrozen();
         controllerDeclaration = d;
         if (d != null) {
@@ -140,6 +149,7 @@ public class CPPASTSwitchStatement extends ASTNode
 		}
     }
 
+	@Override
 	public IScope getScope() {
 		if (scope == null)
             scope = new CPPBlockScope(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java
index 22d37821fef..4f31d51e060 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateDeclaration.java
@@ -89,7 +89,7 @@ public class CPPASTTemplateDeclaration extends ASTNode
     @Override
 	public ICPPASTTemplateParameter[] getTemplateParameters() {
         if (parameters == null) return ICPPASTTemplateParameter.EMPTY_TEMPLATEPARAMETER_ARRAY;
-        parameters = (ICPPASTTemplateParameter[]) ArrayUtil.trimAt(ICPPASTTemplateParameter.class, parameters, parametersPos);
+        parameters = ArrayUtil.trimAt(ICPPASTTemplateParameter.class, parameters, parametersPos);
         return parameters;
     }
 
@@ -97,7 +97,7 @@ public class CPPASTTemplateDeclaration extends ASTNode
 	public void addTemplateParameter(ICPPASTTemplateParameter parm) {
         assertNotFrozen();
     	if (parm != null) {
-    		parameters = (ICPPASTTemplateParameter[]) ArrayUtil.appendAt(ICPPASTTemplateParameter.class, parameters, ++parametersPos, parm);
+    		parameters = ArrayUtil.appendAt(ICPPASTTemplateParameter.class, parameters, ++parametersPos, parm);
     		parm.setParent(this);
 			parm.setPropertyInParent(PARAMETER);
     	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java
index 44c7ab3c778..80941af6f40 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateId.java
@@ -48,10 +48,12 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI
 		setTemplateName(templateName);
 	}
 
+	@Override
 	public CPPASTTemplateId copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTTemplateId copy(CopyStyle style) {
 		CPPASTTemplateId copy = new CPPASTTemplateId(templateName == null ?
 				null : templateName.copy(style));
@@ -64,19 +66,23 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI
 		return copy;
 	}
 
+	@Override
 	public char[] getSimpleID() {
 		return templateName.getSimpleID();
 	}
 
+	@Override
 	public char[] getLookupKey() {
 		return templateName.getLookupKey();
 	}
 	
+	@Override
 	public IASTName getTemplateName() {
         return templateName;
     }
 
-    public void setTemplateName(IASTName name) {
+    @Override
+	public void setTemplateName(IASTName name) {
         assertNotFrozen();
     	assert !(name instanceof ICPPASTQualifiedName) && !(name instanceof ICPPASTTemplateId);
         templateName = name;
@@ -88,28 +94,32 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI
     
     private void internalAddTemplateArgument(IASTNode node) {
 		assertNotFrozen();
-	    templateArguments = (IASTNode[]) ArrayUtil.append(IASTNode.class, templateArguments, node);
+	    templateArguments = ArrayUtil.append(IASTNode.class, templateArguments, node);
 	    if (node != null) {
 	    	node.setParent(this);
 	    	node.setPropertyInParent(TEMPLATE_ID_ARGUMENT);
  		}
     }
 
-    public void addTemplateArgument(IASTTypeId typeId) {
+    @Override
+	public void addTemplateArgument(IASTTypeId typeId) {
     	internalAddTemplateArgument(typeId);
     }
 
-    public void addTemplateArgument(IASTExpression expression) {
+    @Override
+	public void addTemplateArgument(IASTExpression expression) {
     	internalAddTemplateArgument(expression);
     }
     
-    public void addTemplateArgument(ICPPASTAmbiguousTemplateArgument ata) {
+    @Override
+	public void addTemplateArgument(ICPPASTAmbiguousTemplateArgument ata) {
     	internalAddTemplateArgument(ata);
     }
 
-    public IASTNode[] getTemplateArguments() {
+    @Override
+	public IASTNode[] getTemplateArguments() {
         if (templateArguments == null) return ICPPASTTemplateId.EMPTY_ARG_ARRAY;
-        return (IASTNode[]) ArrayUtil.trim(IASTNode.class, templateArguments);
+        return ArrayUtil.trim(IASTNode.class, templateArguments);
     }
 
     @Override
@@ -117,7 +127,8 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI
        return CPPTemplates.createBinding(this);
     }
 
-    public char[] toCharArray() {
+    @Override
+	public char[] toCharArray() {
     	assert sAllowNameComputation;
     	
     	StringBuilder buf= new StringBuilder();
@@ -195,13 +206,15 @@ public class CPPASTTemplateId extends CPPASTNameBase implements ICPPASTTemplateI
 		return true; //for now this seems to be true
 	}
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (n == templateName)
 			return r_reference;
 		return r_unclear;
 	}
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (templateArguments == null) return;
         for (int i = 0; i < templateArguments.length; ++i) {
             if (child == templateArguments[i]) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java
index 84501177ac4..ceeca60f8a8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplateSpecialization.java
@@ -40,10 +40,12 @@ public class CPPASTTemplateSpecialization extends ASTNode implements
 		setDeclaration(declaration);
 	}
 	
+	@Override
 	public CPPASTTemplateSpecialization copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTTemplateSpecialization copy(CopyStyle style) {
 		CPPASTTemplateSpecialization copy = new CPPASTTemplateSpecialization();
 		copy.setDeclaration(declaration == null ? null : declaration.copy(style));
@@ -54,11 +56,13 @@ public class CPPASTTemplateSpecialization extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTDeclaration getDeclaration() {
         return declaration;
     }
 
-    public void setDeclaration(IASTDeclaration declaration) {
+    @Override
+	public void setDeclaration(IASTDeclaration declaration) {
         assertNotFrozen();
         this.declaration = declaration;
         if (declaration != null) {
@@ -89,34 +93,41 @@ public class CPPASTTemplateSpecialization extends ASTNode implements
         return true;
     }
 
+	@Override
 	public boolean isExported() {
 		return false;
 	}
 
+	@Override
 	public void setExported(boolean value) {
         assertNotFrozen();
 	}
 
+	@Override
 	public ICPPASTTemplateParameter[] getTemplateParameters() {
 		return ICPPASTTemplateParameter.EMPTY_TEMPLATEPARAMETER_ARRAY;
 	}
 
+	@Override
 	public void addTemplateParameter(ICPPASTTemplateParameter param) {
         assertNotFrozen();
 	}
 
+	@Override
 	@Deprecated
 	public void addTemplateParamter(ICPPASTTemplateParameter param) {
 		addTemplateParameter(param);
 	}
 
+	@Override
 	public ICPPTemplateScope getScope() {
 		if (templateScope == null)
 			templateScope = new CPPTemplateScope(this);
 		return templateScope;
 	}
     
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (declaration == child) {
             other.setParent(child.getParent());
             other.setPropertyInParent(child.getPropertyInParent());
@@ -124,6 +135,7 @@ public class CPPASTTemplateSpecialization extends ASTNode implements
         }
     }
     
+	@Override
 	public short getNestingLevel() {
 		if (nestingLevel == -1) {
 			CPPTemplates.associateTemplateDeclarations(this);
@@ -132,6 +144,7 @@ public class CPPASTTemplateSpecialization extends ASTNode implements
 		return nestingLevel;
 	}
 
+	@Override
 	public boolean isAssociatedWithLastName() {
 		if (isAssociatedWithLastName == -1)
 			CPPTemplates.associateTemplateDeclarations(this);
@@ -140,10 +153,12 @@ public class CPPASTTemplateSpecialization extends ASTNode implements
 		return isAssociatedWithLastName != 0;
 	}
 	
+	@Override
 	public void setAssociatedWithLastName(boolean value) {
 		isAssociatedWithLastName= value ? (byte) 1 : (byte) 0;
 	}
 
+	@Override
 	public void setNestingLevel(short level) {
 		assert level >= 0;
 		nestingLevel= level;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java
index dab0e9d2ee1..15c83b747e5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTemplatedTypeTemplateParameter.java
@@ -42,10 +42,12 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
 		setDefaultValue(defaultValue);
 	}
 	
+	@Override
 	public CPPASTTemplatedTypeTemplateParameter copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 
+	@Override
 	public CPPASTTemplatedTypeTemplateParameter copy(CopyStyle style) {
 		CPPASTTemplatedTypeTemplateParameter copy = new CPPASTTemplatedTypeTemplateParameter();
 		copy.setName(fName == null ? null : fName.copy(style));
@@ -60,22 +62,25 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public ICPPASTTemplateParameter[] getTemplateParameters() {
 		if (fNestedParameters == null)
 			return ICPPASTTemplateParameter.EMPTY_TEMPLATEPARAMETER_ARRAY;
-		fNestedParameters = (ICPPASTTemplateParameter[]) ArrayUtil.trim(ICPPASTTemplateParameter.class, fNestedParameters);
+		fNestedParameters = ArrayUtil.trim(ICPPASTTemplateParameter.class, fNestedParameters);
 		return fNestedParameters;
 	}
 
+	@Override
 	@Deprecated
 	public void addTemplateParamter(ICPPASTTemplateParameter param) {
 		addTemplateParameter(param);
 	}
 
+	@Override
 	public void addTemplateParameter(ICPPASTTemplateParameter param) {
 		assertNotFrozen();
 		if (param != null) {
-			fNestedParameters = (ICPPASTTemplateParameter[]) ArrayUtil.append(ICPPASTTemplateParameter.class,
+			fNestedParameters = ArrayUtil.append(ICPPASTTemplateParameter.class,
 					fNestedParameters, param);
 			param.setParent(this);
 			param.setPropertyInParent(PARAMETER);
@@ -83,20 +88,24 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
 	}
 
 	
-    public void setIsParameterPack(boolean val) {
+    @Override
+	public void setIsParameterPack(boolean val) {
     	assertNotFrozen();
     	fIsParameterPack= val;
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return fIsParameterPack;
 	}
 
+	@Override
 	public IASTName getName() {
         return fName;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.fName =name;
         if (name != null) {
@@ -105,11 +114,13 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
 		}
     }
 
-    public IASTExpression getDefaultValue() {
+    @Override
+	public IASTExpression getDefaultValue() {
         return fDefaultValue;
     }
 
-    public void setDefaultValue(IASTExpression expression) {
+    @Override
+	public void setDefaultValue(IASTExpression expression) {
         assertNotFrozen();
         this.fDefaultValue = expression;
         if (expression != null) {
@@ -144,13 +155,15 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
 		return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( n == fName )
 			return r_declaration;
 		return r_unclear;
 	}
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( child == fDefaultValue )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
@@ -159,6 +172,7 @@ public class CPPASTTemplatedTypeTemplateParameter extends ASTNode implements
         }
     }
 
+	@Override
 	public ICPPScope asScope() {
 		if (fScope == null) {
 			fScope= new CPPTemplateTemplateParameterScope(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java
index 35f0d416135..047dc89a429 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTranslationUnit.java
@@ -128,7 +128,7 @@ public class CPPASTTranslationUnit extends ASTTranslationUnit implements ICPPAST
                 names[i] = null;
         }
     	// nulls can be anywhere, don't use trim()
-        return (IASTName[]) ArrayUtil.removeNulls(IASTName.class, names);
+        return ArrayUtil.removeNulls(IASTName.class, names);
     }
 
     @Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java
index 7a95c23dcd1..f41cb4312c5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTryBlockStatement.java
@@ -33,10 +33,12 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS
 		setTryBody(tryBody);
 	}
 
+	@Override
 	public CPPASTTryBlockStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTTryBlockStatement copy(CopyStyle style) {
 		CPPASTTryBlockStatement copy = new CPPASTTryBlockStatement(tryBody == null ? null
 				: tryBody.copy(style));
@@ -49,19 +51,21 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS
 		return copy;
 	}
 
+	@Override
 	public void addCatchHandler(ICPPASTCatchHandler statement) {
         assertNotFrozen();
     	if (statement != null) {
-    		catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.appendAt( ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement );
+    		catchHandlers = ArrayUtil.appendAt( ICPPASTCatchHandler.class, catchHandlers, ++catchHandlersPos, statement );
     		statement.setParent(this);
 			statement.setPropertyInParent(CATCH_HANDLER);
     	}
     }
 
 
-    public ICPPASTCatchHandler[] getCatchHandlers() {
+    @Override
+	public ICPPASTCatchHandler[] getCatchHandlers() {
         if( catchHandlers == null ) return ICPPASTCatchHandler.EMPTY_CATCHHANDLER_ARRAY;
-        catchHandlers = (ICPPASTCatchHandler[]) ArrayUtil.trimAt( ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos );
+        catchHandlers = ArrayUtil.trimAt( ICPPASTCatchHandler.class, catchHandlers, catchHandlersPos );
         return catchHandlers;
     }
 
@@ -70,7 +74,8 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS
     private int catchHandlersPos=-1;
     private IASTStatement tryBody;
 
-    public void setTryBody(IASTStatement tryBlock) {
+    @Override
+	public void setTryBody(IASTStatement tryBlock) {
         assertNotFrozen();
         tryBody = tryBlock;
         if (tryBlock != null) {
@@ -80,7 +85,8 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS
     }
 
  
-    public IASTStatement getTryBody() {
+    @Override
+	public IASTStatement getTryBody() {
         return tryBody;
     }
 
@@ -110,7 +116,8 @@ public class CPPASTTryBlockStatement extends ASTNode implements ICPPASTTryBlockS
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if( tryBody == child )
         {
             other.setPropertyInParent( child.getPropertyInParent() );
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java
index e21f50f95ff..94e2f84d37f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdExpression.java
@@ -33,10 +33,12 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr
 		setTypeId(typeId);
 	}
 
+	@Override
 	public CPPASTTypeIdExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTTypeIdExpression copy(CopyStyle style) {
 		CPPASTTypeIdExpression copy = new CPPASTTypeIdExpression(op, typeId == null ? null
 				: typeId.copy(style));
@@ -47,16 +49,19 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr
 		return copy;
 	}
 
+	@Override
 	public int getOperator() {
         return op;
     }
 
-    public void setOperator(int value) {
+    @Override
+	public void setOperator(int value) {
         assertNotFrozen();
         this.op = value;
     }
 
-    public void setTypeId(IASTTypeId typeId) {
+    @Override
+	public void setTypeId(IASTTypeId typeId) {
         assertNotFrozen();
        this.typeId = typeId;
        if (typeId != null) {
@@ -65,7 +70,8 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr
        } 
     }
 
-    public IASTTypeId getTypeId() {
+    @Override
+	public IASTTypeId getTypeId() {
         return typeId;
     }
 
@@ -91,6 +97,7 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr
         return true;
     }
     
+	@Override
 	public IType getExpressionType() {
 		switch (getOperator()) {
 		case op_sizeof:
@@ -117,6 +124,7 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr
 		return CPPVisitor.createType(getTypeId());
 	}
 
+	@Override
 	public boolean isLValue() {
 		switch (getOperator()) {
 		case op_typeid:
@@ -125,6 +133,7 @@ public class CPPASTTypeIdExpression extends ASTNode implements ICPPASTTypeIdExpr
 		return false;
 	}
 
+	@Override
 	public ValueCategory getValueCategory() {
 		return isLValue() ? LVALUE : PRVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java
index e54ddbc4b10..17edd3c2d88 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypeIdInitializerExpression.java
@@ -31,16 +31,19 @@ public class CPPASTTypeIdInitializerExpression extends ASTTypeIdInitializerExpre
 		super(typeId, initializer);
 	}
 
+	@Override
 	public IASTTypeIdInitializerExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public IASTTypeIdInitializerExpression copy(CopyStyle style) {
 		CPPASTTypeIdInitializerExpression expr = new CPPASTTypeIdInitializerExpression();
 		initializeCopy(expr, style);
 		return expr;
 	}
 
+	@Override
 	public IType getExpressionType() {
 		final IASTTypeId typeId = getTypeId();
 		return prvalueType(CPPVisitor.createType(typeId.getAbstractDeclarator()));
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java
index 4046ed7eb19..ff1ade59140 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTTypenameExpression.java
@@ -50,13 +50,15 @@ public class CPPASTTypenameExpression extends CPPASTSimpleTypeConstructorExpress
 		return copy;
 	}
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
     	CPPASTNamedTypeSpecifier spec= new CPPASTNamedTypeSpecifier(name);
     	spec.setOffsetAndLength(this);
     	setDeclSpecifier(spec);
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
     	IASTDeclSpecifier spec= getDeclSpecifier();
     	if (spec instanceof ICPPASTNamedTypeSpecifier) {
     		return ((ICPPASTNamedTypeSpecifier) spec).getName();
@@ -64,16 +66,19 @@ public class CPPASTTypenameExpression extends CPPASTSimpleTypeConstructorExpress
     	return null;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (n == getName())
 			return r_reference;
 		return r_unclear;
 	}
 
+	@Override
 	@Deprecated
 	public void setIsTemplate(boolean val) {
     }
 
+	@Override
 	@Deprecated
     public boolean isTemplate() {
         return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java
index 1905933da34..b8b983c5b38 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUnaryExpression.java
@@ -62,10 +62,12 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 		setOperand(operand);
 	}
 
+	@Override
 	public CPPASTUnaryExpression copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTUnaryExpression copy(CopyStyle style) {
 		CPPASTUnaryExpression copy = new CPPASTUnaryExpression(op, operand == null ? null
 				: operand.copy(style));
@@ -76,20 +78,24 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 		return copy;
 	}
 
+	@Override
 	public int getOperator() {
         return op;
     }
 
-    public void setOperator(int operator) {
+    @Override
+	public void setOperator(int operator) {
         assertNotFrozen();
         op = operator;
     }
 
-    public IASTExpression getOperand() {
+    @Override
+	public IASTExpression getOperand() {
         return operand;
     }
 
-    public void setOperand(IASTExpression expression) {
+    @Override
+	public void setOperand(IASTExpression expression) {
         assertNotFrozen();
         operand = expression;
         if (expression != null) {
@@ -105,7 +111,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
     /**
      * @see org.eclipse.cdt.core.dom.ast.IASTImplicitNameOwner#getImplicitNames()
      */
-    public IASTImplicitName[] getImplicitNames() {
+    @Override
+	public IASTImplicitName[] getImplicitNames() {
 		if (implicitNames == null) {
 			ICPPFunction overload = getOverload();
 			if (overload == null || overload instanceof CPPImplicitFunction) {
@@ -161,7 +168,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
         return true;
     }
 
-    public void replace(IASTNode child, IASTNode other) {
+    @Override
+	public void replace(IASTNode child, IASTNode other) {
         if (child == operand) {
             other.setPropertyInParent(child.getPropertyInParent());
             other.setParent(child.getParent());
@@ -211,7 +219,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 		return null;
     }
 
-    public IType getExpressionType() {
+    @Override
+	public IType getExpressionType() {
     	final int op= getOperator();
 		switch (op) {
 		case op_sizeof:
@@ -286,7 +295,8 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 		return typeOfOperand;
     }
 
-    public ValueCategory getValueCategory() {
+    @Override
+	public ValueCategory getValueCategory() {
     	final int op= getOperator();
 		switch (op) {
 		case op_typeid:
@@ -315,6 +325,7 @@ public class CPPASTUnaryExpression extends ASTNode implements ICPPASTUnaryExpres
 		return PRVALUE;
     }
     
+	@Override
 	public boolean isLValue() {
 		return getValueCategory() == LVALUE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java
index 42da29c2247..f90cf8b82c2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDeclaration.java
@@ -38,10 +38,12 @@ public class CPPASTUsingDeclaration extends ASTNode
 		setName(name);	
 	}
 
+	@Override
 	public CPPASTUsingDeclaration copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTUsingDeclaration copy(CopyStyle style) {
 		CPPASTUsingDeclaration copy = new CPPASTUsingDeclaration(name == null ? null
 				: name.copy(style));
@@ -53,20 +55,24 @@ public class CPPASTUsingDeclaration extends ASTNode
 		return copy;
 	}
 
+	@Override
 	public void setIsTypename(boolean value) {
         assertNotFrozen();
         this.typeName = value;
     }
 
-    public boolean isTypename() {
+    @Override
+	public boolean isTypename() {
         return typeName;
     }
 
-    public IASTName getName() {
+    @Override
+	public IASTName getName() {
         return name;
     }
 
-    public void setName(IASTName name) {
+    @Override
+	public void setName(IASTName name) {
         assertNotFrozen();
         this.name = name;
         if (name != null) {
@@ -97,12 +103,14 @@ public class CPPASTUsingDeclaration extends ASTNode
         return true;
     }
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if (n == name)
 			return r_declaration;
 		return r_unclear;
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 		List<IBinding> filtered = new ArrayList<IBinding>();
@@ -121,6 +129,7 @@ public class CPPASTUsingDeclaration extends ASTNode
 		return name.toString();
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java
index 0ef0d20e50d..cc6cbb3f92e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTUsingDirective.java
@@ -36,10 +36,12 @@ public class CPPASTUsingDirective extends ASTNode implements
 		setQualifiedName(name);
 	}
 
+	@Override
 	public CPPASTUsingDirective copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTUsingDirective copy(CopyStyle style) {
 		CPPASTUsingDirective copy = new CPPASTUsingDirective(name == null ? null : name.copy(style));
 		copy.setOffsetAndLength(this);
@@ -49,11 +51,13 @@ public class CPPASTUsingDirective extends ASTNode implements
 		return copy;
 	}
 
+	@Override
 	public IASTName getQualifiedName() {
         return name;
     }
 
-    public void setQualifiedName(IASTName qualifiedName) {
+    @Override
+	public void setQualifiedName(IASTName qualifiedName) {
         assertNotFrozen();
         this.name = qualifiedName;
         if (qualifiedName != null) {
@@ -86,12 +90,14 @@ public class CPPASTUsingDirective extends ASTNode implements
     }
 
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		if( n == name )
 			return r_reference;
 		return r_unclear;
 	}
 
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix, String[] namespaces) {
 		IBinding[] bindings = CPPSemantics.findBindingsForContentAssist(n, isPrefix, namespaces);
 		List<IBinding> filtered = new ArrayList<IBinding>();
@@ -105,6 +111,7 @@ public class CPPASTUsingDirective extends ASTNode implements
 		return filtered.toArray(new IBinding[filtered.size()]);
 	}
 	
+	@Override
 	public IBinding[] findBindings(IASTName n, boolean isPrefix) {
 		return findBindings(n, isPrefix, null);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java
index de7af9f7dbe..d9847a9dfaa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTVisibilityLabel.java
@@ -29,10 +29,12 @@ public class CPPASTVisibilityLabel extends ASTNode implements ICPPASTVisibilityL
 		this.visibility = visibility;
 	}
 
+	@Override
 	public CPPASTVisibilityLabel copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
 	
+	@Override
 	public CPPASTVisibilityLabel copy(CopyStyle style) {
 		CPPASTVisibilityLabel copy = new CPPASTVisibilityLabel(visibility);
 		copy.setOffsetAndLength(this);
@@ -42,11 +44,13 @@ public class CPPASTVisibilityLabel extends ASTNode implements ICPPASTVisibilityL
 		return copy;
 	}
 
+	@Override
 	public int getVisibility() {
         return visibility;
     }
 
-    public void setVisibility(int visibility) {
+    @Override
+	public void setVisibility(int visibility) {
         assertNotFrozen();
         this.visibility = visibility;
     }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java
index b28b6fc5169..96fb06b9267 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPASTWhileStatement.java
@@ -44,10 +44,12 @@ public class CPPASTWhileStatement extends ASTNode
 		setBody(body);
 	}
 
-    public CPPASTWhileStatement copy() {
+    @Override
+	public CPPASTWhileStatement copy() {
 		return copy(CopyStyle.withoutLocations);
 	}
     
+	@Override
 	public CPPASTWhileStatement copy(CopyStyle style) {
 		CPPASTWhileStatement copy = new CPPASTWhileStatement();
 		copy.setConditionDeclaration(condition2 == null ? null : condition2.copy(style));
@@ -60,11 +62,13 @@ public class CPPASTWhileStatement extends ASTNode
 		return copy;
 	}
 
+	@Override
 	public IASTExpression getCondition() {
         return condition;
     }
 
-    public void setCondition(IASTExpression condition) {
+    @Override
+	public void setCondition(IASTExpression condition) {
         assertNotFrozen();
         this.condition = condition;
         if (condition != null) {
@@ -74,11 +78,13 @@ public class CPPASTWhileStatement extends ASTNode
 		}
     }
 
-    public IASTStatement getBody() {
+    @Override
+	public IASTStatement getBody() {
         return body;
     }
 
-    public void setBody(IASTStatement body) {
+    @Override
+	public void setBody(IASTStatement body) {
         assertNotFrozen();
         this.body = body;
         if (body != null) {
@@ -87,10 +93,12 @@ public class CPPASTWhileStatement extends ASTNode
 		}
     }
 
+	@Override
 	public IASTDeclaration getConditionDeclaration() {
 		return condition2;
 	}
 
+	@Override
 	public void setConditionDeclaration(IASTDeclaration declaration) {
         assertNotFrozen();
 		condition2 = declaration;
@@ -124,6 +132,7 @@ public class CPPASTWhileStatement extends ASTNode
         return true;
     }
     
+	@Override
 	public void replace(IASTNode child, IASTNode other) {
 		if (body == child) {
 			other.setPropertyInParent(child.getPropertyInParent());
@@ -139,6 +148,7 @@ public class CPPASTWhileStatement extends ASTNode
 		}
 	}
 
+	@Override
 	public IScope getScope() {
 		if (scope == null)
             scope = new CPPBlockScope(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java
index 91f033144aa..52d9d8e6892 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPArrayType.java
@@ -39,16 +39,19 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy
     	setType(type);
     }
     
-    public IType getType() {
+    @Override
+	public IType getType() {
         return type;
     }
     
-    public void setType(IType t) {
+    @Override
+	public void setType(IType t) {
     	assert t != null;
         this.type = t;
     }
     
-    public boolean isSameType(IType obj) {
+    @Override
+	public boolean isSameType(IType obj) {
         if (obj == this)
             return true;
         if (obj instanceof ITypedef)
@@ -72,7 +75,8 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy
     	return false;
     }
 
-    public IValue getSize() {
+    @Override
+	public IValue getSize() {
     	if (value != Value.NOT_INITIALIZED)
     		return value;
     	
@@ -82,7 +86,8 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy
     	return value= Value.create(sizeExpression, Value.MAX_RECURSION_DEPTH);
     }
     
-    @Deprecated
+    @Override
+	@Deprecated
     public IASTExpression getArraySizeExpression() {
         return sizeExpression;
     }
@@ -103,6 +108,7 @@ public class CPPArrayType implements IArrayType, ITypeContainer, ISerializableTy
 		return ASTTypeUtil.getType(this);
 	}
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		final byte firstByte = ITypeMarshalBuffer.ARRAY;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java
index 5304995672b..7963c9d8979 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBaseClause.java
@@ -37,7 +37,8 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBase#getBaseClass()
      */
-    public IBinding getBaseClass() {
+    @Override
+	public IBinding getBaseClass() {
 		if (baseClass == null) {
 	    	IBinding b = base.getName().resolveBinding();
 	    	if (b instanceof IProblemBinding) {
@@ -60,7 +61,8 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBase#getVisibility()
      */
-    public int getVisibility() {
+    @Override
+	public int getVisibility() {
 		int vis = base.getVisibility();
 		
 		if (vis == 0) {
@@ -77,14 +79,17 @@ public class CPPBaseClause implements ICPPBase, ICPPInternalBase {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBase#isVirtual()
      */
-    public boolean isVirtual() {
+    @Override
+	public boolean isVirtual() {
         return base.isVirtual();
     }
 
+	@Override
 	public void setBaseClass(IBinding cls) {
 		baseClass = cls;
 	}
 
+	@Override
 	public IName getBaseClassSpecifierName() {
 		return base.getName();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java
index 3e993262cad..1a96060d666 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBasicType.java
@@ -97,6 +97,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType {
 		}
 	}
 
+	@Override
 	public boolean isSameType(IType object) {
 		if (object == this)
 			return true;
@@ -118,34 +119,42 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType {
 		return fModifiers == t.getModifiers();
 	}
 
+	@Override
 	public Kind getKind() {
 		return fKind;
 	}
 	
+	@Override
 	public boolean isSigned() {
 		return (fModifiers & IS_SIGNED) != 0;
 	}
 
+	@Override
 	public boolean isUnsigned() {
 		return (fModifiers & IS_UNSIGNED) != 0;
 	}
 
+	@Override
 	public boolean isShort() {
 		return (fModifiers & IS_SHORT) != 0;
 	}
 
+	@Override
 	public boolean isLong() {
 		return (fModifiers & IS_LONG) != 0;
 	}
 
+	@Override
 	public boolean isLongLong() {
 		return (fModifiers & IS_LONG_LONG) != 0;
 	}
 
+	@Override
 	public boolean isComplex() {
 		return (fModifiers & IS_COMPLEX) != 0;
 	}
 
+	@Override
 	public boolean isImaginary() {
 		return (fModifiers & IS_IMAGINARY) != 0;
 	}
@@ -172,6 +181,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType {
 		return fExpression;
 	}
 	
+	@Override
 	public int getModifiers() {
 		return fModifiers;
 	}
@@ -181,6 +191,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType {
 		return ASTTypeUtil.getType(this);
 	}
 	
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		final int kind= getKind().ordinal();
 		final int shiftedKind=  kind * ITypeMarshalBuffer.FLAG1;
@@ -207,11 +218,13 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType {
 		return new CPPBasicType(Kind.values()[kind], modifiers);
 	}
 
+	@Override
 	@Deprecated
 	public int getQualifierBits() {
 		return getModifiers();
 	}
 
+	@Override
 	@Deprecated
 	public int getType() {
 		switch (fKind) {
@@ -240,6 +253,7 @@ public class CPPBasicType implements ICPPBasicType, ISerializableType {
     /**
      * @deprecated types don't have values
      */
+	@Override
 	@Deprecated
 	public IASTExpression getValue() {
 		return fExpression;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java
index 985117457bc..f1f9c2e2c9c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPBuiltinParameter.java
@@ -40,74 +40,92 @@ public class CPPBuiltinParameter extends PlatformObject implements ICPPParameter
         this.type = type;
     }
 
-    public IType getType() {
+    @Override
+	public IType getType() {
         return type;
     }
 
-    public boolean isStatic() {
+    @Override
+	public boolean isStatic() {
         return false;
     }
 
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         return false;
     }
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
 
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         return false;
     }
 
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         return false;
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
         return ""; //$NON-NLS-1$
     }
 
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
     	return CharArrayUtils.EMPTY;
     }
 
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         return null;
     }
 
-    public boolean hasDefaultValue() {
+    @Override
+	public boolean hasDefaultValue() {
         return false;
     }
 
-    public boolean isMutable() {
+    @Override
+	public boolean isMutable() {
         return false;
     }
 
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return new String[0];
     }
 
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return new char[0][];
     }
 
-    public boolean isGloballyQualified() {
+    @Override
+	public boolean isGloballyQualified() {
         return false;
     }
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return null;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java
index 9385af855e6..06b679f4c7b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassInstance.java
@@ -38,10 +38,12 @@ public class CPPClassInstance extends CPPClassSpecialization implements ICPPTemp
 		this.arguments= args;
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return (ICPPTemplateDefinition) getSpecializedBinding();
 	}
 	
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return arguments;
 	}
@@ -57,10 +59,12 @@ public class CPPClassInstance extends CPPClassSpecialization implements ICPPTemp
 		return super.getSpecializationScope();
 	}
 
+	@Override
 	public boolean isExplicitSpecialization() {
 		return !(getCompositeScope() instanceof ICPPClassSpecializationScope);
 	}
 
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return CPPTemplates.getArguments(getTemplateArguments());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
index 6d9718665e8..b325b1a406a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassScope.java
@@ -249,16 +249,16 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
 	    if ((!prefixLookup && CharArrayUtils.equals(c, compName.getLookupKey()))
 				|| (prefixLookup && ContentAssistMatcherFactory.getInstance().match(c, compName.getLookupKey()))) {
 	        if (shallReturnConstructors(name, prefixLookup)) {
-	            result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result, getConstructors(name, resolve));
+	            result = ArrayUtil.addAll(IBinding.class, result, getConstructors(name, resolve));
 	        }
             //9.2 ... The class-name is also inserted into the scope of the class itself
-            result = (IBinding[]) ArrayUtil.append(IBinding.class, result, compName.resolveBinding());
+            result = ArrayUtil.append(IBinding.class, result, compName.resolveBinding());
             if (!prefixLookup)
-            	return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+            	return ArrayUtil.trim(IBinding.class, result);
 	    }
-	    result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result,
+	    result = ArrayUtil.addAll(IBinding.class, result,
 	    		super.getBindings(name, resolve, prefixLookup, fileSet, checkPointOfDecl));
-	    return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+	    return ArrayUtil.trim(IBinding.class, result);
 	}
 
 	static protected boolean shouldResolve(boolean force, IASTName candidate, IASTName forName) {
@@ -295,7 +295,7 @@ public class CPPClassScope extends CPPScope implements ICPPClassScope {
         				IASTName n = (IASTName) obj;
         				binding = shouldResolve(forceResolve, n, forName) ? n.resolveBinding() : n.getBinding();
         				if (binding instanceof ICPPConstructor) {
-    						bs = (IBinding[]) ArrayUtil.append(ICPPConstructor.class, bs, binding);
+    						bs = ArrayUtil.append(ICPPConstructor.class, bs, binding);
         				}
         			} else if (obj instanceof ICPPConstructor) {
 						bs = (IBinding[]) ArrayUtil.append(ICPPConstructor.class, bs, obj);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
index 53a3453f8be..38fd986516f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
@@ -54,6 +54,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return (ICPPClassType) super.getSpecializedBinding();
 	}
 	
+	@Override
 	public IBinding specializeMember(IBinding original) {		
 		synchronized(this) {
 			IBinding result= (IBinding) specializationMap.get(original);
@@ -73,10 +74,12 @@ public class CPPClassSpecialization extends CPPSpecialization
 		}
 	}
 	
+	@Override
 	public void checkForDefinition() {
 		// Ambiguity resolution ensures that declarations and definitions are resolved.
 	}
 
+	@Override
 	public ICPPASTCompositeTypeSpecifier getCompositeTypeSpecifier() {
 		IASTNode definition= getDefinition();
 		if (definition != null) {
@@ -89,6 +92,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return null;
 	}
 	
+	@Override
 	public ICPPBase[] getBases() {
 		ICPPClassSpecializationScope scope= getSpecializationScope();
 		if (scope == null)
@@ -97,6 +101,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return scope.getBases();
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		ICPPClassSpecializationScope scope= getSpecializationScope();
 		if (scope == null)
@@ -105,6 +110,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return scope.getDeclaredFields();
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		ICPPClassSpecializationScope scope= getSpecializationScope();
 		if (scope == null)
@@ -113,6 +119,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return scope.getDeclaredMethods();
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		ICPPClassSpecializationScope scope= getSpecializationScope();
 		if (scope == null)
@@ -121,6 +128,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return scope.getConstructors();
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		ICPPClassSpecializationScope scope= getSpecializationScope();
 		if (scope == null)
@@ -129,6 +137,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return scope.getFriends();
 	}
 	
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		ICPPClassSpecializationScope scope= getSpecializationScope();
 		if (scope == null)
@@ -137,18 +146,22 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return scope.getNestedClasses();
 	}
 
+	@Override
 	public IField[] getFields() {
 		return ClassTypeHelper.getFields(this);
 	}
 
+	@Override
 	public IField findField(String name) {
 		return ClassTypeHelper.findField(this, name);
 	}
 
+	@Override
 	public ICPPMethod[] getMethods() {
 		return ClassTypeHelper.getMethods(this);
 	}
 
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ClassTypeHelper.getAllDeclaredMethods(this);
 	}
@@ -156,6 +169,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getKey()
 	 */
+	@Override
 	public int getKey() {
 		if (getDefinition() != null)
 			return getCompositeTypeSpecifier().getKey();
@@ -166,6 +180,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getCompositeScope()
 	 */
+	@Override
 	public ICPPClassScope getCompositeScope() {
 		final ICPPClassScope specScope= getSpecializationScope();
 		if (specScope != null)
@@ -193,6 +208,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType)
 	 */
+	@Override
 	public boolean isSameType(IType type) {
 		if (type == this)
 			return true;
@@ -211,6 +227,7 @@ public class CPPClassSpecialization extends CPPSpecialization
 		return this;
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		if (getNameCharArray().length > 0) 
 			return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java
index dbf7c43a78b..03a10702570 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplate.java
@@ -61,7 +61,7 @@ public class CPPClassTemplate extends CPPTemplateDefinition implements ICPPClass
 	
 	@Override
 	public void addPartialSpecialization(ICPPClassTemplatePartialSpecialization spec) {
-		partialSpecializations = (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.append(
+		partialSpecializations = ArrayUtil.append(
 				ICPPClassTemplatePartialSpecialization.class, partialSpecializations, spec);
 	}
 
@@ -139,7 +139,7 @@ public class CPPClassTemplate extends CPPTemplateDefinition implements ICPPClass
 				}
 			}
 		}
-		partialSpecializations = (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.trim(ICPPClassTemplatePartialSpecialization.class, partialSpecializations);
+		partialSpecializations = ArrayUtil.trim(ICPPClassTemplatePartialSpecialization.class, partialSpecializations);
 		return partialSpecializations;
 	}
 	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java
index fb2ff50d687..600d625863b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecialization.java
@@ -39,6 +39,7 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate
 		super(name);
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() throws DOMException {
 		if (arguments == null) {
 			arguments= CPPTemplates.createTemplateArgumentArray((ICPPASTTemplateId) getTemplateName());
@@ -49,15 +50,18 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassTemplatePartialSpecialization#getPrimaryClassTemplate()
 	 */
+	@Override
 	public ICPPClassTemplate getPrimaryClassTemplate() {
 		ICPPASTTemplateId id = (ICPPASTTemplateId) getTemplateName();
 		return (ICPPClassTemplate) id.getTemplateName().resolveBinding();
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return getPrimaryClassTemplate();
 	}
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		try {
 			return CPPTemplates.createParameterMap(getPrimaryClassTemplate(), getTemplateArguments());
@@ -80,11 +84,13 @@ public class CPPClassTemplatePartialSpecialization extends CPPClassTemplate
 		}
 	}
 	
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return CPPTemplates.getArgumentMap(getPrimaryClassTemplate(), getTemplateParameterMap());
 	}
 	
+	@Override
 	@Deprecated
 	public IType[] getArguments() throws DOMException {
 		return CPPTemplates.getArguments(getTemplateArguments());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java
index 3cdf86e5091..08dfc43baae 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassType.java
@@ -57,39 +57,51 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		public CPPClassTypeProblem(IASTNode node, int id, char[] arg) {
 			super(node, id, arg);
 		}
+		@Override
 		public ICPPBase[] getBases() {
 			return ICPPBase.EMPTY_BASE_ARRAY;
 		}
+		@Override
 		public IField[] getFields() {
 			return IField.EMPTY_FIELD_ARRAY;
 		}
+		@Override
 		public ICPPField[] getDeclaredFields() {
 			return ICPPField.EMPTY_CPPFIELD_ARRAY;
 		}
+		@Override
 		public ICPPMethod[] getMethods() {
 			return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 		}
+		@Override
 		public ICPPMethod[] getAllDeclaredMethods() {
 			return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 		}
+		@Override
 		public ICPPMethod[] getDeclaredMethods() {
 			return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 		}
+		@Override
 		public ICPPConstructor[] getConstructors() {
 			return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
 		}
+		@Override
 		public int getKey() {
 			return k_class;
 		}
+		@Override
 		public IField findField(String name) {
 			return null;
 		}
+		@Override
 		public IScope getCompositeScope() {
 			return this;
 		}
+		@Override
 		public IBinding[] getFriends() {
 			return IBinding.EMPTY_BINDING_ARRAY;
 		}
+		@Override
 		public ICPPClassType[] getNestedClasses() {
 			return ICPPClassType.EMPTY_CLASS_ARRAY;
 		}
@@ -119,14 +131,17 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		}
 	}
 
+	@Override
 	public IASTNode[] getDeclarations() {
 		return declarations;
 	}
 
+	@Override
 	public IASTNode getDefinition() {
 		return definition;
 	}
 
+	@Override
 	public void checkForDefinition() {
 		// Ambiguity resolution ensures that definitions are resolved.
 		if (!checked) {
@@ -140,6 +155,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		}
 	}
 
+	@Override
 	public ICPPASTCompositeTypeSpecifier getCompositeTypeSpecifier() {
 		if (definition != null) {
 			IASTNode node = definition;
@@ -162,14 +178,17 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return null;
 	}
 
+	@Override
 	public final String getName() {
 		return new String(getNameCharArray());
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return (definition != null) ? definition.getSimpleID() : declarations[0].getSimpleID();
 	}
 
+	@Override
 	public IScope getScope() {
 		IASTName name = definition != null ? definition : declarations[0];
 
@@ -191,6 +210,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return scope;
 	}
 
+	@Override
 	public ICPPClassScope getCompositeScope() {
 		checkForDefinition();
 		if (definition != null) {
@@ -209,6 +229,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return definition != null ? (IASTNode) definition : declarations[0];
 	}
 
+	@Override
 	public int getKey() {
 		if (definition != null)
 			return getCompositeTypeSpecifier().getKey();
@@ -216,6 +237,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return getElaboratedTypeSpecifier().getKind();
 	}
 
+	@Override
 	public void addDefinition(IASTNode node) {
 		if (node instanceof ICPPASTCompositeTypeSpecifier) {
 			definition = ((ICPPASTCompositeTypeSpecifier)node).getName();
@@ -224,6 +246,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		}
 	}
 	
+	@Override
 	public void addDeclaration(IASTNode node) {
 		if (node instanceof ICPPASTElaboratedTypeSpecifier) {
 			IASTName name = ((ICPPASTElaboratedTypeSpecifier) node).getName();
@@ -235,23 +258,26 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 
 			// Keep the lowest offset declaration in [0]
 			if (declarations.length > 0 && ((ASTNode)node).getOffset() < ((ASTNode) declarations[0]).getOffset()) {
-				declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name);
+				declarations = ArrayUtil.prepend(IASTName.class, declarations, name);
 			} else {
-				declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name);
+				declarations = ArrayUtil.append(IASTName.class, declarations, name);
 			}
 		} else {
 			assert false;
 		}
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return CPPVisitor.getQualifiedName(this);
 	}
 
+	@Override
 	public char[][] getQualifiedNameCharArray() {
 		return CPPVisitor.getQualifiedNameCharArray(this);
 	}
 
+	@Override
 	public boolean isGloballyQualified() throws DOMException {
 		IScope scope = getScope();
 		while (scope != null) {
@@ -262,10 +288,12 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return true;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 	
+	@Override
 	public boolean isSameType(IType type) {
 		if (type == this)
 			return true;
@@ -274,42 +302,52 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return false;
 	}
 	
+	@Override
 	public ICPPBase[] getBases() {
 		return ClassTypeHelper.getBases(this);
 	}
 
+	@Override
 	public IField[] getFields() {
 		return ClassTypeHelper.getFields(this);
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		return ClassTypeHelper.getDeclaredFields(this);
 	}
 
+	@Override
 	public ICPPMethod[] getMethods() {
 		return ClassTypeHelper.getMethods(this);
 	}
 
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ClassTypeHelper.getAllDeclaredMethods(this);
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		return ClassTypeHelper.getDeclaredMethods(this);
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		return ClassTypeHelper.getConstructors(this);
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		return ClassTypeHelper.getFriends(this);
 	}
 	
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		return ClassTypeHelper.getNestedClasses(this);
 	}
 
+	@Override
 	public IField findField(String name) {
 		return ClassTypeHelper.findField(this, name);
 	}
@@ -331,6 +369,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return getName(); 
 	}
 
+	@Override
 	public IBinding getOwner() {
 		if (definition != null) {
 			return CPPVisitor.findNameOwner(definition, true);
@@ -338,6 +377,7 @@ public class CPPClassType extends PlatformObject implements ICPPInternalClassTyp
 		return CPPVisitor.findDeclarationOwner(declarations[0], true);
 	}
 	
+	@Override
 	public boolean isAnonymous() {
 		if (getNameCharArray().length > 0) 
 			return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java
index 7a702e36aa8..5b544f74265 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClosureType.java
@@ -171,18 +171,22 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 		return IType.EMPTY_TYPE_ARRAY;
 	}
 	
+	@Override
 	public final String getName() {
 		return ""; //$NON-NLS-1$
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return CharArrayUtils.EMPTY;
 	}
 
+	@Override
 	public IScope getScope() {
 		return CPPVisitor.getContainingScope(fLambdaExpression);
 	}
 
+	@Override
 	public ICPPClassScope getCompositeScope() {
 		if (fScope == null) {
 			fScope= new ClassScope();
@@ -190,26 +194,32 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 		return fScope;
 	}
 
+	@Override
 	public int getKey() {
 		return k_class;
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return CPPVisitor.getQualifiedName(this);
 	}
 
+	@Override
 	public char[][] getQualifiedNameCharArray() {
 		return CPPVisitor.getQualifiedNameCharArray(this);
 	}
 
+	@Override
 	public boolean isGloballyQualified() {
 		return getOwner() == null;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 	
+	@Override
 	public boolean isSameType(IType type) {
 		if (type == this)
 			return true;
@@ -218,18 +228,22 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 		return false;
 	}
 	
+	@Override
 	public ICPPBase[] getBases() {
 		return ICPPBase.EMPTY_BASE_ARRAY;
 	}
 
+	@Override
 	public ICPPField[] getFields() {
 		return ICPPField.EMPTY_CPPFIELD_ARRAY;
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		return ICPPField.EMPTY_CPPFIELD_ARRAY;
 	}
 
+	@Override
 	public ICPPMethod[] getMethods() {
 		if (fMethods == null) {
 			fMethods= createMethods();
@@ -237,14 +251,17 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 		return fMethods;
 	}
 
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		ICPPMethod[] methods= getMethods();
 		int i= 0;
@@ -258,14 +275,17 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 		return result;
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 	
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		return ICPPClassType.EMPTY_CLASS_ARRAY;
 	}
 
+	@Override
 	public IField findField(String name) {
 		return null;
 	}
@@ -290,38 +310,47 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 		return null;
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return CPPVisitor.findDeclarationOwner(fLambdaExpression, true);
 	}
 	
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
 	
+	@Override
 	public IASTNode getDefinition() {
 		return fLambdaExpression;
 	}
 
+	@Override
 	public IASTNode[] getDeclarations() {
 		return IASTNode.EMPTY_NODE_ARRAY;
 	}
 
+	@Override
 	public void addDefinition(IASTNode node) {
 	}
 
+	@Override
 	public void addDeclaration(IASTNode node) {
 	}
 
 
 	private final class ClassScope implements ICPPClassScope {
+		@Override
 		public EScopeKind getKind() {
 			return EScopeKind.eClassType;
 		}
 
+		@Override
 		public IName getScopeName() {
 			return null;
 		}
 
+		@Override
 		public IScope getParent() {
 			return getScope();
 		}
@@ -356,20 +385,24 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 			return result.toArray(new IBinding[result.size()]);
 		}
 
+		@Override
 		public IBinding[] find(String name) {
 			return getBindings(name.toCharArray());
 		}
 
+		@Override
 		public IBinding getBinding(IASTName name, boolean resolve) {
 			if (name instanceof ICPPASTTemplateId)
 				return null;
 			return getBinding(name.getSimpleID());
 		}
 
+		@Override
 		public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet acceptLocalBindings) {
 			return getBinding(name, resolve);
 		}
 
+		@Override
 		public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) {
 			if (name instanceof ICPPASTTemplateId)
 				return IBinding.EMPTY_BINDING_ARRAY;
@@ -379,19 +412,23 @@ public class CPPClosureType extends PlatformObject implements ICPPClassType, ICP
 			return getBindings(name.getSimpleID());
 		}
 
+		@Override
 		public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup,
 				IIndexFileSet acceptLocalBindings) {
 			return getBindings(name, resolve, prefixLookup);
 		}
 
+		@Override
 		public ICPPClassType getClassType() {
 			return CPPClosureType.this;
 		}
 
+		@Override
 		public ICPPMethod[] getImplicitMethods() {
 			return getMethods();
 		}
 
+		@Override
 		public ICPPConstructor[] getConstructors() {
 			return CPPClosureType.this.getConstructors();
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java
index dfc6f059114..5fa4b795365 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPDeferredClassInstance.java
@@ -53,10 +53,12 @@ public class CPPDeferredClassInstance extends CPPUnknownClass implements ICPPDef
 		return fClassTemplate.getOwner();
 	}
 
+	@Override
 	public ICPPClassTemplate getClassTemplate() {
 		return (ICPPClassTemplate) getSpecializedBinding();
 	}
 
+	@Override
 	public boolean isExplicitSpecialization() {
 		return false;
 	}
@@ -92,23 +94,28 @@ public class CPPDeferredClassInstance extends CPPUnknownClass implements ICPPDef
     	return getClassTemplate().getKey();
     }
     
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return CPPTemplates.getArguments(getTemplateArguments());
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return fArguments;
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return fClassTemplate;
 	}
 
+	@Override
 	public ObjectMap getArgumentMap() {
 		return ObjectMap.EMPTY_MAP;
 	}
 	
+	@Override
 	public CPPTemplateParameterMap getTemplateParameterMap() {
 		ICPPTemplateParameter[] params = fClassTemplate.getTemplateParameters();
 		int size = Math.min(fArguments.length, params.length);
@@ -119,6 +126,7 @@ public class CPPDeferredClassInstance extends CPPUnknownClass implements ICPPDef
 		return map;
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return getTemplateDefinition();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java
index db69723d23a..c176ea88493 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumScope.java
@@ -22,6 +22,7 @@ public class CPPEnumScope extends CPPScope {
 		super(specifier);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eNamespace;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java
index 04882ba9792..1ea5e20d6de 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumeration.java
@@ -73,7 +73,8 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
 		name.setBinding(this);
     }
 
-    public IASTNode[] getDeclarations() {
+    @Override
+	public IASTNode[] getDeclarations() {
     	fDeclarations= ArrayUtil.trim(fDeclarations);
     	return fDeclarations;
     }
@@ -120,17 +121,20 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
 		}
 	}
 
-    public IASTName getDefinition() {
+    @Override
+	public IASTName getDefinition() {
     	if (fDefinition == NOT_INITIALIZED)
     		return null;
         return fDefinition;
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
         return new String(getNameCharArray());
     }
 
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
     	return getADeclaration().getSimpleID();
     }
 
@@ -140,6 +144,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
     	return fDeclarations[0];
 	}
 
+	@Override
 	public IScope getScope() {
         return CPPVisitor.getContainingScope(getADeclaration());
     }
@@ -149,15 +154,18 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
     	throw new IllegalArgumentException("Enums must not be cloned"); //$NON-NLS-1$
     }
 
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return CPPVisitor.getQualifiedName(this);
     }
 
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return CPPVisitor.getQualifiedNameCharArray(this);
     }
 
-    public boolean isGloballyQualified() throws DOMException {
+    @Override
+	public boolean isGloballyQualified() throws DOMException {
         IScope scope = getScope();
         while (scope != null) {
             if (scope instanceof ICPPBlockScope)
@@ -167,11 +175,13 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
         return true;
     }
 
+	@Override
 	public void addDefinition(IASTNode node) {
 		assert fDefinition == null || fDefinition == NOT_INITIALIZED;
 		fDefinition= (IASTName) node;
 	}
 
+	@Override
 	public void addDeclaration(IASTNode node) {
 		assert node instanceof IASTName;
 		if (fDeclarations == null) {
@@ -181,7 +191,8 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
 		}
 	}
 	
-    public boolean isSameType(IType type) {
+    @Override
+	public boolean isSameType(IType type) {
         if (type == this)
             return true;
         if (type instanceof ITypedef || type instanceof IIndexBinding)
@@ -189,10 +200,12 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
         return false;
     }
     
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return CPPVisitor.findDeclarationOwner(getADeclaration(), true);
 	}
@@ -202,6 +215,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
 		return getName();
 	}
 	
+	@Override
 	public long getMinValue() {
 		if (fMinValue != null)
 			return fMinValue.longValue();
@@ -224,6 +238,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
 		return minValue;
 	}
 
+	@Override
 	public long getMaxValue() {
 		if (fMaxValue != null)
 			return fMaxValue.longValue();
@@ -246,15 +261,18 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
 		return maxValue;
 	}
 
+	@Override
 	public boolean isScoped() {
 		return fIsScoped;
 	}
 
+	@Override
 	public IType getFixedType() {
 		return fFixedType;
 	}
 
-    public IEnumerator[] getEnumerators() {
+    @Override
+	public IEnumerator[] getEnumerators() {
     	findDefinition();
     	final IASTName definition = getDefinition();
 		if (definition == null) {
@@ -287,6 +305,7 @@ public class CPPEnumeration extends PlatformObject implements ICPPEnumeration, I
 		return fIndexBinding;
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		findDefinition();
 		IASTName def = getDefinition();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java
index 1a89f15b764..eab149b455c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPEnumerator.java
@@ -46,35 +46,40 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDeclarations()
      */
-    public IASTNode[] getDeclarations() {
+    @Override
+	public IASTNode[] getDeclarations() {
         return null;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDefinition()
      */
-    public IASTNode getDefinition() {
+    @Override
+	public IASTNode getDefinition() {
         return enumName;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
      */
-    public String getName() {
+    @Override
+	public String getName() {
         return new String(getNameCharArray());
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
      */
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
         return enumName.getSimpleID();
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
      */
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         return CPPVisitor.getContainingScope(enumName);
     }
 
@@ -88,6 +93,7 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IEnumerator#getType()
 	 */
+	@Override
 	public IType getType() {
 	    IASTEnumerator etor = (IASTEnumerator) enumName.getParent();
 		IASTEnumerationSpecifier enumSpec = (IASTEnumerationSpecifier) etor.getParent();
@@ -97,21 +103,24 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedName()
      */
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return CPPVisitor.getQualifiedName(this);
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedNameCharArray()
      */
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return CPPVisitor.getQualifiedNameCharArray(this);
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified()
      */
-    public boolean isGloballyQualified() throws DOMException {
+    @Override
+	public boolean isGloballyQualified() throws DOMException {
         IScope scope = getScope();
         while (scope != null) {
             if (scope instanceof ICPPBlockScope)
@@ -121,20 +130,25 @@ public class CPPEnumerator extends PlatformObject implements IEnumerator, ICPPIn
         return true;
     }
 
+	@Override
 	public void addDefinition(IASTNode node) {
 	}
 
+	@Override
 	public void addDeclaration(IASTNode node) {
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return CPPVisitor.findDeclarationOwner(enumName, true);
 	}
 
+	@Override
 	public IValue getValue() {
 		final IASTNode parent= enumName.getParent();
 		if (parent instanceof ASTEnumerator)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java
index 15876035efb..f622e0987b5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPField.java
@@ -40,12 +40,15 @@ public class CPPField extends CPPVariable implements ICPPField {
             super( node, id, arg );
             fOwner= owner;
         }
-        public int getVisibility() {
+        @Override
+		public int getVisibility() {
             return v_private;
         }
-        public ICPPClassType getClassOwner() {
+        @Override
+		public ICPPClassType getClassOwner() {
             return fOwner;
         }
+		@Override
 		public ICompositeType getCompositeTypeOwner() {
 			return getClassOwner();
 		}
@@ -101,6 +104,7 @@ public class CPPField extends CPPVariable implements ICPPField {
 		return null;
 	}
 
+	@Override
 	public int getVisibility() {
 		ICPPASTVisibilityLabel vis = null;
 		IASTDeclaration decl = getPrimaryDeclaration();
@@ -124,6 +128,7 @@ public class CPPField extends CPPVariable implements ICPPField {
 		return ICPPASTVisibilityLabel.v_public;
 	}
 	
+	@Override
 	public ICPPClassType getClassOwner() {
 		ICPPClassScope scope = (ICPPClassScope) getScope();
 		return scope.getClassType();
@@ -153,6 +158,7 @@ public class CPPField extends CPPVariable implements ICPPField {
         return false;
     }
     
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		return getClassOwner();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java
index 26b7772c313..cdc92a2ed4e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFieldSpecialization.java
@@ -36,14 +36,17 @@ public class CPPFieldSpecialization extends CPPSpecialization implements ICPPFie
 		return (ICPPField) getSpecializedBinding();
 	}
 	
+	@Override
 	public int getVisibility() {
 		return getField().getVisibility();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return getField().getClassOwner();
 	}
 	
+	@Override
 	public IType getType() {
 		if (type == null) {
 			type= specializeType(getField().getType());
@@ -51,38 +54,47 @@ public class CPPFieldSpecialization extends CPPSpecialization implements ICPPFie
 		return type;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return getField().isStatic();
 	}
 
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         return getField().isExtern();
     }
 
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         return getField().isAuto();
     }
 
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         return getField().isRegister();
     }
 
-    public boolean isMutable() {
+    @Override
+	public boolean isMutable() {
         return getField().isMutable();
     }
 
-    public boolean isExternC() {
+    @Override
+	public boolean isExternC() {
     	return false;
     }
 
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		return getClassOwner();
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return getInitialValue(Value.MAX_RECURSION_DEPTH);
 	}
 
+	@Override
 	public IValue getInitialValue(int maxRecursionDepth) {
 		if (value == null) {
 			ICPPField field= getField();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java
index 37ab8fe19f8..88ff224c1b9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunction.java
@@ -101,20 +101,23 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 	        if (tu != null) {
 	            CPPVisitor.getDeclarations(tu, this);
 	        }
-	        declarations = (IASTDeclarator[]) ArrayUtil.trim(IASTDeclarator.class, declarations);
+	        declarations = ArrayUtil.trim(IASTDeclarator.class, declarations);
 	        bits |= FULLY_RESOLVED;
 	        bits &= ~RESOLUTION_IN_PROGRESS;
 	    }
 	}
 	
-    public IASTDeclarator[] getDeclarations() {
+    @Override
+	public IASTDeclarator[] getDeclarations() {
         return declarations;
     }
 
-    public ICPPASTFunctionDeclarator getDefinition() {
+    @Override
+	public ICPPASTFunctionDeclarator getDefinition() {
         return definition;
     }
     
+	@Override
 	public final void addDefinition(IASTNode node) {
 		IASTDeclarator dtor = extractRelevantDtor(node);
 		if (dtor instanceof ICPPASTFunctionDeclarator) {
@@ -124,6 +127,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 		}
 	}
 	
+	@Override
 	public final void addDeclaration(IASTNode node) {
 		IASTDeclarator dtor = extractRelevantDtor(node);
 		if (dtor == null) {
@@ -155,6 +159,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 		return ASTQueries.findTypeRelevantDeclarator((IASTDeclarator) node);
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 	    IASTStandardFunctionDeclarator dtor = getPreferredDtor();
 	    if (dtor == null) {
@@ -179,6 +184,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 		return result;
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 	    resolveAllDeclarations();
 	    if (definition != null) {
@@ -195,10 +201,12 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 	    return null;
 	}
 
+	@Override
 	public String getName() {
 	    return getASTName().toString();
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return getASTName().getSimpleID();
 	}
@@ -214,6 +222,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 	    return name;
 	}
 
+	@Override
 	public IScope getScope() {
 	    IASTName n = getASTName();
 	    IScope scope = CPPVisitor.getContainingScope(n);
@@ -240,7 +249,8 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 		return scope;
 	}
 
-    public ICPPFunctionType getType() {
+    @Override
+	public ICPPFunctionType getType() {
         if (type == null) {
 			final IType t = getNestedType(CPPVisitor.createType((definition != null) ? definition : declarations[0]), TDEF);
 			if (t instanceof ICPPFunctionType) {
@@ -255,7 +265,8 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
         return type;
     }
 
-    public IBinding resolveParameter(CPPParameter param) {
+    @Override
+	public IBinding resolveParameter(CPPParameter param) {
 		int pos= param.getParameterPosition();
 		
     	int tdeclLen= declarations == null ? 0 : declarations.length;
@@ -323,11 +334,13 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
     	}
     }
 
-    public final boolean isStatic() {
+    @Override
+	public final boolean isStatic() {
         return isStatic(true);
     }
 
-    public boolean isStatic(boolean resolveAll) {
+    @Override
+	public boolean isStatic(boolean resolveAll) {
         if (resolveAll && (bits & FULLY_RESOLVED) == 0) {
             resolveAllDeclarations();
         }
@@ -365,15 +378,18 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 //        return false;
 //    }
     
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return CPPVisitor.getQualifiedName(this);
     }
 
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return CPPVisitor.getQualifiedNameCharArray(this);
     }
 
-    public boolean isGloballyQualified() throws DOMException {
+    @Override
+	public boolean isGloballyQualified() throws DOMException {
         IScope scope = getScope();
         while (scope != null) {
             if (scope instanceof ICPPBlockScope)
@@ -413,6 +429,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
         return false;
 	}
 	
+	@Override
 	public boolean isDeleted() {
 		return isDeletedDefinition(getDefinition());
 	}
@@ -427,11 +444,13 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 		return false;
 	}
 
+	@Override
 	public boolean isMutable() {
         return false;
     }
 
-    public boolean isInline() {
+    @Override
+	public boolean isInline() {
     	IASTDeclarator dtor = getDefinition();
         IASTDeclarator[] ds = getDeclarations();
         int i = -1;
@@ -458,7 +477,8 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
         return false;
     }
 
-    public boolean isExternC() {
+    @Override
+	public boolean isExternC() {
 	    if (CPPVisitor.isExternC(getDefinition())) {
 	    	return true;
 	    }
@@ -473,23 +493,28 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
         return false;
     }
 
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         return hasStorageClass(this, IASTDeclSpecifier.sc_extern);
     }
 
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         return hasStorageClass(this, IASTDeclSpecifier.sc_auto);
     }
 
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         return hasStorageClass(this, IASTDeclSpecifier.sc_register);
     }
 
-    public boolean takesVarArgs() {
+    @Override
+	public boolean takesVarArgs() {
         ICPPASTFunctionDeclarator dtor= getPreferredDtor();
         return dtor != null ? dtor.takesVarArgs() : false;
     }
     
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
@@ -503,10 +528,12 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 		return result.toString();
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		return CPPVisitor.findNameOwner(getASTName(), false);
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
 		ICPPASTFunctionDeclarator declarator = getPreferredDtor();
 		if (declarator != null) {
@@ -541,6 +568,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
         return null;
 	}
 
+	@Override
 	public int getRequiredArgumentCount() {
 		return getRequiredArgumentCount(getParameters());
 	}
@@ -561,6 +589,7 @@ public class CPPFunction extends PlatformObject implements ICPPFunction, ICPPInt
 		return 0;
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		ICPPParameter[] pars= getParameters();
 		return pars.length > 0 && pars[pars.length-1].isParameterPack();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java
index 8550489357f..734cb5fc85a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionInstance.java
@@ -33,19 +33,23 @@ public class CPPFunctionInstance extends CPPFunctionSpecialization implements IC
 		fArguments = args;
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return (ICPPTemplateDefinition) getSpecializedBinding();
 	}
 
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return CPPTemplates.getArguments(fArguments);
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return fArguments;
 	}
 
+	@Override
 	public boolean isExplicitSpecialization() {
 		if (getDefinition() != null)
 			return true;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java
index 120aaf011e9..a32e0a8c9e7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionSpecialization.java
@@ -51,6 +51,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return (ICPPFunction) getSpecializedBinding();
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 		if (fParams == null) {
 			ICPPFunction function = getFunction();
@@ -75,18 +76,22 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return fParams;
 	}
 
+	@Override
 	public int getRequiredArgumentCount() {
 		return ((ICPPFunction) getSpecializedBinding()).getRequiredArgumentCount();
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		return ((ICPPFunction) getSpecializedBinding()).hasParameterPack();
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		return null;
 	}
 
+	@Override
 	public ICPPFunctionType getType() {
 		if (type == null) {
 			ICPPFunction function = (ICPPFunction) getSpecializedBinding();
@@ -96,10 +101,12 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return type;
 	}
 
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
 
+	@Override
 	public boolean isDeleted() {
 		IASTNode def = getDefinition();
 		if (def != null)
@@ -112,6 +119,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return false;
 	}
 
+	@Override
 	public boolean isInline() {
 		if (getDefinition() != null) {
 			IASTNode def = getDefinition();
@@ -122,6 +130,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return getFunction().isInline();
 	}
 	
+	@Override
 	public boolean isExternC() {
 		if (CPPVisitor.isExternC(getDefinition())) {
 			return true;
@@ -129,9 +138,11 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return getFunction().isExternC();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return isStatic(true);
 	}
+	@Override
 	public boolean isStatic(boolean resolveAll) {
 		//TODO resolveAll
 		IBinding f = getSpecializedBinding();
@@ -143,6 +154,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_static);
 	}
 
+	@Override
 	public boolean isExtern() {
 		ICPPFunction f = (ICPPFunction) getSpecializedBinding();
 		if (f != null)
@@ -150,6 +162,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_extern);
 	}
 
+	@Override
 	public boolean isAuto() {
 		ICPPFunction f = (ICPPFunction) getSpecializedBinding();
 		if (f != null)
@@ -157,6 +170,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_auto);
 	}
 
+	@Override
 	public boolean isRegister() {
 		ICPPFunction f = (ICPPFunction) getSpecializedBinding();
 		if (f != null)
@@ -164,6 +178,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return CPPFunction.hasStorageClass(this, IASTDeclSpecifier.sc_register);
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		ICPPFunction f = (ICPPFunction) getSpecializedBinding();
 		if (f != null)
@@ -180,7 +195,8 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
         return false;
 	}
 
-    public IBinding resolveParameter(CPPParameter param) {
+    @Override
+	public IBinding resolveParameter(CPPParameter param) {
 		int pos= param.getParameterPosition();
 		
     	final IASTNode[] decls= getDeclarations();
@@ -288,6 +304,7 @@ public class CPPFunctionSpecialization extends CPPSpecialization implements ICPP
 		return result.toString();
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
 		if (specializedExceptionSpec == null) {
 			ICPPFunction function = (ICPPFunction) getSpecializedBinding();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java
index 2d45901cd2e..e42728ea17f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java
@@ -93,6 +93,7 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
         return null;
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 		ICPPASTFunctionDeclarator fdecl= getFirstFunctionDtor();
 		if (fdecl != null) {
@@ -118,19 +119,23 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
 		return CPPBuiltinParameter.createParameterList(getType());
 	}
 
+	@Override
 	public int getRequiredArgumentCount() {
 		return CPPFunction.getRequiredArgumentCount(getParameters());
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		ICPPParameter[] pars= getParameters();
 		return pars.length > 0 && pars[pars.length-1].isParameterPack();
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		return null;
 	}
 
+	@Override
 	public ICPPFunctionType getType() {
 		if (type == null) {
 			IASTName name = getTemplateName();
@@ -184,7 +189,8 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
 		return null;
 	}
 
-    public IBinding resolveParameter(CPPParameter param) {
+    @Override
+	public IBinding resolveParameter(CPPParameter param) {
 		int pos= param.getParameterPosition();
 		
     	final IASTNode[] decls= getDeclarations();
@@ -252,15 +258,18 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
 		return ASTQueries.findInnermostDeclarator(paramDecl.getDeclarator()).getName();
 	}
 
+	@Override
 	public final boolean isStatic() {
 		return isStatic(true);
 	}
 
-    public boolean isMutable() {
+    @Override
+	public boolean isMutable() {
         return hasStorageClass(IASTDeclSpecifier.sc_mutable);
     }
 
-    public boolean isInline() {
+    @Override
+	public boolean isInline() {
         IASTName name = (IASTName) getDefinition();
         IASTNode[] ns = getDeclarations();
         int i = -1;
@@ -283,7 +292,8 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
         return false;
     }
 
-    public boolean isExternC() {
+    @Override
+	public boolean isExternC() {
 	    if (CPPVisitor.isExternC(getDefinition())) {
 	    	return true;
 	    }
@@ -298,23 +308,28 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
         return false;
     }
 
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         return hasStorageClass(IASTDeclSpecifier.sc_extern);
     }
 
+	@Override
 	public boolean isDeleted() {
 		return CPPFunction.isDeletedDefinition(getDefinition());
 	}
 
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         return hasStorageClass(IASTDeclSpecifier.sc_auto);
     }
 
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         return hasStorageClass(IASTDeclSpecifier.sc_register);
     }
 
-    public boolean takesVarArgs() {
+    @Override
+	public boolean takesVarArgs() {
     	ICPPASTFunctionDeclarator fdecl= getFirstFunctionDtor();
     	if (fdecl != null) {
     		return fdecl.takesVarArgs();
@@ -333,7 +348,8 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
     	return null;
 	}
 
-    public boolean isStatic(boolean resolveAll) {
+    @Override
+	public boolean isStatic(boolean resolveAll) {
     	return hasStorageClass(IASTDeclSpecifier.sc_static);
     }
     
@@ -346,6 +362,7 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition
 		return result.toString();
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
     	ICPPASTFunctionDeclarator declarator = getFirstFunctionDtor();
 		if (declarator != null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java
index d0e6535f8e7..01120115dd3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplateSpecialization.java
@@ -34,11 +34,13 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization
 		super(original, owner, argumentMap);
 	}
 
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		ICPPFunctionTemplate template = (ICPPFunctionTemplate) getSpecializedBinding();
 		return template.getTemplateParameters();
 	}
 
+	@Override
 	public synchronized final void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) {
 		if (instances == null)
 			instances = new ObjectMap(2);
@@ -46,6 +48,7 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization
 		instances.put(key, instance);
 	}
 
+	@Override
 	public synchronized final ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) {
 		if (instances != null) {
 			String key= ASTTypeUtil.getArgumentListString(arguments, true);
@@ -54,6 +57,7 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization
 		return null;
 	}
 	
+	@Override
 	public synchronized ICPPTemplateInstance[] getAllInstances() {
 		if (instances != null) {
 			ICPPTemplateInstance[] result= new ICPPTemplateInstance[instances.size()];
@@ -65,6 +69,7 @@ public class CPPFunctionTemplateSpecialization extends CPPFunctionSpecialization
 		return ICPPTemplateInstance.EMPTY_TEMPLATE_INSTANCE_ARRAY;
 	}
 	
+	@Override
 	public IBinding resolveTemplateParameter(ICPPTemplateParameter param) {
 		return param;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java
index f46908ecffb..7c07c5c8b0e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionType.java
@@ -45,7 +45,8 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType {
         this.takesVarargs= takesVarargs;
     }
 
-    public boolean isSameType(IType o) {
+    @Override
+	public boolean isSameType(IType o) {
         if (o instanceof ITypedef)
             return o.isSameType(this);
         if (o instanceof ICPPFunctionType) {
@@ -82,14 +83,16 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getReturnType()
      */
-    public IType getReturnType() {
+    @Override
+	public IType getReturnType() {
         return returnType;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IFunctionType#getParameterTypes()
      */
-    public IType[] getParameterTypes() {
+    @Override
+	public IType[] getParameterTypes() {
         return parameters;
     }
 
@@ -104,19 +107,23 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType {
         return t;
     }
 
-    @Deprecated
+    @Override
+	@Deprecated
     public IPointerType getThisType() {
         return null;
     }
 
+	@Override
 	public final boolean isConst() {
 		return isConst;
 	}
 
+	@Override
 	public final boolean isVolatile() {
 		return isVolatile;
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return takesVarargs;
 	}
@@ -126,6 +133,7 @@ public class CPPFunctionType implements ICPPFunctionType, ISerializableType {
 		return ASTTypeUtil.getType(this);
 	}
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.FUNCTION_TYPE;
 		if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java
index 4747a21ef10..229f129609a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPImplicitMethod.java
@@ -45,6 +45,7 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod
 		super(name, scope, type, params, false);
 	}
    
+	@Override
 	public int getVisibility() {
 		IASTDeclaration decl= getPrimaryDeclaration();
 		if (decl == null) {
@@ -76,6 +77,7 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod
         return ICPPASTVisibilityLabel.v_public;
     }
 	
+	@Override
 	public ICPPClassType getClassOwner() {
 		ICPPClassScope scope = (ICPPClassScope)getScope();
 		return scope.getClassType();
@@ -157,10 +159,12 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod
 		return null;
 	}
 
-    public boolean isVirtual() {
+    @Override
+	public boolean isVirtual() {
         return false;
     }
 
+	@Override
 	public boolean isDestructor() {
 		char [] n = getNameCharArray();
 		if( n != null && n.length > 0 )
@@ -168,14 +172,17 @@ public class CPPImplicitMethod extends CPPImplicitFunction implements ICPPMethod
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return getPrimaryDeclaration() == null;
 	}
 	
-    public boolean isExplicit() {
+    @Override
+	public boolean isExplicit() {
         return false;
     }
 	
+	@Override
 	public boolean isPureVirtual() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java
index 0a51c7342c1..db11a37fe21 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPLambdaExpressionParameter.java
@@ -38,22 +38,27 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP
 		fDeclaration = name;
 	}
 		
-    public boolean isParameterPack() {
+    @Override
+	public boolean isParameterPack() {
 		return getType() instanceof ICPPParameterPackType;
 	}
 
+	@Override
 	public String getName() {
 		return new String(getNameCharArray());
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return fDeclaration.getSimpleID();
 	}
 
+	@Override
 	public IScope getScope() {
 		return CPPVisitor.getContainingScope(fDeclaration);
 	}
 
+	@Override
 	public IType getType() {
 		if (fType == null) {
 			IASTNode parent= fDeclaration.getParent();
@@ -68,34 +73,42 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP
 		return fType;
 	}
 
-    public boolean isStatic() {
+    @Override
+	public boolean isStatic() {
         return false;
     }
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return new String[] { getName() };
     }
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return new char[][] { getNameCharArray() };
     }
-    public boolean isGloballyQualified() {
+    @Override
+	public boolean isGloballyQualified() {
         return false;
     }
 
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         //7.1.1-5 extern can not be used in the declaration of a parameter
         return false;
     }
 
-    public boolean isMutable() {
+    @Override
+	public boolean isMutable() {
         //7.1.1-8 mutable can only apply to class members
         return false;
     }
 
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         return hasStorageClass(IASTDeclSpecifier.sc_auto);
     }
 
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         return hasStorageClass(IASTDeclSpecifier.sc_register);
     }
     
@@ -111,14 +124,17 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP
 		return false;
 	}
 
+	@Override
 	public boolean hasDefaultValue() {
 		return false;
 	}
 	
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
@@ -129,6 +145,7 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP
 		return name.length() != 0 ? name : "<unnamed>"; //$NON-NLS-1$
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		IASTNode node= fDeclaration;
 		while (node != null && !(node instanceof ICPPASTLambdaExpression))
@@ -143,6 +160,7 @@ public class CPPLambdaExpressionParameter extends PlatformObject implements ICPP
 		return null;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java
index 7067ca1b3e6..3ebf67a4377 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethod.java
@@ -89,6 +89,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMember#getVisibility()
 	 */
+	@Override
 	public int getVisibility() {
 		IASTDeclaration decl = getPrimaryDeclaration();
 		if (decl == null) {
@@ -119,6 +120,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod {
 		return ICPPASTVisibilityLabel.v_public;
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		ICPPClassScope scope = (ICPPClassScope)getScope();
 		return scope.getClassType();
@@ -144,7 +146,8 @@ public class CPPMethod extends CPPFunction implements ICPPMethod {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isVirtual()
      */
-    public boolean isVirtual() {
+    @Override
+	public boolean isVirtual() {
     	IASTDeclaration decl = getPrimaryDeclaration();
 		if (decl != null) {
 			ICPPASTDeclSpecifier declSpec = getDeclSpec(decl);
@@ -203,6 +206,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod {
 	/* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isDestructor()
      */
+	@Override
 	public boolean isDestructor() {
 		char[] name = getNameCharArray();
 		if (name.length > 1 && name[0] == '~')
@@ -211,6 +215,7 @@ public class CPPMethod extends CPPFunction implements ICPPMethod {
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return false;
 	}
@@ -218,7 +223,8 @@ public class CPPMethod extends CPPFunction implements ICPPMethod {
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isPureVirtual()
      */
-    public boolean isPureVirtual() {
+    @Override
+	public boolean isPureVirtual() {
     	if (declarations != null) {
 			for (IASTDeclarator dtor : declarations) {
 				if (dtor == null)
@@ -237,7 +243,8 @@ public class CPPMethod extends CPPFunction implements ICPPMethod {
     	return false;
     }
 
-    public boolean isExplicit() {
+    @Override
+	public boolean isExplicit() {
     	IASTDeclaration decl= getPrimaryDeclaration();
     	if (decl != null) {
     		ICPPASTDeclSpecifier declspec= getDeclSpec(decl);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java
index 7fd74322ca2..286b131d745 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodInstance.java
@@ -27,10 +27,12 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMember#getVisibility()
 	 */
+	@Override
 	public int getVisibility() {
 		return ((ICPPMethod)getTemplateDefinition()).getVisibility();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
@@ -38,17 +40,20 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isVirtual()
      */
-    public boolean isVirtual() {
+    @Override
+	public boolean isVirtual() {
         return ((ICPPMethod)getTemplateDefinition()).isVirtual();
     }
 
 	/* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isPureVirtual()
      */
+	@Override
 	public boolean isPureVirtual() {
         return ((ICPPMethod)getTemplateDefinition()).isPureVirtual();
 	}
 	
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod) getTemplateDefinition()).isExplicit();
 	}
@@ -56,6 +61,7 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod
 	/* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod#isDestructor()
      */
+	@Override
 	public boolean isDestructor() {
 		char[] name = getNameCharArray();
 		if (name.length > 1 && name[0] == '~')
@@ -64,6 +70,7 @@ public class CPPMethodInstance extends CPPFunctionInstance implements ICPPMethod
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java
index dc6ba8e3d42..962e2fd4e01 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodSpecialization.java
@@ -31,6 +31,7 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization
 		super(orig, owner, argMap );
 	}
 
+	@Override
 	public boolean isVirtual() {
 		ICPPMethod f = (ICPPMethod) getSpecializedBinding();
 		if( f != null )
@@ -54,6 +55,7 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization
 		return false;
 	}
 
+	@Override
 	public int getVisibility() {
 		ICPPMethod f = (ICPPMethod) getSpecializedBinding();
 		if( f != null )
@@ -61,10 +63,12 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization
 		return 0;
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 	
+	@Override
 	public boolean isDestructor() {
 		char[] name = getNameCharArray();
 		if (name.length > 1 && name[0] == '~')
@@ -73,14 +77,17 @@ public class CPPMethodSpecialization extends CPPFunctionSpecialization
 		return false;
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod)getSpecializedBinding()).isExplicit();
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return ((ICPPMethod) getSpecializedBinding()).isImplicit();
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		ICPPMethod f = (ICPPMethod) getSpecializedBinding();
 		if (f != null)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java
index 43c111e8317..e2b57e00cfa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplate.java
@@ -100,6 +100,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod
 		return null;
 	}
 	
+	@Override
 	public int getVisibility() {
 		IASTDeclaration decl = getPrimaryDeclaration();
 		if( decl == null ){
@@ -126,6 +127,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod
 		return ICPPASTVisibilityLabel.v_public;
 	}
 	
+	@Override
 	public ICPPClassType getClassOwner() {
 		IScope scope= getScope();
 		if (scope instanceof ICPPTemplateScope) {
@@ -141,7 +143,8 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod
 		return null;
 	}
 
-    public boolean isVirtual() {
+    @Override
+	public boolean isVirtual() {
 		IASTDeclaration decl = getPrimaryDeclaration();
 		if (decl instanceof ICPPASTTemplateDeclaration) {
 			ICPPASTDeclSpecifier declSpec= getDeclSpecifier(((ICPPASTTemplateDeclaration) decl).getDeclaration());
@@ -174,6 +177,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod
 		return super.isInline();
 	}
 
+	@Override
 	public boolean isDestructor() {
 		char[] name = getNameCharArray();
 		if (name.length > 1 && name[0] == '~')
@@ -182,10 +186,12 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return false;
 	}
 	
+	@Override
 	public boolean isExplicit() {
 		IASTDeclaration decl = getPrimaryDeclaration();
 		if (decl instanceof ICPPASTTemplateDeclaration) {
@@ -197,6 +203,7 @@ public class CPPMethodTemplate extends CPPFunctionTemplate implements ICPPMethod
 		return false;
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		if (declarations != null && declarations.length > 0) {
 			IASTName decl= declarations[0];
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java
index 7ea5aff8d97..e65a789c68e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPMethodTemplateSpecialization.java
@@ -27,6 +27,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali
 		super(specialized, owner, ctmap);
 	}
 
+	@Override
 	public boolean isVirtual() {
 		IBinding m = getSpecializedBinding();
 		if (m instanceof ICPPMethod)
@@ -34,6 +35,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali
 		return false;
 	}
 
+	@Override
 	public int getVisibility() {
 		IBinding m = getSpecializedBinding();
 		if (m instanceof ICPPMethod)
@@ -41,10 +43,12 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali
 		return 0;
 	}
 	
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public boolean isDestructor() {
 		char[] name = getNameCharArray();
 		if (name.length > 1 && name[0] == '~')
@@ -53,6 +57,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		IBinding m = getSpecializedBinding();
 		if (m instanceof ICPPMethod)
@@ -60,6 +65,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali
 		return false;
 	}
 	
+	@Override
 	public boolean isExplicit() {
 		IBinding m = getSpecializedBinding();
 		if (m instanceof ICPPMethod)
@@ -67,6 +73,7 @@ public class CPPMethodTemplateSpecialization extends CPPFunctionTemplateSpeciali
 		return false;
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		IBinding m = getSpecializedBinding();
 		if (m instanceof ICPPMethod)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java
index 9bf75fe1f2a..9e800ac6d99 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespace.java
@@ -48,17 +48,22 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
         public CPPNamespaceProblem(IASTNode node, int id, char[] arg) {
             super(node, id, arg);
         }
+		@Override
 		public ICPPNamespaceScope getNamespaceScope() {
 			return this;
 		}
+		@Override
 		public IBinding[] getMemberBindings() {
 			return IBinding.EMPTY_BINDING_ARRAY;
 		}
+		@Override
 		public void addUsingDirective(ICPPUsingDirective usingDirective) {
 		}
+		@Override
 		public ICPPUsingDirective[] getUsingDirectives() {
 			return ICPPUsingDirective.EMPTY_ARRAY;
 		}
+		@Override
 		public ICPPNamespaceScope[] getInlineNamespaces() {
 			return ICPPNamespaceScope.EMPTY_NAMESPACE_SCOPE_ARRAY;
 		}
@@ -80,14 +85,16 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
     /* (non-Javadoc)
      * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDeclarations()
      */
-    public IASTNode[] getDeclarations() {
+    @Override
+	public IASTNode[] getDeclarations() {
         return namespaceDefinitions;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDefinition()
      */
-    public IASTNode getDefinition() {
+    @Override
+	public IASTNode getDefinition() {
         return (tu != null) ? tu : (IASTNode) namespaceDefinitions[0];
     }
 
@@ -119,7 +126,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 	    		}
 	    	}
 
-	    	namespaces = (IASTName[]) ArrayUtil.append(IASTName.class, namespaces, namespace.getName());
+	    	namespaces = ArrayUtil.append(IASTName.class, namespaces, namespace.getName());
 	        return PROCESS_SKIP;
 	    }
 	    
@@ -131,7 +138,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 	    }
 	    
 	    public IASTName[] getNamespaces() {
-	    	return (IASTName[]) ArrayUtil.trim(IASTName.class, namespaces);
+	    	return ArrayUtil.trim(IASTName.class, namespaces);
 	    }
 	}
 	
@@ -220,6 +227,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespace#getNamespaceScope()
 	 */
+	@Override
 	public ICPPNamespaceScope getNamespaceScope() {
 		if (scope == null) {
 		    if (tu != null)
@@ -233,6 +241,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
 	 */
+	@Override
 	public String getName() {
         return new String(getNameCharArray());
 	}
@@ -240,6 +249,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
 	 */
+	@Override
 	public char[] getNameCharArray() {
 		return tu != null ? EMPTY_CHAR_ARRAY : namespaceDefinitions[0].getSimpleID();
 	}
@@ -247,6 +257,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
 	 */
+	@Override
 	public IScope getScope() {
 		return tu != null ? null : CPPVisitor.getContainingScope(namespaceDefinitions[0]);
 	}
@@ -275,27 +286,31 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedName()
      */
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return CPPVisitor.getQualifiedName(this);
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray()
      */
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return CPPVisitor.getQualifiedNameCharArray(this);
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified()
      */
-    public boolean isGloballyQualified() {
+    @Override
+	public boolean isGloballyQualified() {
         return true;
     }
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode)
 	 */
+	@Override
 	public void addDefinition(IASTNode node) {
 		if (!(node instanceof IASTName))
 		    return;
@@ -307,19 +322,21 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 		}
 		
 		if (namespaceDefinitions.length > 0 && ((ASTNode)name).getOffset() < ((ASTNode)namespaceDefinitions[0]).getOffset()) {
-			namespaceDefinitions = (IASTName[]) ArrayUtil.prepend(IASTName.class, namespaceDefinitions, name);
+			namespaceDefinitions = ArrayUtil.prepend(IASTName.class, namespaceDefinitions, name);
 		} else {
-			namespaceDefinitions = (IASTName[]) ArrayUtil.append(IASTName.class, namespaceDefinitions, name);
+			namespaceDefinitions = ArrayUtil.append(IASTName.class, namespaceDefinitions, name);
 		}
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDeclaration(org.eclipse.cdt.core.dom.ast.IASTNode)
 	 */
+	@Override
 	public void addDeclaration(IASTNode node) {
 		addDefinition(node);
 	}
 
+	@Override
 	public IBinding[] getMemberBindings() {
 		if (namespaceDefinitions != null) {
 			NamespaceMemberCollector collector = new NamespaceMemberCollector();
@@ -337,6 +354,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 
+	@Override
 	public boolean isInline() {
 		final ICPPNamespaceScope nsScope = getNamespaceScope();
 		if (nsScope instanceof CPPNamespaceScope) {
@@ -345,6 +363,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
 		return false;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
@@ -358,6 +377,7 @@ public class CPPNamespace extends PlatformObject implements ICPPNamespace, ICPPI
     	return ASTStringUtil.join(names, String.valueOf(Keywords.cpCOLONCOLON));
 	}
     
+	@Override
 	public IBinding getOwner() {
 		if (namespaceDefinitions != null && namespaceDefinitions.length > 0) {
 			return CPPVisitor.findDeclarationOwner(namespaceDefinitions[0], false);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java
index 4bec0e288bd..34f05022d68 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceAlias.java
@@ -36,35 +36,43 @@ public class CPPNamespaceAlias extends PlatformObject implements ICPPNamespaceAl
         this.alias = aliasName;
     }
 
-    public ICPPNamespaceScope getNamespaceScope() {
+    @Override
+	public ICPPNamespaceScope getNamespaceScope() {
         return namespace.getNamespaceScope();
     }
 
-    public IBinding getBinding() {
+    @Override
+	public IBinding getBinding() {
         return namespace;
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
     	return new String(getNameCharArray());
     }
 
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
         return alias.getSimpleID();
     }
 
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return CPPVisitor.getQualifiedName( this );
     }
 
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return CPPVisitor.getQualifiedNameCharArray( this );
     }
 
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         return CPPVisitor.getContainingScope( alias );
     }
 
-    public boolean isGloballyQualified() throws DOMException {
+    @Override
+	public boolean isGloballyQualified() throws DOMException {
         IScope scope = getScope();
         while( scope != null ){
             if( scope instanceof ICPPBlockScope )
@@ -74,32 +82,40 @@ public class CPPNamespaceAlias extends PlatformObject implements ICPPNamespaceAl
         return true;
     }
 
-    public IASTNode[] getDeclarations() {
+    @Override
+	public IASTNode[] getDeclarations() {
         return null;
     }
 
-    public IASTNode getDefinition() {
+    @Override
+	public IASTNode getDefinition() {
         return alias;
     }
 
+	@Override
 	public void addDefinition(IASTNode node) {
 	}
 
+	@Override
 	public void addDeclaration(IASTNode node) {
 	}
 
+	@Override
 	public IBinding[] getMemberBindings() {
 		return namespace.getMemberBindings();
 	}
 	
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		return CPPVisitor.findDeclarationOwner(alias, false);
 	}
 
+	@Override
 	public boolean isInline() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java
index f82d20c5b84..c06b8d06f17 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNamespaceScope.java
@@ -56,6 +56,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace
 		super(physicalNode);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		if (getPhysicalNode() instanceof IASTTranslationUnit)
 			return  EScopeKind.eGlobal;
@@ -66,6 +67,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope#getUsingDirectives()
 	 */
+	@Override
 	public ICPPUsingDirective[] getUsingDirectives() {
 		initUsingDirectives();
 		populateCache();
@@ -87,6 +89,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope#addUsingDirective(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTUsingDirective)
 	 */
+	@Override
 	public void addUsingDirective(ICPPUsingDirective directive) {
 		initUsingDirectives();
 		fUsingDirectives.add(directive);
@@ -145,6 +148,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace
     	return result[0];
     }
 
+	@Override
 	public boolean isInlineNamepace() {
 		if (!fIsInlineInitialized) {
 			fIsInline= computeIsInline();
@@ -186,6 +190,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace
 		return false;
 	}
 
+	@Override
 	public ICPPNamespaceScope[] getEnclosingNamespaceSet() {
 		if (fEnclosingNamespaceSet == null) {
 			return fEnclosingNamespaceSet= computeEnclosingNamespaceSet(this);
@@ -193,6 +198,7 @@ public class CPPNamespaceScope extends CPPScope implements ICPPInternalNamespace
 		return fEnclosingNamespaceSet;
 	}
 	
+	@Override
 	public ICPPInternalNamespaceScope[] getInlineNamespaces() {
 		if (getKind() == EScopeKind.eLocal)
 			return NO_NAMESPACE_SCOPES;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java
index 905650daf31..5e987c39a55 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPNodeFactory.java
@@ -125,75 +125,93 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
 		return DEFAULT_INSTANCE;
 	}
 	
+	@Override
 	public ICPPASTArrayDeclarator newArrayDeclarator(IASTName name) {
 		return new CPPASTArrayDeclarator(name);
 	}
 	
+	@Override
 	public IASTArrayModifier newArrayModifier(IASTExpression expr) {
 		return new CPPASTArrayModifier(expr);
 	}
 
+	@Override
 	public ICPPASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr, IASTExpression subscript) {
 		return new CPPASTArraySubscriptExpression(arrayExpr, subscript);
 	}
 	
+	@Override
 	public ICPPASTArraySubscriptExpression newArraySubscriptExpression(IASTExpression arrayExpr,
 			IASTInitializerClause subscript) {
 		return new CPPASTArraySubscriptExpression(arrayExpr, subscript);
 	}
 	
+	@Override
 	public IASTASMDeclaration newASMDeclaration(String assembly) {
 		return new CPPASTASMDeclaration(assembly);
 	}
 
+	@Override
 	public ICPPASTBaseSpecifier newBaseSpecifier(IASTName name, int visibility, boolean isVirtual) {
 		return new CPPASTBaseSpecifier(name, visibility, isVirtual);
 	}
 
+	@Override
 	public ICPPASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTExpression expr2) {
 		return new CPPASTBinaryExpression(op, expr1, expr2);
 	}
 
+	@Override
 	public ICPPASTBinaryExpression newBinaryExpression(int op, IASTExpression expr1, IASTInitializerClause expr2) {
 		return new CPPASTBinaryExpression(op, expr1, expr2);
 	}
 
+	@Override
 	public IASTExpression newBinaryTypeIdExpression(Operator op, IASTTypeId type1, IASTTypeId type2) {
 		return new CPPASTBinaryTypeIdExpression(op, type1, type2);
 	}
 	
+	@Override
 	public IASTBreakStatement newBreakStatement() {
 		return new CPPASTBreakStatement();
 	}
 
+	@Override
 	public ICPPASTCapture newCapture() {
 		return new CPPASTCapture();
 	}
 
+	@Override
 	public IASTCaseStatement newCaseStatement(IASTExpression expr) {
 		return new CPPASTCaseStatement(expr);
 	}
 
+	@Override
 	public ICPPASTCastExpression newCastExpression(int operator, IASTTypeId typeId, IASTExpression operand) {
 		return new CPPASTCastExpression(operator, typeId, operand);
 	}
 
+	@Override
 	public ICPPASTCatchHandler newCatchHandler(IASTDeclaration decl, IASTStatement body) {
 		return new CPPASTCatchHandler(decl, body);
 	}
 
+	@Override
 	public ICPPASTCompositeTypeSpecifier newCompositeTypeSpecifier(int key, IASTName name) {
 		return new CPPASTCompositeTypeSpecifier(key, name);
 	}
 
+	@Override
 	public IASTCompoundStatement newCompoundStatement() {
 		return new CPPASTCompoundStatement();
 	}
 
+	@Override
 	public IASTConditionalExpression newConditionalExpession(IASTExpression condition, IASTExpression positive, IASTExpression negative) {
 		return new CPPASTConditionalExpression(condition, positive, negative);
 	}
 
+	@Override
 	@Deprecated
 	public ICPPASTConstructorChainInitializer newConstructorChainInitializer(IASTName id, IASTExpression expression) {
 		ICPPASTConstructorChainInitializer result= new CPPASTConstructorChainInitializer(id, null);
@@ -201,10 +219,12 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
 		return result;
 	}
 
+	@Override
 	public ICPPASTConstructorChainInitializer newConstructorChainInitializer(IASTName id, IASTInitializer init) {
 		return new CPPASTConstructorChainInitializer(id, init);
 	}
 
+	@Override
 	@Deprecated
 	public ICPPASTConstructorInitializer newConstructorInitializer(IASTExpression exp) {
 		ICPPASTConstructorInitializer result= new CPPASTConstructorInitializer(null);
@@ -212,98 +232,121 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
 		return result;
 	}
 
+	@Override
 	public ICPPASTConstructorInitializer newConstructorInitializer(IASTInitializerClause[] args) {
 		return new CPPASTConstructorInitializer(args);
 	}
 
+	@Override
 	public IASTContinueStatement newContinueStatement() {
 		return new CPPASTContinueStatement();
 	}
 	
+	@Override
 	public ICPPASTConversionName newConversionName(IASTTypeId typeId) {
 		return new CPPASTConversionName(typeId);
 	}
 
+	@Override
 	public IASTDeclarationStatement newDeclarationStatement(IASTDeclaration declaration) {
 		return new CPPASTDeclarationStatement(declaration);
 	}
 	
+	@Override
 	public ICPPASTDeclarator newDeclarator(IASTName name) {
 		return new CPPASTDeclarator(name);
 	}
 
+	@Override
 	public IASTDefaultStatement newDefaultStatement() {
 		return new CPPASTDefaultStatement();
 	}
 
+	@Override
 	public ICPPASTDeleteExpression newDeleteExpression(IASTExpression operand) {
 		return new CPPASTDeleteExpression(operand);
 	}
 
+	@Override
 	public IASTDoStatement newDoStatement(IASTStatement body, IASTExpression condition) {
 		return new CPPASTDoStatement(body, condition);
 	}
 
+	@Override
 	public ICPPASTElaboratedTypeSpecifier newElaboratedTypeSpecifier(int kind, IASTName name) {
 		return new CPPASTElaboratedTypeSpecifier(kind, name);
 	}
 
+	@Override
 	public ICPPASTEnumerationSpecifier newEnumerationSpecifier(boolean isScoped, IASTName name,
 			ICPPASTDeclSpecifier baseType) {
 		return new CPPASTEnumerationSpecifier(isScoped, name, baseType);
 	}
 
+	@Override
 	public ICPPASTEnumerationSpecifier newEnumerationSpecifier(IASTName name) {
 		return new CPPASTEnumerationSpecifier(false, name, null);
 	}
 
+	@Override
 	public IASTEnumerator newEnumerator(IASTName name, IASTExpression value) {
 		return new CPPASTEnumerator(name, value);
 	}
 
+	@Override
 	public IASTEqualsInitializer newEqualsInitializer(IASTInitializerClause initClause) {
 		return new CPPASTEqualsInitializer(initClause);
 	}
 
+	@Override
 	public ICPPASTExplicitTemplateInstantiation newExplicitTemplateInstantiation(IASTDeclaration declaration) {
 		return new CPPASTExplicitTemplateInstantiation(declaration);
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTExplicitTemplateInstantiation newExplicitTemplateInstantiationGPP(IASTDeclaration declaration) {
 		return new GPPASTExplicitTemplateInstantiation(declaration);
 	}
 	
+	@Override
 	public ICPPASTExpressionList newExpressionList() {
 		return new CPPASTExpressionList();
 	}
 	
+	@Override
 	public IASTExpressionStatement newExpressionStatement(IASTExpression expression) {
 		return new CPPASTExpressionStatement(expression);
 	}
 
+	@Override
 	public ICPPASTFieldDeclarator newFieldDeclarator(IASTName name, IASTExpression bitFieldSize) {
 		return new CPPASTFieldDeclarator(name, bitFieldSize);
 	}
 	
+	@Override
 	public ICPPASTFieldReference newFieldReference(IASTName name, IASTExpression owner) {
 		return new CPPASTFieldReference(name, owner);
 	}
 
+	@Override
 	public ICPPASTForStatement newForStatement() {
 		return new CPPASTForStatement();
 	}
 
+	@Override
 	public ICPPASTForStatement newForStatement(IASTStatement init, IASTDeclaration condition, 
 			IASTExpression iterationExpression, IASTStatement body) {
 		return new CPPASTForStatement(init, condition, iterationExpression, body);
 	}
 	
+	@Override
 	public ICPPASTForStatement newForStatement(IASTStatement init, IASTExpression condition, 
 			IASTExpression iterationExpr, IASTStatement body) {
 		return new CPPASTForStatement(init, condition, iterationExpr, body);
 	}
 
+	@Override
 	@Deprecated
 	public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTExpression argList) {
 		CPPASTFunctionCallExpression result = new CPPASTFunctionCallExpression(idExpr, null);
@@ -311,89 +354,110 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
 		return result;
 	}
 
+	@Override
 	public ICPPASTFunctionCallExpression newFunctionCallExpression(IASTExpression idExpr, IASTInitializerClause[] arguments) {
 		return new CPPASTFunctionCallExpression(idExpr, arguments);
 	}
 
+	@Override
 	public ICPPASTFunctionDeclarator newFunctionDeclarator(IASTName name) {
 		return new CPPASTFunctionDeclarator(name);
 	}
 
+	@Override
 	public ICPPASTFunctionDefinition newFunctionDefinition(IASTDeclSpecifier declSpecifier, IASTFunctionDeclarator declarator,
 			IASTStatement bodyStatement) {
 		return new CPPASTFunctionDefinition(declSpecifier, declarator, bodyStatement);
 	}
 
+	@Override
 	public ICPPASTFunctionWithTryBlock newFunctionTryBlock(IASTDeclSpecifier declSpecifier, IASTFunctionDeclarator declarator,
 			IASTStatement bodyStatement) {
 		return new CPPASTFunctionWithTryBlock(declSpecifier, declarator, bodyStatement);
 	}
 	
+	@Override
 	public IGNUASTCompoundStatementExpression newGNUCompoundStatementExpression(IASTCompoundStatement compoundStatement) {
 		return new CPPASTCompoundStatementExpression(compoundStatement);
 	}
 	
+	@Override
 	public IASTGotoStatement newGotoStatement(IASTName name) {
 		return new CPPASTGotoStatement(name);
 	}
 
+	@Override
 	public IASTIdExpression newIdExpression(IASTName name) {
 		return new CPPASTIdExpression(name);
 	}
 
+	@Override
 	public ICPPASTIfStatement newIfStatement() {
 		return new CPPASTIfStatement();
 	}
 
+	@Override
 	public ICPPASTIfStatement newIfStatement(IASTDeclaration condition, IASTStatement then, IASTStatement elseClause) {
 		return new CPPASTIfStatement(condition, then, elseClause);
 	}
 
+	@Override
 	public ICPPASTIfStatement newIfStatement(IASTExpression condition, IASTStatement then, IASTStatement elseClause) {
 		return new CPPASTIfStatement(condition, then, elseClause);
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.IASTInitializerExpression newInitializerExpression(IASTExpression expression) {
 		return new CPPASTInitializerExpression(expression);
 	}
 
+	@Override
 	public ICPPASTInitializerList newInitializerList() {
 		return new CPPASTInitializerList();
 	}
 	
+	@Override
 	public IASTLabelStatement newLabelStatement(IASTName name, IASTStatement nestedStatement) {
 		return new CPPASTLabelStatement(name, nestedStatement);
 	}
 
+	@Override
 	public ICPPASTLambdaExpression newLambdaExpression() {
 		return new CPPASTLambdaExpression();
 	}
 	
+	@Override
 	public ICPPASTLinkageSpecification newLinkageSpecification(String literal) {
 		return new CPPASTLinkageSpecification(literal);
 	}
 
+	@Override
 	public ICPPASTLiteralExpression newLiteralExpression(int kind, String rep) {
 		return new CPPASTLiteralExpression(kind, rep.toCharArray());
 	}
 
+	@Override
 	public IASTName newName() {
 		return new CPPASTName();
 	}
 
+	@Override
 	public IASTName newName(char[] name) {
 		return new CPPASTName(name);
 	}
 
+	@Override
 	public ICPPASTNamespaceAlias newNamespaceAlias(IASTName alias, IASTName qualifiedName) {
 		return new CPPASTNamespaceAlias(alias, qualifiedName);
 	}
 
+	@Override
 	public ICPPASTNamespaceDefinition newNamespaceDefinition(IASTName name) {
 		return new CPPASTNamespaceDefinition(name);
 	}
 
+	@Override
 	@Deprecated
 	public ICPPASTNewExpression newNewExpression(IASTExpression placement, IASTExpression initializer, IASTTypeId typeId) {
 		final ICPPASTNewExpression result = new CPPASTNewExpression(null, null, typeId);
@@ -402,106 +466,131 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
 		return result;
 	}
 
+	@Override
 	public ICPPASTNewExpression newNewExpression(IASTInitializerClause[] placement, IASTInitializer initializer, IASTTypeId typeId) {
 		return new CPPASTNewExpression(placement, initializer, typeId);
 	}
 
+	@Override
 	public IASTNullStatement newNullStatement() {
 		return new CPPASTNullStatement();
 	}
 
+	@Override
 	public ICPPASTOperatorName newOperatorName(char[] name) {
 		return new CPPASTOperatorName(name);
 	}
 
+	@Override
 	public ICPPASTPackExpansionExpression newPackExpansionExpression(IASTExpression pattern) {
 		return new CPPASTPackExpansionExpression(pattern);
 	}
 
+	@Override
 	public ICPPASTParameterDeclaration newParameterDeclaration(IASTDeclSpecifier declSpec, IASTDeclarator declarator) {
 		return new CPPASTParameterDeclaration(declSpec, declarator);
 	}
 	
+	@Override
 	public IASTPointer newPointer() {
 		return new CPPASTPointer();
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointer newPointerGPP() {
 		return new GPPASTPointer();
 	}
 
+	@Override
 	public ICPPASTPointerToMember newPointerToMember(IASTName name) {
 		return new CPPASTPointerToMember(name);
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTPointerToMember newPointerToMemberGPP(IASTName name) {
 		return new GPPASTPointerToMember(name);
 	}
 
+	@Override
 	public IASTProblem newProblem(int id, char[] arg, boolean error) {
 		return new CPPASTProblem(id, arg, error);
 	}
 
+	@Override
 	public IASTProblemDeclaration newProblemDeclaration(IASTProblem problem) {
 		return new CPPASTProblemDeclaration(problem);
 	}
 
+	@Override
 	public IASTProblemExpression newProblemExpression(IASTProblem problem) {
 		return new CPPASTProblemExpression(problem);
 	}
 
+	@Override
 	public IASTProblemStatement newProblemStatement(IASTProblem problem) {
 		return new CPPASTProblemStatement(problem);
 	}
 
+	@Override
 	public IASTProblemTypeId newProblemTypeId(IASTProblem problem) {
 		return new CPPASTProblemTypeId(problem);
 	}
 
+	@Override
 	public ICPPASTQualifiedName newQualifiedName() {
 		return new CPPASTQualifiedName();
 	}
 
+	@Override
 	public ICPPASTRangeBasedForStatement newRangeBasedForStatement() {
 		return new CPPASTRangeBasedForStatement();
 	}
 
+	@Override
 	public ICPPASTReferenceOperator newReferenceOperator() {
 		return new CPPASTReferenceOperator(false);
 	}
 
+	@Override
 	public ICPPASTReferenceOperator newReferenceOperator(boolean isRValueReference) {
 		return new CPPASTReferenceOperator(isRValueReference);
 	}
 	
+	@Override
 	public IASTReturnStatement newReturnStatement(IASTExpression retValue) {
 		return new CPPASTReturnStatement(retValue);
 	}
 
+	@Override
 	public IASTReturnStatement newReturnStatement(IASTInitializerClause retValue) {
 		return new CPPASTReturnStatement(retValue);
 	}
 
+	@Override
 	public IASTSimpleDeclaration newSimpleDeclaration(IASTDeclSpecifier declSpecifier) {
 		return new CPPASTSimpleDeclaration(declSpecifier);
 	}
 	
+	@Override
 	public ICPPASTSimpleDeclSpecifier newSimpleDeclSpecifier() {
 		return new CPPASTSimpleDeclSpecifier();
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.gnu.cpp.IGPPASTSimpleDeclSpecifier newSimpleDeclSpecifierGPP() {
 		return new GPPASTSimpleDeclSpecifier();
 	}
 
+	@Override
 	public ICPPASTSimpleTypeConstructorExpression newSimpleTypeConstructorExpression(
 			ICPPASTDeclSpecifier declSpec, IASTInitializer initializer) {
 		return new CPPASTSimpleTypeConstructorExpression(declSpec, initializer);
 	}
 
+	@Override
 	@Deprecated
 	public ICPPASTSimpleTypeConstructorExpression newSimpleTypeConstructorExpression(int type, IASTExpression expression) {
 		CPPASTSimpleTypeConstructorExpression result = new CPPASTSimpleTypeConstructorExpression();
@@ -510,47 +599,58 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
 		return result;
 	}
 
+	@Override
 	public ICPPASTSimpleTypeTemplateParameter newSimpleTypeTemplateParameter(int type, IASTName name, IASTTypeId typeId) {
 		return new CPPASTSimpleTypeTemplateParameter(type, name, typeId);
 	}
 
+	@Override
 	public ICPPASTStaticAssertDeclaration newStaticAssertion(IASTExpression condition,
 			ICPPASTLiteralExpression message) {
 		return new CPPASTStaticAssertionDeclaration(condition, message);
 	}
 
+	@Override
 	public ICPPASTSwitchStatement newSwitchStatement() {
 		return new CPPASTSwitchStatement();
 	}
 
+	@Override
 	public ICPPASTSwitchStatement newSwitchStatement(IASTDeclaration controller, IASTStatement body) {
 		return new CPPASTSwitchStatement(controller, body);
 	}
 	
+	@Override
 	public ICPPASTSwitchStatement newSwitchStatement(IASTExpression controller, IASTStatement body) {
 		return new CPPASTSwitchStatement(controller, body);
 	}
 
+	@Override
 	public ICPPASTTemplateDeclaration newTemplateDeclaration(IASTDeclaration declaration) {
 		return new CPPASTTemplateDeclaration(declaration);
 	}
 
+	@Override
 	public ICPPASTTemplatedTypeTemplateParameter newTemplatedTypeTemplateParameter(IASTName name, IASTExpression defaultValue) {
 		return new CPPASTTemplatedTypeTemplateParameter(name, defaultValue);
 	}
 
+	@Override
 	public ICPPASTTemplateId newTemplateId(IASTName templateName) {
 		return new CPPASTTemplateId(templateName);
 	}
 
+	@Override
 	public ICPPASTTemplateSpecialization newTemplateSpecialization(IASTDeclaration declaration) {
 		return new CPPASTTemplateSpecialization(declaration);
 	}
 
+	@Override
 	public ICPPASTTranslationUnit newTranslationUnit() {
 		return newTranslationUnit(null);
 	}
 
+	@Override
 	public ICPPASTTranslationUnit newTranslationUnit(IScanner scanner) {
 		CPPASTTranslationUnit tu = new CPPASTTranslationUnit();
 		
@@ -564,55 +664,68 @@ public class CPPNodeFactory extends NodeFactory implements ICPPNodeFactory {
 		return tu;
 	}
 
+	@Override
 	public ICPPASTTryBlockStatement newTryBlockStatement(IASTStatement body) {
 		return new CPPASTTryBlockStatement(body);
 	}
 
+	@Override
 	public ICPPASTNamedTypeSpecifier newTypedefNameSpecifier(IASTName name) {
 		return new CPPASTNamedTypeSpecifier(name);
 	}
 
+	@Override
 	public ICPPASTTypeId newTypeId(IASTDeclSpecifier declSpecifier, IASTDeclarator declarator) {
 		return new CPPASTTypeId(declSpecifier, declarator);
 	}
 	
+	@Override
 	public ICPPASTTypeIdExpression newTypeIdExpression(int operator, IASTTypeId typeId) {
 		return new CPPASTTypeIdExpression(operator, typeId);
 	}
 
+	@Override
 	public IASTTypeIdInitializerExpression newTypeIdInitializerExpression(IASTTypeId typeId, IASTInitializer initializer) {
 		return new CPPASTTypeIdInitializerExpression(typeId, initializer);
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.cdt.core.dom.ast.cpp.ICPPASTTypenameExpression newTypenameExpression(IASTName qualifiedName, IASTExpression expr, boolean isTemplate) {
 		return new CPPASTTypenameExpression(qualifiedName, expr);
 	}
 
+	@Override
 	public ICPPASTUnaryExpression newUnaryExpression(int operator, IASTExpression operand) {
 		return new CPPASTUnaryExpression(operator, operand);
 	}
 
+	@Override
 	public ICPPASTUsingDeclaration newUsingDeclaration(IASTName name) {
 		return new CPPASTUsingDeclaration(name);
 	}
 
+	@Override
 	public ICPPASTUsingDirective newUsingDirective(IASTName name) {
 		return new CPPASTUsingDirective(name);
 	}
 
+	@Override
 	public ICPPASTVisibilityLabel newVisibilityLabel(int visibility) {
 		return new CPPASTVisibilityLabel(visibility);
 	}
 
+	@Override
 	public ICPPASTWhileStatement newWhileStatement() {
 		return new CPPASTWhileStatement();
 	}
 
+	@Override
 	public ICPPASTWhileStatement newWhileStatement(IASTDeclaration condition, IASTStatement body) {
 		return new CPPASTWhileStatement(condition, body);
 	}
 
+	@Override
 	public ICPPASTWhileStatement newWhileStatement(IASTExpression condition, IASTStatement body) {
 		return new CPPASTWhileStatement(condition, body);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java
index 99c33bfb6e0..50032369a36 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameter.java
@@ -62,24 +62,28 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	    fPosition= pos;
 	}
 	
-    public boolean isParameterPack() {
+    @Override
+	public boolean isParameterPack() {
 		return getType() instanceof ICPPParameterPackType;
 	}
 
 	/* (non-Javadoc)
      * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDeclarations()
      */
-    public IASTNode[] getDeclarations() {
+    @Override
+	public IASTNode[] getDeclarations() {
         return fDeclarations;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPBinding#getDefinition()
      */
-    public IASTNode getDefinition() {
+    @Override
+	public IASTNode getDefinition() {
         return null;
     }
 
+	@Override
 	public void addDeclaration(IASTNode node) {
 		if (!(node instanceof IASTName))
 			return;
@@ -88,9 +92,9 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	        fDeclarations = new IASTName[] { name };
 		} else {
 	        if (isDeclaredBefore((ASTNode)node, (ASTNode)fDeclarations[0])) {
-				fDeclarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, fDeclarations, name);
+				fDeclarations = ArrayUtil.prepend(IASTName.class, fDeclarations, name);
 			} else {
-				fDeclarations = (IASTName[]) ArrayUtil.append(IASTName.class, fDeclarations, name);
+				fDeclarations = ArrayUtil.append(IASTName.class, fDeclarations, name);
 			}
 	    }
 	}
@@ -120,6 +124,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
 	 */
+	@Override
 	public String getName() {
 		return new String(getNameCharArray());
 	}
@@ -127,6 +132,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
 	 */
+	@Override
 	public char[] getNameCharArray() {
 	    IASTName name = getPrimaryDeclaration();
 	    if (name != null)
@@ -137,6 +143,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
 	 */
+	@Override
 	public IScope getScope() {
 		return CPPVisitor.getContainingScope(getPrimaryDeclaration());
 	}
@@ -153,6 +160,7 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#getType()
 	 */
+	@Override
 	public IType getType() {
 		if (fType == null && fDeclarations != null) {
 			IASTNode parent= fDeclarations[0].getParent();
@@ -170,34 +178,39 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic()
      */
-    public boolean isStatic() {
+    @Override
+	public boolean isStatic() {
         return false;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedName()
      */
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return new String[] { getName() };
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IBinding#getFullyQualifiedNameCharArray()
      */
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
         return new char[][] { getNameCharArray() };
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified()
      */
-    public boolean isGloballyQualified() {
+    @Override
+	public boolean isGloballyQualified() {
         return false;
     }
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode)
 	 */
+	@Override
 	public void addDefinition(IASTNode node) {
 		addDeclaration(node);
 	}
@@ -205,7 +218,8 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern()
      */
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         //7.1.1-5 extern can not be used in the declaration of a parameter
         return false;
     }
@@ -213,7 +227,8 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable#isMutable()
      */
-    public boolean isMutable() {
+    @Override
+	public boolean isMutable() {
         //7.1.1-8 mutable can only apply to class members
         return false;
     }
@@ -221,14 +236,16 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto()
      */
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         return hasStorageClass(IASTDeclSpecifier.sc_auto);
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister()
      */
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         return hasStorageClass(IASTDeclSpecifier.sc_register);
     }
     
@@ -264,14 +281,17 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 		return null;
 	}
 	
+	@Override
 	public boolean hasDefaultValue() {
 		return getDefaultValue() != null;
 	}
 	
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
@@ -282,14 +302,17 @@ public class CPPParameter extends PlatformObject implements ICPPParameter, ICPPI
 		return name.length() != 0 ? name : "<unnamed>"; //$NON-NLS-1$
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		return CPPVisitor.findEnclosingFunction(fDeclarations[0]);
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
 
+	@Override
 	public IBinding resolveFinalBinding(CPPASTNameBase name) {
 		// check if the binding has been updated.
 		IBinding current= name.getPreBinding();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java
index c5dc6cd4457..7369fe71858 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterPackType.java
@@ -28,16 +28,19 @@ public class CPPParameterPackType implements ICPPParameterPackType, ITypeContain
     	setType(type);
     }
 
-    public IType getType() {
+    @Override
+	public IType getType() {
         return fType;
     }
     
-    public void setType(IType t) {
+    @Override
+	public void setType(IType t) {
     	assert t != null;
     	fType= t;
     }
 
-    public boolean isSameType(IType obj) {
+    @Override
+	public boolean isSameType(IType obj) {
         if (obj == this)
             return true;
         if (obj instanceof ITypedef)
@@ -67,6 +70,7 @@ public class CPPParameterPackType implements ICPPParameterPackType, ITypeContain
 		return ASTTypeUtil.getType(this);
 	}
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.PACK_EXPANSION;
 		buffer.putByte((byte) firstByte);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java
index 24d857d9776..93628b1d04d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPParameterSpecialization.java
@@ -36,10 +36,12 @@ public class CPPParameterSpecialization extends CPPSpecialization implements ICP
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#getType()
 	 */
+	@Override
 	public IType getType() {
 		return fType;
 	}
 	
+	@Override
 	public boolean isParameterPack() {
 		return fType instanceof ICPPParameterPackType;
 	}
@@ -53,6 +55,7 @@ public class CPPParameterSpecialization extends CPPSpecialization implements ICP
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IVariable#isStatic()
 	 */
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
@@ -60,39 +63,46 @@ public class CPPParameterSpecialization extends CPPSpecialization implements ICP
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isExtern()
      */
-    public boolean isExtern() {
+    @Override
+	public boolean isExtern() {
         return false;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isAuto()
      */
-    public boolean isAuto() {
+    @Override
+	public boolean isAuto() {
         return getParameter().isAuto();
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IVariable#isRegister()
      */
-    public boolean isRegister() {
+    @Override
+	public boolean isRegister() {
         return getParameter().isRegister();
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPVariable#isMutable()
      */
-    public boolean isMutable() {
+    @Override
+	public boolean isMutable() {
         return false;
     }
 
+	@Override
 	public boolean hasDefaultValue() {
 		return getParameter().hasDefaultValue();
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java
index a89e4b4c3d5..e0ae6bca75f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPPointerToMemberType.java
@@ -67,6 +67,7 @@ public class CPPPointerToMemberType extends CPPPointerType implements ICPPPointe
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPPointerToMemberType#getMemberOfClass()
 	 */
+	@Override
 	public IType getMemberOfClass() {
 		if (classType == null) {
 			IASTName name;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java
index f034402d957..7687f116c24 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPQualifierType.java
@@ -31,7 +31,8 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer, ISerial
         setType(type);
     }
     
-    public boolean isSameType(IType o) {
+    @Override
+	public boolean isSameType(IType o) {
 		if (o instanceof ITypedef)
 			return o.isSameType(this);
 		if (!(o instanceof IQualifierType))
@@ -46,25 +47,29 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer, ISerial
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isConst()
      */
-    public boolean isConst() {
+    @Override
+	public boolean isConst() {
         return isConst;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IQualifierType#isVolatile()
      */
-    public boolean isVolatile() {
+    @Override
+	public boolean isVolatile() {
         return isVolatile;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IQualifierType#getType()
      */
-    public IType getType() {
+    @Override
+	public IType getType() {
         return type;
     }
     
-    public void setType(IType t) {
+    @Override
+	public void setType(IType t) {
     	assert t != null;
         type = t;
     }
@@ -85,6 +90,7 @@ public class CPPQualifierType implements IQualifierType, ITypeContainer, ISerial
 		return ASTTypeUtil.getType(this);
 	}
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.CVQUALIFIER;
 		if (isConst()) firstByte |= ITypeMarshalBuffer.FLAG1;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java
index b825ccbbd82..d25aff00651 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPReferenceType.java
@@ -29,15 +29,18 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer, ISer
     	setType(type);
     }
 
-    public IType getType() {
+    @Override
+	public IType getType() {
         return fType;
     }
     
+	@Override
 	public boolean isRValueReference() {
 		return fIsRValue;
 	}
 
-    public void setType(IType t) {
+    @Override
+	public void setType(IType t) {
     	if (t instanceof ICPPReferenceType) {
     		final ICPPReferenceType rt = (ICPPReferenceType) t;
 			fIsRValue = fIsRValue && rt.isRValueReference();
@@ -47,7 +50,8 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer, ISer
     	fType= t;
     }
 
-    public boolean isSameType(IType obj) {
+    @Override
+	public boolean isSameType(IType obj) {
         if (obj == this)
             return true;
         if (obj instanceof ITypedef)
@@ -103,6 +107,7 @@ public class CPPReferenceType implements ICPPReferenceType, ITypeContainer, ISer
 		return ASTTypeUtil.getType(this);
 	}
 
+	@Override
 	public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
 		int firstByte= ITypeMarshalBuffer.REFERENCE;
 		if (isRValueReference()) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java
index 15707e5fcdb..d2ebbe45255 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScope.java
@@ -225,7 +225,7 @@ abstract public class CPPScope implements ICPPASTInternalScope {
 						if (fileSet != null) {
 							bindings= fileSet.filterFileLocalBindings(bindings);
 						}
-						result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result, bindings);
+						result = ArrayUtil.addAll(IBinding.class, result, bindings);
 					} catch (CoreException e) {
 						CCorePlugin.log(e);
 					}
@@ -239,7 +239,7 @@ abstract public class CPPScope implements ICPPASTInternalScope {
 							if (fileSet != null) {
 								bindings= fileSet.filterFileLocalBindings(bindings);
 							}
-							result = (IBinding[]) ArrayUtil.addAll(IBinding.class, result, bindings);
+							result = ArrayUtil.addAll(IBinding.class, result, bindings);
 						}
 					} catch (CoreException e) {
 						CCorePlugin.log(e);
@@ -248,7 +248,7 @@ abstract public class CPPScope implements ICPPASTInternalScope {
 			}
 		}
 
-		return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+		return ArrayUtil.trim(IBinding.class, result);
 	}
 
 
@@ -289,7 +289,7 @@ abstract public class CPPScope implements ICPPASTInternalScope {
 	        	result = addCandidate(obj, name, forceResolve, checkPointOfDecl, result);
 	        }
 	    }
-	    return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+	    return ArrayUtil.trim(IBinding.class, result);
 	}
 
 	private IBinding[] addCandidate(Object candidate, IASTName name, boolean forceResolve, 
@@ -319,7 +319,7 @@ abstract public class CPPScope implements ICPPASTInternalScope {
 			binding= (IBinding) candidate;
 		}
 
-		return (IBinding[]) ArrayUtil.append(IBinding.class, result, binding);
+		return ArrayUtil.append(IBinding.class, result, binding);
 	}
 	
 	@Override
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java
index 7fe24052b59..cf8bb539ebf 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPScopeMapper.java
@@ -60,12 +60,15 @@ public class CPPScopeMapper {
 			fContainer= container;
 			fNominated= inline;
 		}
+		@Override
 		public IScope getContainingScope() {
 			return fContainer;
 		}
+		@Override
 		public ICPPNamespaceScope getNominatedScope() throws DOMException {
 			return fNominated;
 		}
+		@Override
 		public int getPointOfDeclaration() {
 			return 0;
 		}
@@ -84,25 +87,32 @@ public class CPPScopeMapper {
 			assert fScope instanceof IIndexScope;
 		}
 
+		@Override
 		public EScopeKind getKind() {
 			return fScope.getKind();
 		}
 
+		@Override
 		public IBinding[] find(String name) {
 			return fScope.find(name);
 		}
+		@Override
 		public IBinding getBinding(IASTName name, boolean resolve) {
 			return fScope.getBinding(name, resolve);
 		}
+		@Override
 		public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet acceptLocalBindings) {
 			return fScope.getBinding(name, resolve, acceptLocalBindings);
 		}
+		@Override
 		public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) {
 			return fScope.getBindings(name, resolve, prefixLookup);
 		}
+		@Override
 		public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup,	IIndexFileSet acceptLocalBindings) {
 			return fScope.getBindings(name, resolve, prefixLookup, acceptLocalBindings);
 		}
+		@Override
 		public IScope getParent() throws DOMException {
 			IScope parent= fScope.getParent();
 			if (parent instanceof IIndexScope) {
@@ -111,10 +121,12 @@ public class CPPScopeMapper {
 			return fTu.getScope();
 		}
 
+		@Override
 		public IName getScopeName() {
 			return fScope.getScopeName();
 		}
 
+		@Override
 		public void addUsingDirective(ICPPUsingDirective usingDirective) {
 			initUsingDirectives();
 			fUsingDirectives.add(usingDirective);
@@ -130,11 +142,13 @@ public class CPPScopeMapper {
 			}
 		}
 
+		@Override
 		public ICPPUsingDirective[] getUsingDirectives() {
 			initUsingDirectives();
 			return fUsingDirectives.toArray(new ICPPUsingDirective[fUsingDirectives.size()]);
 		}
 
+		@Override
 		public ICPPNamespaceScope[] getEnclosingNamespaceSet() {
 			if (fEnclosingNamespaceSet == null)
 				return fEnclosingNamespaceSet= CPPNamespaceScope.computeEnclosingNamespaceSet(this);
@@ -142,6 +156,7 @@ public class CPPScopeMapper {
 			return fEnclosingNamespaceSet;
 		}
 
+		@Override
 		public boolean isInlineNamepace() {
 			IIndexBinding binding = ((IIndexScope) fScope).getScopeBinding();
 			if (binding instanceof ICPPNamespace && ((ICPPNamespace) binding).isInline())
@@ -150,6 +165,7 @@ public class CPPScopeMapper {
 			return false;
 		}
 
+		@Override
 		public ICPPInternalNamespaceScope[] getInlineNamespaces() {
 			// Obtain the inline namespaces from the index and map them to the ast
 			ICPPNamespaceScope[] pre = fScope.getInlineNamespaces();
@@ -173,6 +189,7 @@ public class CPPScopeMapper {
 			fDirective= ud;
 		}
 
+		@Override
 		public IScope getContainingScope() {
 			final IScope scope= fDirective.getContainingScope();
 			if (scope == null) {
@@ -181,10 +198,12 @@ public class CPPScopeMapper {
 			return scope;
 		}
 
+		@Override
 		public ICPPNamespaceScope getNominatedScope() throws DOMException {
 			return fDirective.getNominatedScope();
 		}
 
+		@Override
 		public int getPointOfDeclaration() {
 			return fOffset;
 		}
@@ -208,7 +227,7 @@ public class CPPScopeMapper {
 					final char[] nameChars = name.getLookupKey();
 					if (nameChars.length > 0) {
 						IASTName[] names= fClasses.get(nameChars);
-						names= (IASTName[]) ArrayUtil.append(IASTName.class, names, name);
+						names= ArrayUtil.append(IASTName.class, names, name);
 						fClasses.put(nameChars, names);
 					}
 					return PROCESS_CONTINUE;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java
index 953ef4203ce..87c4757dda6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPSpecialization.java
@@ -92,22 +92,27 @@ public abstract class CPPSpecialization extends PlatformObject implements ICPPSp
 		}
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return specialized;
 	}
 
+	@Override
 	public IASTNode[] getDeclarations() {
 		return declarations;
 	}
 
+	@Override
 	public IASTNode getDefinition() {
 		return definition;
 	}
 
+	@Override
 	public void addDefinition(IASTNode node) {
 		definition = node;
 	}
 
+	@Override
 	public void addDeclaration(IASTNode node) {
 		if (declarations == null) {
 	        declarations = new IASTNode[] { node };
@@ -115,25 +120,29 @@ public abstract class CPPSpecialization extends PlatformObject implements ICPPSp
 	        // keep the lowest offset declaration in [0]
 			if (declarations.length > 0 &&
 					((ASTNode) node).getOffset() < ((ASTNode) declarations[0]).getOffset()) {
-				declarations = (IASTNode[]) ArrayUtil.prepend(IASTNode.class, declarations, node);
+				declarations = ArrayUtil.prepend(IASTNode.class, declarations, node);
 			} else {
-				declarations = (IASTNode[]) ArrayUtil.append(IASTNode.class, declarations, node);
+				declarations = ArrayUtil.append(IASTNode.class, declarations, node);
 			}
 	    }
 	}
 
+	@Override
 	public String getName() {
 		return specialized.getName();
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return specialized.getNameCharArray();
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return owner;
 	}
 	
+	@Override
 	public IScope getScope() throws DOMException {
 		if (owner instanceof ICPPClassType) {
 			return ((ICPPClassType) owner).getCompositeScope();
@@ -150,29 +159,35 @@ public abstract class CPPSpecialization extends PlatformObject implements ICPPSp
 		return specialized.getScope();
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return CPPVisitor.getQualifiedName(this);
 	}
 
+	@Override
 	public char[][] getQualifiedNameCharArray() {
 		return CPPVisitor.getQualifiedNameCharArray(this);
 	}
 
+	@Override
 	public boolean isGloballyQualified() throws DOMException {
 		if (specialized instanceof ICPPBinding)
 			return ((ICPPBinding) specialized).isGloballyQualified();
 		return false;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return CPPTemplates.getArgumentMap(this, getTemplateParameterMap());
 	}
 	
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		return argumentMap;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java
index e9b268a29c7..77956c14b9f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateArgument.java
@@ -35,30 +35,37 @@ public class CPPTemplateArgument implements ICPPTemplateArgument {
 		fValue= null;
 	}
 	
+	@Override
 	public boolean isTypeValue() {
 		return fValue == null;
 	}
 
+	@Override
 	public boolean isNonTypeValue() {
 		return fValue != null;
 	}
 
+	@Override
 	public IType getTypeValue() {
 		return isTypeValue() ? fType : null;
 	}
 
+	@Override
 	public IValue getNonTypeValue() {
 		return fValue;
 	}
 	
+	@Override
 	public IType getTypeOfNonTypeValue() {
 		return isNonTypeValue() ? fType : null;
 	}
 	
+	@Override
 	public boolean isPackExpansion() {
 		return fType instanceof ICPPParameterPackType;
 	}
 
+	@Override
 	public ICPPTemplateArgument getExpansionPattern() {
 		if (fType instanceof ICPPParameterPackType) {
 			IType t= ((ICPPParameterPackType) fType).getType();
@@ -72,6 +79,7 @@ public class CPPTemplateArgument implements ICPPTemplateArgument {
 		return null;
 	}
 
+	@Override
 	public boolean isSameValue(ICPPTemplateArgument arg) {
 		if (fValue != null) {
 			return fValue.equals(arg.getNonTypeValue());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java
index c914bbe3eb2..a9e1c000d37 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java
@@ -227,7 +227,7 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC
 					result = (ICPPTemplateParameter[]) ArrayUtil.append(ICPPTemplateParameter.class, result, p);
 				}
 			}
-			templateParameters = (ICPPTemplateParameter[]) ArrayUtil.trim(ICPPTemplateParameter.class, result);
+			templateParameters = ArrayUtil.trim(ICPPTemplateParameter.class, result);
 		}
 		return templateParameters;
 	}
@@ -271,9 +271,9 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC
 		} else {
 	        // keep the lowest offset declaration in[0]
 			if (declarations.length > 0 && ((ASTNode) node).getOffset() < ((ASTNode) declarations[0]).getOffset()) {
-				declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, declName);
+				declarations = ArrayUtil.prepend(IASTName.class, declarations, declName);
 			} else {
-				declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, declName);
+				declarations = ArrayUtil.append(IASTName.class, declarations, declName);
 			}
 	    }
 	}	
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java
index 4a751d5a1e6..444d85a0316 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java
@@ -92,6 +92,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
 	 */
+	@Override
 	public final String getName() {
 		return new String(getNameCharArray());
 	}
@@ -99,6 +100,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
 	 */
+	@Override
 	public final char[] getNameCharArray() {
 		// Search for the first declaration that has a name.
 		for (IASTName decl : declarations) {
@@ -112,14 +114,17 @@ public abstract class CPPTemplateParameter extends PlatformObject
 		return CharArrayUtils.EMPTY;
 	}
 
+	@Override
 	public int getParameterID() {
 		return fParameterID;
 	}
 
+	@Override
 	public short getParameterPosition() {
 		return (short) fParameterID;
 	}
 
+	@Override
 	public short getTemplateNestingLevel() {
 		return (short) (fParameterID >> 16);
 	}
@@ -139,6 +144,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
 	 */
+	@Override
 	public IScope getScope() {
 		return CPPVisitor.getContainingScope(getPrimaryDeclaration());
 	}
@@ -146,6 +152,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedName()
 	 */
+	@Override
 	public String[] getQualifiedName() {
 		return new String[] { getName() };
 	}
@@ -153,6 +160,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray()
 	 */
+	@Override
 	public char[][] getQualifiedNameCharArray() {
 		return new char[][] {getNameCharArray() };
 	}
@@ -160,6 +168,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#isGloballyQualified()
 	 */
+	@Override
 	public boolean isGloballyQualified() {
 		return false;
 	}
@@ -167,6 +176,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#getDeclarations()
 	 */
+	@Override
 	public IASTName[] getDeclarations() {
 		return declarations;
 	}
@@ -174,6 +184,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#getDefinition()
 	 */
+	@Override
 	public IASTNode getDefinition() {
 		if (declarations != null && declarations.length > 0)
 			return declarations[0];
@@ -183,6 +194,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode)
 	 */
+	@Override
 	public void addDefinition(IASTNode node) {
 		addDeclaration(node);
 	}
@@ -190,6 +202,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDeclaration(org.eclipse.cdt.core.dom.ast.IASTNode)
 	 */
+	@Override
 	public void addDeclaration(IASTNode node) {
 		if (!(node instanceof IASTName))
 			return;
@@ -201,13 +214,14 @@ public abstract class CPPTemplateParameter extends PlatformObject
 	            return;
 			// keep the lowest offset declaration in [0]
 			if (declarations.length > 0 && ((ASTNode)node).getOffset() < ((ASTNode)declarations[0]).getOffset()) {
-				declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name);
+				declarations = ArrayUtil.prepend(IASTName.class, declarations, name);
 			} else {
-				declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name);
+				declarations = ArrayUtil.append(IASTName.class, declarations, name);
 			}
 	    }
 	}
 	
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
@@ -217,6 +231,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 		return getName();
 	}	
 	
+	@Override
 	public IBinding getOwner() {
 		if (declarations == null || declarations.length == 0)
 			return null;
@@ -232,6 +247,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
 		return CPPTemplates.getContainingTemplate((ICPPASTTemplateParameter) node);
 	}
 	
+	@Override
 	public IBinding resolveFinalBinding(CPPASTNameBase name) {
 		// check if the binding has been updated.
 		IBinding current= name.getPreBinding();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java
index 3d5bc411e5b..bb7d051db56 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameterMap.java
@@ -73,6 +73,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap {
 	/**
 	 * Returns the value for the given parameter.
 	 */
+	@Override
 	public ICPPTemplateArgument getArgument(ICPPTemplateParameter param) {
 		if (param == null)
 			return null;
@@ -83,6 +84,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap {
 	 * Returns the value for the template parameter with the given id.
 	 * @see ICPPTemplateParameter#getParameterID()
 	 */
+	@Override
 	public ICPPTemplateArgument getArgument(int paramID) {
 		final Object object = fMap.get(paramID);
 		if (object instanceof ICPPTemplateArgument) {
@@ -94,6 +96,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap {
 	/**
 	 * Returns the values for the given template parameter pack.
 	 */
+	@Override
 	public ICPPTemplateArgument[] getPackExpansion(ICPPTemplateParameter tpar) {
 		return getPackExpansion(tpar.getParameterID());
 	}
@@ -102,6 +105,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap {
 	 * Returns the values for the template parameter pack with the given id.
 	 * @see ICPPTemplateParameter#getParameterID()
 	 */
+	@Override
 	public ICPPTemplateArgument[] getPackExpansion(int paramID) {
 		final Object object = fMap.get(paramID);
 		if (object instanceof ICPPTemplateArgument[]) {
@@ -197,6 +201,7 @@ public class CPPTemplateParameterMap implements ICPPTemplateParameterMap {
 	/**
 	 * Returns the array of template parameter positions, for which a mapping exists.
 	 */
+	@Override
 	public Integer[] getAllParameterPositions() {
 		return fMap.keyArray(Integer.class);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java
index 6057105f843..310ec0cfbeb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateScope.java
@@ -27,14 +27,17 @@ public class CPPTemplateScope extends CPPScope implements ICPPTemplateScope {
 		super(physicalNode);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eTemplateDeclaration;
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return null;
 	}
 	
+	@Override
 	public ICPPASTTemplateDeclaration getTemplateDeclaration() {
 		return (ICPPASTTemplateDeclaration) getPhysicalNode();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java
index 38afe6913f3..27a1f197756 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameter.java
@@ -86,7 +86,7 @@ public class CPPTemplateTemplateParameter extends CPPTemplateParameter implement
 					result = (ICPPTemplateParameter[]) ArrayUtil.append(ICPPTemplateParameter.class, result, binding);
 				}
 			}
-			templateParameters = (ICPPTemplateParameter[]) ArrayUtil.trim(ICPPTemplateParameter.class, result);
+			templateParameters = ArrayUtil.trim(ICPPTemplateParameter.class, result);
 		}
 		return templateParameters;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java
index cf1e2ad30c4..64a1905dfef 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTemplateParameterScope.java
@@ -24,6 +24,7 @@ public class CPPTemplateTemplateParameterScope extends CPPScope {
 		super(parameter);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eLocal;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java
index 1d1cef89537..ec47f888fbd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateTypeParameter.java
@@ -36,10 +36,12 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements
 		fIsParameterPack= isPack;
 	}
 
+	@Override
 	public final boolean isParameterPack() {
 		return fIsParameterPack;
 	}
 
+	@Override
 	public ICPPScope asScope() {
 	    if (unknownScope == null) {
 	    	IASTName n = null;
@@ -51,6 +53,7 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements
 	    return unknownScope;
 	}
 
+	@Override
 	public IType getDefault() {
 		IASTName[] nds = getDeclarations();
 		if (nds == null || nds.length == 0)
@@ -69,6 +72,7 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements
 		return null;
 	}
 	
+	@Override
 	public ICPPTemplateArgument getDefaultValue() {
 		IType t= getDefault();
 		if (t == null)
@@ -77,7 +81,8 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements
 		return new CPPTemplateArgument(t);
 	}
 
-    public boolean isSameType(IType type) {
+    @Override
+	public boolean isSameType(IType type) {
         if (type == this)
             return true;
         if (type instanceof ITypedef)
@@ -88,6 +93,7 @@ public class CPPTemplateTypeParameter extends CPPTemplateParameter implements
         return getParameterID() == ((ICPPTemplateParameter) type).getParameterID();
     }
 
+	@Override
 	public IASTName getUnknownName() {
 		return new CPPASTName(getNameCharArray());
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java
index 1374189dd2d..6974a726823 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedef.java
@@ -154,9 +154,9 @@ public class CPPTypedef extends PlatformObject implements ITypedef, ITypeContain
 	        // Keep the lowest offset declaration in [0]
 			if (declarations.length > 0 &&
 					((ASTNode) node).getOffset() < ((ASTNode) declarations[0]).getOffset()) {
-				declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name);
+				declarations = ArrayUtil.prepend(IASTName.class, declarations, name);
 			} else {
-				declarations = (IASTName[]) ArrayUtil.append(IASTName.class, declarations, name);
+				declarations = ArrayUtil.append(IASTName.class, declarations, name);
 			}
 	    }
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java
index 54ca87d2101..52f6968bc62 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTypedefSpecialization.java
@@ -52,7 +52,8 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.ITypedef#getType()
      */
-    public IType getType() {
+    @Override
+	public IType getType() {
     	return getType(MAX_TYPE_NESTING);
     }
     
@@ -114,7 +115,8 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType)
      */
-    public boolean isSameType(IType o) {
+    @Override
+	public boolean isSameType(IType o) {
         if (o == this)
             return true;
 	    if (o instanceof ITypedef) {
@@ -130,6 +132,7 @@ public class CPPTypedefSpecialization extends CPPSpecialization implements IType
 	    return false;
     }
 
+	@Override
 	public void setType(IType type) {
 		this.type = type;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java
index 406f9392e78..b99f7bead64 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownBinding.java
@@ -43,41 +43,51 @@ public class CPPUnknownBinding extends PlatformObject
         fOwner= owner;
     }
 
-    public IASTNode[] getDeclarations() {
+    @Override
+	public IASTNode[] getDeclarations() {
         return null;
     }
 
-    public IASTNode getDefinition() {
+    @Override
+	public IASTNode getDefinition() {
         return null;
     }
 
-    public void addDefinition(IASTNode node) {
+    @Override
+	public void addDefinition(IASTNode node) {
     }
 
-    public void addDeclaration(IASTNode node) {
+    @Override
+	public void addDeclaration(IASTNode node) {
     }
 
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
         return CPPVisitor.getQualifiedName(this);
     }
 
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
     	return CPPVisitor.getQualifiedNameCharArray(this);
     }
 
-    public boolean isGloballyQualified() {
+    @Override
+	public boolean isGloballyQualified() {
         return false;
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
         return name.toString();
     }
 
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
         return name.getSimpleID();
     }
 
-    public IScope getScope() throws DOMException {
+    @Override
+	public IScope getScope() throws DOMException {
     	// Use getOwner(), it is overridden by derived classes.
     	final IBinding owner = getOwner();
 		if (owner instanceof ICPPUnknownBinding) {
@@ -92,13 +102,15 @@ public class CPPUnknownBinding extends PlatformObject
     	return null;
     }
 
-    public ICPPScope asScope() {
+    @Override
+	public ICPPScope asScope() {
         if (unknownScope == null) {
             unknownScope = new CPPUnknownScope(this, name);
         }
         return unknownScope;
     }
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
@@ -117,10 +129,12 @@ public class CPPUnknownBinding extends PlatformObject
 		return getName();
 	}
 	
+	@Override
 	public IASTName getUnknownName() {
 		return name;
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return fOwner;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java
index 47d12562692..ad24ae0b606 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClass.java
@@ -37,51 +37,63 @@ public class CPPUnknownClass extends CPPUnknownBinding implements ICPPUnknownCla
         super(binding, name);
     }
 
-    public ICPPBase[] getBases() {
+    @Override
+	public ICPPBase[] getBases() {
         return ICPPBase.EMPTY_BASE_ARRAY;
     }
 
-    public IField[] getFields() {
+    @Override
+	public IField[] getFields() {
         return IField.EMPTY_FIELD_ARRAY;
     }
 
-    public IField findField(String name) {
+    @Override
+	public IField findField(String name) {
         return null;
     }
 
-    public ICPPField[] getDeclaredFields() {
+    @Override
+	public ICPPField[] getDeclaredFields() {
         return ICPPField.EMPTY_CPPFIELD_ARRAY;
     }
 
-    public ICPPMethod[] getMethods() {
+    @Override
+	public ICPPMethod[] getMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
-    public ICPPMethod[] getAllDeclaredMethods() {
+    @Override
+	public ICPPMethod[] getAllDeclaredMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
-    public ICPPMethod[] getDeclaredMethods() {
+    @Override
+	public ICPPMethod[] getDeclaredMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
-    public ICPPConstructor[] getConstructors() {
+    @Override
+	public ICPPConstructor[] getConstructors() {
         return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
     }
 
-    public IBinding[] getFriends() {
+    @Override
+	public IBinding[] getFriends() {
         return IBinding.EMPTY_BINDING_ARRAY;
     }
 
-    public int getKey(){
+    @Override
+	public int getKey(){
         return 0;
     }
 
-    public final IScope getCompositeScope() {
+    @Override
+	public final IScope getCompositeScope() {
         return asScope();
     }
 
-    public boolean isSameType(IType type) {
+    @Override
+	public boolean isSameType(IType type) {
     	if (this == type) 
     		return true;
     	
@@ -103,10 +115,12 @@ public class CPPUnknownClass extends CPPUnknownBinding implements ICPPUnknownCla
 		return false;
     }
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		return ICPPClassType.EMPTY_CLASS_ARRAY;
 	}
 	
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java
index 0f3c3af4587..d83258844ef 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownClassInstance.java
@@ -31,6 +31,7 @@ public class CPPUnknownClassInstance extends CPPUnknownClass implements ICPPUnkn
 		this.arguments = arguments;
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getArguments() {
 		return arguments;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java
index 85bf91bb0c9..2c0e8bcf8cc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownConstructor.java
@@ -23,30 +23,37 @@ public class CPPUnknownConstructor extends CPPUnknownFunction implements ICPPCon
 		super(owner, owner.getNameCharArray());
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return false;
 	}
 
+	@Override
 	public boolean isDestructor() {
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return false;
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return false;
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return false;
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public int getVisibility() {
 		return v_public;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java
index 7958038e3c9..88663d1e776 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUnknownFunction.java
@@ -39,34 +39,42 @@ public class CPPUnknownFunction extends CPPUnknownBinding implements ICPPFunctio
 		super(owner, name);
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
 		return null;
 	}
 
+	@Override
 	public boolean isDeleted() {
 		return false;
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
 
+	@Override
 	public boolean isInline() {
 		return false;
 	}
 
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		return asScope();
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 		return ICPPParameter.EMPTY_CPPPARAMETER_ARRAY;
 	}
 
+	@Override
 	public ICPPFunctionType getType() {
 		if (fType == null) {
 			fType= new CPPUnknownFunctionType();
@@ -74,30 +82,37 @@ public class CPPUnknownFunction extends CPPUnknownBinding implements ICPPFunctio
 		return fType;
 	}
 
+	@Override
 	public boolean isAuto() {
 		return false;
 	}
 
+	@Override
 	public boolean isExtern() {
 		return false;
 	}
 
+	@Override
 	public boolean isRegister() {
 		return false;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return false;
 	}
 
+	@Override
 	public int getRequiredArgumentCount() {
 		return 0;
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java
index d4807ecdfdf..79b68c06656 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclaration.java
@@ -38,19 +38,23 @@ public class CPPUsingDeclaration extends PlatformObject implements ICPPUsingDecl
         this.delegates= bindings;
     }
         
-    public IBinding[] getDelegates() {
+    @Override
+	public IBinding[] getDelegates() {
         return delegates;
     }
 
-    public String[] getQualifiedName() {
+    @Override
+	public String[] getQualifiedName() {
     	return CPPVisitor.getQualifiedName(this);
     }
 
-    public char[][] getQualifiedNameCharArray() {
+    @Override
+	public char[][] getQualifiedNameCharArray() {
     	return CPPVisitor.getQualifiedNameCharArray(this);
     }
 
-    public boolean isGloballyQualified() throws DOMException {
+    @Override
+	public boolean isGloballyQualified() throws DOMException {
         IScope scope = getScope();
         while (scope != null) {
             if(scope instanceof ICPPBlockScope)
@@ -60,23 +64,28 @@ public class CPPUsingDeclaration extends PlatformObject implements ICPPUsingDecl
         return true;
     }
 
-    public String getName() {
+    @Override
+	public String getName() {
     	return new String(getNameCharArray());
     }
 
-    public char[] getNameCharArray() {
+    @Override
+	public char[] getNameCharArray() {
     	return name.getSimpleID();
     }
 
-    public IScope getScope() {
+    @Override
+	public IScope getScope() {
         return CPPVisitor.getContainingScope(name.getParent());
     }
 
-    public IASTNode[] getDeclarations() {
+    @Override
+	public IASTNode[] getDeclarations() {
         return null;
     }
 
-    public IASTNode getDefinition() {
+    @Override
+	public IASTNode getDefinition() {
         IASTNode n = name.getParent();
         if (n instanceof ICPPASTTemplateId)
             n = n.getParent();
@@ -84,16 +93,20 @@ public class CPPUsingDeclaration extends PlatformObject implements ICPPUsingDecl
         return n;
     }
 
-    public void addDefinition(IASTNode node) {
+    @Override
+	public void addDefinition(IASTNode node) {
     }
 
-    public void addDeclaration(IASTNode node) {
+    @Override
+	public void addDeclaration(IASTNode node) {
     }
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 	
+	@Override
 	public IBinding getOwner() {
 		return CPPVisitor.findDeclarationOwner(name, true);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java
index 3e8ebd91cea..2ac509e168b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDeclarationSpecialization.java
@@ -32,6 +32,7 @@ public class CPPUsingDeclarationSpecialization extends CPPSpecialization impleme
         super(specialized, owner, tpmap);
     }
 
+	@Override
 	public IBinding[] getDelegates() {
 		if (fDelegates == null) {
 			fDelegates= specializeDelegates();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java
index 195de6660bf..119ce9cdcf0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPUsingDirective.java
@@ -46,6 +46,7 @@ public class CPPUsingDirective implements ICPPUsingDirective {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getNamespaceScope()
 	 */
+	@Override
 	public ICPPNamespaceScope getNominatedScope() throws DOMException {
 		IBinding binding= fNamespaceName.resolveBinding();
 		if (binding instanceof ICPPNamespace) {
@@ -57,6 +58,7 @@ public class CPPUsingDirective implements ICPPUsingDirective {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getPointOfDeclaration()
 	 */
+	@Override
 	public int getPointOfDeclaration() {
 		final ASTNode astNode = (ASTNode) fNamespaceName;
 		return astNode.getOffset() + astNode.getLength();
@@ -65,6 +67,7 @@ public class CPPUsingDirective implements ICPPUsingDirective {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getContainingScope()
 	 */
+	@Override
 	public IScope getContainingScope() {
 		return CPPVisitor.getContainingScope(fNamespaceName);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
index 4410727af14..bfa9f6b0498 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPVariable.java
@@ -100,9 +100,9 @@ public class CPPVariable extends PlatformObject implements ICPPVariable, ICPPInt
 			// keep the lowest offset declaration at the first position
 			if (fDeclarations.length > 0
 					&& ((ASTNode) node).getOffset() < ((ASTNode) fDeclarations[0]).getOffset()) {
-				fDeclarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, fDeclarations, name);
+				fDeclarations = ArrayUtil.prepend(IASTName.class, fDeclarations, name);
 			} else {
-				fDeclarations = (IASTName[]) ArrayUtil.append(IASTName.class, fDeclarations, name);
+				fDeclarations = ArrayUtil.append(IASTName.class, fDeclarations, name);
 			}
 		}
 		// array types may be incomplete
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
index 4dd50a7d918..84394d52ea8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ClassTypeHelper.java
@@ -237,7 +237,7 @@ public class ClassTypeHelper {
 				}
 			}
 		}
-		return (ICPPField[]) ArrayUtil.trim(ICPPField.class, result);
+		return ArrayUtil.trim(ICPPField.class, result);
 	}
 
 	/**
@@ -291,9 +291,9 @@ public class ClassTypeHelper {
 		ICPPMethod[] methods= ct.getDeclaredMethods();
 		ICPPClassType[] bases= getAllBases(ct);
 		for (ICPPClassType base : bases) {
-			methods = (ICPPMethod[]) ArrayUtil.addAll(ICPPMethod.class, methods, base.getDeclaredMethods());
+			methods = ArrayUtil.addAll(ICPPMethod.class, methods, base.getDeclaredMethods());
 		}
-		return (ICPPMethod[]) ArrayUtil.trim(ICPPMethod.class, methods);
+		return ArrayUtil.trim(ICPPMethod.class, methods);
 	}
 
 	public static ICPPMethod[] getMethods(ICPPClassType ct) {
@@ -376,7 +376,7 @@ public class ClassTypeHelper {
 				}
 			}
 		}
-		return (ICPPMethod[]) ArrayUtil.trim(ICPPMethod.class, result);
+		return ArrayUtil.trim(ICPPMethod.class, result);
 	}
 
 	/* (non-Javadoc)
@@ -421,16 +421,16 @@ public class ClassTypeHelper {
 					result = (ICPPClassType[])ArrayUtil.append(ICPPClassType.class, result, binding);
 			} 
 		}
-		return (ICPPClassType[]) ArrayUtil.trim(ICPPClassType.class, result);
+		return ArrayUtil.trim(ICPPClassType.class, result);
 	}
 
 	public static IField[] getFields(ICPPClassType ct) {
 		IField[] fields = ct.getDeclaredFields();
 		ICPPClassType[] bases = getAllBases(ct);
 		for (ICPPClassType base : bases) {
-			fields = (IField[]) ArrayUtil.addAll(IField.class, fields, base.getDeclaredFields());
+			fields = ArrayUtil.addAll(IField.class, fields, base.getDeclaredFields());
 		}
-		return (IField[]) ArrayUtil.trim(IField.class, fields);
+		return ArrayUtil.trim(IField.class, fields);
 	}
 
 	public static IField findField(ICPPClassType ct, String name) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
index 8b73bb6d741..f0a3aa88b97 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GNUCPPSourceParser.java
@@ -2364,9 +2364,9 @@ public class GNUCPPSourceParser extends AbstractGNUSourceCodeParser {
         				markBeforDtor= null;
         				dtor= addInitializer(e, declOption);
         			}
-        			declarators = (IASTDeclarator[]) ArrayUtil.append(IASTDeclarator.class, declarators, dtor);
+        			declarators = ArrayUtil.append(IASTDeclarator.class, declarators, dtor);
         		}
-        		declarators = (IASTDeclarator[]) ArrayUtil.removeNulls(IASTDeclarator.class, declarators);
+        		declarators = ArrayUtil.removeNulls(IASTDeclarator.class, declarators);
         	}
         }
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java
index d37ea4bc93e..4d3b7d3344e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/GPPASTSimpleDeclSpecifier.java
@@ -44,11 +44,13 @@ public class GPPASTSimpleDeclSpecifier extends CPPASTSimpleDeclSpecifier impleme
 		return copy;
 	}
 
-    public void setTypeofExpression(IASTExpression typeofExpression) {
+    @Override
+	public void setTypeofExpression(IASTExpression typeofExpression) {
     	setDeclTypeExpression(typeofExpression);
     }
 
-    public IASTExpression getTypeofExpression() {
+    @Override
+	public IASTExpression getTypeofExpression() {
         return getDeclTypeExpression();
     }
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java
index 3a086562752..4dd8464e8fd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPClassSpecializationScope.java
@@ -33,6 +33,7 @@ public interface ICPPClassSpecializationScope extends ICPPClassScope {
 	/**
 	 * The specialized class.
 	 */
+	@Override
 	ICPPClassSpecialization getClassType();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java
index 2341cba3178..8bd724ab129 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPDeferredClassInstance.java
@@ -30,5 +30,6 @@ public interface ICPPDeferredClassInstance extends ICPPUnknownClassType, ICPPTem
 	 * arguments of this instance.
 	 * @since 5.1
 	 */
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java
index 187a3a94e19..af964f6f7b8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalClassTypeMixinHost.java
@@ -26,7 +26,8 @@ interface ICPPInternalClassTypeMixinHost extends ICPPClassType, ICPPInternalBind
 	 /**
 	  * {@inheritDoc}
 	  */
-	 ICPPClassScope getCompositeScope();
+	 @Override
+	ICPPClassScope getCompositeScope();
 
 	 /**
 	  * Ensures the ICPPInternalBinding definition is set, if this is possible.
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java
index 139889242e6..1d2208a312a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/ICPPInternalNamespaceScope.java
@@ -30,5 +30,6 @@ public interface ICPPInternalNamespaceScope extends ICPPNamespaceScope {
 	/**
 	 * Returns the inline namespace scopes mapped back to the AST.
 	 */
+	@Override
 	public ICPPInternalNamespaceScope[] getInlineNamespaces();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java
index 24316c3a014..bcda5244bcd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/AutoTypeResolver.java
@@ -42,103 +42,128 @@ class AutoTypeResolver implements ICPPFunctionTemplate {
 		functionType = new CPPFunctionType(new CPPBasicType(Kind.eVoid, 0), new IType[] { paramType });
 	}
 	
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		return TEMPLATE_PARAMETERS;
 	}
 	
+	@Override
 	public ICPPFunctionType getType() {
 		return functionType;
 	}
 
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
 
+	@Override
 	public boolean isInline() {
 		return false;
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
 
+	@Override
 	public boolean isDeleted() {
 		return false;
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
 		return null;
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public int getRequiredArgumentCount() {
 		return 1;
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		return false;
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
 
+	@Override
 	public boolean isExtern() {
 		return false;
 	}
 
+	@Override
 	public boolean isAuto() {
 		return false;
 	}
 
+	@Override
 	public boolean isRegister() {
 		return false;
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return false;
 	}
 
+	@Override
 	public String getName() {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public IBinding getOwner() {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public IScope getScope() throws DOMException {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Class adapter) {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public String[] getQualifiedName() throws DOMException {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public char[][] getQualifiedNameCharArray() throws DOMException {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
 
+	@Override
 	public boolean isGloballyQualified() throws DOMException {
 		throw new UnsupportedOperationException(UNEXPECTED_CALL);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java
index f6a714cf3d6..c37e3b9b8e7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPFunctionSet.java
@@ -29,18 +29,22 @@ public class CPPFunctionSet implements ICPPTwoPhaseBinding {
 		fBindings = ArrayUtil.removeNulls(bindingList);
 	}
 	
+	@Override
 	public String getName() {
 		return fBindings[0].getName();
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return fBindings[0].getNameCharArray();
 	}
 
+	@Override
 	public IScope getScope() throws DOMException {
 		return fBindings[0].getScope();
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return fBindings[0].getOwner();
 	}
@@ -49,15 +53,18 @@ public class CPPFunctionSet implements ICPPTwoPhaseBinding {
 		return fBindings;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return Linkage.CPP_LINKAGE;
 	}
 
+	@Override
 	public IBinding resolveFinalBinding(CPPASTNameBase astName) {
 		return CPPSemantics.resolveTargetedFunction(astName, fBindings);
 	}
 
 	
+	@Override
 	@SuppressWarnings("unchecked")
 	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
 		if (adapter.isAssignableFrom(getClass())) 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
index fde5e727d38..761b47cb16e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPSemantics.java
@@ -1449,7 +1449,7 @@ public class CPPSemantics {
 		    if (item instanceof ICPPASTLinkageSpecification) {
 		        IASTDeclaration[] decls = ((ICPPASTLinkageSpecification) item).getDeclarations();
 		        if (decls != null && decls.length > 0) {
-			        nodeStack = (IASTNode[][]) ArrayUtil.append(IASTNode[].class, nodeStack, nodes);
+			        nodeStack = ArrayUtil.append(IASTNode[].class, nodeStack, nodes);
 			        nodeIdxStack = ArrayUtil.setInt(nodeIdxStack, ++nodeStackPos, idx);
 			        nodes = ((ICPPASTLinkageSpecification) item).getDeclarations();
 			        idx = 0;
@@ -1783,7 +1783,7 @@ public class CPPSemantics {
         IBinding[] result = null;
         for (Object binding : bindings) {
             if (binding instanceof IASTName)
-                result = (IBinding[]) ArrayUtil.append(IBinding.class, result, ((IASTName) binding).resolveBinding());
+                result = ArrayUtil.append(IBinding.class, result, ((IASTName) binding).resolveBinding());
             else if (binding instanceof IBinding)
                 result = (IBinding[]) ArrayUtil.append(IBinding.class, result, binding);
         }
@@ -2021,13 +2021,13 @@ public class CPPSemantics {
 
 	        IBinding[] bindings = null;
 	        if (cmp > 0) {
-	            bindings = (IBinding[]) ArrayUtil.append(IBinding.class, bindings, obj);
-	            bindings = (IBinding[]) ArrayUtil.append(IBinding.class, bindings, type);
+	            bindings = ArrayUtil.append(IBinding.class, bindings, obj);
+	            bindings = ArrayUtil.append(IBinding.class, bindings, type);
 	        } else {
-	            bindings = (IBinding[]) ArrayUtil.append(IBinding.class, bindings, type);
+	            bindings = ArrayUtil.append(IBinding.class, bindings, type);
 	            bindings = (IBinding[]) ArrayUtil.addAll(IBinding.class, bindings, fns.keyArray());
 	        }
-	        bindings = (IBinding[]) ArrayUtil.trim(IBinding.class, bindings);
+	        bindings = ArrayUtil.trim(IBinding.class, bindings);
 	        ICPPUsingDeclaration composite = new CPPUsingDeclaration(data.astName, bindings);
 	        return composite;	
 	    }
@@ -2328,7 +2328,7 @@ public class CPPSemantics {
 	}
 	
 	public static IBinding resolveFunction(LookupData data, ICPPFunction[] fns, boolean allowUDC) throws DOMException {
-	    fns= (ICPPFunction[]) ArrayUtil.trim(ICPPFunction.class, fns);
+	    fns= ArrayUtil.trim(ICPPFunction.class, fns);
 	    if (fns == null || fns.length == 0)
 	        return null;
 	    
@@ -2413,7 +2413,7 @@ public class CPPSemantics {
 				bestFnCost= fnCost;
 				ambiguousFunctions= null;
 			} else if (cmp == 0) {
-				ambiguousFunctions= (IFunction[]) ArrayUtil.append(IFunction.class, ambiguousFunctions, fn);
+				ambiguousFunctions= ArrayUtil.append(IFunction.class, ambiguousFunctions, fn);
 			}
 		}
 		
@@ -2425,7 +2425,7 @@ public class CPPSemantics {
 						bestFnCost= fnCost;
 						ambiguousFunctions= null;
 					} else if (cmp == 0) {
-						ambiguousFunctions= (IFunction[]) ArrayUtil.append(IFunction.class, ambiguousFunctions, fnCost.getFunction());
+						ambiguousFunctions= ArrayUtil.append(IFunction.class, ambiguousFunctions, fnCost.getFunction());
 					}
 				}
 			}
@@ -2435,7 +2435,7 @@ public class CPPSemantics {
 			return null;
 		
 		if (ambiguousFunctions != null) {
-			ambiguousFunctions= (IFunction[]) ArrayUtil.append(IFunction.class, ambiguousFunctions, bestFnCost.getFunction());
+			ambiguousFunctions= ArrayUtil.append(IFunction.class, ambiguousFunctions, bestFnCost.getFunction());
 			return new ProblemBinding(data.astName, IProblemBinding.SEMANTIC_AMBIGUOUS_LOOKUP,
 					ambiguousFunctions);
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
index c8255cfca5a..c46a0b1e620 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java
@@ -533,7 +533,7 @@ public class CPPTemplates {
 				parent = parent.getParent();
 				templates = (ICPPASTTemplateDeclaration[]) ArrayUtil.append(ICPPASTTemplateDeclaration.class, templates, parent);
 			}
-			templates = (ICPPASTTemplateDeclaration[]) ArrayUtil.trim(ICPPASTTemplateDeclaration.class, templates);
+			templates = ArrayUtil.trim(ICPPASTTemplateDeclaration.class, templates);
 
 			ICPPASTTemplateDeclaration templateDeclaration = templates[0];
 			IASTDeclaration decl = templateDeclaration.getDeclaration();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
index e97fe4f13e1..f8229c7fbe0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java
@@ -2289,9 +2289,9 @@ public class CPPVisitor extends ASTQueries {
 		    	continue;
 		    }
 		
-		    ns = (String[]) ArrayUtil.append(String.class, ns, n);
+		    ns = ArrayUtil.append(String.class, ns, n);
 		}
-        ns = (String[]) ArrayUtil.trim(String.class, ns);
+        ns = ArrayUtil.trim(String.class, ns);
         String[] result = new String[ns.length + 1];
         for (int i = ns.length - 1; i >= 0; i--) {
             result[ns.length - i - 1] = ns[i];
@@ -2311,10 +2311,10 @@ public class CPPVisitor extends ASTQueries {
 		    if (owner instanceof ICPPNamespace && n.length == 0)
 		    	continue;
 		
-		    ns = (char[][]) ArrayUtil.append(n.getClass(), ns, n);
+		    ns = ArrayUtil.append(n.getClass(), ns, n);
 		}
         final char[] bname = binding.getNameCharArray();
-        ns = (char[][]) ArrayUtil.trim(bname.getClass(), ns);
+        ns = ArrayUtil.trim(bname.getClass(), ns);
         char[][] result = new char[ns.length + 1][];
         for (int i = ns.length - 1; i >= 0; i--) {
             result[ns.length - i - 1] = ns[i];
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java
index b6c39944c15..29f411715c5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/FunctionSetType.java
@@ -34,6 +34,7 @@ public class FunctionSetType implements IType {
 		fPointerType= addressOf;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return type == this;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java
index fd4578cb33b..8cb763dc3ff 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/InitializerListType.java
@@ -29,6 +29,7 @@ class InitializerListType implements IType {
 		fInitializerList= list;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java
index cde78f029fc..eca0003abaa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/UniqueType.java
@@ -20,6 +20,7 @@ class UniqueType implements IType {
 		fForParameterPack= forParameterPack;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return type == this;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
index db3ed821391..c03a92b63ab 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
@@ -372,7 +372,7 @@ public class ChangeGenerator extends ASTVisitor {
 					DefaultCodeFormatterConstants.FALSE);
 			CodeFormatter formatter = ToolFactory.createCodeFormatter(options);
 			code = document.get();
-			TextEdit[] formatEdits = formatter.format(CCodeFormatter.K_TRANSLATION_UNIT, code,
+			TextEdit[] formatEdits = formatter.format(CodeFormatter.K_TRANSLATION_UNIT, code,
 					regionsAfter, TextUtilities.getDefaultLineDelimiter(document));
 
 			// For each of the regions we apply formatting changes and create a ReplaceEdit using
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java
index 2c5a02188eb..47d06d5b46a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/CPPTypedefClone.java
@@ -27,6 +27,7 @@ public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, IC
 		this.delegate = typedef;
 	}
 
+	@Override
 	public IType getType() {
 		if (type == null) {
 			return delegate.getType();
@@ -34,31 +35,38 @@ public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, IC
 		return type;
 	}
 
+	@Override
 	public ILinkage getLinkage() {
 		return delegate.getLinkage();
 	}
 
+	@Override
 	public String getName() {
 		return delegate.getName();
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return delegate.getNameCharArray();
 	}
 
+	@Override
 	public IScope getScope() throws DOMException {
 		return delegate.getScope();
 	}
 
+	@Override
 	public IBinding getOwner() {
 		return delegate.getOwner();
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Class adapter) {
 		return delegate.getAdapter(adapter);
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		IType myrtype = getType();
 		if (myrtype == null)
@@ -70,18 +78,22 @@ public class CPPTypedefClone implements ITypedef, ITypeContainer, IIndexType, IC
 		return myrtype.isSameType(type);
 	}
 
+	@Override
 	public void setType(IType type) {
 		this.type = type;
 	}
 
+	@Override
 	public String[] getQualifiedName() throws DOMException {
 		return ((ICPPBinding) delegate).getQualifiedName();
 	}
 
+	@Override
 	public char[][] getQualifiedNameCharArray() throws DOMException {
 		return ((ICPPBinding) delegate).getQualifiedNameCharArray();
 	}
 
+	@Override
 	public boolean isGloballyQualified() throws DOMException {
 		return ((ICPPBinding) delegate).isGloballyQualified();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java
index 404c0770b58..c7bea3b2613 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/DefaultFragmentBindingComparator.java
@@ -18,6 +18,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
  * this implementation is too slow.
  */
 public class DefaultFragmentBindingComparator implements IIndexFragmentBindingComparator {
+	@Override
 	public int compare(IIndexFragmentBinding a, IIndexFragmentBinding b) {
 		int cmp= compareQualifiedNames(CPPVisitor.getQualifiedName(a), CPPVisitor.getQualifiedName(b));
 		if (cmp == 0) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java
index acc91a98edc..383217ae74c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/EmptyCIndex.java
@@ -39,136 +39,168 @@ final public class EmptyCIndex implements IIndex {
 	private EmptyCIndex() {
 	}
 
+	@Override
 	public IIndexName[] findDeclarations(IBinding binding) {
 		return IIndexFragmentName.EMPTY_NAME_ARRAY;
 	}
 
+	@Override
 	public IIndexName[] findDefinitions(IBinding binding) {
 		return IIndexFragmentName.EMPTY_NAME_ARRAY;
 	}
 
+	@Override
 	public IIndexName[] findReferences(IBinding binding) {
 		return IIndexFragmentName.EMPTY_NAME_ARRAY;
 	}
 
+	@Override
 	public IIndexName[] findNames(IBinding binding, int flags) {
 		return IIndexFragmentName.EMPTY_NAME_ARRAY;
 	}
 
+	@Override
 	@Deprecated
 	public IIndexFile getFile(int linkageID, IIndexFileLocation location) {
 		return null;
 	}
 
+	@Override
 	public IIndexFile getFile(int linkageID, IIndexFileLocation location,
 			ISignificantMacros significantFiles) throws CoreException {
 		return null;
 	}
 
+	@Override
 	public IIndexFile[] getFiles(int linkageID, IIndexFileLocation location) throws CoreException {
 		return IIndexFile.EMPTY_FILE_ARRAY;
 	}
 
+	@Override
 	public IIndexFile[] getFiles(IIndexFileLocation location) {
 		return IIndexFile.EMPTY_FILE_ARRAY;
 	}
 
+	@Override
 	public IIndexFile resolveInclude(IIndexInclude include) {
 		return null;
 	}
 
+	@Override
 	public IIndexInclude[] findIncludedBy(IIndexFile file) {
 		return IIndexInclude.EMPTY_INCLUDES_ARRAY;
 	}
 
+	@Override
 	public IIndexInclude[] findIncludedBy(IIndexFile file, int depth) {
 		return IIndexInclude.EMPTY_INCLUDES_ARRAY;
 	}
 
+	@Override
 	public IIndexInclude[] findIncludes(IIndexFile file) {
 		return IIndexInclude.EMPTY_INCLUDES_ARRAY;
 	}
 
+	@Override
 	public IIndexInclude[] findIncludes(IIndexFile file, int depth) {
 		return IIndexInclude.EMPTY_INCLUDES_ARRAY;
 	}
 
+	@Override
 	public void acquireReadLock() {
 	}
 
+	@Override
 	public void releaseReadLock() {
 	}
 
+	@Override
 	public boolean hasWaitingReaders() {
 		return false;
 	}
 
+	@Override
 	public long getLastWriteAccess() {
 		return 0;
 	}
 
+	@Override
 	public IIndexBinding findBinding(IName name) {
 		return null;
 	}
 
+	@Override
 	public IIndexBinding[] findBindings(Pattern pattern, boolean isFullyQualified,
 			IndexFilter filter, IProgressMonitor monitor) {
 		return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IIndexBinding[] findBindings(Pattern[] pattern, boolean isFullyQualified,
 			IndexFilter filter, IProgressMonitor monitor) throws CoreException {
 		return IIndexFragmentBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IIndexBinding adaptBinding(IBinding binding) {
 		return null;
 	}
 
+	@Override
 	public IIndexBinding[] findBindingsForPrefix(char[] prefix, boolean filescope,
 			IndexFilter filter, IProgressMonitor monitor) {
 		return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IIndexBinding[] findBindingsForContentAssist(char[] prefix, boolean filescope,
 			IndexFilter filter, IProgressMonitor monitor) {
 		return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IIndexBinding[] findBindings(char[][] names, IndexFilter filter,
 			IProgressMonitor monitor) {
 		return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IIndexBinding[] findBindings(char[] names, IndexFilter filter,
 			IProgressMonitor monitor)  {
 		return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IIndexMacro[] findMacros(char[] name, IndexFilter filter, IProgressMonitor monitor) {
 		return IIndexMacro.EMPTY_INDEX_MACRO_ARRAY;
 	}
 
+	@Override
 	public IIndexMacro[] findMacrosForPrefix(char[] prefix, IndexFilter filter, IProgressMonitor monitor) {
 		return IIndexMacro.EMPTY_INDEX_MACRO_ARRAY;
 	}
 
+	@Override
 	public IIndexFileSet createFileSet() {
 		return new IndexFileSet();
 	}
 
+	@Override
 	public IIndexFile[] getAllFiles() {
 		return IIndexFile.EMPTY_FILE_ARRAY;
 	}
 
+	@Override
 	public IIndexBinding[] findBindings(char[] name, boolean fileScopeOnly,	IndexFilter filter, IProgressMonitor monitor) {
 		return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IIndexBinding[] findMacroContainers(Pattern pattern, IndexFilter filter, IProgressMonitor monitor) {
 		return IIndexBinding.EMPTY_INDEX_BINDING_ARRAY;
 	}
 
+	@Override
 	public IScope[] getInlineNamespaces() {
 		return new IScope[0];
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java
index 778a76ea282..61f6e0ac56a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentBinding.java
@@ -27,6 +27,7 @@ public interface IIndexFragmentBinding extends IIndexBinding {
 	/**
 	 * Returns the linkage the binding belongs to.
 	 */
+	@Override
 	ILinkage getLinkage();
 	
 	/**
@@ -49,12 +50,14 @@ public interface IIndexFragmentBinding extends IIndexBinding {
 	/**
 	 * Returns the scope that contains this binding, or <code>null</code> for bindings in global scope.
 	 */
+	@Override
 	IIndexScope getScope();
 	
 	/**
 	 * {@inheritDoc}
 	 * @since 5.1
 	 */
+	@Override
 	IIndexFragmentBinding getOwner();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java
index 210261583b7..a8c922b561b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragmentFile.java
@@ -54,6 +54,7 @@ public interface IIndexFragmentFile extends IIndexFile {
 	/**
 	 * Returns the id of the linkage this file belongs to.
 	 */
+	@Override
 	int getLinkageID() throws CoreException;
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java
index 12efd0e5f74..17ee9cf89fc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexScope.java
@@ -31,10 +31,12 @@ public interface IIndexScope extends IScope {
 	/**
 	 * Returns the parent scope or <code>null</code> if the scope is nested in the global scope.
 	 */
+	@Override
 	IIndexScope getParent();
 	
 	/**
 	 * Returns the name of this scope.
 	 */
+	@Override
 	IIndexName getScopeName();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java
index cb0ce7d8864..10082a6ee7c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexChangeEvent.java
@@ -32,6 +32,7 @@ public class IndexChangeEvent implements IIndexChangeEvent {
 		fChangeEvent= new ChangeEvent();
 	}
 
+	@Override
 	public ICProject getAffectedProject() {
 		return fAffectedProject;
 	}
@@ -41,22 +42,27 @@ public class IndexChangeEvent implements IIndexChangeEvent {
 		fChangeEvent= e;
 	}
 
+	@Override
 	public Set<IIndexFileLocation> getFilesCleared() {
 		return fChangeEvent.fClearedFiles;
 	}
 
+	@Override
 	public Set<IIndexFileLocation> getFilesWritten() {
 		return fChangeEvent.fFilesWritten;
 	}
 
+	@Override
 	public boolean isCleared() {
 		return fChangeEvent.isCleared();
 	}
 
+	@Override
 	public boolean isReloaded() {
 		return fChangeEvent.isReloaded();
 	}
 
+	@Override
 	public boolean hasNewFile() {
 		return fChangeEvent.hasNewFiles();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
index 215ced10904..4f53ea73de6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexFactory.java
@@ -52,7 +52,7 @@ public class IndexFactory {
 	}
 
 	public IIndex getIndex(ICProject[] projects, int options) throws CoreException {
-		projects = (ICProject[]) ArrayUtil.removeNulls(ICProject.class, projects);
+		projects = ArrayUtil.removeNulls(ICProject.class, projects);
 
 		boolean addDependencies= (options & ADD_DEPENDENCIES) != 0;
 		boolean addDependent= (options & ADD_DEPENDENT) != 0;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java
index 62b5a78801a..7d58439d30a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexerStateEvent.java
@@ -32,6 +32,7 @@ public class IndexerStateEvent implements IIndexerStateEvent {
 		fState= state;
 	}
 
+	@Override
 	public boolean indexerIsIdle() {
 		return fState == STATE_IDLE;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java
index 0a0526da2c5..dca03afd456 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/WritableCIndex.java
@@ -38,37 +38,45 @@ public class WritableCIndex extends CIndex implements IWritableIndex {
 		return result;
 	}
 
+	@Override
 	public IWritableIndexFragment getWritableFragment() {
 		return fWritableFragment;
 	}
 	
+	@Override
 	public IIndexFragmentFile getWritableFile(int linkageID, IIndexFileLocation location,
 			ISignificantMacros macroDictionary) throws CoreException {
 		return fWritableFragment.getFile(linkageID, location, macroDictionary);
 	}
 
+	@Override
 	public IIndexFragmentFile[] getWritableFiles(int linkageID, IIndexFileLocation location) throws CoreException {
 		return fWritableFragment.getFiles(linkageID, location);
 	}
 
+	@Override
 	public IIndexFragmentFile[] getWritableFiles(IIndexFileLocation location) throws CoreException {
 		return fWritableFragment.getFiles(location);
 	}
 
+	@Override
 	public IIndexFragmentFile addFile(int linkageID, IIndexFileLocation location,
 			ISignificantMacros macroDictionary) throws CoreException {
 		return fWritableFragment.addFile(linkageID, location, macroDictionary);
 	}
 
+	@Override
 	public IIndexFragmentFile addUncommittedFile(int linkageID, IIndexFileLocation location,
 			ISignificantMacros macroDictionary) throws CoreException {
 		return fWritableFragment.addUncommittedFile(linkageID, location, macroDictionary);
 	}
 
+	@Override
 	public IIndexFragmentFile commitUncommittedFile() throws CoreException {
 		return fWritableFragment.commitUncommittedFile();
 	}
 
+	@Override
 	public void clearUncommittedFile() throws CoreException {
 		fWritableFragment.clearUncommittedFile();
 	}
@@ -77,6 +85,7 @@ public class WritableCIndex extends CIndex implements IWritableIndex {
 		return frag == fWritableFragment;
 	}
 
+	@Override
 	public void setFileContent(IIndexFragmentFile file, int linkageID, IncludeInformation[] includes,
 			IASTPreprocessorStatement[] macros, IASTName[][] names, ASTFilePathResolver resolver,
 			YieldableIndexLock lock) throws CoreException, InterruptedException {
@@ -94,15 +103,18 @@ public class WritableCIndex extends CIndex implements IWritableIndex {
 		}
 	}
 
+	@Override
 	public void clear() throws CoreException {
 		fWritableFragment.clear();
 	}
 
+	@Override
 	public boolean isWritableFile(IIndexFile file) {
 		return file instanceof IIndexFragmentFile && 
 				isWritableFragment(((IIndexFragmentFile)file).getIndexFragment());
 	}
 	
+	@Override
 	public void clearFile(IIndexFragmentFile file) throws CoreException {
 		IIndexFragment indexFragment = file.getIndexFragment();
 		if (!isWritableFragment(indexFragment)) {
@@ -128,6 +140,7 @@ public class WritableCIndex extends CIndex implements IWritableIndex {
 			fThread= null;
 	}
 
+	@Override
 	public void acquireWriteLock() throws InterruptedException {
 		checkThread();
 		assert !fIsWriteLocked: "Multiple write locks is not allowed"; //$NON-NLS-1$
@@ -136,10 +149,12 @@ public class WritableCIndex extends CIndex implements IWritableIndex {
 		fIsWriteLocked= true;
 	}
 
+	@Override
 	public void releaseWriteLock() {
 		releaseWriteLock(true);
 	}
 
+	@Override
 	public void releaseWriteLock(boolean flush) {
 		checkThread();
 		assert fIsWriteLocked: "No write lock to be released"; //$NON-NLS-1$
@@ -173,15 +188,18 @@ public class WritableCIndex extends CIndex implements IWritableIndex {
 		super.clearResultCache();
 	}
 
+	@Override
 	public void flush() throws CoreException {
 		assert !fIsWriteLocked;
 		fWritableFragment.flush();
 	}
 
+	@Override
 	public long getDatabaseSizeBytes() {
 		return fWritableFragment.getDatabaseSizeBytes();
 	}
 
+	@Override
 	public void transferIncluders(IIndexFragmentFile source, IIndexFragmentFile target) throws CoreException {
 		if (source == null || target == null || !isWritableFile(source) || !isWritableFile(target))
 			throw new IllegalArgumentException();
@@ -190,6 +208,7 @@ public class WritableCIndex extends CIndex implements IWritableIndex {
 		target.transferIncluders(source);
 	}
 	
+	@Override
 	public void transferContext(IIndexFragmentFile source, IIndexFragmentFile target) throws CoreException {
 		if (source == null || target == null || !isWritableFile(source) || !isWritableFile(target))
 			throw new IllegalArgumentException();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java
index b10ff4aa34d..0017b69df52 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/AbstractCompositeFactory.java
@@ -64,6 +64,7 @@ public abstract class AbstractCompositeFactory implements ICompositesFactory {
 	/**
 	 * @see ICompositesFactory#getCompositeBindings(IIndexFragmentBinding[][])
 	 */
+	@Override
 	public final IIndexBinding[] getCompositeBindings(IIndexFragmentBinding[][] fragmentBindings) {
 		return getCompositeBindings(mergeBindingArrays(fragmentBindings));
 	}
@@ -75,6 +76,7 @@ public abstract class AbstractCompositeFactory implements ICompositesFactory {
 		return result;
 	}
 
+	@Override
 	public final IIndexFragmentBinding[] findEquivalentBindings(IBinding binding) {
 		CIndex cindex= (CIndex) index;
 		try {
@@ -139,6 +141,7 @@ public abstract class AbstractCompositeFactory implements ICompositesFactory {
 			this.comparators= comparators;
 		}
 		
+		@Override
 		public int compare(IIndexFragmentBinding f1, IIndexFragmentBinding f2) {
 			for (IIndexFragmentBindingComparator comparator : comparators) {
 				int cmp= comparator.compare(f1, f2);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java
index 8bf0fb56e2f..2cdf226499a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeIndexBinding.java
@@ -46,18 +46,22 @@ public abstract class CompositeIndexBinding implements IIndexBinding {
 		this.rbinding = rbinding;
 	}
 	
+	@Override
 	public ILinkage getLinkage() {
 		return rbinding.getLinkage();
 	}
 
+	@Override
 	public String getName() {
 		return rbinding.getName();
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		return rbinding.getNameCharArray();
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Class adapter) {
 		if (adapter.isInstance(rbinding)) {
@@ -66,10 +70,12 @@ public abstract class CompositeIndexBinding implements IIndexBinding {
 		return null;
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return new String[] { getName() };
 	}
 	
+	@Override
 	public IIndexScope getScope() {
 		return cf.getCompositeScope(rbinding.getScope());
 	}
@@ -87,10 +93,12 @@ public abstract class CompositeIndexBinding implements IIndexBinding {
 		return rbinding.toString();
 	}
 	
+	@Override
 	public boolean isFileLocal() throws CoreException {
 		return rbinding != null && rbinding.isFileLocal();
 	}
 
+	@Override
 	public IIndexFile getLocalToFile() throws CoreException {
 		return rbinding != null ? rbinding.getLocalToFile() : null;
 	}
@@ -110,6 +118,7 @@ public abstract class CompositeIndexBinding implements IIndexBinding {
 		return rbinding.hashCode();
 	}
 	
+	@Override
 	public IIndexBinding getOwner() {
 		final IIndexFragmentBinding owner= rbinding.getOwner();
 		if (owner == null)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java
index 582decb50d6..65e8e274cbb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeType.java
@@ -25,6 +25,7 @@ public abstract class CompositeType implements IIndexType {
 		this.cf = cf;
 	}
 	
+	@Override
 	public boolean isSameType(IType other) {
 		return type.isSameType(other);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java
index bc56c0f4e06..71e6e8f3415 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeTypeContainer.java
@@ -20,6 +20,7 @@ public class CompositeTypeContainer extends CompositeType implements ITypeContai
 		super(rtype, cf);
 	}
 
+	@Override
 	public final IType getType() {
 		return cf.getCompositeType(((ITypeContainer) type).getType());
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CCompositesFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CCompositesFactory.java
index 068ba418d5b..55089ce557a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CCompositesFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CCompositesFactory.java
@@ -49,6 +49,7 @@ public class CCompositesFactory extends AbstractCompositeFactory {
 	/* 
 	 * @see org.eclipse.cdt.internal.core.index.composite.cpp.ICompositesFactory#getCompositeScope(org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.dom.ast.IScope)
 	 */
+	@Override
 	public IIndexScope getCompositeScope(IIndexScope rscope) {
 		if(rscope==null)
 			return null;
@@ -63,6 +64,7 @@ public class CCompositesFactory extends AbstractCompositeFactory {
 	/* 
 	 * @see org.eclipse.cdt.internal.core.index.composite.cpp.ICompositesFactory#getCompositeType(org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.dom.ast.IType)
 	 */
+	@Override
 	public IType getCompositeType(IType rtype) {
 
 		if (rtype instanceof IIndexFragmentBinding) {
@@ -124,6 +126,7 @@ public class CCompositesFactory extends AbstractCompositeFactory {
 		throw new CompositingNotImplementedError();
 	}
 
+	@Override
 	public IValue getCompositeValue(IValue v) {
 		return v;
 	}
@@ -131,6 +134,7 @@ public class CCompositesFactory extends AbstractCompositeFactory {
 	/* 
 	 * @see org.eclipse.cdt.internal.core.index.composite.cpp.ICompositesFactory#getCompositeBinding(org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.dom.ast.IBinding)
 	 */
+	@Override
 	public IIndexBinding getCompositeBinding(IIndexFragmentBinding rbinding) {
 		IIndexBinding result;
 		
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCCompositeScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCCompositeScope.java
index 92c53eb6fe6..03d5ceeb136 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCCompositeScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCCompositeScope.java
@@ -27,33 +27,40 @@ class CompositeCCompositeScope extends CompositeScope implements ICCompositeType
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IBinding getBinding(char[] name) {
 		fail(); return null;
 	}
 
+	@Override
 	public ICompositeType getCompositeType() {
 		return (ICompositeType) cf.getCompositeBinding(rbinding);
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
 		IBinding binding = ((ICompositeType)rbinding).getCompositeScope().getBinding(name, resolve, fileSet);
 		return processUncertainBinding(binding);
 	}
 	
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
 		IBinding[] bindings = ((ICompositeType)rbinding).getCompositeScope().getBindings(name, resolve, prefixLookup, fileSet);
 		return processUncertainBindings(bindings);
 	}
 	
+	@Override
 	public IBinding[] find(String name) {
 		IBinding[] preresult = ((ICompositeType)rbinding).getCompositeScope().find(name);
 		return processUncertainBindings(preresult);	
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return (IIndexBinding) getCompositeType();
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eClassType;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java
index a68e2f85d87..a08ab1bb058 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumeration.java
@@ -24,6 +24,7 @@ class CompositeCEnumeration extends CompositeCBinding implements IEnumeration, I
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IEnumerator[] getEnumerators() throws DOMException {
 		IEnumerator[] result = ((IEnumeration)rbinding).getEnumerators();
 		for (int i= 0; i < result.length; i++)
@@ -31,6 +32,7 @@ class CompositeCEnumeration extends CompositeCBinding implements IEnumeration, I
 		return result;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((IEnumeration)rbinding).isSameType(type);
 	}
@@ -43,10 +45,12 @@ class CompositeCEnumeration extends CompositeCBinding implements IEnumeration, I
 		return getName();
 	}
 
+	@Override
 	public long getMinValue() {
 		return ((IEnumeration)rbinding).getMinValue();
 	}
 
+	@Override
 	public long getMaxValue() {
 		return ((IEnumeration)rbinding).getMaxValue();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumerator.java
index 1c21ee11085..ee8389259f9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCEnumerator.java
@@ -22,10 +22,12 @@ class CompositeCEnumerator extends CompositeCBinding implements IEnumerator {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IType getType() throws DOMException {
 		return cf.getCompositeType(((IEnumerator) rbinding).getType());
 	}
 
+	@Override
 	public IValue getValue() {
 		return ((IEnumerator) rbinding).getValue();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCField.java
index 8ca38789758..d48bcb369e7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCField.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCField.java
@@ -21,6 +21,7 @@ class CompositeCField extends CompositeCVariable implements IField {
 		super(cf, rbinding);
 	}
 	
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		IBinding preresult = ((IField)rbinding).getCompositeTypeOwner();
 		return (ICompositeType) cf.getCompositeBinding((IIndexFragmentBinding)preresult);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCFunction.java
index 5737f0fc6e5..a4235584516 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCFunction.java
@@ -24,10 +24,12 @@ class CompositeCFunction extends CompositeCBinding implements IFunction {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		return null;
 	}
 	
+	@Override
 	public IParameter[] getParameters() {
 		IParameter[] preResult = ((IFunction)rbinding).getParameters();
 		IParameter[] result = new IParameter[preResult.length];
@@ -37,31 +39,38 @@ class CompositeCFunction extends CompositeCBinding implements IFunction {
 		return result;
 	}
 	
+	@Override
 	public IFunctionType getType() {
 		IType rtype = ((IFunction)rbinding).getType();
 		return (IFunctionType) cf.getCompositeType(rtype);
 	}
 
+	@Override
 	public boolean isAuto() {
 		return ((IFunction)rbinding).isAuto();
 	}
 
+	@Override
 	public boolean isExtern() {
 		return ((IFunction)rbinding).isExtern();
 	}
 
+	@Override
 	public boolean isInline() {
 		return ((IFunction)rbinding).isInline();
 	}
 
+	@Override
 	public boolean isRegister() {
 		return ((IFunction)rbinding).isRegister();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return ((IFunction)rbinding).isStatic();
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return ((IFunction)rbinding).takesVarArgs();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCParameter.java
index d8fb48cd6fa..ff10cb11cd5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCParameter.java
@@ -22,27 +22,33 @@ class CompositeCParameter extends CompositeCBinding implements IParameter {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IType getType() {
 		IType rtype = ((IParameter)rbinding).getType();
 		return cf.getCompositeType(rtype);
 	}
 
+	@Override
 	public boolean isAuto() {
 		return ((IParameter)rbinding).isAuto();
 	}
 
+	@Override
 	public boolean isExtern() {
 		return ((IParameter)rbinding).isExtern();
 	}
 
+	@Override
 	public boolean isRegister() {
 		return ((IParameter)rbinding).isRegister();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return ((IParameter)rbinding).isStatic();
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java
index c7ad8114918..20bb2304793 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCStructure.java
@@ -24,15 +24,18 @@ class CompositeCStructure extends CompositeCBinding implements ICompositeType, I
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IField findField(String name) {
 		IField preresult = ((ICompositeType) rbinding).findField(name);
 		return (IField) cf.getCompositeBinding((IIndexFragmentBinding) preresult);
 	}
 
+	@Override
 	public IScope getCompositeScope() {
 		return new CompositeCCompositeScope(cf, rbinding); 
 	}
 
+	@Override
 	public IField[] getFields() {
 		IField[] result = ((ICompositeType) rbinding).getFields();
 		for (int i= 0; i < result.length; i++)
@@ -40,10 +43,12 @@ class CompositeCStructure extends CompositeCBinding implements ICompositeType, I
 		return result;
 	}
 
+	@Override
 	public int getKey() {
 		return ((ICompositeType) rbinding).getKey();
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((ICompositeType) rbinding).isSameType(type);
 	}
@@ -53,6 +58,7 @@ class CompositeCStructure extends CompositeCBinding implements ICompositeType, I
 		fail(); return null;
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		return ((ICompositeType) rbinding).isAnonymous();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java
index 34a3a8b54ad..a1ff231794a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCTypedef.java
@@ -22,11 +22,13 @@ class CompositeCTypedef extends CompositeCBinding implements ITypedef, IIndexTyp
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IType getType() {
 		IType type = ((ITypedef)rbinding).getType();
 		return cf.getCompositeType(type);
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((ITypedef)rbinding).isSameType(type);
 	}
@@ -36,6 +38,7 @@ class CompositeCTypedef extends CompositeCBinding implements ITypedef, IIndexTyp
 		fail(); return null;
 	}
 
+	@Override
 	public void setType(IType type) {
 		fail();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCVariable.java
index 0441c1cfefe..94bd4492641 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/c/CompositeCVariable.java
@@ -22,27 +22,33 @@ class CompositeCVariable extends CompositeCBinding implements IVariable {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IType getType() {
 		IType rtype = ((IVariable)rbinding).getType();
 		return cf.getCompositeType(rtype);
 	}
 
+	@Override
 	public boolean isAuto() {
 		return ((IVariable)rbinding).isAuto();
 	}
 
+	@Override
 	public boolean isExtern() {
 		return ((IVariable)rbinding).isExtern();
 	}
 
+	@Override
 	public boolean isRegister() {
 		return ((IVariable)rbinding).isRegister();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return ((IVariable)rbinding).isStatic();
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return ((IVariable)rbinding).getInitialValue();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
index 86ff782071a..71ea180a863 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
@@ -87,6 +87,7 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.index.composite.cpp.ICompositesFactory#getCompositeScope(org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.dom.ast.IScope)
 	 */
+	@Override
 	public IIndexScope getCompositeScope(IIndexScope rscope) {
 		try {
 			if (rscope == null) {
@@ -124,6 +125,7 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.index.composite.cpp.ICompositesFactory#getCompositeType(org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.dom.ast.IType)
 	 */
+	@Override
 	public IType getCompositeType(IType rtype) {
 		if (rtype instanceof IIndexFragmentBinding) {
 			return (IType) getCompositeBinding((IIndexFragmentBinding) rtype);
@@ -204,6 +206,7 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
 		throw new CompositingNotImplementedError();
 	}
 	
+	@Override
 	public IValue getCompositeValue(IValue v) {
 		if (v == null)
 			return null;
@@ -239,6 +242,7 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.index.composite.cpp.ICompositesFactory#getCompositeBinding(org.eclipse.cdt.core.index.IIndex, org.eclipse.cdt.core.dom.ast.IBinding)
 	 */
+	@Override
 	public IIndexBinding getCompositeBinding(IIndexFragmentBinding binding) {
 		IIndexBinding result;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java
index 6b3cb0caa09..c3c6f03429b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPBinding.java
@@ -33,10 +33,12 @@ abstract class CompositeCPPBinding extends CompositeIndexBinding implements ICPP
 		}
 	}
 	
+	@Override
 	public char[][] getQualifiedNameCharArray() throws DOMException {
 		return ((ICPPBinding)rbinding).getQualifiedNameCharArray();
 	}
 
+	@Override
 	public boolean isGloballyQualified() throws DOMException {
 		return ((ICPPBinding)rbinding).isGloballyQualified();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java
index 4085f7d9ebf..1e2f71a1266 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassInstance.java
@@ -25,10 +25,12 @@ public class CompositeCPPClassInstance extends CompositeCPPClassSpecialization i
 		super(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return TemplateInstanceUtil.getTemplateDefinition(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return TemplateInstanceUtil.getTemplateArguments(cf, (ICPPTemplateInstance) rbinding);
 	}
@@ -38,10 +40,12 @@ public class CompositeCPPClassInstance extends CompositeCPPClassSpecialization i
 		return TemplateInstanceUtil.getTemplateParameterMap(cf, (ICPPTemplateInstance) rbinding);
 	}
 	
+	@Override
 	public boolean isExplicitSpecialization() {
 		return ((ICPPTemplateInstance) rbinding).isExplicitSpecialization();
 	}
 
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return TemplateInstanceUtil.getArguments(cf, (ICPPTemplateInstance) rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java
index 8b94c78d625..824653a38e6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.java
@@ -29,14 +29,17 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eClassType;
 	}
 
+	@Override
 	public ICPPClassType getClassType() {
 		return (ICPPClassType) cf.getCompositeBinding(rbinding);
 	}
 
+	@Override
 	public ICPPMethod[] getImplicitMethods() {
 		ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope();
 		ICPPMethod[] result = rscope.getImplicitMethods();
@@ -46,6 +49,7 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
 		return result;
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope();
 		ICPPConstructor[] result = rscope.getConstructors();
@@ -55,21 +59,25 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
 		return result;
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
 		IBinding binding = ((ICPPClassType)rbinding).getCompositeScope().getBinding(name, resolve, fileSet);
 		return processUncertainBinding(binding);
 	}
 
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
 		IBinding[] bindings = ((ICPPClassType)rbinding).getCompositeScope().getBindings(name, resolve, prefixLookup, fileSet);
 		return processUncertainBindings(bindings);
 	}
 	
+	@Override
 	public IBinding[] find(String name) {
 		IBinding[] preresult = ((ICPPClassType)rbinding).getCompositeScope().find(name);
 		return processUncertainBindings(preresult);	
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return (IIndexBinding) getClassType();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
index 55690716214..7b8589160c1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecialization.java
@@ -44,10 +44,12 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 		return (ICPPClassScope) cf.getCompositeScope((IIndexScope) ((ICPPClassType) rbinding).getCompositeScope());
 	}
 
+	@Override
 	public ICPPClassType getSpecializedBinding() {
 		return (ICPPClassType) TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}
 	
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		IBinding owner= getOwner();
 		if (owner instanceof ICPPSpecialization) {
@@ -56,6 +58,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 		return CPPTemplateParameterMap.EMPTY;
 	}
 
+	@Override
 	public IBinding specializeMember(IBinding original) {
 		if (specializationMap == null) {
 			final Object key= CPPCompositesFactory.createSpecializationKey(cf, rbinding);
@@ -156,6 +159,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
 		return super.getNestedClasses();
 	}
 	
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecializationScope.java
index ab0b7216893..5de773b597b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecializationScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassSpecializationScope.java
@@ -39,18 +39,22 @@ public class CompositeCPPClassSpecializationScope extends CompositeScope impleme
 		return (ICPPClassSpecialization) cf.getCompositeBinding(rbinding);
 	}
 
+	@Override
 	public ICPPClassType getOriginalClassType() {
 		return specialization().getSpecializedBinding();
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eClassType;
 	}
 
+	@Override
 	public ICPPClassSpecialization getClassType() {
 		return (ICPPClassSpecialization) cf.getCompositeBinding(rbinding);
 	}
 
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return (IIndexBinding) getClassType();
 	}
@@ -61,52 +65,62 @@ public class CompositeCPPClassSpecializationScope extends CompositeScope impleme
 		}
 	}
 
+	@Override
 	public ICPPMethod[] getImplicitMethods() {
 		createDelegate();
 		return fDelegate.getImplicitMethods();
 	}
 
+	@Override
 	public IBinding[] find(String name) {
 		createDelegate();
 		return fDelegate.find(name);
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet acceptLocalBindings) {
 		createDelegate();
 		return fDelegate.getBinding(name, resolve, acceptLocalBindings);
 	}
 
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup,
 			IIndexFileSet acceptLocalBindings) {
 		createDelegate();
 		return fDelegate.getBindings(name, resolve, prefixLookup, acceptLocalBindings);
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		createDelegate();
 		return fDelegate.getConstructors();
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		createDelegate();
 		return fDelegate.getDeclaredMethods();
 	}
 
+	@Override
 	public ICPPBase[] getBases() {
 		createDelegate();
 		return fDelegate.getBases();
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		createDelegate();
 		return fDelegate.getDeclaredFields();
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		createDelegate();
 		return fDelegate.getFriends();
 	}
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		createDelegate();
 		return fDelegate.getNestedClasses();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java
index dd557c0ead0..5420ca21e92 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecialization.java
@@ -30,19 +30,23 @@ public class CompositeCPPClassTemplatePartialSpecialization extends CompositeCPP
 		super(cf, delegate);
 	}
 
+	@Override
 	public ICPPClassTemplate getPrimaryClassTemplate() {
 		ICPPClassTemplate preresult= ((ICPPClassTemplatePartialSpecialization)rbinding).getPrimaryClassTemplate();
 		return (ICPPClassTemplate) cf.getCompositeBinding((IIndexFragmentBinding)preresult);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}
 
+	@Override
 	public int getSignatureHash() throws CoreException {
 		return ((IPDOMOverloader) rbinding).getSignatureHash();
 	}
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		IBinding owner= getOwner();
 		if (owner instanceof ICPPSpecialization) {
@@ -51,15 +55,18 @@ public class CompositeCPPClassTemplatePartialSpecialization extends CompositeCPP
 		return CPPTemplateParameterMap.EMPTY;
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return TemplateInstanceUtil.getTemplateArguments(cf, (ICPPClassTemplatePartialSpecialization) rbinding);
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
 	}
 
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return TemplateInstanceUtil.getArguments(cf, (ICPPClassTemplatePartialSpecialization) rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java
index 7a07fc3cbe5..f7f2006d635 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java
@@ -32,34 +32,42 @@ public class CompositeCPPClassTemplatePartialSpecializationSpecialization extend
 		super(cf, rbinding);
 	}
 
+	@Override
 	public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() {
 		return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY;
 	}
 
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		return TemplateInstanceUtil.convert(cf, ((ICPPClassTemplate) rbinding).getTemplateParameters());
 	}
 
+	@Override
 	public ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) {
 		return CompositeInstanceCache.getCache(cf, rbinding).getInstance(arguments);	
 	}
 
+	@Override
 	public void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) {
 		CompositeInstanceCache.getCache(cf, rbinding).addInstance(arguments, instance);	
 	}
 
+	@Override
 	public ICPPTemplateInstance[] getAllInstances() {
 		return CompositeInstanceCache.getCache(cf, rbinding).getAllInstances();
 	}
 
+	@Override
 	public ICPPClassTemplate getPrimaryClassTemplate() {
 		return (ICPPClassTemplate) cf.getCompositeBinding((IIndexFragmentBinding) ((ICPPClassTemplatePartialSpecializationSpecialization) rbinding).getPrimaryClassTemplate());
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return TemplateInstanceUtil.getTemplateArguments(cf, (ICPPClassTemplatePartialSpecialization) rbinding);
 	}
 
+	@Override
 	public ICPPDeferredClassInstance asDeferredInstance() throws DOMException  {
 		CompositeInstanceCache cache= CompositeInstanceCache.getCache(cf, rbinding);
 		synchronized (cache) {
@@ -77,6 +85,7 @@ public class CompositeCPPClassTemplatePartialSpecializationSpecialization extend
 		return new CPPDeferredClassInstance(this, args, getCompositeScope());
 	}
 	
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return TemplateInstanceUtil.getArguments(cf, (ICPPClassTemplatePartialSpecialization) rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassType.java
index a95683e753e..f6a197b91f7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassType.java
@@ -36,10 +36,12 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 		fail(); return null;
 	}
 
+	@Override
 	public final IField findField(String name) {
 		return ClassTypeHelper.findField(this, name);
 	}
 
+	@Override
 	public final ICPPMethod[] getAllDeclaredMethods() {
 		return ClassTypeHelper.getAllDeclaredMethods(this);
 	}
@@ -58,6 +60,7 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 			this.writable= writable; 
 		}
 		
+		@Override
 		public IBinding getBaseClass() {
 			if (baseClass != null) {
 				return baseClass;
@@ -66,18 +69,22 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 			}
 		}
 
+		@Override
 		public IName getBaseClassSpecifierName() {
 			return base.getBaseClassSpecifierName();
 		}
 
+		@Override
 		public int getVisibility() {
 			return base.getVisibility();
 		}
 
+		@Override
 		public boolean isVirtual() {
 			return base.isVirtual();
 		}
 
+		@Override
 		public void setBaseClass(IBinding binding) {
 			if (writable) {
 				baseClass= binding;
@@ -92,6 +99,7 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 	    }
 	}
 	
+	@Override
 	public ICPPBase[] getBases() {
 		final ICPPBase[] preresult = ((ICPPClassType) rbinding).getBases();
 		ICPPBase[] result = new ICPPBase[preresult.length];
@@ -101,6 +109,7 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 		return result;
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		ICPPConstructor[] result = ((ICPPClassType) rbinding).getConstructors();
 		for (int i= 0; i < result.length; i++) {
@@ -109,6 +118,7 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 		return result;
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		ICPPField[] result = ((ICPPClassType) rbinding).getDeclaredFields();
 		for (int i= 0; i < result.length; i++) {
@@ -117,6 +127,7 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 		return result;
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		ICPPMethod[] result = ((ICPPClassType) rbinding).getDeclaredMethods();
 		for (int i= 0; i < result.length; i++) {
@@ -125,10 +136,12 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 		return result;
 	}
 
+	@Override
 	public final IField[] getFields() {
 		return ClassTypeHelper.getFields(this);
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		IBinding[] preResult = ((ICPPClassType) rbinding).getFriends();
 		IBinding[] result = new IBinding[preResult.length];
@@ -138,10 +151,12 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 		return result;
 	}
 
+	@Override
 	public final ICPPMethod[] getMethods() {
 		return ClassTypeHelper.getMethods(this);
 	}
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		ICPPClassType[] result = ((ICPPClassType) rbinding).getNestedClasses();
 		for (int i= 0; i < result.length; i++) {
@@ -150,18 +165,22 @@ class CompositeCPPClassType extends CompositeCPPBinding implements ICPPClassType
 		return result;
 	}
 
+	@Override
 	public ICPPScope getCompositeScope() {
 		return new CompositeCPPClassScope(cf, rbinding);
 	}
 
+	@Override
 	public int getKey() {
 		return ((ICPPClassType) rbinding).getKey();
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((ICPPClassType) rbinding).isSameType(type);
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		return ((ICPPClassType) rbinding).isAnonymous();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java
index 856c4de85ce..90c582a119a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPDeferredClassInstance.java
@@ -34,6 +34,7 @@ public class CompositeCPPDeferredClassInstance extends CompositeCPPClassType imp
 		super(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		ICPPTemplateDefinition preresult= ((ICPPTemplateInstance)rbinding).getTemplateDefinition();
 		return (ICPPTemplateDefinition) cf.getCompositeBinding((IIndexFragmentBinding)preresult);
@@ -44,14 +45,17 @@ public class CompositeCPPDeferredClassInstance extends CompositeCPPClassType imp
 		return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
 	}
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		return TemplateInstanceUtil.getTemplateParameterMap(cf, (ICPPTemplateInstance) rbinding);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}
 
+	@Override
 	public IASTName getUnknownName() {
 		return ((ICPPDeferredClassInstance) rbinding).getUnknownName();
 	}
@@ -61,6 +65,7 @@ public class CompositeCPPDeferredClassInstance extends CompositeCPPClassType imp
 		return asScope();
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		if (unknownScope == null) {
 			unknownScope= new CompositeCPPUnknownScope(this, getUnknownName());
@@ -68,23 +73,28 @@ public class CompositeCPPDeferredClassInstance extends CompositeCPPClassType imp
 		return unknownScope;
 	}
 
+	@Override
 	public ICPPClassTemplate getClassTemplate() {
 		return (ICPPClassTemplate) cf.getCompositeBinding((IIndexFragmentBinding) ((ICPPDeferredClassInstance) rbinding).getClassTemplate());
 	}
 	
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return TemplateInstanceUtil.getTemplateArguments(cf, (ICPPTemplateInstance) rbinding);
 	}
 
+	@Override
 	public boolean isExplicitSpecialization() {
 		return false;
 	}
 
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return TemplateInstanceUtil.getArguments(cf, (ICPPTemplateInstance) rbinding);
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumScope.java
index fcaa5ed4c65..a19f6f06303 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumScope.java
@@ -26,25 +26,30 @@ class CompositeCPPEnumScope extends CompositeScope implements ICPPScope {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eEnumeration;
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
 		IBinding binding = ((ICPPEnumeration)rbinding).asScope().getBinding(name, resolve, fileSet);
 		return processUncertainBinding(binding);
 	}
 
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
 		IBinding[] bindings = ((ICPPEnumeration)rbinding).asScope().getBindings(name, resolve, prefixLookup, fileSet);
 		return processUncertainBindings(bindings);
 	}
 	
+	@Override
 	public IBinding[] find(String name) {
 		IBinding[] preresult = ((ICPPEnumeration)rbinding).asScope().find(name);
 		return processUncertainBindings(preresult);	
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return cf.getCompositeBinding(rbinding);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
index 75a7cbace78..50c3a63b530 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumeration.java
@@ -26,6 +26,7 @@ class CompositeCPPEnumeration extends CompositeCPPBinding implements ICPPEnumera
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IEnumerator[] getEnumerators() throws DOMException {
 		IEnumerator[] result = ((IEnumeration)rbinding).getEnumerators();
 		for (int i= 0; i < result.length; i++)
@@ -33,6 +34,7 @@ class CompositeCPPEnumeration extends CompositeCPPBinding implements ICPPEnumera
 		return result;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((IEnumeration)rbinding).isSameType(type);
 	}
@@ -44,22 +46,27 @@ class CompositeCPPEnumeration extends CompositeCPPBinding implements ICPPEnumera
 	public String toString() {
 		return getName();
 	}
+	@Override
 	public long getMinValue() {
 		return ((IEnumeration)rbinding).getMinValue();
 	}
 
+	@Override
 	public long getMaxValue() {
 		return ((IEnumeration)rbinding).getMaxValue();
 	}
 
+	@Override
 	public boolean isScoped() {
 		return ((ICPPEnumeration)rbinding).isScoped();
 	}
 
+	@Override
 	public IType getFixedType() {
 		return ((ICPPEnumeration)rbinding).getFixedType();
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		return new CompositeCPPEnumScope(cf, rbinding);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerator.java
index ba4a2f8d915..990fc35ae32 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPEnumerator.java
@@ -21,11 +21,13 @@ class CompositeCPPEnumerator extends CompositeCPPBinding implements IEnumerator
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IType getType() throws DOMException {
 		IType type = ((IEnumerator) rbinding).getType();
 		return cf.getCompositeType(type);
 	}
 	
+	@Override
 	public IValue getValue() {
 		return ((IEnumerator) rbinding).getValue();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPField.java
index 24cf7491199..ffa118a6bb3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPField.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPField.java
@@ -23,15 +23,18 @@ class CompositeCPPField extends CompositeCPPVariable implements ICPPField {
 		super(cf, rbinding);
 	}
 	
+	@Override
 	public ICPPClassType getClassOwner() {
 		IIndexFragmentBinding rowner = (IIndexFragmentBinding) ((ICPPField)rbinding).getClassOwner();
 		return (ICPPClassType) cf.getCompositeBinding(rowner);
 	}
 
+	@Override
 	public int getVisibility() {
 		return ((ICPPField)rbinding).getVisibility();
 	}
 	
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		IBinding preresult = ((IField)rbinding).getCompositeTypeOwner();
 		return (ICompositeType) cf.getCompositeBinding((IIndexFragmentBinding) preresult);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFieldSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFieldSpecialization.java
index 51a206247dc..97f33139395 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFieldSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFieldSpecialization.java
@@ -25,10 +25,12 @@ public class CompositeCPPFieldSpecialization extends CompositeCPPField implement
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}	
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		IBinding owner= getOwner();
 		if (owner instanceof ICPPSpecialization) {
@@ -37,6 +39,7 @@ public class CompositeCPPFieldSpecialization extends CompositeCPPField implement
 		return CPPTemplateParameterMap.EMPTY;
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunction.java
index 7522c4f4bea..3f298efa3be 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunction.java
@@ -26,22 +26,27 @@ class CompositeCPPFunction extends CompositeCPPBinding implements ICPPFunction {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public boolean isExternC() {
 		return ((ICPPFunction)rbinding).isExternC();
 	}
 
+	@Override
 	public boolean isInline() {
 		return ((ICPPFunction)rbinding).isInline();
 	}
 
+	@Override
 	public boolean isMutable() {
 		return ((ICPPFunction)rbinding).isMutable();
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		return null;
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 		ICPPParameter[] result = ((ICPPFunction)rbinding).getParameters();
 		for(int i=0; i<result.length; i++) {
@@ -50,39 +55,48 @@ class CompositeCPPFunction extends CompositeCPPBinding implements ICPPFunction {
 		return result;
 	}
 
+	@Override
 	public ICPPFunctionType getType() {
 		IType rtype = ((ICPPFunction)rbinding).getType();
 		return (ICPPFunctionType) cf.getCompositeType(rtype);
 	}
 
+	@Override
 	public boolean isDeleted() {
 		return ((ICPPFunction)rbinding).isDeleted();
 	}
 
+	@Override
 	public boolean isAuto() {
 		return ((ICPPFunction)rbinding).isAuto();
 	}
 
+	@Override
 	public boolean isExtern() {
 		return ((ICPPFunction)rbinding).isExtern();
 	}
 
+	@Override
 	public boolean isRegister() {
 		return ((ICPPFunction)rbinding).isRegister();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return ((ICPPFunction)rbinding).isStatic();
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return ((ICPPFunction)rbinding).takesVarArgs();
 	}
 	
+	@Override
 	public int getRequiredArgumentCount() {
 		return ((ICPPFunction)rbinding).getRequiredArgumentCount();
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		return ((ICPPFunction)rbinding).hasParameterPack();
 	}
@@ -99,6 +113,7 @@ class CompositeCPPFunction extends CompositeCPPBinding implements ICPPFunction {
 		return result.toString();
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
 		IType[] es= ((ICPPFunction)rbinding).getExceptionSpecification();
 		if (es == null || es.length == 0)
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionInstance.java
index 5ec99e09551..b0f5cc5a6b0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionInstance.java
@@ -27,31 +27,38 @@ public class CompositeCPPFunctionInstance extends CompositeCPPFunction implement
 		super(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return TemplateInstanceUtil.getTemplateDefinition(cf, rbinding);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}
 	
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		return TemplateInstanceUtil.getTemplateArguments(cf, (ICPPTemplateInstance) rbinding);
 	}
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		return TemplateInstanceUtil.getTemplateParameterMap(cf, (ICPPTemplateInstance) rbinding);
 	}
 
+	@Override
 	public boolean isExplicitSpecialization() {
 		return ((ICPPTemplateInstance) rbinding).isExplicitSpecialization();
 	}
 
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return TemplateInstanceUtil.getArguments(cf, (ICPPTemplateInstance) rbinding);
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java
index 9d32880859f..fede76028e2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionSpecialization.java
@@ -27,10 +27,12 @@ public class CompositeCPPFunctionSpecialization extends CompositeCPPFunction imp
 		super(cf, ft);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		IBinding owner= getOwner();
 		if (owner instanceof ICPPSpecialization) {
@@ -59,6 +61,7 @@ public class CompositeCPPFunctionSpecialization extends CompositeCPPFunction imp
 		return result;
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplate.java
index f1213180365..86c15eafcb2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplate.java
@@ -26,18 +26,22 @@ public class CompositeCPPFunctionTemplate extends CompositeCPPFunction
 		super(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		return TemplateInstanceUtil.convert(cf, ((ICPPFunctionTemplate) rbinding).getTemplateParameters());
 	}
 
+	@Override
 	public ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) {
 		return CompositeInstanceCache.getCache(cf, rbinding).getInstance(arguments);	
 	}
 
+	@Override
 	public void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) {
 		CompositeInstanceCache.getCache(cf, rbinding).addInstance(arguments, instance);	
 	}
 
+	@Override
 	public ICPPTemplateInstance[] getAllInstances() {
 		return CompositeInstanceCache.getCache(cf, rbinding).getAllInstances();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplateSpecialization.java
index 3404f806f6b..163bd7f4040 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplateSpecialization.java
@@ -26,18 +26,22 @@ public class CompositeCPPFunctionTemplateSpecialization	extends CompositeCPPFunc
 		super(cf, ft);
 	}
 
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		return TemplateInstanceUtil.convert(cf, ((ICPPFunctionTemplate) rbinding).getTemplateParameters());
 	}
 
+	@Override
 	public ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) {
 		return CompositeInstanceCache.getCache(cf, rbinding).getInstance(arguments);	
 	}
 
+	@Override
 	public void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) {
 		CompositeInstanceCache.getCache(cf, rbinding).addInstance(arguments, instance);	
 	}
 
+	@Override
 	public ICPPTemplateInstance[] getAllInstances() {
 		return CompositeInstanceCache.getCache(cf, rbinding).getAllInstances();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethod.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethod.java
index d82a6f97d76..79d262ef835 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethod.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethod.java
@@ -22,31 +22,38 @@ class CompositeCPPMethod extends CompositeCPPFunction implements ICPPMethod {
 		super(cf, rbinding);
 	}
 
+	@Override
 	public boolean isDestructor() {
 		return ((ICPPMethod)rbinding).isDestructor();
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return ((ICPPMethod)rbinding).isImplicit();
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod)rbinding).isExplicit();
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return ((ICPPMethod)rbinding).isVirtual();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		IIndexFragmentBinding rowner = (IIndexFragmentBinding) ((ICPPMethod)rbinding).getClassOwner();
 		return (ICPPClassType) cf.getCompositeBinding(rowner);
 	}
 
+	@Override
 	public int getVisibility() {
 		return ((ICPPMethod)rbinding).getVisibility();
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return ((ICPPMethod)rbinding).isPureVirtual();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodInstance.java
index 659385fc4f0..ca7964b92a8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodInstance.java
@@ -21,31 +21,38 @@ public class CompositeCPPMethodInstance extends CompositeCPPFunctionInstance imp
 		super(cf, rbinding);
 	}
 
+	@Override
 	public boolean isDestructor() {
 		return ((ICPPMethod)rbinding).isDestructor();
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return ((ICPPMethod)rbinding).isImplicit();
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod)rbinding).isExplicit();
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return ((ICPPMethod)rbinding).isDestructor();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		IIndexFragmentBinding rowner = (IIndexFragmentBinding) ((ICPPMethod)rbinding).getClassOwner();
 		return (ICPPClassType) cf.getCompositeBinding(rowner);
 	}
 
+	@Override
 	public int getVisibility() {
 		return ((ICPPMethod)rbinding).getVisibility();
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return ((ICPPMethod)rbinding).isPureVirtual();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodSpecialization.java
index 167c2f57bd5..2f745eac609 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodSpecialization.java
@@ -22,31 +22,38 @@ implements ICPPMethod {
 		super(cf, method);
 	}
 	
+	@Override
 	public boolean isDestructor() {
 		return ((ICPPMethod)rbinding).isDestructor();
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return ((ICPPMethod)rbinding).isImplicit();
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod)rbinding).isExplicit();
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return ((ICPPMethod)rbinding).isVirtual();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		IIndexFragmentBinding rowner = (IIndexFragmentBinding) ((ICPPMethod)rbinding).getClassOwner();
 		return (ICPPClassType) cf.getCompositeBinding(rowner);
 	}
 
+	@Override
 	public int getVisibility() {
 		return ((ICPPMethod)rbinding).getVisibility();
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return ((ICPPMethod)rbinding).isPureVirtual();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplate.java
index 42b11be3c7f..f778d2dc282 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplate.java
@@ -21,32 +21,39 @@ public class CompositeCPPMethodTemplate extends CompositeCPPFunctionTemplate imp
 		super(cf, rbinding);
 	}
 
+	@Override
 	public boolean isDestructor() {
 		return ((ICPPMethod)rbinding).isDestructor();
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return ((ICPPMethod)rbinding).isImplicit();
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod)rbinding).isExplicit();
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return ((ICPPMethod)rbinding).isVirtual();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		IIndexFragmentBinding rowner = (IIndexFragmentBinding) ((ICPPMethod)rbinding).getClassOwner();
 		return (ICPPClassType) cf.getCompositeBinding(rowner);
 	}
 
 
+	@Override
 	public int getVisibility() {
 		return ((ICPPMethod)rbinding).getVisibility();
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return ((ICPPMethod)rbinding).isPureVirtual();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplateSpecialization.java
index e3803e49e73..e67d4af4f77 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPMethodTemplateSpecialization.java
@@ -25,31 +25,38 @@ public class CompositeCPPMethodTemplateSpecialization
 		super(cf, ft);
 	}
 	
+	@Override
 	public boolean isDestructor() {
 		return ((ICPPMethod)rbinding).isDestructor();
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return ((ICPPMethod)rbinding).isImplicit();
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod)rbinding).isExplicit();
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return ((ICPPMethod)rbinding).isVirtual();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		IIndexFragmentBinding rowner = (IIndexFragmentBinding) ((ICPPMethod)rbinding).getClassOwner();
 		return (ICPPClassType) cf.getCompositeBinding(rowner);
 	}
 
+	@Override
 	public int getVisibility() {
 		return ((ICPPMethod)rbinding).getVisibility();
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return ((ICPPMethod)rbinding).isPureVirtual();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespace.java
index f6ea8d202ef..cea8fe4d5e3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespace.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespace.java
@@ -24,6 +24,7 @@ class CompositeCPPNamespace extends CompositeCPPBinding implements ICPPNamespace
 		this.namespaces = namespaces;
 	}
 
+	@Override
 	public IBinding[] getMemberBindings() {
 		IIndexFragmentBinding[][] memberBindings = new IIndexFragmentBinding[namespaces.length][];
 		for(int i=0; i<namespaces.length; i++) {
@@ -34,10 +35,12 @@ class CompositeCPPNamespace extends CompositeCPPBinding implements ICPPNamespace
 		return cf.getCompositeBindings(memberBindings);
 	}
 
+	@Override
 	public ICPPNamespaceScope getNamespaceScope() {
 		return new CompositeCPPNamespaceScope(cf, namespaces);
 	}
 
+	@Override
 	public boolean isInline() {
 		for (ICPPNamespace namespace : namespaces) {
 			if (namespace.isInline())
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceAlias.java
index 6da03fa2dec..f4e27b5f0e9 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceAlias.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceAlias.java
@@ -22,6 +22,7 @@ class CompositeCPPNamespaceAlias extends CompositeCPPBinding implements ICPPName
 		super(cf, alias);
 	}
 	
+	@Override
 	public IBinding[] getMemberBindings() {
 		IBinding[] result= ((ICPPNamespaceAlias)rbinding).getMemberBindings();
 		for(int i=0; i<result.length; i++) {
@@ -30,15 +31,18 @@ class CompositeCPPNamespaceAlias extends CompositeCPPBinding implements ICPPName
 		return result;
 	}
 
+	@Override
 	public ICPPNamespaceScope getNamespaceScope() {
 		return (ICPPNamespaceScope) cf.getCompositeScope((IIndexScope) ((ICPPNamespaceAlias)rbinding).getNamespaceScope());
 	}
 
+	@Override
 	public IBinding getBinding() {
 		IIndexFragmentBinding ns = (IIndexFragmentBinding) ((ICPPNamespaceAlias)rbinding).getBinding();
 		return cf.getCompositeBinding(ns);
 	}
 
+	@Override
 	public boolean isInline() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java
index 2129215d70c..0b6f1b5c84f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPNamespaceScope.java
@@ -33,18 +33,22 @@ class CompositeCPPNamespaceScope extends CompositeScope implements ICPPNamespace
 		this.namespaces = namespaces;
 	}
 	
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eNamespace;
 	}
 
+	@Override
 	public void addUsingDirective(ICPPUsingDirective directive) {
 		fail();
 	}
 
+	@Override
 	public ICPPUsingDirective[] getUsingDirectives() {
 		return new ICPPUsingDirective[0]; // same behavior as PDOMCPPNamespace
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
 		IBinding preresult = null;
 		for(int i=0; preresult==null && i<namespaces.length; i++) {
@@ -53,6 +57,7 @@ class CompositeCPPNamespaceScope extends CompositeScope implements ICPPNamespace
 		return processUncertainBinding(preresult);
 	}
 	
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
 		IIndexFragmentBinding[][] preresult = new IIndexFragmentBinding[namespaces.length][];
 		for(int i=0; i<namespaces.length; i++) {
@@ -63,6 +68,7 @@ class CompositeCPPNamespaceScope extends CompositeScope implements ICPPNamespace
 		return cf.getCompositeBindings(preresult);
 	}
 	
+	@Override
 	final public IBinding[] find(String name) {
 		IIndexFragmentBinding[][] preresult = new IIndexFragmentBinding[namespaces.length][];
 		for(int i=0; i<namespaces.length; i++) {
@@ -73,6 +79,7 @@ class CompositeCPPNamespaceScope extends CompositeScope implements ICPPNamespace
 		return cf.getCompositeBindings(preresult);
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return cf.getCompositeBinding(rbinding);
 	}
@@ -93,6 +100,7 @@ class CompositeCPPNamespaceScope extends CompositeScope implements ICPPNamespace
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPNamespaceScope#getInlineNamespaces()
 	 */
+	@Override
 	public ICPPNamespaceScope[] getInlineNamespaces() {
 		IIndexFragmentBinding[][] preresult = new IIndexFragmentBinding[namespaces.length][];
 		for(int i=0; i<namespaces.length; i++) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameter.java
index ca0b07961c8..bbc23c63db4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameter.java
@@ -20,10 +20,12 @@ class CompositeCPPParameter extends CompositeCPPVariable implements ICPPParamete
 		super(cf, rbinding);
 	}
 
+	@Override
 	public boolean hasDefaultValue() {
 		return ((ICPPParameter)rbinding).hasDefaultValue();
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return ((ICPPParameter)rbinding).isParameterPack();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameterSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameterSpecialization.java
index a202fec059b..7c26e009ecc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameterSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPParameterSpecialization.java
@@ -25,10 +25,12 @@ public class CompositeCPPParameterSpecialization extends CompositeCPPParameter i
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		IBinding owner= getOwner();
 		if (owner instanceof ICPPSpecialization) {
@@ -37,6 +39,7 @@ public class CompositeCPPParameterSpecialization extends CompositeCPPParameter i
 		return CPPTemplateParameterMap.EMPTY;
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateNonTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateNonTypeParameter.java
index 240339854c9..be3fd2f5007 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateNonTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateNonTypeParameter.java
@@ -33,22 +33,27 @@ public class CompositeCPPTemplateNonTypeParameter extends CompositeCPPVariable i
 		fail(); return null; 
 	}
 
+	@Override
 	public short getParameterPosition() {
 		return ((ICPPTemplateParameter)rbinding).getParameterPosition();
 	}
 
+	@Override
 	public short getTemplateNestingLevel() {
 		return ((ICPPTemplateParameter)rbinding).getTemplateNestingLevel();
 	}
 	
+	@Override
 	public int getParameterID() {
 		return ((ICPPTemplateParameter)rbinding).getParameterID();
 	}
 	
+	@Override
 	public boolean isParameterPack() {
 		return ((ICPPTemplateParameter)rbinding).isParameterPack();
 	}
 
+	@Override
 	public ICPPTemplateArgument getDefaultValue() {
 		try {
 			return TemplateInstanceUtil.convert(cf, ((ICPPTemplateNonTypeParameter)rbinding).getDefaultValue());
@@ -57,6 +62,7 @@ public class CompositeCPPTemplateNonTypeParameter extends CompositeCPPVariable i
 		}
 	}
 
+	@Override
 	@Deprecated
 	public IASTExpression getDefault() {
 		return null;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTemplateParameter.java
index b7c1979538d..9038f519cec 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTemplateParameter.java
@@ -43,27 +43,33 @@ public class CompositeCPPTemplateTemplateParameter extends CompositeCPPBinding
 		super(cf, binding);
 	}
 
+	@Override
 	public IType getDefault() throws DOMException {
 		IType preresult= ((ICPPTemplateTemplateParameter)rbinding).getDefault();
 		return cf.getCompositeType(preresult);
 	}
 
+	@Override
 	public short getParameterPosition() {
 		return ((ICPPTemplateParameter)rbinding).getParameterPosition();
 	}
 
+	@Override
 	public short getTemplateNestingLevel() {
 		return ((ICPPTemplateParameter)rbinding).getTemplateNestingLevel();
 	}
 	
+	@Override
 	public int getParameterID() {
 		return ((ICPPTemplateParameter)rbinding).getParameterID();
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return ((ICPPTemplateParameter)rbinding).isParameterPack();
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((IType)rbinding).isSameType(type);
 	}
@@ -73,6 +79,7 @@ public class CompositeCPPTemplateTemplateParameter extends CompositeCPPBinding
 		fail(); return null; 
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		if (unknownScope == null) {
 			unknownScope= new CompositeCPPUnknownScope(this, getUnknownName());
@@ -80,10 +87,12 @@ public class CompositeCPPTemplateTemplateParameter extends CompositeCPPBinding
 		return unknownScope;
 	}
 
+	@Override
 	public IASTName getUnknownName() {
 		return new CPPASTName(getNameCharArray());
 	}
 	
+	@Override
 	public ICPPTemplateArgument getDefaultValue() {
 		try {
 			return TemplateInstanceUtil.convert(cf, ((ICPPTemplateTemplateParameter)rbinding).getDefaultValue());
@@ -92,66 +101,82 @@ public class CompositeCPPTemplateTemplateParameter extends CompositeCPPBinding
 		}
 	}
 
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		return TemplateInstanceUtil.convert(cf, ((ICPPTemplateTemplateParameter)rbinding).getTemplateParameters());
 	}
 
+	@Override
 	public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() {
 		return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY;
 	}
 
+	@Override
 	public IField findField(String name) {
 		return null;
 	}
 
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public ICPPBase[] getBases() {
 		return ICPPBase.EMPTY_BASE_ARRAY;
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		return ICPPField.EMPTY_CPPFIELD_ARRAY;
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public IField[] getFields() {
 		return ICPPField.EMPTY_CPPFIELD_ARRAY;
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 
+	@Override
 	public ICPPMethod[] getMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		return ICPPClassType.EMPTY_CLASS_ARRAY;
 	}
 
+	@Override
 	public IScope getCompositeScope() {
 		return asScope();
 	}
 
+	@Override
 	public int getKey() {
 		return 0;
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
 	
+	@Override
 	public ICPPDeferredClassInstance asDeferredInstance() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTypeParameter.java
index 29d7d9b6fad..858785c5604 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTemplateTypeParameter.java
@@ -33,27 +33,33 @@ public class CompositeCPPTemplateTypeParameter extends CompositeCPPBinding
 		super(cf, binding);
 	}
 
+	@Override
 	public IType getDefault() throws DOMException {
 		IType preresult= ((ICPPTemplateTypeParameter)rbinding).getDefault();
 		return cf.getCompositeType(preresult);
 	}
 
+	@Override
 	public short getParameterPosition() {
 		return ((ICPPTemplateParameter)rbinding).getParameterPosition();
 	}
 
+	@Override
 	public short getTemplateNestingLevel() {
 		return ((ICPPTemplateParameter)rbinding).getTemplateNestingLevel();
 	}
 	
+	@Override
 	public int getParameterID() {
 		return ((ICPPTemplateParameter)rbinding).getParameterID();
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return ((ICPPTemplateParameter)rbinding).isParameterPack();
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((IType)rbinding).isSameType(type);
 	}
@@ -63,6 +69,7 @@ public class CompositeCPPTemplateTypeParameter extends CompositeCPPBinding
 		fail(); return null; 
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		if (unknownScope == null) {
 			unknownScope= new CompositeCPPUnknownScope(this, getUnknownName());
@@ -70,10 +77,12 @@ public class CompositeCPPTemplateTypeParameter extends CompositeCPPBinding
 		return unknownScope;
 	}
 
+	@Override
 	public IASTName getUnknownName() {
 		return new CPPASTName(getNameCharArray());
 	}
 	
+	@Override
 	public ICPPTemplateArgument getDefaultValue() {
 		try {
 			return TemplateInstanceUtil.convert(cf, ((ICPPTemplateTypeParameter)rbinding).getDefaultValue());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java
index f1c09908faf..51820cbe782 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedef.java
@@ -23,15 +23,18 @@ class CompositeCPPTypedef extends CompositeCPPBinding implements ITypedef, IInde
 		super(cf, delegate);
 	}
 
+	@Override
 	public IType getType() {
 		IType type = ((ITypedef)rbinding).getType();
 		return cf.getCompositeType(type);
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((ITypedef)rbinding).isSameType(type);
 	}
 
+	@Override
 	public void setType(IType type) {
 		fail();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java
index 488583d50d5..3e6b2e1069c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPTypedefSpecialization.java
@@ -24,10 +24,12 @@ class CompositeCPPTypedefSpecialization extends CompositeCPPTypedef implements I
 		super(cf, delegate);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}	
 	
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		IBinding owner= getOwner();
 		if (owner instanceof ICPPSpecialization) {
@@ -36,6 +38,7 @@ class CompositeCPPTypedefSpecialization extends CompositeCPPTypedef implements I
 		return CPPTemplateParameterMap.EMPTY;
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownBinding.java
index 43cbd1798e2..4d548c08151 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownBinding.java
@@ -25,10 +25,12 @@ class CompositeCPPUnknownBinding extends CompositeCPPBinding implements ICPPUnkn
 		fail(); return null;
 	}
 
+	@Override
 	public ICPPScope asScope() {
     	return null;
     }
 
+	@Override
 	public IASTName getUnknownName() {
 		return ((ICPPUnknownBinding) rbinding).getUnknownName();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassInstance.java
index 931bc319fe3..78c5cb2d04e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassInstance.java
@@ -26,6 +26,7 @@ class CompositeCPPUnknownClassInstance extends CompositeCPPUnknownClassType
 		super(cf, rbinding);
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getArguments() {
 		ICPPTemplateArgument[] arguments = ((ICPPUnknownClassInstance) rbinding).getArguments();
 		return TemplateInstanceUtil.convert(cf, arguments);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassType.java
index d7856966141..ca5ff930faa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUnknownClassType.java
@@ -34,6 +34,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 		super(cf, rbinding);
 	}
 
+	@Override
 	public IField findField(String name) {
 		IField preResult = ((ICPPClassType) rbinding).findField(name);
 		return (IField) cf.getCompositeBinding((IIndexFragmentBinding)preResult);
@@ -42,6 +43,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getBases()
 	 */
+	@Override
 	public ICPPBase[] getBases() {
 		return ICPPBase.EMPTY_BASE_ARRAY;
 	}
@@ -49,6 +51,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getFields()
 	 */
+	@Override
 	public IField[] getFields() {
 		return IField.EMPTY_FIELD_ARRAY;
 	}
@@ -56,6 +59,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getDeclaredFields()
 	 */
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		return ICPPField.EMPTY_CPPFIELD_ARRAY;
 	}
@@ -63,6 +67,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getMethods()
 	 */
+	@Override
 	public ICPPMethod[] getMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
@@ -70,6 +75,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getAllDeclaredMethods()
 	 */
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
@@ -77,6 +83,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getDeclaredMethods()
 	 */
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
@@ -84,6 +91,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getConstructors()
 	 */
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
 	}
@@ -91,10 +99,12 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getFriends()
 	 */
+	@Override
 	public IBinding[] getFriends() {
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		ICPPClassType[] result = ((ICPPClassType) rbinding).getNestedClasses();
 		for (int i = 0; i < result.length; i++) {
@@ -103,14 +113,17 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
 		return result;
 	}
 
+	@Override
 	public IScope getCompositeScope() {
 		return new CompositeCPPClassScope(cf, rbinding);
 	}
 
+	@Override
 	public int getKey() {
 		return ((ICPPClassType) rbinding).getKey();
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		return ((ICPPClassType) rbinding).isSameType(type);
 	}
@@ -123,6 +136,7 @@ class CompositeCPPUnknownClassType extends CompositeCPPUnknownBinding implements
     	return unknownScope;
     }
 
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclaration.java
index 9ce463943a0..4bcd5c33fd7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclaration.java
@@ -26,6 +26,7 @@ class CompositeCPPUsingDeclaration extends CompositeCPPBinding implements ICPPUs
 		fail(); return null;
 	}
 
+	@Override
 	public IBinding[] getDelegates() {
 		IBinding[] delegates = ((ICPPUsingDeclaration) rbinding).getDelegates();
 		IBinding[] composites = new IBinding[delegates.length];
@@ -36,6 +37,6 @@ class CompositeCPPUsingDeclaration extends CompositeCPPBinding implements ICPPUs
 				composites[j++] = cf.getCompositeBinding((IIndexFragmentBinding) binding);
 			}
 		}
-		return (IBinding[]) ArrayUtil.trim(IBinding.class, composites);
+		return ArrayUtil.trim(IBinding.class, composites);
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclarationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclarationSpecialization.java
index 401e2d9a3bb..c538065b2c2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclarationSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPUsingDeclarationSpecialization.java
@@ -23,10 +23,12 @@ class CompositeCPPUsingDeclarationSpecialization extends CompositeCPPUsingDeclar
 		super(cf, delegate);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		return TemplateInstanceUtil.getSpecializedBinding(cf, rbinding);
 	}	
 
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		IBinding owner= getOwner();
 		if (owner instanceof ICPPSpecialization) {
@@ -35,6 +37,7 @@ class CompositeCPPUsingDeclarationSpecialization extends CompositeCPPUsingDeclar
 		return CPPTemplateParameterMap.EMPTY;
 	}
 
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return TemplateInstanceUtil.getArgumentMap(cf, rbinding);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPVariable.java
index 1347017df5c..461fe8b317b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPVariable.java
@@ -23,35 +23,43 @@ class CompositeCPPVariable extends CompositeCPPBinding implements ICPPVariable {
 		super(cf, delegate);
 	}
 	
+	@Override
 	public boolean isMutable() {
 		return ((ICPPVariable)rbinding).isMutable();
 	}
 
+	@Override
 	public boolean isExternC() {
 		return ((ICPPVariable)rbinding).isExternC();
 	}
 
+	@Override
 	public IType getType() {
 		IType rtype = ((ICPPVariable)rbinding).getType();
 		return cf.getCompositeType(rtype);
 	}
 
+	@Override
 	public boolean isAuto() {
 		return ((ICPPVariable)rbinding).isAuto();
 	}
 
+	@Override
 	public boolean isExtern() {
 		return ((ICPPVariable)rbinding).isExtern();
 	}
 
+	@Override
 	public boolean isRegister() {
 		return ((ICPPVariable)rbinding).isRegister();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return ((ICPPVariable)rbinding).isStatic();
 	}
 	
+	@Override
 	public IValue getInitialValue() {
 		return ((ICPPVariable)rbinding).getInitialValue();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java
index b9946676fb8..a9b09520c36 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/IndexProviderManager.java
@@ -314,6 +314,7 @@ public final class IndexProviderManager implements IElementChangedListener {
 		return provisionMap.get(key).booleanValue();
 	}
 
+	@Override
 	public void elementChanged(ElementChangedEvent event) {
 		try {
 			if (event.getType() == ElementChangedEvent.POST_CHANGE) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/ReadOnlyPDOMProviderBridge.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/ReadOnlyPDOMProviderBridge.java
index ebab83fb4cd..e7e8f14f041 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/ReadOnlyPDOMProviderBridge.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/provider/ReadOnlyPDOMProviderBridge.java
@@ -31,6 +31,7 @@ public class ReadOnlyPDOMProviderBridge implements IIndexFragmentProvider {
 		this.provider= provider;
 	}
 
+	@Override
 	public IIndexFragment[] getIndexFragments(ICConfigurationDescription config) throws CoreException {
 		List<PDOM> result = new ArrayList<PDOM>();
 		IPDOMDescriptor[] descriptions = provider.getDescriptors(config);
@@ -48,6 +49,7 @@ public class ReadOnlyPDOMProviderBridge implements IIndexFragmentProvider {
 		return result.toArray(new IIndexFragment[result.size()]);
 	}
 
+	@Override
 	public boolean providesFor(ICProject cproject) throws CoreException {
 		return provider.providesFor(cproject);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java
index f95aa8167c7..25939c72be6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/indexer/StandaloneIndexerFallbackReaderFactory.java
@@ -39,6 +39,7 @@ public class StandaloneIndexerFallbackReaderFactory extends AbstractCodeReaderFa
 		super(null);
 	}
 
+	@Override
 	public CodeReader createCodeReaderForInclusion(String path) {
 		try {
 			if (!new File(path).isFile())
@@ -49,6 +50,7 @@ public class StandaloneIndexerFallbackReaderFactory extends AbstractCodeReaderFa
 		}
 	}
 
+	@Override
 	public CodeReader createCodeReaderForTranslationUnit(String path) {
 		try {
 			if (!new File(path).isFile())
@@ -59,10 +61,12 @@ public class StandaloneIndexerFallbackReaderFactory extends AbstractCodeReaderFa
 		}
 	}
 
+	@Override
 	public ICodeReaderCache getCodeReaderCache() {
 		return null;
 	}
 
+	@Override
 	public int getUniqueIdentifier() {
 		return 0;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java
index d22aaf80a50..0df000ab842 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderCacheEntry.java
@@ -34,6 +34,7 @@ class CodeReaderCacheEntry implements ILRUCacheable {
 		size = (int)Math.ceil(reader.buffer.length / CHAR_TO_KB_FACTOR); // get the size of the file in terms of KB 
 	}
 
+	@Override
 	public int getCacheFootprint() {
 		return size;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java
index 3ac9468aaab..fae7015df1b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/CodeReaderFactoryAdapter.java
@@ -44,6 +44,7 @@ public class CodeReaderFactoryAdapter extends AbstractCodeReaderFactory {
 		fDelegate= fcp;
 	}
 
+	@Override
 	public org.eclipse.cdt.core.parser.CodeReader createCodeReaderForInclusion(String path) {
 		return CodeReaderAdapter.adapt(fDelegate.getContentForInclusion(path, null));
 	}
@@ -54,15 +55,18 @@ public class CodeReaderFactoryAdapter extends AbstractCodeReaderFactory {
 		return CodeReaderAdapter.adapt(fDelegate.getContentForInclusion(ifl, astPath));
 	}
 
+	@Override
 	public org.eclipse.cdt.core.parser.CodeReader createCodeReaderForTranslationUnit(String path) {
 		return CodeReaderAdapter.adapt(fDelegate.getContentForInclusion(path, null));
 	}
 
+	@Override
 	@Deprecated
 	public org.eclipse.cdt.core.parser.ICodeReaderCache getCodeReaderCache() {
 		return null;
 	}
 
+	@Override
 	public int getUniqueIdentifier() {
 		return 0;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java
index 9a1ede73052..63803aaba3d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/EmptyIterator.java
@@ -27,21 +27,24 @@ public final class EmptyIterator<T> implements Iterator<T> {
     /* (non-Javadoc)
      * @see java.util.Iterator#hasNext()
      */
-    public final boolean hasNext() {
+    @Override
+	public final boolean hasNext() {
         return false;
     }
 
     /* (non-Javadoc)
      * @see java.util.Iterator#next()
      */
-    public final T next() {
+    @Override
+	public final T next() {
         throw new NoSuchElementException();
     }
 
     /* (non-Javadoc)
      * @see java.util.Iterator#remove()
      */
-    public final void remove() {
+    @Override
+	public final void remove() {
 		throw new UnsupportedOperationException();          
     }
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java
index 314e83a5751..555666df72b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ASTPreprocessorNode.java
@@ -83,10 +83,12 @@ abstract class ASTPreprocessorNode extends ASTNode {
 		nodeSpec.visit(this);
 	}
 	
+	@Override
 	public IASTNode copy() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public IASTNode copy(CopyStyle style) {
 		throw new UnsupportedOperationException();
 	}
@@ -115,14 +117,17 @@ class ASTComment extends ASTPreprocessorNode implements IASTComment {
 		fIsBlockComment= isBlockComment;
 	}
 
+	@Override
 	public char[] getComment() {
 		return getSource(getOffset(), getLength());
 	}
 
+	@Override
 	public boolean isBlockComment() {
 		return fIsBlockComment;
 	}
 
+	@Override
 	public void setComment(char[] comment) {
 		assert false;
 	}
@@ -169,7 +174,8 @@ class ASTElse extends ASTPreprocessorNode implements IASTPreprocessorElseStateme
 		super(parent, IASTTranslationUnit.PREPROCESSOR_STATEMENT, startNumber, endNumber);
 		fTaken= taken;
 	}
-    public boolean taken() {
+    @Override
+	public boolean taken() {
         return fTaken;
     }
 }
@@ -186,6 +192,7 @@ class ASTIfndef extends ASTDirectiveWithCondition implements IASTPreprocessorIfn
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement#getMacroReference()
 	 */
+	@Override
 	public ASTPreprocessorName getMacroReference() {
 		return fMacroRef;
 	}
@@ -202,6 +209,7 @@ class ASTIfdef extends ASTDirectiveWithCondition implements IASTPreprocessorIfde
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorIfdefStatement#getMacroReference()
 	 */
+	@Override
 	public ASTPreprocessorName getMacroReference() {
 		return fMacroRef;
 	}
@@ -218,6 +226,7 @@ class ASTError extends ASTDirectiveWithCondition implements IASTPreprocessorErro
 		super(parent, startNumber, condNumber, condEndNumber, true);
 	}
 
+	@Override
 	public char[] getMessage() {
 		return getCondition();
 	}
@@ -228,10 +237,12 @@ class ASTPragma extends ASTDirectiveWithCondition implements IASTPreprocessorPra
 		super(parent, startNumber, condNumber, condEndNumber, true);
 	}
 
+	@Override
 	public char[] getMessage() {
 		return getCondition();
 	}
 
+	@Override
 	public boolean isPragmaOperator() {
 		return false;
 	}
@@ -289,18 +300,22 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces
 		}
 	}
 
+	@Override
 	public IASTName getName() {
 		return fName;
 	}
 
+	@Override
 	public String getPath() {
 		return fPath;
 	}
 
+	@Override
 	public boolean isResolved() {
 		return fIsResolved;
 	}
 
+	@Override
 	public boolean isSystemInclude() {
 		return fIsSystemInclude;
 	}
@@ -311,10 +326,12 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces
 		nodeSpec.visit(fName);
 	}
 
+	@Override
 	public boolean isResolvedByHeuristics() {
 		return fFoundByHeuristics;
 	}
 
+	@Override
 	public boolean hasPragmaOnceSemantics() {
 		if (fNominationDelegate != null) {
 			try {
@@ -330,6 +347,7 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces
 		fPragmaOnce= value;
 	}
 
+	@Override
 	public ISignificantMacros getSignificantMacros() {
 		if (fNominationDelegate != null) {
 			try {
@@ -350,10 +368,12 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces
 		fLoadedVersions= versions;
 	}
 
+	@Override
 	public ISignificantMacros[] getLoadedVersions() {
 		return fLoadedVersions;
 	}
 	
+	@Override
 	public long getContentsHash() {
 		if (fNominationDelegate != null) {
 			return 0;
@@ -367,10 +387,12 @@ class ASTInclusionStatement extends ASTPreprocessorNode implements IASTPreproces
 		fContentsHash= hash;
 	}
 
+	@Override
 	public boolean createsAST() {
 		return fCreatesAST;
 	}
 	
+	@Override
 	public IIndexFile getImportedIndexFile() {
 		if (fNominationDelegate instanceof IIndexFile)
 			return (IIndexFile) fNominationDelegate;
@@ -421,14 +443,17 @@ class ASTMacroDefinition extends ASTPreprocessorNode implements IASTPreprocessor
 		return (IMacroBinding) fName.getBinding();
 	}
 	
+	@Override
 	public String getExpansion() {
 		return new String(getMacro().getExpansion());
 	}
 
+	@Override
 	public IASTName getName() {
 		return fName;
 	}
 
+	@Override
 	public int getRoleForName(IASTName n) {
 		return (fName == n) ? r_definition : r_unclear;
 	}
@@ -439,9 +464,12 @@ class ASTMacroDefinition extends ASTPreprocessorNode implements IASTPreprocessor
 		nodeSpec.visit(fName);
 	}
 
+	@Override
 	public void setExpansion(String exp) {assert false;}
+	@Override
 	public void setName(IASTName name) {assert false;}
 
+	@Override
 	public IASTFileLocation getExpansionLocation() {
 		if (fExpansionNumber >= 0) {
 			IASTTranslationUnit ast = getTranslationUnit();
@@ -476,10 +504,12 @@ class ASTMacroParameter extends ASTPreprocessorNode implements IASTFunctionStyle
 		fParameter= new String(param);
 	}
 
+	@Override
 	public String getParameter() {
 		return fParameter;
 	}
 
+	@Override
 	public void setParameter(String value) {assert false;}
 }
 
@@ -500,6 +530,7 @@ class ASTFunctionStyleMacroDefinition extends ASTMacroDefinition implements IAST
 		super(parent, macro, nameLoc, expansionOffset);
 	}
 
+	@Override
 	public IASTFunctionStyleMacroParameter[] getParameters() {
     	IMacroBinding macro= getMacro();
     	char[][] paramList= macro.getParameterList();
@@ -529,6 +560,7 @@ class ASTFunctionStyleMacroDefinition extends ASTMacroDefinition implements IAST
         return result;
     }
 
+	@Override
 	public void addParameter(IASTFunctionStyleMacroParameter parm) {assert false;}
 	
 	@Override
@@ -561,6 +593,7 @@ class ASTUndef extends ASTPreprocessorNode implements IASTPreprocessorUndefState
 			setInactive();
 	}
 
+	@Override
 	public ASTPreprocessorName getMacroName() {
 		return fName;
 	}
@@ -574,10 +607,12 @@ class ASTInclusionNode implements IASTInclusionNode {
 		fLocationCtx= ctx;
 	}
 
+	@Override
 	public IASTPreprocessorIncludeStatement getIncludeDirective() {
 		return fLocationCtx.getInclusionStatement();
 	}
 
+	@Override
 	public IASTInclusionNode[] getNestedInclusions() {
 		if (fInclusions == null) {
 			ArrayList<IASTInclusionNode> result= new ArrayList<IASTInclusionNode>();
@@ -593,10 +628,12 @@ class DependencyTree extends ASTInclusionNode implements IDependencyTree {
 		super(ctx);
 	}
 
+	@Override
 	public IASTInclusionNode[] getInclusions() {
 		return getNestedInclusions();
 	}
 
+	@Override
 	public String getTranslationUnitPath() {
 		return fLocationCtx.getFilePath();
 	}
@@ -613,27 +650,33 @@ class ASTFileLocation implements IASTFileLocation {
 		fLength= length;
 	}
 
+	@Override
 	public String getFileName() {
 		return fLocationCtx.getFilePath();
 	}
 
+	@Override
 	public IASTFileLocation asFileLocation() {
 		return this;
 	}
 
+	@Override
 	public int getNodeLength() {
 		return fLength;
 	}
 
+	@Override
 	public int getNodeOffset() {
 		return fOffset;
 	}
 
+	@Override
 	public int getEndingLineNumber() {
 		int end= fLength > 0 ? fOffset+fLength-1 : fOffset;
 		return fLocationCtx.getLineNumber(end);
 	}
 
+	@Override
 	public int getStartingLineNumber() {
 		return fLocationCtx.getLineNumber(fOffset);
 	}
@@ -659,6 +702,7 @@ class ASTFileLocation implements IASTFileLocation {
 		return fLocationCtx;
 	}
 
+	@Override
 	public IASTPreprocessorIncludeStatement getContextInclusionStatement() {
 		return fLocationCtx.getInclusionStatement();
 	}
@@ -679,6 +723,7 @@ class ASTMacroExpansion extends ASTPreprocessorNode implements IASTPreprocessorM
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion#getName()
 	 */
+	@Override
 	public ASTMacroReferenceName getMacroReference() {
 		return fContext.getMacroReference();
 	}
@@ -686,6 +731,7 @@ class ASTMacroExpansion extends ASTPreprocessorNode implements IASTPreprocessorM
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion#getMacroDefinition()
 	 */
+	@Override
 	public IASTPreprocessorMacroDefinition getMacroDefinition() {
 		return fContext.getMacroDefinition();
 	}
@@ -693,6 +739,7 @@ class ASTMacroExpansion extends ASTPreprocessorNode implements IASTPreprocessorM
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IASTPreprocessorMacroExpansion#getNestedExpansions()
 	 */
+	@Override
 	public ASTPreprocessorName[] getNestedMacroReferences() {
 		return fContext.getNestedMacroReferences();
 	}
@@ -718,31 +765,38 @@ class ASTMacroExpansionLocation implements IASTMacroExpansionLocation, org.eclip
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.IASTMacroExpansionLocation#getExpansion()
 	 */
+	@Override
 	public IASTPreprocessorMacroExpansion getExpansion() {
 		return fContext.getExpansion();
 	}
 
+	@Override
 	public IASTNodeLocation[] getExpansionLocations() {
 		final IASTFileLocation fl= asFileLocation();
 		return fl == null ? new IASTNodeLocation[0] : new IASTNodeLocation[] {fl};
 	}
 
+	@Override
 	public IASTPreprocessorMacroDefinition getMacroDefinition() {
 		return fContext.getMacroDefinition();
 	}
 	
+	@Override
 	public IASTName getMacroReference() {
 		return fContext.getMacroReference();
 	}
 
+	@Override
 	public IASTFileLocation asFileLocation() {
 		return ((LocationCtxContainer) fContext.getParent()).createFileLocation(fContext.fOffsetInParent, fContext.fEndOffsetInParent-fContext.fOffsetInParent);
 	}
 
+	@Override
 	public int getNodeLength() {
 		return fLength;
 	}
 
+	@Override
 	public int getNodeOffset() {
 		return fOffset;
 	}
@@ -768,30 +822,37 @@ class ASTFileLocationForBuiltins implements IASTFileLocation {
 		fLength= length;
 	}
 
+	@Override
 	public String getFileName() {
 		return fFile;
 	}
 
+	@Override
 	public IASTFileLocation asFileLocation() {
 		return this;
 	}
 
+	@Override
 	public int getNodeLength() {
 		return fLength;
 	}
 
+	@Override
 	public int getNodeOffset() {
 		return fOffset;
 	}
 
+	@Override
 	public int getEndingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public int getStartingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public IASTPreprocessorIncludeStatement getContextInclusionStatement() {
 		return null;
 	}
@@ -806,6 +867,7 @@ class ASTImageLocation extends ASTFileLocationForBuiltins implements IASTImageLo
 		fKind= kind;
 	}
 
+	@Override
 	public int getLocationKind() {
 		return fKind;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java
index 5e5053e2fed..bb1837e07c8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/ILexerLog.java
@@ -18,7 +18,9 @@ import org.eclipse.cdt.core.parser.IProblem;
  */
 public interface ILexerLog {
 	ILexerLog NULL = new ILexerLog() {
+		@Override
 		public void handleComment(boolean isBlockComment, int offset, int endOffset) {}
+		@Override
 		public void handleProblem(int problemID, char[] info, int offset, int endOffset) {}
 	};
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java
index 7a5e0a0d771..f6d303c4c6e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/InactiveCodeToken.java
@@ -25,10 +25,12 @@ public class InactiveCodeToken extends Token implements IInactiveCodeToken {
 		fNewNesting= newNesting;
 	}
 
+	@Override
 	public int getOldNesting() {
 		return fOldNesting;
 	}
 
+	@Override
 	public int getNewNesting() {
 		return fNewNesting;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java
index 5bfffcf6237..00125a9e335 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/LocationCtx.java
@@ -47,10 +47,12 @@ abstract class LocationCtx implements ILocationCtx {
 		}
 	}
 	
+	@Override
 	public String getFilePath() {
 		return fParent.getFilePath();
 	}
 	
+	@Override
 	final public ILocationCtx getParent() {
 		return fParent;
 	}
@@ -136,6 +138,7 @@ abstract class LocationCtx implements ILocationCtx {
 	/**
 	 * Support for the dependency tree, returns inclusion statement that created this context, or <code>null</code>.
 	 */
+	@Override
 	public ASTInclusionStatement getInclusionStatement() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java
index 4617031d704..e6844cc1ed0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MacroExpansionStep.java
@@ -31,10 +31,12 @@ public class MacroExpansionStep implements IMacroExpansionStep {
 		fMacroLocation= macroLoc;
 	}
 	
+	@Override
 	public String getCodeBeforeStep() {
 		return fBefore;
 	}
 	
+	@Override
 	public String getCodeAfterStep() {
 		StringBuilder result= new StringBuilder();
 		int offset= 0;
@@ -48,12 +50,15 @@ public class MacroExpansionStep implements IMacroExpansionStep {
 		return result.toString();
 	}
 	
+	@Override
 	public IMacroBinding getExpandedMacro() {
 		return fMacroDefinition;
 	}
+	@Override
 	public ReplaceEdit[] getReplacements() {
 		return fReplacements;
 	}
+	@Override
 	public IASTFileLocation getLocationOfExpandedMacroDefinition() {
 		return fMacroLocation;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java
index 89deea45e9e..dd18b64510f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/MultiMacroExpansionExplorer.java
@@ -49,13 +49,20 @@ public class MultiMacroExpansionExplorer extends MacroExpansionExplorer {
 			fOffset= offset;
 			fLength= length;
 		}
+		@Override
 		public int getNodeOffset() { return fOffset; }
+		@Override
 		public int getNodeLength() { return fLength; }
+		@Override
 		public String getFileName() { return fFilePath; }
 
+		@Override
 		public int getStartingLineNumber() { return 0; }
+		@Override
 		public int getEndingLineNumber() { return 0; }
+		@Override
 		public IASTFileLocation asFileLocation() { return this; }
+		@Override
 		public IASTPreprocessorIncludeStatement getContextInclusionStatement() { return null; }
 	}
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java
index beb11a8f5a3..59b597d8ed3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner/Token.java
@@ -31,31 +31,38 @@ public class Token implements IToken, Cloneable {
 		fSource= source;
 	}
 
+	@Override
 	final public int getType() {
 		return fKind;
 	}
 
+	@Override
 	final public int getOffset() {
 		return fOffset;
 	}
 
+	@Override
 	final public int getEndOffset() {
 		return fEndOffset;
 	}
 
+	@Override
 	final public int getLength() {
 		return fEndOffset-fOffset;
 	}
 
+	@Override
 	final public IToken getNext() {
 		return fNextToken;
 	}
 
 	
+	@Override
 	final public void setType(int kind) {
 		fKind= kind;
 	}
 
+	@Override
 	final public void setNext(IToken t) {
 		fNextToken= t;
 	}
@@ -70,6 +77,7 @@ public class Token implements IToken, Cloneable {
 		fEndOffset+= shift;
 	}
 
+	@Override
 	public char[] getCharImage() {
 		return TokenUtil.getImage(getType());
 	}
@@ -79,10 +87,12 @@ public class Token implements IToken, Cloneable {
 		return getImage();
 	}
 	
+	@Override
 	final public boolean isOperator() {
 		return TokenUtil.isOperator(fKind);
 	}
 
+	@Override
 	public String getImage() {
 		return new String(getCharImage());
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java
index 6ac40fe7527..93e778c6150 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/ContentAssistMatcherFactory.java
@@ -37,14 +37,17 @@ public class ContentAssistMatcherFactory {
 			matcher = new SegmentMatcher(pattern);
 		}
 		
+		@Override
 		public char[] getPrefixForBinarySearch() {
 			return matcher.getPrefixForBinarySearch();
 		}
 		
+		@Override
 		public boolean matchRequiredAfterBinarySearch() {
 			return matcher.matchRequiredAfterBinarySearch();
 		}
 
+		@Override
 		public boolean match(char[] name) {
 			return matcher.match(name);
 		}
@@ -58,14 +61,17 @@ public class ContentAssistMatcherFactory {
 			this.prefix = prefix;
 		}
 		
+		@Override
 		public char[] getPrefixForBinarySearch() {
 			return prefix;
 		}
 
+		@Override
 		public boolean matchRequiredAfterBinarySearch() {
 			return false;
 		}
 
+		@Override
 		public boolean match(char[] name) {
 			return CharArrayUtils.equals(name, 0, prefix.length, prefix, true);
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java
index 247285b5732..70bae49466e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/util/Profiler.java
@@ -136,6 +136,7 @@ public class Profiler {
 			List<Map.Entry<String, Timer>> list =
 					new ArrayList<Map.Entry<String, Timer>>(profiler.timers.entrySet());
 			Comparator<Map.Entry<String, Timer>> c = new Comparator<Map.Entry<String, Timer>>() {
+				@Override
 				public int compare(Entry<String, Timer> o1, Entry<String, Timer> o2) {
 					long diff = o2.getValue().getElapsedTime() - o1.getValue().getElapsedTime();
 					return diff < 0 ? -1 : diff > 0 ? 1 : 0; 
@@ -152,6 +153,7 @@ public class Profiler {
 				List<Map.Entry<String, int[]>> keyList =
 					new ArrayList<Map.Entry<String, int[]>>(profiler.counters.entrySet());
 				Comparator<Map.Entry<String, int[]>> c2 = new Comparator<Map.Entry<String, int[]>>() {
+					@Override
 					public int compare(Entry<String, int[]> o1, Entry<String, int[]> o2) {
 						return o2.getValue()[0] - o1.getValue()[0];
 					}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java
index a0cb1fe0c94..aaeb280dfd8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/WritablePDOM.java
@@ -301,6 +301,7 @@ public class WritablePDOM extends PDOM implements IWritableIndexFragment {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.index.IWritableIndexFragment#getDatabaseSizeBytes()
 	 */
+	@Override
 	public long getDatabaseSizeBytes() {
 		return getDB().getSizeBytes();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java
index 718fc77340c..4e88f118e6f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/BTree.java
@@ -633,10 +633,14 @@ public class BTree {
 
 		public String getMsg() { return msg; }
 		public boolean isValid() { return valid; }
+		@Override
 		public void postNode(long node) throws CoreException { depth--; }
+		@Override
 		public int compare(long record) throws CoreException { return 0; }
+		@Override
 		public boolean visit(long record) throws CoreException { return true; }
 
+		@Override
 		public void preNode(long node) throws CoreException {
 			depth++;
 
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java
index 5cdf202b075..a3709fd54de 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java
@@ -127,9 +127,11 @@ public class DBProperties {
 	 */
 	public void clear() throws CoreException {
 		index.accept(new IBTreeVisitor(){
+			@Override
 			public int compare(long record) throws CoreException {
 				return 0;
 			}
+			@Override
 			public boolean visit(long record) throws CoreException {
 				new DBProperty(db, record).delete();
 				return false; // there should never be duplicates
@@ -204,6 +206,7 @@ public class DBProperties {
 		
 		public static IBTreeComparator getComparator(final Database db) {
 			return new IBTreeComparator() {
+				@Override
 				public int compare(long record1, long record2) throws CoreException {
 					IString left= db.getString(db.getRecPtr(record1 + KEY));
 					IString right= db.getString(db.getRecPtr(record2 + KEY));
@@ -215,9 +218,11 @@ public class DBProperties {
 		public static DBProperty search(final Database db, final BTree index, final String key) throws CoreException {
 			final DBProperty[] result= new DBProperty[1];
 			index.accept(new IBTreeVisitor(){
+				@Override
 				public int compare(long record) throws CoreException {
 					return db.getString(db.getRecPtr(record + KEY)).compare(key, true);
 				}
+				@Override
 				public boolean visit(long record) throws CoreException {
 					result[0] = new DBProperty(db, record);
 					return false; // there should never be duplicates
@@ -229,9 +234,11 @@ public class DBProperties {
 		public static Set<String> getKeySet(final Database db, final BTree index) throws CoreException {
 			final Set<String> result= new HashSet<String>();
 			index.accept(new IBTreeVisitor(){
+				@Override
 				public int compare(long record) throws CoreException {
 					return 0;
 				}
+				@Override
 				public boolean visit(long record) throws CoreException {
 					result.add(new DBProperty(db, record).getKey().getString());
 					return true; // there should never be duplicates
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
index 50db8b78f33..5c9198bba2f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
@@ -67,6 +67,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		return fBuffer;
 	}
 
+	@Override
 	public void marshalBinding(IBinding binding) throws CoreException {
 		if (binding instanceof ISerializableType) {
 			((ISerializableType) binding).marshal(this);
@@ -84,6 +85,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		} 
 	}
 
+	@Override
 	public IBinding unmarshalBinding() throws CoreException {
 		if (fPos >= fBuffer.length)
 			throw unmarshallingError();
@@ -105,6 +107,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		throw unmarshallingError();
 	}
 
+	@Override
 	public void marshalType(IType type) throws CoreException {
 		if (type instanceof IBinding) {
 			marshalBinding((IBinding) type);
@@ -118,6 +121,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		}
 	}
 
+	@Override
 	public IType unmarshalType() throws CoreException {
 		if (fPos >= fBuffer.length)
 			throw unmarshallingError();
@@ -138,6 +142,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		return fLinkage.unmarshalType(this);
 	}
 
+	@Override
 	public void marshalValue(IValue value) throws CoreException {
 		if (value instanceof Value) {
 			((Value) value).marshall(this);
@@ -146,6 +151,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		} 
 	}
 
+	@Override
 	public IValue unmarshalValue() throws CoreException {
 		if (fPos >= fBuffer.length)
 			throw unmarshallingError();
@@ -172,17 +178,20 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		}
 	}
 
+	@Override
 	public void putByte(byte b) {
 		request(1);
 		fBuffer[fPos++]= b;
 	}
 
+	@Override
 	public int getByte() throws CoreException {
 		if (fPos+1 > fBuffer.length)
 			throw unmarshallingError();
 		return 0xff & fBuffer[fPos++];
 	}
 
+	@Override
 	public CoreException unmarshallingError() {
 		return new CoreException(CCorePlugin.createStatus("Unmarshalling error")); //$NON-NLS-1$
 	}
@@ -190,12 +199,14 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		return new CoreException(CCorePlugin.createStatus("Marshalling error")); //$NON-NLS-1$
 	}
 
+	@Override
 	public void putShort(short value) {
 		request(2);
 		fBuffer[fPos++]= (byte)(value >> 8);
 		fBuffer[fPos++]= (byte)(value);
 	}
 
+	@Override
 	public int getShort() throws CoreException {
 		if (fPos+2 > fBuffer.length)
 			throw unmarshallingError();
@@ -225,6 +236,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		return result;
 	}
 
+	@Override
 	public void putLong(long value) {
 		request(8);
 		fPos += 8;
@@ -239,6 +251,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		fBuffer[--p]= (byte)(value); 
 	}
 
+	@Override
 	public long getLong() throws CoreException {
 		if (fPos+8 > fBuffer.length)
 			throw unmarshallingError();
@@ -270,6 +283,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		return Chunk.getRecPtr(fBuffer, pos);
 	}
 
+	@Override
 	public void putCharArray(char[] chars) {
 		putShort((short) chars.length);
 		for (char c : chars) {
@@ -277,6 +291,7 @@ public class TypeMarshalBuffer implements ITypeMarshalBuffer {
 		}
 	}
 
+	@Override
 	public char[] getCharArray() throws CoreException {
 		int len= getShort();
 		char[] expr= new char[len];
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java
index 72139f6b9e6..6e63870e2a6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/ApplyVisitor.java
@@ -28,10 +28,12 @@ public class ApplyVisitor implements IBTreeVisitor, IPDOMVisitor {
 		this.visitor= visitor;
 	}
 	
+	@Override
 	public int compare(long record) throws CoreException {
 		return 0; // visit all nodes in a b-tree
 	}
 	
+	@Override
 	public boolean visit(IPDOMNode node) throws CoreException {
 		if(node instanceof PDOMBinding) {
 			((PDOMBinding)node).accept(visitor);
@@ -40,6 +42,7 @@ public class ApplyVisitor implements IBTreeVisitor, IPDOMVisitor {
 		return false; // don't visit children of the node
 	}
 	
+	@Override
 	public boolean visit(long record) throws CoreException {
 		if (record == 0)
 			return true;
@@ -51,6 +54,7 @@ public class ApplyVisitor implements IBTreeVisitor, IPDOMVisitor {
 		return true;
 	}
 
+	@Override
 	public void leave(IPDOMNode node) throws CoreException {
 	}	
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java
index 57450629dc0..f8614bee19d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/FindBinding.java
@@ -35,6 +35,7 @@ public class FindBinding {
 			this.database= linkage.getDB();
 		}
 
+		@Override
 		public int compare(long record1, long record2) throws CoreException {
 			IString nm1 = PDOMNamedNode.getDBName(database, record1);
 			IString nm2 = PDOMNamedNode.getDBName(database, record2);
@@ -72,6 +73,7 @@ public class FindBinding {
 		}
 		
 		// IBTreeVisitor
+		@Override
 		public int compare(long record) throws CoreException {
 			final Database db = fLinkage.getDB();
 			IString nm1 = PDOMNamedNode.getDBName(db, record);
@@ -85,6 +87,7 @@ public class FindBinding {
 		}
 	
 		// IBTreeVisitor
+		@Override
 		public boolean visit(long record) throws CoreException {
 			final PDOMNamedNode nnode = (PDOMNamedNode) fLinkage.getNode(record);
 			if (nnode instanceof PDOMBinding) {
@@ -113,6 +116,7 @@ public class FindBinding {
 			return fResult;
 		}
 		// IPDOMVisitor
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof PDOMBinding) {
 				final PDOMBinding nnode = (PDOMBinding) node;
@@ -124,6 +128,7 @@ public class FindBinding {
 			return false; /* do not visit children of node */
 		}
 		// IPDOMVisitor
+		@Override
 		public void leave(IPDOMNode node) throws CoreException {
 		}
 	}
@@ -153,6 +158,7 @@ public class FindBinding {
 		public MacroBTreeComparator(Database database) {
 			db= database;
 		}
+		@Override
 		public int compare(long record1, long record2) throws CoreException {
 			return compare(PDOMNamedNode.getDBName(db, record1), PDOMNamedNode.getDBName(db, record2));	// compare names
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java
index 829ea8024b8..d88a4451445 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/IPDOMBinding.java
@@ -32,5 +32,6 @@ public interface IPDOMBinding extends IPDOMNode, IIndexFragmentBinding {
 	/**
 	 * Returns the linkage of the binding.
 	 */
+	@Override
 	PDOMLinkage getLinkage();
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java
index db75385a3e5..d2d0e650dfc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerCollector.java
@@ -79,6 +79,7 @@ public final class MacroContainerCollector implements IBTreeVisitor {
 		monitor= pm;
 	}
 	
+	@Override
 	final public int compare(long record) throws CoreException {
 		if (monitor != null)
 			checkCancelled();
@@ -104,6 +105,7 @@ public final class MacroContainerCollector implements IBTreeVisitor {
 		return cmp;
 	}
 	
+	@Override
 	final public boolean visit(long record) throws CoreException {
 		if (monitor != null)
 			checkCancelled();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java
index cf349ee613d..dcc7f8a0dc5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerFinder.java
@@ -31,6 +31,7 @@ public final class MacroContainerFinder implements IBTreeVisitor {
 		fLinkage= linkage;
 	}
 		
+	@Override
 	final public int compare(long record) throws CoreException {
 		IString name= PDOMNamedNode.getDBName(fLinkage.getDB(), record);
 		return compare(name);
@@ -40,6 +41,7 @@ public final class MacroContainerFinder implements IBTreeVisitor {
 		return rhsName.compareCompatibleWithIgnoreCase(fName);
 	}
 	
+	@Override
 	final public boolean visit(long record) throws CoreException {
 		if (record == 0)
 			return true;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java
index b2a4a283e34..083c0e0344e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/MacroContainerPatternCollector.java
@@ -39,12 +39,14 @@ public final class MacroContainerPatternCollector implements IBTreeVisitor {
 	}
 
 	
+	@Override
 	final public int compare(long record) throws CoreException {
 		if (fMonitor != null)
 			checkCancelled();
 		return 0;
 	}
 	
+	@Override
 	final public boolean visit(long record) throws CoreException {
 		if (record == 0)
 			return true;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java
index 651a02d49ce..be12fa0e7a7 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/NamedNodeCollector.java
@@ -87,6 +87,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor {
 		monitor= pm;
 	}
 		
+	@Override
 	final public int compare(long record) throws CoreException {
 		if (monitor != null)
 			checkCancelled();
@@ -112,6 +113,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor {
 		return cmp;
 	}
 	
+	@Override
 	final public boolean visit(long record) throws CoreException {
 		if (monitor != null)
 			checkCancelled();
@@ -145,6 +147,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor {
 		return nodes.toArray(new PDOMNamedNode[nodes.size()]);
 	}
 
+	@Override
 	final public boolean visit(IPDOMNode node) throws CoreException {
 		if (monitor != null)
 			checkCancelled();
@@ -164,6 +167,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor {
 		}
 	}
 
+	@Override
 	final public void leave(IPDOMNode node) throws CoreException {
 	}
 }
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java
index 2fdbb79020a..d04f19fe4ee 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java
@@ -60,6 +60,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 		super(linkage, record);
 	}
 	
+	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Object getAdapter(Class adapter) {
 		if (adapter.isAssignableFrom(PDOMBinding.class))
@@ -85,6 +86,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 				&& db.getRecPtr(record + FIRST_REF_OFFSET) == 0;
 	}
 	
+	@Override
 	public final boolean hasDeclaration() throws CoreException {
 		if (hasDeclaration == -1) {
 			final Database db = getDB();
@@ -156,6 +158,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 		getDB().putRecPtr(record + FIRST_REF_OFFSET, namerec);
 	}
 	
+	@Override
 	public final PDOMFile getLocalToFile() throws CoreException {
 		final long filerec = getLocalToFileRec(getDB(), record);
 		return filerec == 0 ? null : new PDOMFile(getLinkage(), filerec);
@@ -173,6 +176,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 		getDB().putRecPtr(record + LOCAL_TO_FILE, rec);
 	}
 
+	@Override
 	public String getName() {
 		try {
 			return super.getDBName().getString();
@@ -204,6 +208,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 		return null;
 	}
 	
+	@Override
 	public final IIndexScope getScope() {
 		// The parent node in the binding hierarchy is the scope. 
 		try {
@@ -232,6 +237,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 		return null;
 	}
 	
+	@Override
 	public IIndexFragment getFragment() {
 		return getPDOM();
 	}
@@ -303,14 +309,17 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 		}
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return new String[] { getName() };
 	}
 	
+	@Override
 	final public boolean isFileLocal() throws CoreException {
 		return getDB().getRecPtr(record + LOCAL_TO_FILE) != 0;
 	}
 
+	@Override
 	public boolean hasDefinition() throws CoreException {
 		return getDB().getRecPtr(record + FIRST_DEF_OFFSET) != 0;
 	}
@@ -382,6 +391,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
 		return pdomCompareTo(other)==0;
 	}
 	
+	@Override
 	public final int getBindingConstant() {
 		return getNodeType();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java
index be4f1a8024b..0bb20610ac6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFragmentBindingComparator.java
@@ -18,6 +18,7 @@ import org.eclipse.cdt.internal.core.index.IIndexFragmentBindingComparator;
  *
  */
 public class PDOMFragmentBindingComparator implements IIndexFragmentBindingComparator {
+	@Override
 	public int compare(IIndexFragmentBinding a, IIndexFragmentBinding b) {
 		if(a instanceof PDOMBinding && b instanceof PDOMBinding) {
 			return ((PDOMBinding) a).pdomCompareTo((PDOMBinding) b);			
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java
index 52fc6379f33..48c2c731d71 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMInclude.java
@@ -136,6 +136,7 @@ public class PDOMInclude implements IIndexFragmentInclude {
 			nextInclude.setPrevInIncludedBy(prevInclude);
 	}
 
+	@Override
 	public IIndexFragmentFile getIncludes() throws CoreException {
 		long rec = linkage.getDB().getRecPtr(record + INCLUDED_FILE);
 		return rec != 0 ? new PDOMFile(linkage, rec) : null;
@@ -166,6 +167,7 @@ public class PDOMInclude implements IIndexFragmentInclude {
 		return true;
 	}
 
+	@Override
 	public IIndexFile getIncludedBy() throws CoreException {
 		long rec = linkage.getDB().getRecPtr(record + INCLUDED_BY);
 		return rec != 0 ? new PDOMFile(linkage, rec) : null;
@@ -210,15 +212,18 @@ public class PDOMInclude implements IIndexFragmentInclude {
 		linkage.getDB().putRecPtr(record + INCLUDED_BY_PREV, rec);
 	}
 
+	@Override
 	public IIndexFileLocation getIncludedByLocation() throws CoreException {
 		return getIncludedBy().getLocation();
 	}
 
+	@Override
 	public IIndexFileLocation getIncludesLocation() throws CoreException {
 		IIndexFragmentFile includes = getIncludes();
 		return includes != null ? includes.getLocation() : null;
 	}
 
+	@Override
 	public IIndexFragment getFragment() {
 		return linkage.getPDOM();
 	}
@@ -231,30 +236,37 @@ public class PDOMInclude implements IIndexFragmentInclude {
 		return linkage.getDB().getByte(record + FLAGS);
 	}
 
+	@Override
 	public boolean isSystemInclude() throws CoreException {
 		return (getFlag() & FLAG_SYSTEM_INCLUDE) != 0;
 	}
 
+	@Override
 	public boolean isActive() throws CoreException {
 		return (getFlag() & FLAG_INACTIVE_INCLUDE) == 0;
 	}
 
+	@Override
 	public boolean isResolved() throws CoreException {
 		return linkage.getDB().getRecPtr(record + INCLUDED_FILE) != 0;
 	}
 
+	@Override
 	public boolean isResolvedByHeuristics() throws CoreException {
 		return (getFlag() & FLAG_RESOLVED_BY_HEURISTICS) != 0;
 	}
 
+	@Override
 	public int getNameOffset() throws CoreException {
 		return linkage.getDB().get3ByteUnsignedInt(record + NODE_OFFSET);
 	}
 
+	@Override
 	public int getNameLength() throws CoreException {
 		return linkage.getDB().getShort(record + NODE_LENGTH) & 0xffff;
 	}	
 
+	@Override
 	public String getFullName() throws CoreException {
 		if (fName == null) {
 			final Database db = linkage.getDB();
@@ -272,6 +284,7 @@ public class PDOMInclude implements IIndexFragmentInclude {
 		return fName;
 	}
 
+	@Override
 	public String getName() throws CoreException {
 		final String fullName= getFullName();
 		final int idx= Math.max(fullName.lastIndexOf('/'), fullName.lastIndexOf('\\'));
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java
index 8f8b0a6f10d..30c881dd18d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacro.java
@@ -115,14 +115,17 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		container.addDefinition(this);
 	}
 
+	@Override
 	public PDOM getPDOM() {
 		return fLinkage.getPDOM();
 	}
 
+	@Override
 	public long getRecord() {
 		return fRecord;
 	}
 	
+	@Override
 	public void delete(PDOMLinkage linkage) throws CoreException {
 		// Delete from the binding chain
 		PDOMMacro prevName = getPrevInContainer();
@@ -208,6 +211,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		return namerec != 0 ? new PDOMMacro(fLinkage, namerec) : null;
 	}
 
+	@Override
 	public char[][] getParameterList() {
 		if (fParameterList == UNINITIALIZED) {
 			fParameterList= null;
@@ -240,6 +244,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		return fExpansion != null;
 	}
 
+	@Override
 	public char[] getExpansionImage() {
 		if (fExpansion == UNINITIALIZED1) {
 			try {
@@ -253,6 +258,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		return fExpansion;
 	}
 
+	@Override
 	public char[] getNameCharArray() {
 		try {
 			return getContainer().getNameCharArray();
@@ -262,10 +268,12 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		}
 	}
 	
+	@Override
 	public String getName() {
 		return new String(getNameCharArray());
 	}
 	
+	@Override
 	public PDOMFile getFile() throws CoreException {
 		long filerec = fLinkage.getDB().getRecPtr(fRecord + FILE);
 		return filerec != 0 ? new PDOMFile(fLinkage, filerec) : null;
@@ -279,6 +287,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		fLinkage.getDB().putRecPtr(fRecord + FILE, file != null ? file.getRecord() : 0);
 	}
 
+	@Override
 	public String getFileName() {
 		try {
 			IIndexFile file = getFile();
@@ -296,26 +305,32 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		return null;
 	}
 
+	@Override
 	public int getStartingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public int getEndingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public IASTPreprocessorIncludeStatement getContextInclusionStatement() {
 		return null;
 	}
 
+	@Override
 	public IASTFileLocation asFileLocation() {
 		return this;
 	}
 	
+	@Override
 	public IASTFileLocation getFileLocation() {
 		return this;
 	}
 
+	@Override
 	public int getNodeLength() {
 		try {
 			return fLinkage.getDB().getShort(fRecord + NAME_LENGTH);
@@ -325,6 +340,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		}
 	}
 
+	@Override
 	public int getNodeOffset() {
 		try {
 			return fLinkage.getDB().getInt(fRecord + NAME_OFFSET);
@@ -334,11 +350,13 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		}
 	}
 
+	@Override
 	public char[] getExpansion() {
 		char[] expansionImage= getExpansionImage();
 		return MacroDefinitionParser.getExpansion(new CharArray(expansionImage), 0, expansionImage.length);
 	}
 
+	@Override
 	public char[][] getParameterPlaceholderList() {
 		char[][] params= getParameterList();
 		if (params != null && params.length > 0) {
@@ -354,22 +372,27 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		return params;
 	}
 
+	@Override
 	public boolean isFunctionStyle() {
 		return getParameterList() != null;
 	}
 	
+	@Override
 	public boolean isDynamic() {
 		return false;
 	}
 
+	@Override
 	public PDOMLinkage getLinkage() {
 		return fLinkage;
 	}
 
+	@Override
 	public IIndexScope getScope() {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Object getAdapter(Class adapter) {
 		if (adapter.isAssignableFrom(PDOMMacro.class)) {
@@ -378,6 +401,7 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		return null;
 	}
 
+	@Override
 	public IIndexFragmentName getDefinition() throws CoreException {
 		if (!isMacroDefinition()) {
 			return null;
@@ -388,41 +412,51 @@ public class PDOMMacro implements IIndexMacro, IPDOMBinding, IASTFileLocation {
 		return fDefinition;
 	}
 
+	@Override
 	public IIndexFile getLocalToFile() throws CoreException {
 		return null;
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return new String[]{getName()};
 	}
 
+	@Override
 	public boolean isFileLocal() throws CoreException {
 		return false;
 	}
 
+	@Override
 	public int getBindingConstant() {
 		return IIndexBindingConstants.MACRO_DEFINITION;
 	}
 
+	@Override
 	public IIndexFragment getFragment() {
 		return fLinkage.getPDOM();
 	}
 
+	@Override
 	public boolean hasDeclaration() throws CoreException {
 		return false;
 	}
 
+	@Override
 	public boolean hasDefinition() throws CoreException {
 		return true;
 	}
 
+	@Override
 	public IIndexFragmentBinding getOwner() {
 		return null;
 	}
 
+	@Override
 	public void accept(IPDOMVisitor visitor) {
 	}
 
+	@Override
 	public long getBindingID() {
 		return fRecord;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java
index 179d5171ed3..cd529df81b4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroContainer.java
@@ -114,6 +114,7 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont
 		super.delete(linkage);
 	}
 
+	@Override
 	public int getBindingConstant() {
 		return IIndexBindingConstants.MACRO_CONTAINER;
 	}
@@ -121,30 +122,37 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.index.IIndexFragmentBinding#getFragment()
 	 */
+	@Override
 	public IIndexFragment getFragment() {
 		return getPDOM();
 	}
 
+	@Override
 	public IIndexScope getScope() {
 		return null;
 	}
 
+	@Override
 	public boolean hasDeclaration() throws CoreException {
 		return false;
 	}
 
+	@Override
 	public boolean hasDefinition() throws CoreException {
 		return getDB().getRecPtr(record + FIRST_DEF_OFFSET) != 0;
 	}
 
+	@Override
 	public IIndexFile getLocalToFile() throws CoreException {
 		return null;
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return new String[]{getName()};
 	}
 
+	@Override
 	public boolean isFileLocal() throws CoreException {
 		return false;
 	}
@@ -159,10 +167,12 @@ public class PDOMMacroContainer extends PDOMNamedNode implements IIndexMacroCont
 		return CharArrayUtils.EMPTY;
 	}
 
+	@Override
 	public String getName() {
 		return new String(getNameCharArray());
 	}
 
+	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Object getAdapter(Class adapter) {
 		if (adapter.isAssignableFrom(PDOMMacroContainer.class)) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java
index c7be074395d..60228f832c2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroDefinitionName.java
@@ -29,49 +29,64 @@ class PDOMMacroDefinitionName implements IIndexFragmentName {
 		return fMacro;
 	}
 	
+	@Override
 	public boolean couldBePolymorphicMethodCall() throws CoreException {
 		return false;
 	}
+	@Override
 	public IIndexName[] getEnclosedNames() throws CoreException {
 		return IIndexName.EMPTY_ARRAY;
 	}
+	@Override
 	public IIndexName getEnclosingDefinition() throws CoreException {
 		return null;
 	}
+	@Override
 	public IIndexFile getFile() throws CoreException {
 		return fMacro.getFile();
 	}
+	@Override
 	public int getNodeLength() {
 		return fMacro.getNodeLength();
 	}
+	@Override
 	public int getNodeOffset() {
 		return fMacro.getNodeOffset();
 	}
+	@Override
 	public boolean isBaseSpecifier() throws CoreException {
 		return false;
 	}
+	@Override
 	public boolean isReadAccess() throws CoreException {
 		return false;
 	}
+	@Override
 	public boolean isWriteAccess() throws CoreException {
 		return false;
 	}
+	@Override
 	public IASTFileLocation getFileLocation() {
 		return fMacro;
 	}
+	@Override
 	public boolean isDeclaration() {
 		return false;
 	}
+	@Override
 	public boolean isDefinition() {
 		return true;
 	}
+	@Override
 	public boolean isReference() {
 		return false;
 	}
+	@Override
 	public boolean isInlineNamespaceDefinition() {
 		return false;
 	}
 
+	@Override
 	@Deprecated
 	public char[] toCharArray() {
 		return fMacro.getNameCharArray();
@@ -81,12 +96,15 @@ class PDOMMacroDefinitionName implements IIndexFragmentName {
 		return new String(getSimpleID());
 	}
 	
+	@Override
 	public char[] getSimpleID() {
 		return fMacro.getNameCharArray();
 	}
+	@Override
 	public IIndexFragmentBinding getBinding() {
 		return fMacro;
 	}
+	@Override
 	public IIndexFragment getIndexFragment() {
 		return fMacro.getFragment();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java
index ff242e63d2e..dfde12a3978 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMMacroReferenceName.java
@@ -113,6 +113,7 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil
 		setNameField(CONTAINER_NEXT_OFFSET, name);
 	}
 	
+	@Override
 	public PDOMFile getFile() throws CoreException {
 		long filerec = linkage.getDB().getRecPtr(record + FILE_REC_OFFSET);
 		return filerec != 0 ? new PDOMFile(linkage, filerec) : null;
@@ -137,11 +138,13 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil
 	/**
 	 * @deprecated use {@link #getSimpleID()}.
 	 */
+	@Override
 	@Deprecated
 	public char[] toCharArray() {
 		return getSimpleID();
 	}
 	
+	@Override
 	public char[] getSimpleID() {
 		try {
 			return getContainer().getNameCharArray();
@@ -156,42 +159,52 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil
 		return new String(getSimpleID());
 	}
 	
+	@Override
 	public boolean isBaseSpecifier() throws CoreException {
 		return false;
 	}
 	
+	@Override
 	public boolean couldBePolymorphicMethodCall() throws CoreException {
 		return false;
 	}
 
+	@Override
 	public boolean isInlineNamespaceDefinition() {
 		return false;
 	}
 
+	@Override
 	public boolean isReadAccess() throws CoreException {
 		return false;
 	}
 
+	@Override
 	public boolean isWriteAccess() throws CoreException {
 		return false;
 	}
 
+	@Override
 	public boolean isDeclaration() {
 		return false;
 	}
 
+	@Override
 	public boolean isReference() {
 		return true;
 	}
 
+	@Override
 	public boolean isDefinition() {
 		return false;
 	}
 
+	@Override
 	public IASTFileLocation getFileLocation() {
 		return this;
 	}
 
+	@Override
 	public String getFileName() {
 		try {
 			IIndexFile file = getFile();
@@ -209,22 +222,27 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil
 		return null;
 	}
 
+	@Override
 	public int getStartingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public int getEndingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public IASTPreprocessorIncludeStatement getContextInclusionStatement() {
 		return null;
 	}
 
+	@Override
 	public IASTFileLocation asFileLocation() {
 		return this;
 	}
 
+	@Override
 	public int getNodeLength() {
 		try {
 			return (linkage.getDB().getShort(record + NODE_LENGTH_OFFSET)) & 0xffff;
@@ -234,6 +252,7 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil
 		}
 	}
 
+	@Override
 	public int getNodeOffset() {
 		try {
 			return linkage.getDB().getInt(record + NODE_OFFSET_OFFSET);
@@ -260,18 +279,22 @@ public final class PDOMMacroReferenceName implements IIndexFragmentName, IASTFil
 		linkage.getDB().free(record);
 	}
 
+	@Override
 	public IIndexFragment getIndexFragment() {
 		return linkage.getPDOM();
 	}
 
+	@Override
 	public IIndexName[] getEnclosedNames() throws CoreException {
 		return IIndexName.EMPTY_ARRAY;
 	}
 
+	@Override
 	public IIndexFragmentBinding getBinding() throws CoreException {
 		return getContainer();
 	}
 
+	@Override
 	public IIndexName getEnclosingDefinition() throws CoreException {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java
index cad23af7f64..3be5bdb1452 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMName.java
@@ -128,6 +128,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		return linkage.getPDOM();
 	}
 	
+	@Override
 	public PDOMBinding getBinding() throws CoreException {
 		long bindingrec = getRecField(BINDING_REC_OFFSET);
 		return linkage.getBinding(bindingrec);
@@ -164,6 +165,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		setNameField(BINDING_NEXT_OFFSET, name);
 	}
 	
+	@Override
 	public PDOMFile getFile() throws CoreException {
 		long filerec = linkage.getDB().getRecPtr(record + FILE_REC_OFFSET);
 		return filerec != 0 ? new PDOMFile(linkage, filerec) : null;
@@ -177,6 +179,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		linkage.getDB().putRecPtr(record + FILE_REC_OFFSET, file != null ? file.getRecord() : 0);
 	}
 
+	@Override
 	public IIndexName getEnclosingDefinition() throws CoreException {
 		long namerec = getEnclosingDefinitionRecord();
 		return namerec != 0 ? new PDOMName(linkage, namerec) : null;
@@ -197,11 +200,13 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 	/**
 	 * @deprecated use {@link #getSimpleID()}, instead.
 	 */
+	@Override
 	@Deprecated
 	public char[] toCharArray() {
 		return getSimpleID();
 	}
 
+	@Override
 	public char[] getSimpleID() {
 		try {
 			Database db = linkage.getDB();
@@ -245,26 +250,32 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		return getFlags(INHERIT_FRIEND_INLINE_MASK) == IS_FRIEND_SPEC;
 	}
 
+	@Override
 	public boolean isBaseSpecifier() throws CoreException {
 		return getFlags(INHERIT_FRIEND_INLINE_MASK) == IS_INHERITANCE_SPEC;
 	}
 	
+	@Override
 	public boolean isInlineNamespaceDefinition() throws CoreException {
 		return getFlags(INHERIT_FRIEND_INLINE_MASK) == IS_INLINE_NAMESPACE;
 	}
 
+	@Override
 	public boolean couldBePolymorphicMethodCall() throws CoreException {
 		return getFlags(COULD_BE_POLYMORPHIC_METHOD_CALL) == COULD_BE_POLYMORPHIC_METHOD_CALL;
 	}
 
+	@Override
 	public boolean isReadAccess() throws CoreException {
 		return getFlags(READ_ACCESS) == READ_ACCESS;
 	}
 
+	@Override
 	public boolean isWriteAccess() throws CoreException {
 		return getFlags(WRITE_ACCESS) == WRITE_ACCESS;
 	}
 
+	@Override
 	public boolean isDeclaration() {
 		try {
 			int flags = getFlags(DECL_DEF_REF_MASK);
@@ -275,6 +286,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		}
 	}
 
+	@Override
 	public boolean isReference() {
 		try {
 			int flags = getFlags(DECL_DEF_REF_MASK);
@@ -285,6 +297,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		}
 	}
 
+	@Override
 	public boolean isDefinition() {
 		try {
 			int flags = getFlags(DECL_DEF_REF_MASK);
@@ -295,10 +308,12 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		}
 	}
 
+	@Override
 	public IASTFileLocation getFileLocation() {
 		return this;
 	}
 
+	@Override
 	public String getFileName() {
 		try {
 			IIndexFile file = getFile();
@@ -316,22 +331,27 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		return null;
 	}
 
+	@Override
 	public int getStartingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public int getEndingLineNumber() {
 		return 0;
 	}
 
+	@Override
 	public IASTPreprocessorIncludeStatement getContextInclusionStatement() {
 		return null;
 	}
 
+	@Override
 	public IASTFileLocation asFileLocation() {
 		return this;
 	}
 
+	@Override
 	public int getNodeLength() {
 		try {
 			return (linkage.getDB().getShort(record + NODE_LENGTH_OFFSET)) & 0xffff;
@@ -341,6 +361,7 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		}
 	}
 
+	@Override
 	public int getNodeOffset() {
 		try {
 			return linkage.getDB().get3ByteUnsignedInt(record + NODE_OFFSET_OFFSET);
@@ -377,10 +398,12 @@ public final class PDOMName implements IIndexFragmentName, IASTFileLocation {
 		linkage.getDB().free(record);
 	}
 
+	@Override
 	public IIndexFragment getIndexFragment() {
 		return linkage.getPDOM();
 	}
 
+	@Override
 	public IIndexName[] getEnclosedNames() throws CoreException {
 		ArrayList<PDOMName> result= new ArrayList<PDOMName>();
 		PDOMName name= getNextInFile();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java
index 49409e4ce80..7f50ad5f082 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMNode.java
@@ -76,6 +76,7 @@ public abstract class PDOMNode implements IInternalPDOMNode {
 
 	public abstract int getNodeType();
 
+	@Override
 	public final long getRecord() {
 		return record;
 	}
@@ -114,6 +115,7 @@ public abstract class PDOMNode implements IInternalPDOMNode {
 		return System.identityHashCode(getPDOM()) + (int) (41 * record);
 	}
 
+	@Override
 	public void accept(IPDOMVisitor visitor) throws CoreException {
 		// No children here.
 	}
@@ -168,6 +170,7 @@ public abstract class PDOMNode implements IInternalPDOMNode {
 	 * @param linkage 
 	 * @throws CoreException 
 	 */
+	@Override
 	public void delete(PDOMLinkage linkage) throws CoreException {
 		getDB().free(record);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java
index f9fe7294a9b..ddf959d40dd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMProjectIndexLocationConverter.java
@@ -47,6 +47,7 @@ public class PDOMProjectIndexLocationConverter implements IIndexLocationConverte
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.pdom.dom.IIndexLocationConverter#fromInternalFormat(java.lang.String)
 	 */
+	@Override
 	public IIndexFileLocation fromInternalFormat(String raw) {
 		String fullPath = null;
 		URI uri= null;
@@ -73,6 +74,7 @@ public class PDOMProjectIndexLocationConverter implements IIndexLocationConverte
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.internal.core.pdom.dom.IIndexLocationConverter#toRaw(java.net.URI)
 	 */
+	@Override
 	public String toInternalFormat(IIndexFileLocation location) {
 		String fullPath= location.getFullPath();
 		if(fullPath!=null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java
index 26cdc22c179..e8823998e44 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumeration.java
@@ -86,6 +86,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType,
 		return IIndexCBindingConstants.CENUMERATION;
 	}
 
+	@Override
 	public IEnumerator[] getEnumerators() {
 		List<PDOMCEnumerator> result = getCachedEnumerators(true);
 		return result.toArray(new IEnumerator[result.size()]);
@@ -111,12 +112,14 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType,
 		try {
 			PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + OFFSET_ENUMERATOR_LIST);
 			list.accept(new IPDOMVisitor() {
+				@Override
 				public boolean visit(IPDOMNode node) throws CoreException {
 					if (node instanceof PDOMCEnumerator) {
 						result.add((PDOMCEnumerator) node);
 					}
 					return true;
 				}
+				@Override
 				public void leave(IPDOMNode node) {}
 			});
 		} catch (CoreException e) {
@@ -151,6 +154,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType,
 	}
 
 
+	@Override
 	public long getMinValue() {
 		if (fMinValue != null) {
 			return fMinValue.longValue();
@@ -164,6 +168,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType,
 		return minValue;
 	}
 
+	@Override
 	public long getMaxValue() {
 		if (fMaxValue != null) {
 			return fMaxValue.longValue();
@@ -177,6 +182,7 @@ class PDOMCEnumeration extends PDOMBinding implements IEnumeration, IIndexType,
 		return maxValue;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java
index da9da2ba9a8..3e6758c720a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCEnumerator.java
@@ -70,6 +70,7 @@ class PDOMCEnumerator extends PDOMBinding implements IEnumerator {
 			storeValue(getDB(), (IEnumerator) newBinding);
 	}
 
+	@Override
 	public IType getType() throws DOMException {
 		IIndexFragmentBinding owner = getOwner();
 		if (owner instanceof IType)
@@ -77,6 +78,7 @@ class PDOMCEnumerator extends PDOMBinding implements IEnumerator {
 		return null;
 	}
 	
+	@Override
 	public IValue getValue() {
 		try {
 			int val= getDB().getInt(record + VALUE);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java
index 44511a16da7..8bfcfdc9638 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCField.java
@@ -69,6 +69,7 @@ class PDOMCField extends PDOMCVariable implements IField {
 		return false;
 	}
 
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		try {
 			return (ICompositeType)getParentNode();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java
index 50e5d7637e8..c749f068612 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCFunction.java
@@ -135,6 +135,7 @@ class PDOMCFunction extends PDOMBinding implements IFunction {
 		return IIndexCBindingConstants.CFUNCTION;
 	}
 
+	@Override
 	public IFunctionType getType() {
 		try {
 			return (IFunctionType) getLinkage().loadType(record + FUNCTION_TYPE);
@@ -144,14 +145,17 @@ class PDOMCFunction extends PDOMBinding implements IFunction {
 		}
 	}
 
+	@Override
 	public boolean isStatic() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.STATIC_OFFSET);
 	}
 
+	@Override
 	public boolean isExtern() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.EXTERN_OFFSET);
 	}
 
+	@Override
 	public IParameter[] getParameters() {
 		try {
 			PDOMLinkage linkage= getLinkage();
@@ -176,24 +180,29 @@ class PDOMCFunction extends PDOMBinding implements IFunction {
 		}
 	}
 	
+	@Override
 	public boolean isAuto() {
 		// ISO/IEC 9899:TC1 6.9.1.4
 		return false;
 	}
 
+	@Override
 	public boolean isRegister() {
 		// ISO/IEC 9899:TC1 6.9.1.4
 		return false;
 	}
 
+	@Override
 	public boolean isInline() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.INLINE_OFFSET);
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.VARARGS_OFFSET);
 	}
 	
+	@Override
 	public IScope getFunctionScope() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java
index 6543eb6cfc3..f7ae39f14da 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCLinkageFactory.java
@@ -21,10 +21,12 @@ import org.eclipse.core.runtime.CoreException;
  */
 public class PDOMCLinkageFactory implements IPDOMLinkageFactory {
 
+	@Override
 	public PDOMLinkage getLinkage(PDOM pdom, long record) {
 		return new PDOMCLinkage(pdom, record);
 	}
 
+	@Override
 	public PDOMLinkage createLinkage(PDOM pdom) throws CoreException {
 		return new PDOMCLinkage(pdom);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java
index 08e229365b2..d7a5ef03c2b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCParameter.java
@@ -68,28 +68,34 @@ final class PDOMCParameter extends PDOMNamedNode implements IParameter, IPDOMBin
 		return IIndexCBindingConstants.CPARAMETER;
 	}
 		
+	@Override
 	public IType getType() {
 		return fType;
 	}
 
+	@Override
 	public boolean isAuto() {
 		byte flag = 1<<PDOMCAnnotation.AUTO_OFFSET;
 		return hasFlag(flag, true);
 	}
 
+	@Override
 	public boolean isRegister() {
 		byte flag = 1<<PDOMCAnnotation.REGISTER_OFFSET;
 		return hasFlag(flag, false);
 	}
 
+	@Override
 	public String getName() {
 		return new String(getNameCharArray());
 	}
 
+	@Override
 	public IIndexScope getScope() {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Class adapter) {
 		return null;
@@ -105,24 +111,29 @@ final class PDOMCParameter extends PDOMNamedNode implements IParameter, IPDOMBin
 		}
 	}
 
+	@Override
 	public IIndexFragment getFragment() {
 		return getPDOM();
 	}
 
+	@Override
 	public boolean hasDefinition() throws CoreException {
 		// parameter bindings do not span index fragments
 		return true;
 	}
 
+	@Override
 	public boolean hasDeclaration() throws CoreException {
 		// parameter bindings do not span index fragments
 		return true;
 	}
 
+	@Override
 	public String[] getQualifiedName() {
 		return new String[] {getName()};
 	}
 
+	@Override
 	public int getBindingConstant() {
 		return getNodeType();
 	}
@@ -149,14 +160,17 @@ final class PDOMCParameter extends PDOMNamedNode implements IParameter, IPDOMBin
 		return rec;
 	}
 
+	@Override
 	public boolean isFileLocal() throws CoreException {
 		return false;
 	}
 	
+	@Override
 	public IIndexFile getLocalToFile() throws CoreException {
 		return null;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
@@ -180,10 +194,12 @@ final class PDOMCParameter extends PDOMNamedNode implements IParameter, IPDOMBin
 	}
 	
 	
+	@Override
 	public boolean isExtern() {
 		return false;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java
index 885c2655fe6..5be9b10a41a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCStructure.java
@@ -65,6 +65,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		super(linkage, record);
 	}
 	
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eClassType;
 	}
@@ -104,6 +105,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		throw new UnsupportedOperationException();
 	}
 	
+	@Override
 	public int getKey() {
 		try {
 			return getDB().getByte(record + KEY);
@@ -113,6 +115,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		}
 	}
 	
+	@Override
 	public boolean isAnonymous() {
 		try {
 			return getDB().getByte(record + ANONYMOUS) != 0;
@@ -124,6 +127,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 
 	private static class GetFields implements IPDOMVisitor {
 		private List<IPDOMNode> fields = new ArrayList<IPDOMNode>();
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof IField) {
 				IField field= (IField) node;
@@ -137,12 +141,14 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 			}
 			return false;
 		}
+		@Override
 		public void leave(IPDOMNode node) throws CoreException {
 		}
 		public IField[] getFields() {
 			return fields.toArray(new IField[fields.size()]);
 		}
 	}
+	@Override
 	public IField[] getFields() {
 		try {
 			GetFields fields = new GetFields();
@@ -160,6 +166,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		public FindField(String name) {
 			this.name = name;
 		}
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof IField) {
 				IField tField = (IField)node;
@@ -176,11 +183,13 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 			}
 			return false;
 		}
+		@Override
 		public void leave(IPDOMNode node) throws CoreException {
 		}
 		public IField getField() { return field; }
 	}
 	
+	@Override
 	public IField findField(String name) {
 		final PDOM pdom = getPDOM();
 		final String key= pdom.createKeyForCache(record, name.toCharArray());
@@ -208,10 +217,12 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		return result;
 	}
 
+	@Override
 	public IScope getCompositeScope() {
 		return this;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
@@ -251,10 +262,12 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		return true;
 	}
 
+	@Override
 	public ICompositeType getCompositeType() {
 		return this;
 	}
 
+	@Override
 	public IBinding getBinding(char[] name) {
 		return findField(new String(name));
 	}
@@ -269,6 +282,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		return getBindings(name.toCharArray());
 	}
 	
+	@Override
 	public IBinding[] find(String name) {
 		return getBindings(name.toCharArray());
 	}
@@ -280,6 +294,7 @@ public class PDOMCStructure extends PDOMBinding implements ICompositeType, ICCom
 		return new IBinding[]{b};
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return this;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java
index 7ade95656fb..6ce1b2b2037 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/c/PDOMCVariable.java
@@ -90,6 +90,7 @@ class PDOMCVariable extends PDOMBinding implements IVariable {
 		return IIndexCBindingConstants.CVARIABLE;
 	}
 	
+	@Override
 	public IType getType() {
 		try {
 			return getLinkage().loadType(record + TYPE_OFFSET);
@@ -99,6 +100,7 @@ class PDOMCVariable extends PDOMBinding implements IVariable {
 		}
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		try {
 			return getLinkage().loadValue(record + VALUE_OFFSET);
@@ -108,18 +110,22 @@ class PDOMCVariable extends PDOMBinding implements IVariable {
 		}
 	}
 
+	@Override
 	public boolean isStatic() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.STATIC_OFFSET);
 	}
 
+	@Override
 	public boolean isExtern() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.EXTERN_OFFSET);
 	}
 
+	@Override
 	public boolean isAuto() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.AUTO_OFFSET);
 	}
 
+	@Override
 	public boolean isRegister() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.REGISTER_OFFSET);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java
index 2395d9b6e85..19b7e2b5c5a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/IPDOMCPPEnumType.java
@@ -27,6 +27,7 @@ public interface IPDOMCPPEnumType extends ICPPEnumeration, IPDOMBinding, IIndexT
 	 */
 	IIndexName getScopeName();
 	
+	@Override
 	IEnumerator[] getEnumerators();
 
 	/**
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java
index 891fb17e875..7fea377b174 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBase.java
@@ -77,6 +77,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 		return getDB().getByte(record + FLAGS);
 	}
 
+	@Override
 	public PDOMName getBaseClassSpecifierName() {
 		try {
 			long rec = getDB().getRecPtr(record + BASECLASS_SPECIFIER);
@@ -89,6 +90,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 		return null;
 	}
 	
+	@Override
 	public IBinding getBaseClass() {
 		if (fCachedBaseClass != null)
 			return fCachedBaseClass;
@@ -108,6 +110,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 		return null;
 	}
 
+	@Override
 	public int getVisibility() {
 		try {
 			return getFlags() & 0x3;
@@ -118,6 +121,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 		
 	}
 
+	@Override
 	public boolean isVirtual() {
 		try {
 			return (getFlags() & 0x4) != 0;
@@ -131,6 +135,7 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 		getDB().free(record);
 	}
 	
+	@Override
 	public void setBaseClass(IBinding binding) {
 		throw new UnsupportedOperationException(); 
 	}
@@ -147,21 +152,26 @@ class PDOMCPPBase implements ICPPBase, ICPPInternalBase {
 		public PDOMCPPBaseClone(ICPPBase base) {
 			this.base = base;
 		}
+		@Override
 		public IBinding getBaseClass() {
 			if (baseClass == null) {
 				return base.getBaseClass();
 			}
 			return baseClass;
 		}
+		@Override
 		public IName getBaseClassSpecifierName() {
 			return base.getBaseClassSpecifierName();
 		}
+		@Override
 		public int getVisibility() {
 			return base.getVisibility();
 		}
+		@Override
 		public boolean isVirtual() {
 			return base.isVirtual();
 		}
+		@Override
 		public void setBaseClass(IBinding binding) {
 			baseClass = binding;
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java
index f57114c1ab1..0ffc5f4b4d5 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBinding.java
@@ -39,10 +39,12 @@ public abstract class PDOMCPPBinding extends PDOMBinding implements ICPPBinding
 		return CPPVisitor.getQualifiedName(this);
 	}
 
+	@Override
 	final public char[][] getQualifiedNameCharArray() {
 		return CPPVisitor.getQualifiedNameCharArray(this);
 	}
 
+	@Override
 	public final boolean isGloballyQualified() throws DOMException {
 		// local stuff is not stored in the index.
 		return true;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java
index 53568867bf9..fa449e7db7e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassInstance.java
@@ -63,10 +63,12 @@ class PDOMCPPClassInstance extends PDOMCPPClassSpecialization implements ICPPTem
 		return IIndexCPPBindingConstants.CPP_CLASS_INSTANCE;
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return (ICPPTemplateDefinition) getSpecializedBinding();
 	}
 		
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		try {
 			final long rec= getPDOM().getDB().getRecPtr(record + ARGUMENTS);
@@ -83,6 +85,7 @@ class PDOMCPPClassInstance extends PDOMCPPClassSpecialization implements ICPPTem
 		return hasDeclaration();
 	}
 	
+	@Override
 	public boolean isExplicitSpecialization() {
 		return !(getCompositeScope() instanceof ICPPClassSpecializationScope);
 	}
@@ -103,6 +106,7 @@ class PDOMCPPClassInstance extends PDOMCPPClassSpecialization implements ICPPTem
 		return CPPClassInstance.isSameClassInstance(this, type);
 	}
 	
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return CPPTemplates.getArguments(getTemplateArguments());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java
index 9ba21e35989..4a572add8e3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassScope.java
@@ -65,6 +65,7 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope {
 			fResult = result;
 		}
 
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof PDOMBinding) {
 				final PDOMBinding binding= (PDOMBinding) node;
@@ -82,6 +83,7 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope {
 			return false;
 		}
 
+		@Override
 		public void leave(IPDOMNode node){}
 	}
 
@@ -100,22 +102,27 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope {
 		fBinding= binding;
 	}
 	
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eClassType;
 	}
 
+	@Override
 	public ICPPClassType getClassType() {
 		return fBinding;
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve) {
 		return getBinding(name, resolve, null);
 	}
 
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) {
 		return getBindings(name, resolve, prefixLookup, null);
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
 		try {
 		    final char[] nameChars = name.getSimpleID();
@@ -140,6 +147,7 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope {
 		return fBinding;
 	}
 	
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
 		try {
 			if (name instanceof ICPPASTConversionName) {
@@ -243,14 +251,17 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope {
 		return map;
 	}
 
+	@Override
 	public IBinding[] find(String name) {
 		return CPPSemantics.findBindings( this, name, false );
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return fBinding;
 	}
 
+	@Override
 	public ICPPMethod[] getImplicitMethods() {
 		try {
 			PDOMClassUtil.MethodCollector methods = new PDOMClassUtil.MethodCollector(true, false);
@@ -261,14 +272,17 @@ class PDOMCPPClassScope implements ICPPClassScope, IIndexScope {
 		}
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		return fBinding.getConstructors();
 	}
 
+	@Override
 	public IIndexScope getParent() {
 		return fBinding.getScope();
 	}
 
+	@Override
 	public IIndexName getScopeName() {
 		return fBinding.getScopeName();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
index 07dedf34799..eb31fe7c9dc 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
@@ -87,6 +87,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		return (ICPPClassType) super.getSpecializedBinding();
 	}
 	
+	@Override
 	public IBinding specializeMember(IBinding original) {	
 		if (specializationMap == null) {
 			final Long key= record+PDOMCPPLinkage.CACHE_INSTANCE_SCOPE;
@@ -126,6 +127,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		return newSpec;
 	}
 
+	@Override
 	public ICPPClassScope getCompositeScope() {
 		if (fScope == null) {
 			try {
@@ -185,6 +187,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 	}
 	
 	// implementation of class type
+	@Override
 	public ICPPBase[] getBases() {
 		IScope scope= getCompositeScope();
 		if (scope instanceof ICPPClassSpecializationScope) {
@@ -211,6 +214,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		return ICPPBase.EMPTY_BASE_ARRAY;
 	}
 	
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		IScope scope= getCompositeScope();
 		if (scope instanceof ICPPClassSpecializationScope) {
@@ -226,6 +230,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		}
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		IScope scope= getCompositeScope();
 		if (scope instanceof ICPPClassSpecializationScope) {
@@ -241,6 +246,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		}
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		IScope scope= getCompositeScope();
 		if (scope instanceof ICPPClassSpecializationScope) {
@@ -256,6 +262,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		}
 	}
 	
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		IScope scope= getCompositeScope();
 		if (scope instanceof ICPPClassSpecializationScope) {
@@ -271,31 +278,38 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		}
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		// not yet supported.
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 
+	@Override
 	public ICPPMethod[] getMethods() { 
 		return ClassTypeHelper.getMethods(this);
 	}
 
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ClassTypeHelper.getAllDeclaredMethods(this);
 	}
 	
+	@Override
 	public IField[] getFields() {
 		return ClassTypeHelper.getFields(this);
 	}
 	
+	@Override
 	public IField findField(String name) {
 		return ClassTypeHelper.findField(this, name);
 	}
 
+	@Override
 	public int getKey() {
 		return getSpecializedBinding().getKey();
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		if (type == this)
 			return true;
@@ -332,6 +346,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		list.addMember(member);
 	}
 
+	@Override
 	public void acceptUncached(IPDOMVisitor visitor) throws CoreException {
 		PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + MEMBERLIST);
 		list.accept(visitor);
@@ -342,6 +357,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
 		PDOMCPPClassScope.acceptViaCache(this, visitor, false);
 	}
 	
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java
index ef0d77a4199..58c503d1365 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecializationScope.java
@@ -25,6 +25,7 @@ public class PDOMCPPClassSpecializationScope extends AbstractCPPClassSpecializat
 		super(specialization);
 	}
 
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return (IIndexBinding) getClassType();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java
index 0e6592c5d51..c5e4af6af93 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassTemplatePartialSpecialization.java
@@ -73,6 +73,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends	PDOMCPPClassTemplate
 		super(linkage, bindingRecord);
 	}
 	
+	@Override
 	public int getSignatureHash() throws CoreException {
 		return getDB().getInt(record + SIGNATURE_HASH);
 	}
@@ -97,6 +98,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends	PDOMCPPClassTemplate
 		getDB().putRecPtr(record + NEXT_PARTIAL, value);
 	}
 	
+	@Override
 	public ICPPClassTemplate getPrimaryClassTemplate() {
 		try {
 			return new PDOMCPPClassTemplate(getLinkage(), getDB().getRecPtr(record + PRIMARY));
@@ -106,10 +108,12 @@ class PDOMCPPClassTemplatePartialSpecialization extends	PDOMCPPClassTemplate
 		}
 	}
 	
+	@Override
 	public IBinding getSpecializedBinding() {
 		return getPrimaryClassTemplate();
 	}
 	
+	@Override
 	public void setArguments(ICPPTemplateArgument[] templateArguments) throws CoreException {
 		final Database db = getPDOM().getDB();
 		long oldRec = db.getRecPtr(record+ARGUMENTS);
@@ -120,6 +124,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends	PDOMCPPClassTemplate
 		}
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		try {
 			final long rec= getPDOM().getDB().getRecPtr(record+ARGUMENTS);
@@ -130,6 +135,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends	PDOMCPPClassTemplate
 		}
 	}
 	
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return CPPTemplates.getArguments(getTemplateArguments());
@@ -155,6 +161,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends	PDOMCPPClassTemplate
 		return cmp;
 	}
 	
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		return CPPTemplates.createParameterMap(getPrimaryClassTemplate(), getTemplateArguments());
 	}
@@ -198,6 +205,7 @@ class PDOMCPPClassTemplatePartialSpecialization extends	PDOMCPPClassTemplate
 		return true;
 	}
 	
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		ICPPTemplateParameter[] params = getPrimaryClassTemplate().getTemplateParameters();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java
index 31464ea5f49..f79a0c1f2f1 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassType.java
@@ -117,6 +117,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 	/**
 	 * Called to populate the cache for the bindings in the class scope.
 	 */
+	@Override
 	public void acceptUncached(IPDOMVisitor visitor) throws CoreException {
 		super.accept(visitor);
 		PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + MEMBERLIST);
@@ -202,6 +203,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public ICPPClassScope getCompositeScope() {
 		if (fScope == null) {
 			fScope= new PDOMCPPClassScope(this);
@@ -209,6 +211,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		return fScope;
 	}
 
+	@Override
 	public int getKey() {
 		try {
 			return getDB().getByte(record + KEY);
@@ -218,6 +221,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		try {
 			return getDB().getByte(record + ANONYMOUS) != 0;
@@ -227,6 +231,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
@@ -260,6 +265,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		return key == k_class ? k_struct : key;
 	}
 
+	@Override
 	public ICPPBase[] getBases() {
 		Long key= record + PDOMCPPLinkage.CACHE_BASES;
 		ICPPBase[] bases= (ICPPBase[]) getPDOM().getCachedResult(key);
@@ -280,6 +286,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		PDOMClassUtil.ConstructorCollector visitor= new PDOMClassUtil.ConstructorCollector();
 		try {
@@ -291,6 +298,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		try {
 			PDOMClassUtil.MethodCollector methods = new PDOMClassUtil.MethodCollector(false);
@@ -302,6 +310,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		try {
 			PDOMClassUtil.FieldCollector visitor = new PDOMClassUtil.FieldCollector();
@@ -313,6 +322,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		try {
 			PDOMClassUtil.NestedClassCollector visitor = new PDOMClassUtil.NestedClassCollector();
@@ -324,6 +334,7 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		try {
 			final List<IBinding> list = new ArrayList<IBinding>();
@@ -338,18 +349,22 @@ class PDOMCPPClassType extends PDOMCPPBinding implements IPDOMCPPClassType, IPDO
 		}
 	}
 
+	@Override
 	public ICPPMethod[] getMethods() { 
 		return ClassTypeHelper.getMethods(this);
 	}
 
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ClassTypeHelper.getAllDeclaredMethods(this);
 	}
 	
+	@Override
 	public IField[] getFields() {
 		return ClassTypeHelper.getFields(this);
 	}
 	
+	@Override
 	public IField findField(String name) {
 		return ClassTypeHelper.findField(this, name);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java
index 1c853a74f4c..67d65e7672b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPDeferredClassInstance.java
@@ -81,14 +81,17 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
 		return IIndexCPPBindingConstants.CPP_DEFERRED_CLASS_INSTANCE;
 	}
 	
+	@Override
 	public boolean isExplicitSpecialization() {
 		return false;
 	}
 
+	@Override
 	public IScope getCompositeScope() {
 		return asScope();
 	}
 		
+	@Override
 	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
@@ -112,6 +115,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
 		return false;
 	}
 
+	@Override
 	public ICPPClassTemplate getClassTemplate() {
 		return (ICPPClassTemplate) getSpecializedBinding();
 	}
@@ -129,47 +133,58 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
 		list.accept(visitor);
 	}
 		
-    public ICPPBase[] getBases() {
+    @Override
+	public ICPPBase[] getBases() {
         return ICPPBase.EMPTY_BASE_ARRAY;
     }
 
-    public IField[] getFields() {
+    @Override
+	public IField[] getFields() {
         return IField.EMPTY_FIELD_ARRAY;
     }
 
-    public IField findField(String name) {
+    @Override
+	public IField findField(String name) {
         return null;
     }
 
-    public ICPPField[] getDeclaredFields() {
+    @Override
+	public ICPPField[] getDeclaredFields() {
         return ICPPField.EMPTY_CPPFIELD_ARRAY;
     }
 
-    public ICPPMethod[] getMethods() {
+    @Override
+	public ICPPMethod[] getMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
-    public ICPPMethod[] getAllDeclaredMethods() {
+    @Override
+	public ICPPMethod[] getAllDeclaredMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
-    public ICPPMethod[] getDeclaredMethods() {
+    @Override
+	public ICPPMethod[] getDeclaredMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
-    public ICPPConstructor[] getConstructors() {
+    @Override
+	public ICPPConstructor[] getConstructors() {
         return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
     }
 
-    public IBinding[] getFriends() {
+    @Override
+	public IBinding[] getFriends() {
         return IBinding.EMPTY_BINDING_ARRAY;
     }
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		return ICPPClassType.EMPTY_CLASS_ARRAY;
 	}
 
-    public int getKey(){
+    @Override
+	public int getKey(){
         return getClassTemplate().getKey();
     }
 
@@ -178,6 +193,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
 		throw new UnsupportedOperationException(); 
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		if (unknownScope == null) {
 			unknownScope= new PDOMCPPUnknownScope(this, getUnknownName());
@@ -185,14 +201,17 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
 		return unknownScope;
 	}
 
+	@Override
 	public IASTName getUnknownName() {
 		return new CPPASTName(getNameCharArray());
 	}
 
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return (ICPPTemplateDefinition) getSpecializedBinding();
 	}
 	
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		try {
 			final long rec= getPDOM().getDB().getRecPtr(record+ARGUMENTS);
@@ -203,6 +222,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
 		}
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
@@ -219,6 +239,7 @@ class PDOMCPPDeferredClassInstance extends PDOMCPPSpecialization
 		return map;
 	}
 	
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return CPPTemplates.getArguments(getTemplateArguments());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java
index 62c6cd90ab2..0514ae7a11e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumScope.java
@@ -47,18 +47,22 @@ class PDOMCPPEnumScope implements ICPPScope, IIndexScope {
 		fBinding= binding;
 	}
 	
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eEnumeration;
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve) {
 		return getBinding(name, resolve, null);
 	}
 
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup) {
 		return getBindings(name, resolve, prefixLookup, null);
 	}
 
+	@Override
 	public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
 		try {
 			CharArrayMap<PDOMCPPEnumerator> map= getBindingMap(fBinding);
@@ -69,6 +73,7 @@ class PDOMCPPEnumScope implements ICPPScope, IIndexScope {
 		}
 	}
 
+	@Override
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup, IIndexFileSet fileSet) {
 		try {
 			CharArrayMap<PDOMCPPEnumerator> map= getBindingMap(fBinding);
@@ -93,18 +98,22 @@ class PDOMCPPEnumScope implements ICPPScope, IIndexScope {
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 
+	@Override
 	public IBinding[] find(String name) {
 		return CPPSemantics.findBindings(this, name, false);
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return fBinding;
 	}
 
+	@Override
 	public IIndexScope getParent() {
 		return fBinding.getScope();
 	}
 
+	@Override
 	public IIndexName getScopeName() {
 		return fBinding.getScopeName();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java
index 6d935832939..33cc375ef8f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumeration.java
@@ -99,6 +99,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 		return IIndexCPPBindingConstants.CPPENUMERATION;
 	}
 
+	@Override
 	public IEnumerator[] getEnumerators() {
 		return PDOMCPPEnumScope.getEnumerators(this);
 	}
@@ -122,6 +123,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 		return true;
 	}
 
+	@Override
 	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
@@ -148,6 +150,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 		return false;
 	}
 
+	@Override
 	public long getMinValue() {
 		if (fMinValue != null) {
 			return fMinValue.longValue();
@@ -161,6 +164,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 		return minValue;
 	}
 
+	@Override
 	public long getMaxValue() {
 		if (fMaxValue != null) {
 			return fMaxValue.longValue();
@@ -179,6 +183,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
     	throw new IllegalArgumentException("Enums must not be cloned"); //$NON-NLS-1$
     }
 
+	@Override
 	public boolean isScoped() {
 		try {
 			return getDB().getByte(record + OFFSET_FLAGS) != 0;
@@ -187,6 +192,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 		}
 	}
 
+	@Override
 	public IType getFixedType() {
 		if (fFixedType == ProblemBinding.NOT_INITIALIZED) {
 			fFixedType= loadFixedType();
@@ -203,6 +209,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 		}
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		if (fScope == null) {
 			fScope= new PDOMCPPEnumScope(this);
@@ -210,10 +217,12 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 		return fScope;
 	}
 
+	@Override
 	public void loadEnumerators(final CharArrayMap<PDOMCPPEnumerator> map) {
 		try {
 			PDOMNodeLinkedList list = new PDOMNodeLinkedList(getLinkage(), record + OFFSET_ENUMERATOR_LIST);
 			list.accept(new IPDOMVisitor() {
+				@Override
 				public boolean visit(IPDOMNode node) throws CoreException {
 					if (node instanceof PDOMCPPEnumerator) {
 						final PDOMCPPEnumerator item = (PDOMCPPEnumerator) node;
@@ -221,6 +230,7 @@ class PDOMCPPEnumeration extends PDOMCPPBinding implements IPDOMCPPEnumType, IPD
 					}
 					return true;
 				}
+				@Override
 				public void leave(IPDOMNode node) {}
 			});
 		} catch (CoreException e) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java
index 8640fc9828d..80e2efa3428 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPEnumerator.java
@@ -67,6 +67,7 @@ class PDOMCPPEnumerator extends PDOMCPPBinding implements IEnumerator {
 			storeValue((IEnumerator) newBinding);
 	}
 
+	@Override
 	public IType getType() throws DOMException {
 		IIndexFragmentBinding owner = getOwner();
 		if (owner instanceof IType)
@@ -74,6 +75,7 @@ class PDOMCPPEnumerator extends PDOMCPPBinding implements IEnumerator {
 		return null;
 	}
 	
+	@Override
 	public IValue getValue() {
 		try {
 			int val= getDB().getInt(record + VALUE);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java
index 3bc3a5b46f2..9e09aeb0c02 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPField.java
@@ -47,10 +47,12 @@ class PDOMCPPField extends PDOMCPPVariable implements ICPPField {
 		return IIndexCPPBindingConstants.CPPFIELD;
 	}
 	
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public int getVisibility() {
 		return PDOMCPPAnnotation.getVisibility(getByte(record + ANNOTATIONS));
 	}
@@ -88,6 +90,7 @@ class PDOMCPPField extends PDOMCPPVariable implements ICPPField {
 		return false; 
 	}
 
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		return getClassOwner();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java
index fe1365dad38..ada16051d73 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFieldSpecialization.java
@@ -64,10 +64,12 @@ class PDOMCPPFieldSpecialization extends PDOMCPPSpecialization implements ICPPFi
 		return (ICPPField) getSpecializedBinding();
 	}
 	
+	@Override
 	public ICompositeType getCompositeTypeOwner() {
 		return getClassOwner();
 	}
 
+	@Override
 	public IType getType() {
 		try {
 			return getLinkage().loadType(record + TYPE_OFFSET);
@@ -77,6 +79,7 @@ class PDOMCPPFieldSpecialization extends PDOMCPPSpecialization implements ICPPFi
 		}
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		try {
 			return getLinkage().loadValue(record + VALUE_OFFSET);
@@ -86,34 +89,42 @@ class PDOMCPPFieldSpecialization extends PDOMCPPSpecialization implements ICPPFi
 		}
 	}
 
+	@Override
 	public boolean isAuto() {
 		return getField().isAuto();
 	}
 
+	@Override
 	public boolean isExtern() {
 		return getField().isExtern();
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
 
+	@Override
 	public boolean isRegister() {
 		return getField().isRegister();
 	}
 
+	@Override
 	public boolean isStatic() {
 		return getField().isStatic();
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public int getVisibility() {
 		return getField().getVisibility();
 	}
 
+	@Override
 	public boolean isMutable() {
 		return getField().isMutable();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java
index 765e16e7d88..0dc03ab7a29 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunction.java
@@ -208,6 +208,7 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl
 		getLinkage().storeType(record+FUNCTION_TYPE, ft);
 	}
 	
+	@Override
 	public int getSignatureHash() throws CoreException {
 		return getDB().getInt(record + SIGNATURE_HASH);
 	}
@@ -235,11 +236,13 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl
 		return rec != 0 ? new PDOMCPPParameter(getLinkage(), rec, type) : null;
 	}
 	
+	@Override
 	public boolean isInline() {
 		return getBit(getAnnotation(), PDOMCAnnotation.INLINE_OFFSET);
 	}
 
 	
+	@Override
 	public int getRequiredArgumentCount() {
 		if (fRequiredArgCount == -1) {
 			try {
@@ -262,18 +265,22 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl
 		return fAnnotation;
 	}
 
+	@Override
 	public boolean isExternC() {
 		return getBit(getAnnotation(), PDOMCPPAnnotation.EXTERN_C_OFFSET);
 	}
 
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		return null;
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 		try {
 			PDOMLinkage linkage= getLinkage();
@@ -298,6 +305,7 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl
 		}
 	}
 
+	@Override
 	public final ICPPFunctionType getType() {	
 		if (fType == null) {
 			try {
@@ -310,32 +318,39 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl
 		return fType;
 	}
 	
+	@Override
 	public boolean isAuto() {
 		// ISO/IEC 14882:2003 7.1.1.2
 		return false; 
 	}
 
+	@Override
 	public boolean isDeleted() {
 		return getBit(getAnnotation(), ANNOT_IS_DELETED);
 	}
 	
+	@Override
 	public boolean isExtern() {
 		return getBit(getAnnotation(), PDOMCAnnotation.EXTERN_OFFSET);
 	}
 
+	@Override
 	public boolean isRegister() {
 		// ISO/IEC 14882:2003 7.1.1.2
 		return false; 
 	}
 
+	@Override
 	public boolean isStatic() {
 		return getBit(getAnnotation(), PDOMCAnnotation.STATIC_OFFSET);
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return getBit(getAnnotation(), PDOMCAnnotation.VARARGS_OFFSET);
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		return getBit(getAnnotation(), ANNOT_PARAMETER_PACK);
 	}
@@ -367,6 +382,7 @@ class PDOMCPPFunction extends PDOMCPPBinding implements ICPPFunction, IPDOMOverl
 		return 0;
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
 		try {
 			final long rec = getPDOM().getDB().getRecPtr(record+EXCEPTION_SPEC);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java
index fdb432d0b0f..7cea5740b6a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionInstance.java
@@ -65,10 +65,12 @@ class PDOMCPPFunctionInstance extends PDOMCPPFunctionSpecialization implements I
 		return IIndexCPPBindingConstants.CPP_FUNCTION_INSTANCE;
 	}
 	
+	@Override
 	public ICPPTemplateDefinition getTemplateDefinition() {
 		return (ICPPTemplateDefinition) getSpecializedBinding();
 	}
 	
+	@Override
 	public boolean isExplicitSpecialization() {
 		try {
 			return hasDeclaration();
@@ -77,6 +79,7 @@ class PDOMCPPFunctionInstance extends PDOMCPPFunctionSpecialization implements I
 		}
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getTemplateArguments() {
 		try {
 			final long rec= getPDOM().getDB().getRecPtr(record+ARGUMENTS);
@@ -98,6 +101,7 @@ class PDOMCPPFunctionInstance extends PDOMCPPFunctionSpecialization implements I
 		}
 	}
 
+	@Override
 	@Deprecated
 	public IType[] getArguments() {
 		return CPPTemplates.getArguments(getTemplateArguments());
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java
index 72c2092749d..fcb5a413c11 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionSpecialization.java
@@ -151,6 +151,7 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
 		return IIndexCPPBindingConstants.CPP_FUNCTION_SPECIALIZATION;
 	}
 
+	@Override
 	public boolean isInline() {
 		return getBit(readAnnotation(), PDOMCAnnotation.INLINE_OFFSET);
 	}
@@ -166,14 +167,17 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
 		return fAnnotation;
 	}
 
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
 
+	@Override
 	public IScope getFunctionScope() {
 		return null;
 	}
 
+	@Override
 	public ICPPParameter[] getParameters() {
 		try {
 			PDOMLinkage linkage= getLinkage();
@@ -198,6 +202,7 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
 		}
 	}
 
+	@Override
 	public ICPPFunctionType getType() {		
 		if (fType == null) {
 			try {
@@ -210,33 +215,40 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
 		return fType;
 	}
 
+	@Override
 	public boolean isAuto() {
 		// ISO/IEC 14882:2003 7.1.1.2
 		return false; 
 	}
 
+	@Override
 	public boolean isExtern() {
 		return getBit(readAnnotation(), PDOMCAnnotation.EXTERN_OFFSET);
 	}
 
+	@Override
 	public boolean isExternC() {
 		return getBit(readAnnotation(), PDOMCPPAnnotation.EXTERN_C_OFFSET);
 	}
 
+	@Override
 	public boolean isRegister() {
 		// ISO/IEC 14882:2003 7.1.1.2
 		return false; 
 	}
 
+	@Override
 	public boolean isStatic() {
 		return getBit(readAnnotation(), PDOMCAnnotation.STATIC_OFFSET);
 	}
 
+	@Override
 	public boolean takesVarArgs() {
 		return getBit(readAnnotation(), PDOMCAnnotation.VARARGS_OFFSET);
 	}
 
 	
+	@Override
 	public int getRequiredArgumentCount() {
 		if (fRequiredArgCount == -1) {
 			try {
@@ -248,10 +260,12 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
 		return fRequiredArgCount;
 	}
 
+	@Override
 	public boolean hasParameterPack() {
 		return getBit(readAnnotation(), ANNOT_PARAMETER_PACK);
 	}
 
+	@Override
 	public boolean isDeleted() {
 		return getBit(readAnnotation(), ANNOT_IS_DELETED);
 	}
@@ -274,6 +288,7 @@ class PDOMCPPFunctionSpecialization extends PDOMCPPSpecialization implements ICP
 		return cmp==0 ? PDOMCPPFunction.compareSignatures(this, other) : cmp;
 	}
 
+	@Override
 	public IType[] getExceptionSpecification() {
 		try {
 			final long rec = getPDOM().getDB().getRecPtr(record+EXCEPTION_SPEC);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java
index f1ed558d752..d47af8e9d5c 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplate.java
@@ -73,6 +73,7 @@ class PDOMCPPFunctionTemplate extends PDOMCPPFunction
 		return IIndexCPPBindingConstants.CPP_FUNCTION_TEMPLATE;
 	}
 
+	@Override
 	public IPDOMCPPTemplateParameter[] getTemplateParameters() {
 		if (params == null) {
 			try {
@@ -90,18 +91,22 @@ class PDOMCPPFunctionTemplate extends PDOMCPPFunction
 		return params;
 	}
 	
+	@Override
 	public ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) {
 		return PDOMInstanceCache.getCache(this).getInstance(arguments);	
 	}
 
+	@Override
 	public void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) {
 		PDOMInstanceCache.getCache(this).addInstance(arguments, instance);	
 	}
 	
+	@Override
 	public ICPPTemplateInstance[] getAllInstances() {
 		return PDOMInstanceCache.getCache(this).getAllInstances();	
 	}
 
+	@Override
 	public ICPPTemplateParameter adaptTemplateParameter(ICPPTemplateParameter param) {
 		// Template parameters are identified by their position in the parameter list.
 		int pos = param.getParameterPosition();
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java
index 3a14fc814d8..9c3e6cf40d8 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPFunctionTemplateSpecialization.java
@@ -44,19 +44,23 @@ class PDOMCPPFunctionTemplateSpecialization extends	PDOMCPPFunctionSpecializatio
 		return IIndexCPPBindingConstants.CPP_FUNCTION_TEMPLATE_SPECIALIZATION;
 	}
 	
+	@Override
 	public ICPPTemplateParameter[] getTemplateParameters() {
 		ICPPFunctionTemplate template = (ICPPFunctionTemplate) getSpecializedBinding();
 		return template.getTemplateParameters();
 	}
 
+	@Override
 	public ICPPTemplateInstance getInstance(ICPPTemplateArgument[] arguments) {
 		return PDOMInstanceCache.getCache(this).getInstance(arguments);	
 	}
 
+	@Override
 	public void addInstance(ICPPTemplateArgument[] arguments, ICPPTemplateInstance instance) {
 		PDOMInstanceCache.getCache(this).addInstance(arguments, instance);	
 	}
 	
+	@Override
 	public ICPPTemplateInstance[] getAllInstances() {
 		return PDOMInstanceCache.getCache(this).getAllInstances();	
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java
index bbd4eb3b474..9f4bdfe97e0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkageFactory.java
@@ -22,10 +22,12 @@ import org.eclipse.core.runtime.CoreException;
  */
 public class PDOMCPPLinkageFactory implements IPDOMLinkageFactory {
 
+	@Override
 	public PDOMLinkage getLinkage(PDOM pdom, long record) {
 		return new PDOMCPPLinkage(pdom, record);
 	}
 
+	@Override
 	public PDOMLinkage createLinkage(PDOM pdom) throws CoreException {
 		return new PDOMCPPLinkage(pdom);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java
index fe5f3c02950..4fb803f0ba4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodInstance.java
@@ -50,6 +50,7 @@ class PDOMCPPMethodInstance extends PDOMCPPFunctionInstance implements ICPPMetho
 		return IIndexCPPBindingConstants.CPP_METHOD_INSTANCE;
 	}
 	
+	@Override
 	public boolean isDestructor() {
 		return ((ICPPMethod)getTemplateDefinition()).isDestructor();
 	}
@@ -59,26 +60,32 @@ class PDOMCPPMethodInstance extends PDOMCPPFunctionInstance implements ICPPMetho
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return ((ICPPMethod)getTemplateDefinition()).isImplicit();
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return ((ICPPMethod)getTemplateDefinition()).isVirtual();
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return ((ICPPMethod)getTemplateDefinition()).isPureVirtual();		
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return ((ICPPMethod)getTemplateDefinition()).isExplicit();
 	}
 	
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public int getVisibility() {
 		return ((ICPPMethod)getTemplateDefinition()).getVisibility();
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java
index e7c45b5cde5..03dfa708e9d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodSpecialization.java
@@ -78,22 +78,27 @@ class PDOMCPPMethodSpecialization extends PDOMCPPFunctionSpecialization
 		return IIndexCPPBindingConstants.CPP_METHOD_SPECIALIZATION;
 	}
 	
+	@Override
 	public boolean isDestructor() {
 		return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.DESTRUCTOR_OFFSET);
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.IMPLICIT_METHOD_OFFSET);
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.EXPLICIT_METHOD_OFFSET);
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.VIRTUAL_OFFSET);
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return getBit(getByte(record + ANNOTATION1), PDOMCPPAnnotation.PURE_VIRTUAL_OFFSET);
 	}
@@ -109,10 +114,12 @@ class PDOMCPPMethodSpecialization extends PDOMCPPFunctionSpecialization
 		return false;
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public int getVisibility() {
 		return PDOMCPPAnnotation.getVisibility(getByte(record + ANNOTATION_OFFSET));
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java
index 9f368747ae6..fc246b59470 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplate.java
@@ -79,6 +79,7 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements ICPPMetho
 		return IIndexCPPBindingConstants.CPP_METHOD_TEMPLATE;
 	}
 
+	@Override
 	public boolean isDestructor() {
 		return getBit(getAnnotation1(), PDOMCPPAnnotation.DESTRUCTOR_OFFSET);
 	}
@@ -89,22 +90,27 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements ICPPMetho
 		return annotation1;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		return getBit(getAnnotation1(), PDOMCPPAnnotation.IMPLICIT_METHOD_OFFSET);
 	}
 
+	@Override
 	public boolean isExplicit() {
 		return getBit(getAnnotation1(), PDOMCPPAnnotation.EXPLICIT_METHOD_OFFSET);
 	}
 
+	@Override
 	public boolean isVirtual() {
 		return getBit(getAnnotation1(), PDOMCPPAnnotation.VIRTUAL_OFFSET);
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public int getVisibility() {
 		return PDOMCPPAnnotation.getVisibility(getAnnotation());
 	}
@@ -140,6 +146,7 @@ class PDOMCPPMethodTemplate extends PDOMCPPFunctionTemplate implements ICPPMetho
 		return false;
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java
index 1771a31ed99..ba697af9949 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPMethodTemplateSpecialization.java
@@ -42,6 +42,7 @@ class PDOMCPPMethodTemplateSpecialization extends
 		return IIndexCPPBindingConstants.CPP_METHOD_TEMPLATE_SPECIALIZATION;
 	}
 	
+	@Override
 	public boolean isDestructor() {
 		IBinding spec = getSpecializedBinding();
 		if (spec instanceof ICPPMethod) {
@@ -50,6 +51,7 @@ class PDOMCPPMethodTemplateSpecialization extends
 		return false;
 	}
 
+	@Override
 	public boolean isImplicit() {
 		IBinding spec = getSpecializedBinding();
 		if (spec instanceof ICPPMethod) {
@@ -58,6 +60,7 @@ class PDOMCPPMethodTemplateSpecialization extends
 		return false;
 	}
 	
+	@Override
 	public boolean isExplicit() {
 		IBinding spec = getSpecializedBinding();
 		if (spec instanceof ICPPMethod) {
@@ -66,6 +69,7 @@ class PDOMCPPMethodTemplateSpecialization extends
 		return false;
 	}
 
+	@Override
 	public boolean isVirtual() {
 		IBinding spec = getSpecializedBinding();
 		if (spec instanceof ICPPMethod) {
@@ -74,10 +78,12 @@ class PDOMCPPMethodTemplateSpecialization extends
 		return false;
 	}
 
+	@Override
 	public ICPPClassType getClassOwner() {
 		return (ICPPClassType) getOwner();
 	}
 
+	@Override
 	public int getVisibility() {
 		IBinding spec = getSpecializedBinding();
 		if (spec instanceof ICPPMethod) {
@@ -91,6 +97,7 @@ class PDOMCPPMethodTemplateSpecialization extends
 		return false;
 	}
 
+	@Override
 	public boolean isPureVirtual() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java
index 2ff8c6ea598..33f84b2ad59 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespace.java
@@ -86,6 +86,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 		getDB().putByte(record + FLAG_OFFSET, (byte) flag);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eNamespace;
 	}
@@ -110,9 +111,11 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 			getIndex().accept((IBTreeVisitor) visitor);
 		} else {
 			getIndex().accept(new IBTreeVisitor() {
+				@Override
 				public int compare(long record) throws CoreException {
 					return 0;
 				}
+				@Override
 				public boolean visit(long record) throws CoreException {
 					PDOMBinding binding = getLinkage().getBinding(record);
 					if (binding != null) {
@@ -142,14 +145,17 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 		db.putRecPtr(listRecord, record);
 	}
 
+	@Override
 	public ICPPNamespaceScope getNamespaceScope() {
 		return this;
 	}
 
+	@Override
 	public ICPPUsingDirective[] getUsingDirectives() {
 		return ICPPUsingDirective.EMPTY_ARRAY;
 	}
 
+	@Override
 	public IBinding[] find(String name) {
 		try {
 			BindingCollector visitor = new BindingCollector(getLinkage(), name.toCharArray(),
@@ -194,7 +200,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 		} catch (CoreException e) {
 			CCorePlugin.log(e);
 		}
-		return (IBinding[]) ArrayUtil.trim(IBinding.class, result);
+		return ArrayUtil.trim(IBinding.class, result);
 	}
 
 	private IBinding[] getBindingsViaCache(final char[] name) throws CoreException {
@@ -217,14 +223,17 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 		return true;
 	}
 
+	@Override
 	public IBinding[] getMemberBindings() {
 		IBinding[] result = null;
 		final List<PDOMNode> preresult = new ArrayList<PDOMNode>();
 		try {
 			getIndex().accept(new IBTreeVisitor() {
+				@Override
 				public int compare(long record) throws CoreException {
 					return 0;
 				}
+				@Override
 				public boolean visit(long record) throws CoreException {
 					preresult.add(getLinkage().getNode(record));
 					return true;
@@ -237,10 +246,12 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 		return result;
 	}
 	
+	@Override
 	public void addUsingDirective(ICPPUsingDirective directive) { 
 		throw new UnsupportedOperationException();
 	}
 	
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return this;
 	}
@@ -254,6 +265,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
     	return ASTStringUtil.join(names, String.valueOf(Keywords.cpCOLONCOLON));
 	}
 
+	@Override
 	public ICPPNamespaceScope[] getInlineNamespaces() {
 		if (fInlineNamespaces == null) {
 			List<PDOMCPPNamespace> nslist = collectInlineNamespaces(getDB(), getLinkage(),
@@ -288,6 +300,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
 		return nslist;
 	}
 
+	@Override
 	public boolean isInline() {
 		if (fFlag == -1) {
 			try {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java
index ef058652067..15b1016d5da 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java
@@ -68,6 +68,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias
 		return IIndexCPPBindingConstants.CPPNAMESPACEALIAS;
 	}
 	
+	@Override
 	public ICPPNamespaceScope getNamespaceScope() {
 		return getNamespaceScope(this, 20);	// avoid an infinite loop.
 	}
@@ -87,6 +88,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias
 		return null;
 	}
 
+	@Override
 	public IBinding[] getMemberBindings() {
 		ICPPNamespace ns= this;
 		for (int i = 0; i < 20; i++) {
@@ -104,6 +106,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias
 		return ns.getMemberBindings();
 	}
 
+	@Override
 	public IBinding getBinding() {
 		try {
 			return (IBinding) getLinkage().getNode(getPDOM().getDB().getRecPtr(record + NAMESPACE_BINDING));
@@ -113,6 +116,7 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias
 		return null;
 	}
 
+	@Override
 	public boolean isInline() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java
index 53b8825570d..beed91a0823 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameter.java
@@ -96,61 +96,74 @@ class PDOMCPPParameter extends PDOMNamedNode implements ICPPParameter, IPDOMBind
 		return IIndexCPPBindingConstants.CPPPARAMETER;
 	}
 	
+	@Override
 	public String[] getQualifiedName() {
 		return new String[] {getName()};
 	}
 
+	@Override
 	public char[][] getQualifiedNameCharArray() throws DOMException {
 		return new char[][]{getNameCharArray()};
 	}
 
+	@Override
 	public boolean isGloballyQualified() {
 		return false;
 	}
 
+	@Override
 	public boolean isMutable() {
 		// ISO/IEC 14882:2003 7.1.1.8
 		return false; 
 	}
 
+	@Override
 	public IType getType() {
 		return fType;
 	}
 
+	@Override
 	public boolean isAuto() {
 		// ISO/IEC 14882:2003 7.1.1.2
 		byte flag = 1<<PDOMCAnnotation.AUTO_OFFSET;
 		return hasFlag(flag, true, ANNOTATIONS);
 	}
 
+	@Override
 	public boolean isExtern() {
 		// ISO/IEC 14882:2003 7.1.1.5
 		return false; 
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
 
+	@Override
 	public boolean isRegister() {
 		// ISO/IEC 14882:2003 7.1.1.2
 		byte flag = 1<<PDOMCAnnotation.REGISTER_OFFSET;
 		return hasFlag(flag, true, ANNOTATIONS);
 	}
 
+	@Override
 	public boolean isStatic() {
 		// ISO/IEC 14882:2003 7.1.1.4
 		return false; 
 	}
 
+	@Override
 	public String getName() {
 		return new String(getNameCharArray());
 	}
 
+	@Override
 	public IIndexScope getScope() {
 		return null;
 	}
 
+	@Override
 	@SuppressWarnings("rawtypes")
 	public Object getAdapter(Class adapter) {
 		return null;
@@ -166,10 +179,12 @@ class PDOMCPPParameter extends PDOMNamedNode implements ICPPParameter, IPDOMBind
 		}
 	}
 
+	@Override
 	public boolean hasDefaultValue() {
 		return hasFlag(FLAG_DEFAULT_VALUE, false, FLAGS);
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return getType() instanceof ICPPParameterPackType;
 	}
@@ -184,20 +199,24 @@ class PDOMCPPParameter extends PDOMNamedNode implements ICPPParameter, IPDOMBind
 		return defValue;
 	}
 	
+	@Override
 	public IIndexFragment getFragment() {
 		return getPDOM();
 	}	
 	
+	@Override
 	public boolean hasDefinition() throws CoreException {
 		// parameter bindings do not span index fragments
 		return true;
 	}
 
+	@Override
 	public boolean hasDeclaration() throws CoreException {
 		// parameter bindings do not span index fragments
 		return true;
 	}
 	
+	@Override
 	public int getBindingConstant() {
 		return getNodeType();
 	}
@@ -223,14 +242,17 @@ class PDOMCPPParameter extends PDOMNamedNode implements ICPPParameter, IPDOMBind
 		return rec;
 	}
 
+	@Override
 	public boolean isFileLocal() throws CoreException {
 		return false;
 	}
 	
+	@Override
 	public IIndexFile getLocalToFile() throws CoreException {
 		return null;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java
index 6d537ead4f3..72eec7dc880 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPParameterSpecialization.java
@@ -65,6 +65,7 @@ class PDOMCPPParameterSpecialization extends PDOMCPPSpecialization implements IC
 		return rec;
 	}
 	
+	@Override
 	public IType getType() {
 		return fType;
 	}
@@ -104,38 +105,47 @@ class PDOMCPPParameterSpecialization extends PDOMCPPSpecialization implements IC
 		return (ICPPParameter) getSpecializedBinding();
 	}
 	
+	@Override
 	public boolean hasDefaultValue() {
 		return getParameter().hasDefaultValue();
 	}
 
+	@Override
 	public boolean isParameterPack() {
 		return getType() instanceof ICPPParameterPackType;
 	}
 
+	@Override
 	public boolean isAuto() {
 		return getParameter().isAuto();
 	}
 
+	@Override
 	public boolean isRegister() {
 		return getParameter().isRegister();
 	}
 
+	@Override
 	public boolean isExtern() {
 		return false;
 	}
 
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
 
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
 
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java
index ddb0b4db702..1a5f9cfa0aa 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPSpecialization.java
@@ -64,6 +64,7 @@ abstract class PDOMCPPSpecialization extends PDOMCPPBinding implements ICPPSpeci
 		super(linkage, bindingRecord);
 	}
 
+	@Override
 	public IBinding getSpecializedBinding() {
 		if (fSpecializedCache == null) {
 			try {
@@ -80,11 +81,13 @@ abstract class PDOMCPPSpecialization extends PDOMCPPBinding implements ICPPSpeci
 		return (IPDOMBinding) getLinkage().getNode(specializedRec);
 	}
 		
+	@Override
 	@Deprecated
 	public ObjectMap getArgumentMap() {
 		return CPPTemplates.getArgumentMap(this, getTemplateParameterMap());
 	}
 	
+	@Override
 	public ICPPTemplateParameterMap getTemplateParameterMap() {
 		if (fArgMap == null) {
 			try {
@@ -104,6 +107,7 @@ abstract class PDOMCPPSpecialization extends PDOMCPPBinding implements ICPPSpeci
 		return fArgMap;
 	}
 	
+	@Override
 	public int getSignatureHash() throws CoreException {
 		return getDB().getInt(record + SIGNATURE_HASH);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateNonTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateNonTypeParameter.java
index ab3d9cc172f..836b8a637bd 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateNonTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateNonTypeParameter.java
@@ -68,6 +68,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 		return IIndexCPPBindingConstants.CPP_TEMPLATE_NON_TYPE_PARAMETER;
 	}
 	
+	@Override
 	public ICPPTemplateArgument getDefaultValue() {
 		try {
 			IValue val= getLinkage().loadValue(record + DEFAULTVAL);
@@ -96,25 +97,30 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 		}
 	}
 
+	@Override
 	public void forceDelete(PDOMLinkage linkage) throws CoreException {
 		getDBName().delete();
 		linkage.storeType(record+TYPE_OFFSET, null);
 		linkage.storeValue(record+DEFAULTVAL, null);
 	}
 
+	@Override
 	public short getParameterPosition() {
 		return (short) getParameterID();
 	}
 	
+	@Override
 	public short getTemplateNestingLevel() {
 		readParamID();
 		return (short)(getParameterID() >> 16);
 	}
 	
+	@Override
 	public boolean isParameterPack() {
 		return getType() instanceof ICPPParameterPackType;
 	}
 
+	@Override
 	public int getParameterID() {
 		readParamID();
 		return fCachedParamID;
@@ -136,6 +142,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 		linkage.storeType(record + TYPE_OFFSET, newType);
 	}
 
+	@Override
 	public void configure(ICPPTemplateParameter param) {
 		try {
 			if (param instanceof ICPPTemplateNonTypeParameter) {
@@ -161,6 +168,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 		}
 	}
 
+	@Override
 	public IType getType() {
 		if (fType == null) {
 			try {
@@ -172,24 +180,31 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 		return fType;
 	}
 
+	@Override
 	public IValue getInitialValue() {
 		return null;
 	}
+	@Override
 	public boolean isAuto() {
 		return false;
 	}
+	@Override
 	public boolean isExtern() {
 		return false;
 	}
+	@Override
 	public boolean isRegister() {
 		return false;
 	}
+	@Override
 	public boolean isStatic() {
 		return false;
 	}
+	@Override
 	public boolean isExternC() {
 		return false;
 	}
+	@Override
 	public boolean isMutable() {
 		return false;
 	}
@@ -201,6 +216,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
 	/**
 	 * @deprecated
 	 */
+	@Override
 	@Deprecated
 	public IASTExpression getDefault() {
 		return null;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java
index 42fb3abf1e0..091b5db7277 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTemplateParameter.java
@@ -94,20 +94,24 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		return IIndexCPPBindingConstants.CPP_TEMPLATE_TEMPLATE_PARAMETER;
 	}
 	
+	@Override
 	public short getParameterPosition() {
 		return (short) getParameterID();
 	}
 	
+	@Override
 	public short getTemplateNestingLevel() {
 		readParamID();
 		return (short)(getParameterID() >> 16);
 	}
 	
+	@Override
 	public boolean isParameterPack() {
 		readParamID();
 		return (fCachedParamID & PACK_BIT) != 0;
 	}
 
+	@Override
 	public int getParameterID() {
 		readParamID();
 		return fCachedParamID & ~PACK_BIT;
@@ -137,6 +141,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		list.accept(visitor);
 	}
 	
+	@Override
 	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
@@ -148,6 +153,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
         return getParameterID() == ((ICPPTemplateParameter) type).getParameterID();
 	}
 
+	@Override
 	public IType getDefault() {
 		try {
 			return getLinkage().loadType(record + DEFAULT_TYPE);
@@ -157,6 +163,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		return null;
 	}
 		
+	@Override
 	public ICPPTemplateArgument getDefaultValue() {
 		IType d= getDefault();
 		if (d == null)
@@ -171,6 +178,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 	}
 
 
+	@Override
 	public ICPPScope asScope() {
 		if (fUnknownScope == null) {
 			fUnknownScope= new PDOMCPPUnknownScope(this, new CPPASTName(getNameCharArray()));
@@ -178,10 +186,12 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		return fUnknownScope;
 	}
 
+	@Override
 	public IASTName getUnknownName() {
 		return new CPPASTName(getNameCharArray());
 	}
 
+	@Override
 	public void configure(ICPPTemplateParameter param) {
 		try {
 			ICPPTemplateArgument val= param.getDefaultValue();
@@ -227,6 +237,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		}
 	}
 
+	@Override
 	public void forceDelete(PDOMLinkage linkage) throws CoreException {
 		getDBName().delete();
 		linkage.storeType(record + DEFAULT_TYPE, null);
@@ -241,6 +252,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		} 
 	}
 
+	@Override
 	public IPDOMCPPTemplateParameter[] getTemplateParameters() {
 		if (params == null) {
 			try {
@@ -258,62 +270,77 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		return params;
 	}
 
+	@Override
 	public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() {
 		return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY;
 	}
 
+	@Override
 	public IField findField(String name) {
 		return null;
 	}
 
+	@Override
 	public ICPPMethod[] getAllDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public ICPPBase[] getBases() {
 		return ICPPBase.EMPTY_BASE_ARRAY;
 	}
 
+	@Override
 	public ICPPConstructor[] getConstructors() {
 		return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
 	}
 
+	@Override
 	public ICPPField[] getDeclaredFields() {
 		return ICPPField.EMPTY_CPPFIELD_ARRAY;
 	}
 
+	@Override
 	public ICPPMethod[] getDeclaredMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public IField[] getFields() {
 		return ICPPField.EMPTY_CPPFIELD_ARRAY;
 	}
 
+	@Override
 	public IBinding[] getFriends() {
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 
+	@Override
 	public ICPPMethod[] getMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		return ICPPClassType.EMPTY_CLASS_ARRAY;
 	}
 
+	@Override
 	public IScope getCompositeScope() {
 		return asScope();
 	}
 
+	@Override
 	public int getKey() {
 		return 0;
 	}
 
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
 
+	@Override
 	public ICPPTemplateParameter adaptTemplateParameter(ICPPTemplateParameter param) {
 		int pos = param.getParameterPosition();
 		ICPPTemplateParameter[] pars = getTemplateParameters();
@@ -335,6 +362,7 @@ public class PDOMCPPTemplateTemplateParameter extends PDOMCPPBinding
 		return null;
 	}
 
+	@Override
 	public ICPPDeferredClassInstance asDeferredInstance() throws DOMException {
 		return null;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java
index c8c3f1ae74d..fe65201466d 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateTypeParameter.java
@@ -80,20 +80,24 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember
 		return IIndexCPPBindingConstants.CPP_TEMPLATE_TYPE_PARAMETER;
 	}
 	
+	@Override
 	public short getParameterPosition() {
 		return (short) getParameterID();
 	}
 	
+	@Override
 	public short getTemplateNestingLevel() {
 		readParamID();
 		return (short)(getParameterID() >> 16);
 	}
 	
+	@Override
 	public boolean isParameterPack() {
 		readParamID();
 		return (fCachedParamID & PACK_BIT) != 0;
 	}
 
+	@Override
 	public int getParameterID() {
 		readParamID();
 		return fCachedParamID & ~PACK_BIT;
@@ -123,6 +127,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember
 		list.accept(visitor);
 	}
 	
+	@Override
 	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
@@ -134,6 +139,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember
         return getParameterID() == ((ICPPTemplateParameter) type).getParameterID();
 	}
 
+	@Override
 	public IType getDefault() {
 		try {
 			return getLinkage().loadType(record + DEFAULT_TYPE);
@@ -143,6 +149,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember
 		return null;
 	}
 		
+	@Override
 	public ICPPTemplateArgument getDefaultValue() {
 		IType d= getDefault();
 		if (d == null)
@@ -156,6 +163,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember
 		throw new UnsupportedOperationException(); 
 	}
 
+	@Override
 	public ICPPScope asScope() {
 		if (fUnknownScope == null) {
 			fUnknownScope= new PDOMCPPUnknownScope(this, new CPPASTName(getNameCharArray()));
@@ -163,10 +171,12 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember
 		return fUnknownScope;
 	}
 
+	@Override
 	public IASTName getUnknownName() {
 		return new CPPASTName(getNameCharArray());
 	}
 
+	@Override
 	public void configure(ICPPTemplateParameter param) {
 		try {
 			ICPPTemplateArgument val= param.getDefaultValue();
@@ -198,6 +208,7 @@ class PDOMCPPTemplateTypeParameter extends PDOMCPPBinding implements IPDOMMember
 		}
 	}
 	
+	@Override
 	public void forceDelete(PDOMLinkage linkage) throws CoreException {
 		getDBName().delete();
 		getLinkage().storeType(record + DEFAULT_TYPE, null);
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java
index a13b13fbf36..32a54c1fcf4 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTypedefSpecialization.java
@@ -73,6 +73,7 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization implements ITyp
 		return IIndexCPPBindingConstants.CPP_TYPEDEF_SPECIALIZATION;
 	}
 
+	@Override
 	public IType getType() {
 		try {
 			return getLinkage().loadType(record + TYPE_OFFSET);
@@ -82,6 +83,7 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization implements ITyp
 		}
 	}
 
+	@Override
 	public boolean isSameType(IType o) {
         if( this.equals(o) )
             return true;
@@ -98,6 +100,7 @@ class PDOMCPPTypedefSpecialization extends PDOMCPPSpecialization implements ITyp
 	    return false;
 	}
 
+	@Override
 	public void setType(IType type) { 
 		throw new UnsupportedOperationException(); 
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java
index a24efe9dd98..ccde7a87f8a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownBinding.java
@@ -46,7 +46,8 @@ class PDOMCPPUnknownBinding extends PDOMCPPBinding implements ICPPUnknownBinding
 		return IIndexCPPBindingConstants.CPP_UNKNOWN_BINDING;
 	}
 	
-    public ICPPScope asScope() {
+    @Override
+	public ICPPScope asScope() {
     	return null;
     }
     
@@ -55,6 +56,7 @@ class PDOMCPPUnknownBinding extends PDOMCPPBinding implements ICPPUnknownBinding
 		return false;
 	}
 
+	@Override
 	public IASTName getUnknownName() {
 		return new CPPASTName(getNameCharArray());
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java
index c8798925839..272deb85c00 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassInstance.java
@@ -71,10 +71,12 @@ class PDOMCPPUnknownClassInstance extends PDOMCPPUnknownClassType implements ICP
 		return IIndexCPPBindingConstants.CPP_UNKNOWN_CLASS_INSTANCE;
 	}
 
+	@Override
 	public int getSignatureHash() throws CoreException {
 		return getDB().getInt(record + SIGNATURE_HASH);
 	}
 
+	@Override
 	public ICPPTemplateArgument[] getArguments() {
 		if (arguments == null) {
 			try {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java
index 7733501a587..8e219260eae 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUnknownClassType.java
@@ -66,6 +66,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass
 		super(linkage, bindingRecord);
 	}
 
+	@Override
 	public EScopeKind getKind() {
 		return EScopeKind.eClassType;
 	}
@@ -106,10 +107,12 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass
 		list.accept(visitor);
 	}
 
+	@Override
 	public ICPPMethod[] getImplicitMethods() {
 		return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
 	}
 
+	@Override
 	public IScope getCompositeScope() {
 		return this;
 	}
@@ -122,10 +125,12 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass
     	return unknownScope;
     }
     
+	@Override
 	public IIndexBinding getScopeBinding() {
 		return this;
 	}
 
+	@Override
 	public ICPPClassType getClassType() {
 		return this;
 	}
@@ -140,6 +145,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass
 		return IBinding.EMPTY_BINDING_ARRAY;
 	}
 	
+	@Override
 	public IBinding[] find(String name) {
 		return CPPSemantics.findBindings(this, name, false);
 	}
@@ -151,6 +157,7 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass
 		throw new UnsupportedOperationException(); 
 	}
 	
+	@Override
 	public IField findField(String name) {
 		return null; 
 	}
@@ -163,70 +170,80 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass
 	/* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getBases()
      */
-    public ICPPBase[] getBases() {
+    @Override
+	public ICPPBase[] getBases() {
         return ICPPBase.EMPTY_BASE_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getFields()
      */
-    public IField[] getFields() {
+    @Override
+	public IField[] getFields() {
         return IField.EMPTY_FIELD_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getDeclaredFields()
      */
-    public ICPPField[] getDeclaredFields() {
+    @Override
+	public ICPPField[] getDeclaredFields() {
         return ICPPField.EMPTY_CPPFIELD_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getMethods()
      */
-    public ICPPMethod[] getMethods() {
+    @Override
+	public ICPPMethod[] getMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getAllDeclaredMethods()
      */
-    public ICPPMethod[] getAllDeclaredMethods() {
+    @Override
+	public ICPPMethod[] getAllDeclaredMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getDeclaredMethods()
      */
-    public ICPPMethod[] getDeclaredMethods() {
+    @Override
+	public ICPPMethod[] getDeclaredMethods() {
         return ICPPMethod.EMPTY_CPPMETHOD_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getConstructors()
      */
-    public ICPPConstructor[] getConstructors() {
+    @Override
+	public ICPPConstructor[] getConstructors() {
         return ICPPConstructor.EMPTY_CONSTRUCTOR_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType#getFriends()
      */
-    public IBinding[] getFriends() {
+    @Override
+	public IBinding[] getFriends() {
         return IBinding.EMPTY_BINDING_ARRAY;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.ICompositeType#getKey()
      */
-    public int getKey() {
+    @Override
+	public int getKey() {
         return 0;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.cdt.core.dom.ast.IType#isSameType(org.eclipse.cdt.core.dom.ast.IType)
      */
-    public boolean isSameType(IType type) {
+    @Override
+	public boolean isSameType(IType type) {
 		if (type instanceof ITypedef) {
 			return type.isSameType(this);
 		}
@@ -255,10 +272,12 @@ class PDOMCPPUnknownClassType extends PDOMCPPUnknownBinding implements ICPPClass
 		return false;
     }
 
+	@Override
 	public ICPPClassType[] getNestedClasses() {
 		return ICPPClassType.EMPTY_CLASS_ARRAY;
 	}
 	
+	@Override
 	public boolean isAnonymous() {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java
index 2175920ffbb..888d4713d27 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclaration.java
@@ -91,6 +91,7 @@ class PDOMCPPUsingDeclaration extends PDOMCPPBinding implements	ICPPUsingDeclara
 		return IIndexCPPBindingConstants.CPP_USING_DECLARATION;
 	}
 
+	@Override
 	public IBinding[] getDelegates() {
 		if (delegates == null) {
 			delegates = new IBinding[1];
@@ -100,13 +101,13 @@ class PDOMCPPUsingDeclaration extends PDOMCPPBinding implements	ICPPUsingDeclara
 				do {
 					IBinding delegate = alias.getBinding();
 					if (delegate != null) {
-						delegates= (IBinding[]) ArrayUtil.appendAt(IBinding.class, delegates, i++, delegate);
+						delegates= ArrayUtil.appendAt(IBinding.class, delegates, i++, delegate);
 					}
 				} while ((alias = alias.getNext()) != null);
 			} catch (CoreException e) {
 				CCorePlugin.log(e);
 			}
-			delegates = (IBinding[]) ArrayUtil.trim(IBinding.class, delegates);
+			delegates = ArrayUtil.trim(IBinding.class, delegates);
 		}
 		return delegates;
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java
index 5e84e80e8a6..2a305683c4f 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDeclarationSpecialization.java
@@ -64,18 +64,21 @@ class PDOMCPPUsingDeclarationSpecialization extends PDOMCPPSpecialization implem
 		return IIndexCPPBindingConstants.CPP_USING_DECLARATION;
 	}
 
+	@Override
 	public IBinding[] getDelegates() {
 		if (delegates == null) {
 			PDOMNodeLinkedList list= new PDOMNodeLinkedList(getLinkage(), record+TARGET_BINDINGS);
 			final List<IBinding> result= new ArrayList<IBinding>();
 			try {
 				list.accept(new IPDOMVisitor() {
+					@Override
 					public boolean visit(IPDOMNode node) {
 						if (node instanceof IBinding) {
 							result.add((IBinding) node);
 						}
 						return true;
 					}
+					@Override
 					public void leave(IPDOMNode node) {
 					}
 				});
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java
index 0e3b9ff9c1b..641d095b5e6 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPUsingDirective.java
@@ -62,6 +62,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getNamespace()
 	 */
+	@Override
 	public ICPPNamespaceScope getNominatedScope() {
 		try {
 			long rec = fLinkage.getDB().getRecPtr(fRecord + NOMINATED_NAMESPACE);
@@ -79,6 +80,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getContainingScope()
 	 */
+	@Override
 	public IScope getContainingScope() {
 		try {
 			long rec = fLinkage.getDB().getRecPtr(fRecord + CONTAINER_NAMESPACE);
@@ -97,6 +99,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPUsingDirective#getPointOfDeclaration()
 	 */
+	@Override
 	public int getPointOfDeclaration() {
 		final Database db= fLinkage.getDB();
 		try {
@@ -118,9 +121,11 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.dom.IPDOMNode#accept(org.eclipse.cdt.core.dom.IPDOMVisitor)
 	 */
+	@Override
 	public void accept(IPDOMVisitor visitor) throws CoreException {
 	}
 
+	@Override
 	public void delete(PDOMLinkage linkage) throws CoreException {
 		fLinkage.getDB().free(fRecord);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java
index f6ec0c1d112..0f357c206d0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPVariable.java
@@ -89,11 +89,13 @@ class PDOMCPPVariable extends PDOMCPPBinding implements ICPPVariable {
 		return IIndexCPPBindingConstants.CPPVARIABLE;
 	}
 	
+	@Override
 	public boolean isMutable() {
 		// ISO/IEC 14882:2003 7.1.1.8
 		return false; 
 	}
 
+	@Override
 	public IType getType() {
 		try {
 			return getLinkage().loadType(record + TYPE_OFFSET);
@@ -103,6 +105,7 @@ class PDOMCPPVariable extends PDOMCPPBinding implements ICPPVariable {
 		}
 	}
 	
+	@Override
 	public IValue getInitialValue() {
 		try {
 			return getLinkage().loadValue(record + VALUE_OFFSET);
@@ -112,22 +115,27 @@ class PDOMCPPVariable extends PDOMCPPBinding implements ICPPVariable {
 		}
 	}
 
+	@Override
 	public boolean isAuto() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.AUTO_OFFSET);
 	}
 
+	@Override
 	public boolean isExtern() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.EXTERN_OFFSET);
 	}
 
+	@Override
 	public boolean isExternC() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCPPAnnotation.EXTERN_C_OFFSET);
 	}
 
+	@Override
 	public boolean isRegister() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.REGISTER_OFFSET);
 	}
 
+	@Override
 	public boolean isStatic() {
 		return getBit(getByte(record + ANNOTATIONS), PDOMCAnnotation.STATIC_OFFSET);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java
index 99a51cfb63d..eeb07ceb5fb 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMClassUtil.java
@@ -31,6 +31,7 @@ import org.eclipse.core.runtime.CoreException;
 class PDOMClassUtil {
 	static class FieldCollector implements IPDOMVisitor {
 		private List<ICPPField> fields = new ArrayList<ICPPField>();
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof ICPPField) {
 				ICPPField field= (ICPPField) node;
@@ -40,6 +41,7 @@ class PDOMClassUtil {
 			}
 			return false;
 		}
+		@Override
 		public void leave(IPDOMNode node) throws CoreException {
 		}
 		public ICPPField[] getFields() {
@@ -49,6 +51,7 @@ class PDOMClassUtil {
 	
 	static class ConstructorCollector implements IPDOMVisitor {
 		private List<ICPPConstructor> fConstructors = new ArrayList<ICPPConstructor>();
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof ICPPConstructor) {
 				ICPPConstructor cons= (ICPPConstructor) node;
@@ -64,6 +67,7 @@ class PDOMClassUtil {
 			}
 			return false;
 		}
+		@Override
 		public void leave(IPDOMNode node) throws CoreException {
 		}
 		public ICPPConstructor[] getConstructors() {
@@ -83,6 +87,7 @@ class PDOMClassUtil {
 			this.acceptNonImplicit= acceptNonImplicit;
 			this.filter= acceptImplicit ? IndexFilter.ALL_DECLARED_OR_IMPLICIT : IndexFilter.ALL_DECLARED;
 		}
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof ICPPMethod) {
 				ICPPMethod method= (ICPPMethod) node;
@@ -94,6 +99,7 @@ class PDOMClassUtil {
 			}
 			return false; // don't visit the method
 		}
+		@Override
 		public void leave(IPDOMNode node) throws CoreException {
 		}
 		public ICPPMethod[] getMethods() {
@@ -103,11 +109,13 @@ class PDOMClassUtil {
 	
 	static class NestedClassCollector implements IPDOMVisitor {
 		private List<IPDOMNode> nestedClasses = new ArrayList<IPDOMNode>();
+		@Override
 		public boolean visit(IPDOMNode node) throws CoreException {
 			if (node instanceof ICPPClassType)
 				nestedClasses.add(node);
 			return false;
 		}
+		@Override
 		public void leave(IPDOMNode node) throws CoreException {
 		}
 		public ICPPClassType[] getNestedClasses() {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java
index 6942e477255..03d2d1c8b2a 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/export/GeneratePDOMApplication.java
@@ -62,6 +62,7 @@ public class GeneratePDOMApplication implements IApplication {
 	 * Starts this application
 	 * @throws CoreException on an unexpected failure
 	 */
+	@Override
 	public Object start(IApplicationContext context) throws CoreException {
 		Object result= IApplication.EXIT_OK;
 		try {
@@ -151,6 +152,7 @@ public class GeneratePDOMApplication implements IApplication {
 		System.out.println(s);
 	}
 
+	@Override
 	public void stop() {
 		// do nothing
 	}
@@ -248,15 +250,19 @@ public class GeneratePDOMApplication implements IApplication {
 			return true;
 		}
 
+		@Override
 		public void done() {
 		}
+		@Override
 		public void worked(int work) {
 			internalWorked(work);
 		}
+		@Override
 		public void beginTask(String name, int total) {
 			this.taskName = name;
 			this.totalWork = total;
 		}
+		@Override
 		public void internalWorked(double work) {
 			synchronized(mutex) {
 				worked += work;
@@ -267,16 +273,20 @@ public class GeneratePDOMApplication implements IApplication {
 			}
 		}
 
+		@Override
 		public boolean isCanceled() {
 			return canceled;
 		}
 
+		@Override
 		public void setCanceled(boolean value) {
 			canceled = value;
 		}
+		@Override
 		public void setTaskName(String name) {
 			taskName = name;
 		}
+		@Override
 		public void subTask(String name) {
 			subTask = name;
 		}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java
index 381625b9c6a..66da09ce548 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMFastIndexer.java
@@ -24,10 +24,12 @@ public class PDOMFastIndexer extends AbstractPDOMIndexer {
 	// Must match extension id
 	public static final String ID = IPDOMManager.ID_FAST_INDEXER;
 		
+	@Override
 	public String getID() {
 		return ID;
 	}
 
+	@Override
 	public IPDOMIndexerTask createTask(ITranslationUnit[] added, ITranslationUnit[] changed, ITranslationUnit[] removed) {
 		return new PDOMFastIndexerTask(this, added, changed, removed);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java
index 7203bf83bab..51c6b58379e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMNullIndexer.java
@@ -27,10 +27,12 @@ public class PDOMNullIndexer extends AbstractPDOMIndexer {
 		fProperties.clear(); // don't accept any properties
 	}
 	
+	@Override
 	public String getID() {
 		return ID;
 	}
 
+	@Override
 	public IPDOMIndexerTask createTask(ITranslationUnit[] added,
 			ITranslationUnit[] changed, ITranslationUnit[] removed) {
 		return null;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java
index 34304635d93..3efed4ab73b 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/PDOMUpdateTask.java
@@ -63,10 +63,12 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 		return progress;
 	}
 
+	@Override
 	public IPDOMIndexer getIndexer() {
 		return fIndexer;
 	}
 
+	@Override
 	public void run(IProgressMonitor monitor) throws InterruptedException {
 		monitor.subTask(NLS.bind(Messages.PDOMIndexerTask_collectingFilesTask, 
 				fIndexer.getProject().getElementName()));
@@ -143,10 +145,12 @@ public class PDOMUpdateTask implements IPDOMIndexerTask {
 		}
 	}
 
+	@Override
 	public synchronized IndexerProgress getProgressInformation() {
 		return fDelegate != null ? fDelegate.getProgressInformation() : fProgress;
 	}
 
+	@Override
 	public synchronized boolean acceptUrgentTask(IPDOMIndexerTask task) {
 		return fDelegate != null && fDelegate.acceptUrgentTask(task);
 	}
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java
index 1edfa61b7dd..a16957cfc7e 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/ProjectIndexerIncludeResolutionHeuristics.java
@@ -43,6 +43,7 @@ public class ProjectIndexerIncludeResolutionHeuristics implements IIncludeFileRe
 		fIgnoreCase= resolver.isCaseInsensitiveFileSystem();
 	}
 
+	@Override
 	public String findInclusion(String include, String currentFile) {
 		final IIndexFileLocation ifl= fResolver.resolveASTPath(currentFile);
 		if (ifl == null || ifl.getFullPath() == null) {
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java
index 4a834ff0e39..07099d456f2 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TodoTaskUpdater.java
@@ -95,6 +95,7 @@ public class TodoTaskUpdater implements ITodoTaskUpdater {
         taskParser = new TodoTaskParser(taskTags, taskPriorities, isTaskCaseSensitive);
 	}
 
+	@Override
 	public void updateTasks(IASTComment[] comments, IIndexFileLocation[] filesToUpdate) {
 		class TaskList {
 			IFile fFile;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java
index 6bf16893d5a..641b347e728 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TranslationUnitCollector.java
@@ -29,6 +29,7 @@ final public class TranslationUnitCollector implements ICElementVisitor {
 		fProgressMonitor= pm;
 	}
 
+	@Override
 	public boolean visit(ICElement element) throws CoreException {
 		if (fProgressMonitor.isCanceled()) {
 			return false;
diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java
index ec5ec716d80..a7c2731dee3 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/indexer/TriggerNotificationTask.java
@@ -31,20 +31,24 @@ public class TriggerNotificationTask implements IPDOMIndexerTask {
 		fPDOM= pdom;
 	}
 
+	@Override
 	public IPDOMIndexer getIndexer() {
 		return null;
 	}
 
+	@Override
 	public IndexerProgress getProgressInformation() {
 		return new IndexerProgress();
 	}
 
+	@Override
 	public void run(IProgressMonitor monitor) {
 		ChangeEvent event= new ChangeEvent();
 		event.setReloaded();
 		fManager.handleChange(fPDOM, event);
 	}
 
+	@Override
 	public boolean acceptUrgentTask(IPDOMIndexerTask task) {
 		return false;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java
index f69b375cb6c..08ed4f425de 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32.java
@@ -77,26 +77,32 @@ public class Addr32 implements IAddress, Serializable {
 		this(Long.parseLong(addr, radix), truncate);
 	}
 	
+	@Override
 	public IAddress add(BigInteger offset) {
 		return new Addr32(this.address + offset.longValue());
 	}
 
+	@Override
 	public IAddress add(long offset) {
 		return new Addr32(this.address + offset);
 	}
 
+	@Override
 	public BigInteger getMaxOffset() {
 		return MAX_OFFSET;
 	}
 	
+	@Override
 	public BigInteger getValue() {
 		return BigInteger.valueOf(address);
 	}
 
+	@Override
 	public BigInteger distanceTo(IAddress other) {
 		return other.getValue().subtract(getValue());
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (!(other instanceof IAddress)) {
 			throw new IllegalArgumentException();
@@ -105,10 +111,12 @@ public class Addr32 implements IAddress, Serializable {
 		return getValue().compareTo(((IAddress)other).getValue());
 	}
 
+	@Override
 	public boolean isMax() {
 		return address == MAX.address;
 	}
 
+	@Override
 	public boolean isZero() {
 		return address == ZERO.address;
 	}
@@ -118,6 +126,7 @@ public class Addr32 implements IAddress, Serializable {
 		return toString(10);
 	}
 
+	@Override
 	public String toString(int radix) {
 		return Long.toString(address, radix);
 	}
@@ -136,6 +145,7 @@ public class Addr32 implements IAddress, Serializable {
 		return (int)(address ^ (address >> 32));
 	}
 	
+	@Override
 	public String toHexAddressString() {
 		String addressString = Long.toString(address, 16);
 		StringBuffer sb = new StringBuffer(CHARS_NUM);
@@ -148,6 +158,7 @@ public class Addr32 implements IAddress, Serializable {
 		return sb.toString();
 	}
 
+	@Override
 	public String toBinaryAddressString() {
 		String addressString = Long.toString(address, 2);
 		StringBuffer sb = new StringBuffer(BINARY_CHARS_NUM);
@@ -160,10 +171,12 @@ public class Addr32 implements IAddress, Serializable {
 		return sb.toString();
 	}
 
+	@Override
 	public int getCharsNum() {
 		return CHARS_NUM;
 	}
 
+	@Override
 	public int getSize() {
 		return BYTES_NUM;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java
index 29c01c19c96..d7faed19e90 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr32Factory.java
@@ -20,6 +20,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#getZero()
 	 */
+	@Override
 	public IAddress getZero() {
 		return Addr32.ZERO;
 	}
@@ -27,6 +28,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#getMax()
 	 */
+	@Override
 	public IAddress getMax() {
 		return Addr32.MAX;
 	}
@@ -34,6 +36,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String)
 	 */
+	@Override
 	public IAddress createAddress(String addr) {
 		return createAddress(addr, true);
 	}
@@ -41,6 +44,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, boolean)
 	 */
+	@Override
 	public IAddress createAddress(String addr, boolean truncate) {
 		return new Addr32(addr, truncate);
 	}
@@ -48,6 +52,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String, int)
 	 */
+	@Override
 	public IAddress createAddress(String addr, int radix) {
 		return createAddress(addr, radix, true);
 	}
@@ -55,6 +60,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, int, boolean)
 	 */
+	@Override
 	public IAddress createAddress(String addr, int radix, boolean truncate) {
 		return new Addr32(addr, radix, truncate);
 	}
@@ -62,6 +68,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.math.BigInteger)
 	 */
+	@Override
 	public IAddress createAddress(BigInteger addr) {
 		return createAddress(addr, true);
 	}
@@ -69,6 +76,7 @@ public class Addr32Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.math.BigInteger, boolean)
 	 */
+	@Override
 	public IAddress createAddress(BigInteger addr, boolean truncate) {
 		return new Addr32(addr.longValue(), truncate);
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java
index dcd23db9702..f7321cc39ff 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64.java
@@ -81,34 +81,42 @@ public class Addr64 implements IAddress, Serializable {
 	}
 	
 	
+	@Override
 	public IAddress add(BigInteger offset) {
 		return new Addr64(this.address.add(offset));
 	}
 
+	@Override
 	public IAddress add(long offset) {
 		return new Addr64(this.address.add(BigInteger.valueOf(offset)));
 	}
 
+	@Override
 	public BigInteger getMaxOffset() {
 		return MAX_OFFSET;
 	}
 
+	@Override
 	public BigInteger distanceTo(IAddress other) {
 		return other.getValue().subtract(getValue());
 	}
 
+	@Override
 	public boolean isMax() {
 		return address.equals(MAX.getValue());
 	}
 
+	@Override
 	public boolean isZero() {
 		return address.equals(ZERO.getValue());
 	}
 
+	@Override
 	public BigInteger getValue() {
 		return address;
 	}
 
+	@Override
 	public int compareTo(Object other) {
 		if (!(other instanceof IAddress)) {
 			throw new IllegalArgumentException();
@@ -136,10 +144,12 @@ public class Addr64 implements IAddress, Serializable {
 		return toString(10);
 	}
 
+	@Override
 	public String toString(int radix) {
 		return address.toString(radix);
 	}
 
+	@Override
 	public String toHexAddressString() {
 		String addressString = address.toString(16);
 		StringBuffer sb = new StringBuffer(CHARS_NUM);
@@ -152,6 +162,7 @@ public class Addr64 implements IAddress, Serializable {
 		return sb.toString();
 	}
 
+	@Override
 	public String toBinaryAddressString() {
 		String addressString = address.toString(2);
 		StringBuffer sb = new StringBuffer(BINARY_CHARS_NUM);
@@ -164,10 +175,12 @@ public class Addr64 implements IAddress, Serializable {
 		return sb.toString();
 	}
 
+	@Override
 	public int getCharsNum() {
 		return CHARS_NUM;
 	}
 
+	@Override
 	public int getSize() {
 		return BYTES_NUM;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java
index 806a233a286..4322417d9a3 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Addr64Factory.java
@@ -20,6 +20,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#getZero()
 	 */
+	@Override
 	public IAddress getZero() {
 		return Addr64.ZERO;
 	}
@@ -27,6 +28,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#getMax()
 	 */
+	@Override
 	public IAddress getMax() {
 		return Addr64.MAX;
 	}
@@ -34,6 +36,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String)
 	 */
+	@Override
 	public IAddress createAddress(String addr) {
 		return createAddress(addr, true);
 	}
@@ -41,6 +44,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, boolean)
 	 */
+	@Override
 	public IAddress createAddress(String addr, boolean truncate) {
 		return new Addr64(addr, truncate);
 	}
@@ -48,6 +52,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.lang.String, int)
 	 */
+	@Override
 	public IAddress createAddress(String addr, int radix) {
 		return createAddress(addr, radix, true);
 	}
@@ -55,6 +60,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.lang.String, int, boolean)
 	 */
+	@Override
 	public IAddress createAddress(String addr, int radix, boolean truncate) {
 		return new Addr64(addr, radix, truncate);
 	}
@@ -62,6 +68,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory#createAddress(java.math.BigInteger)
 	 */
+	@Override
 	public IAddress createAddress(BigInteger addr) {
 		return createAddress(addr, true);
 	}
@@ -69,6 +76,7 @@ public class Addr64Factory implements IAddressFactory2 {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IAddressFactory2#createAddress(java.math.BigInteger, boolean)
 	 */
+	@Override
 	public IAddress createAddress(BigInteger addr, boolean truncate) {
 		return new Addr64(addr, truncate);
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java
index bf4c991392f..341809b09b4 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryFile.java
@@ -36,6 +36,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile {
 		this.type = type;
 	}
 
+	@Override
 	public final IBinaryParser getBinaryParser() {
 		return parser;
 	}
@@ -43,6 +44,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getPath()
 	 */
+	@Override
 	public final IPath getPath() {
 		return path;
 	}
@@ -50,6 +52,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getType()
 	 */
+	@Override
 	public final int getType() {
 		return type;
 	}
@@ -58,6 +61,7 @@ public abstract class BinaryFile extends PlatformObject implements IBinaryFile {
 	 * @throws IOException
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryFile#getContents()
 	 */
+	@Override
 	public InputStream getContents() throws IOException {
 		InputStream stream = null;
 		if (path != null) {
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java
index 8a9ad348b96..350ac74009e 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/BinaryObjectAdapter.java
@@ -48,6 +48,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbol(long)
 	 */
+	@Override
 	public ISymbol getSymbol(IAddress addr) {
 		ISymbol[] syms = getSymbols();
 		int insertion = Arrays.binarySearch(syms, addr);
@@ -68,6 +69,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getBSS()
 	 */
+	@Override
 	public long getBSS() {
 		BinaryObjectInfo info = getBinaryObjectInfo();
 		if (info != null) {
@@ -79,6 +81,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getCPU()
 	 */
+	@Override
 	public String getCPU() {
 		BinaryObjectInfo info = getBinaryObjectInfo();
 		if (info != null) {
@@ -90,6 +93,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getData()
 	 */
+	@Override
 	public long getData() {
 		BinaryObjectInfo info = getBinaryObjectInfo();
 		if (info != null) {
@@ -101,6 +105,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getText()
 	 */
+	@Override
 	public long getText() {
 		BinaryObjectInfo info = getBinaryObjectInfo();
 		if (info != null) {
@@ -112,6 +117,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#hasDebug()
 	 */
+	@Override
 	public boolean hasDebug() {
 		BinaryObjectInfo info = getBinaryObjectInfo();
 		if (info != null) {
@@ -123,6 +129,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#isLittleEndian()
 	 */
+	@Override
 	public boolean isLittleEndian() {
 		BinaryObjectInfo info = getBinaryObjectInfo();
 		if (info != null) {
@@ -156,6 +163,7 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getName()
 	 */
+	@Override
 	public String getName() {
 		return getPath().lastSegment().toString();
 	}
@@ -168,7 +176,9 @@ public abstract class BinaryObjectAdapter extends BinaryFile implements IBinaryO
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryObject#getSymbols()
 	 */
+	@Override
 	public abstract ISymbol[] getSymbols();
+	@Override
 	public abstract IAddressFactory getAddressFactory();
 
 	protected abstract BinaryObjectInfo getBinaryObjectInfo();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java
index d7c7fb72950..8f6fd2c4254 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultCygwinToolFactory.java
@@ -32,6 +32,7 @@ public class DefaultCygwinToolFactory extends DefaultGnuToolFactory implements I
 	 * 
 	 * @see org.eclipse.cdt.utils.CygwinToolsProvider#getCygPath()
 	 */
+	@Override
 	public CygPath getCygPath() {
 		IPath cygPathPath = getCygPathPath();
 		CygPath cygpath = null;
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java
index 568c72ce688..699dafaced4 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/DefaultGnuToolFactory.java
@@ -31,6 +31,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.IGnuToolProvider#getAddr2line(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public Addr2line getAddr2line(IPath path) {
 		IPath addr2LinePath = getAddr2linePath();
 		Addr2line addr2line = null;
@@ -46,6 +47,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.IGnuToolProvider#getCPPFilt()
 	 */
+	@Override
 	public CPPFilt getCPPFilt() {
 		IPath cppFiltPath = getCPPFiltPath();
 		CPPFilt cppfilt = null;
@@ -61,6 +63,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.IGnuToolProvider#getObjdump(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public Objdump getObjdump(IPath path) {
 		IPath objdumpPath = getObjdumpPath();
 		String objdumpArgs = getObjdumpArgs();
@@ -77,6 +80,7 @@ public class DefaultGnuToolFactory implements IGnuToolFactory {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.IGnuToolProvider#getObjdump(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public NM getNM(IPath path) {
 		IPath nmPath = getNMPath();
 		String nmArgs = getNMArgs();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java
index 2e179703fcd..ff336b26df1 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/Symbol.java
@@ -52,6 +52,7 @@ public class Symbol implements ISymbol {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getBinarObject()
 	 */
+	@Override
 	public IBinaryObject getBinaryObject() {
 		return binary;
 	}
@@ -59,6 +60,7 @@ public class Symbol implements ISymbol {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getFilename()
 	 */
+	@Override
 	public IPath getFilename() {
 		return sourceFile;
 	}
@@ -66,6 +68,7 @@ public class Symbol implements ISymbol {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getName()
 	 */
+	@Override
 	public String getName() {
 		return name;
 	}
@@ -73,6 +76,7 @@ public class Symbol implements ISymbol {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getType()
 	 */
+	@Override
 	public int getType() {
 		return type;
 	}
@@ -82,6 +86,7 @@ public class Symbol implements ISymbol {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getAdress()
 	 */
+	@Override
 	public IAddress getAddress() {
 		return addr;
 	}
@@ -91,6 +96,7 @@ public class Symbol implements ISymbol {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getEndLine()
 	 */
+	@Override
 	public int getEndLine() {
 		return endLine;
 	}
@@ -100,6 +106,7 @@ public class Symbol implements ISymbol {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getStartLine()
 	 */
+	@Override
 	public int getStartLine() {
 		return startLine;
 	}
@@ -109,6 +116,7 @@ public class Symbol implements ISymbol {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getLineNumber(long)
 	 */
+	@Override
 	public int getLineNumber(long offset) {
 		return -1;
 	}
@@ -118,10 +126,12 @@ public class Symbol implements ISymbol {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser.ISymbol#getSize()
 	 */
+	@Override
 	public long getSize() {
 		return size;
 	}
 
+	@Override
 	public int compareTo(Object obj) {
 		IAddress thisVal = this.addr;
 		IAddress anotherVal = null;
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java
index 75af6f58e42..62aa351a507 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/CodeViewReader.java
@@ -35,6 +35,7 @@ public class CodeViewReader implements ISymbolReader {
 		fileList = new ArrayList<String>();
 	}
 
+	@Override
 	public String[] getSourceFiles() {
 		if (!parsed) {
 			try {
@@ -169,6 +170,7 @@ public class CodeViewReader implements ISymbolReader {
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public String[] getSourceFiles(IProgressMonitor monitor) {
 		return getSourceFiles();
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
index 2b039257205..84b9806577e 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/CygwinPEBinaryObject.java
@@ -69,6 +69,7 @@ public class CygwinPEBinaryObject extends PEBinaryObject {
 				starttime = System.currentTimeMillis();
 				Runnable worker = new Runnable() {
 
+					@Override
 					public void run() {
 
 						long diff = System.currentTimeMillis() - starttime;
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java
index 45ba995912e..6ff0701e507 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEBinaryArchive.java
@@ -37,6 +37,7 @@ public class PEBinaryArchive extends BinaryFile implements IBinaryArchive {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects()
 	 */
+	@Override
 	public IBinaryObject[] getObjects() {
 		if (hasChanged()) {
 			children.clear();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java
index 6d9e7918a77..ac846401848 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/coff/parser/PEParser.java
@@ -30,6 +30,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(IPath path) throws IOException {
 		return getBinary(null, path);
 	}
@@ -37,6 +38,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[], org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException {
 		if (path == null) {
 			throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$
@@ -87,6 +89,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser#getFormat()
 	 */
+	@Override
 	public String getFormat() {
 		return "PE"; //$NON-NLS-1$
 	}
@@ -94,6 +97,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public boolean isBinary(byte[] array, IPath path) {
 		boolean isBin = PE.isExeHeader(array) || AR.isARHeader(array);
 		// It maybe an object file try the known machine types.
@@ -128,6 +132,7 @@ public class PEParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize()
 	 */
+	@Override
 	public int getHintBufferSize() {
 		return 512;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java
index 3a096ba4ed5..6a3beae3ce0 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/dwarf/DwarfReader.java
@@ -356,6 +356,7 @@ public class DwarfReader extends Dwarf implements ISymbolReader {
 		}
 	}
 
+	@Override
 	public String[] getSourceFiles() {
 		if (!m_parsed) {
 			m_fileCollection.clear();
@@ -484,6 +485,7 @@ public class DwarfReader extends Dwarf implements ISymbolReader {
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public String[] getSourceFiles(IProgressMonitor monitor) {
 		return getSourceFiles();
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java
index 07e6e63efad..279d19f5661 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/stabs/StabsReader.java
@@ -42,6 +42,7 @@ public class StabsReader implements ISymbolReader {
 		fileList = new ArrayList<String>();
 	}
 
+	@Override
 	public String[] getSourceFiles() {
 		if (!parsed) {
 			parse();
@@ -249,6 +250,7 @@ public class StabsReader implements ISymbolReader {
 	/**
 	 * @since 5.2
 	 */
+	@Override
 	public String[] getSourceFiles(IProgressMonitor monitor) {
 		return getSourceFiles();
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java
index 7eea4df5c6a..409b77ca767 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugDump.java
@@ -92,6 +92,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCompilationUnit(java.lang.String, long)
 	 */
+	@Override
 	public void enterCompilationUnit(String name, long address) {
 		write("/* Enter Compilation Unit " + name + " address " + Long.toHexString(address) + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		newLine();
@@ -103,6 +104,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCompilationUnit(long)
 	 */
+	@Override
 	public void exitCompilationUnit(long address) {
 		write("/* Exit Compilation Unit "); //$NON-NLS-1$
 		if (currentCU != null) {
@@ -118,6 +120,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterInclude(java.lang.String)
 	 */
+	@Override
 	public void enterInclude(String name) {
 		write("#include \"" + name + "\" "); //$NON-NLS-1$ //$NON-NLS-2$
 		write("/* Enter Include */"); //$NON-NLS-1$
@@ -129,6 +132,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitInclude()
 	 */
+	@Override
 	public void exitInclude() {
 		//write("/* Exit Include */");
 		//newLine();newLine();
@@ -139,6 +143,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterFunction(java.lang.String, int, boolean, long)
 	 */
+	@Override
 	public void enterFunction(String name, DebugType type, boolean isGlobal, long address) {
 		write("/* Func:" + name + " address " + Long.toHexString(address) + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		newLine();
@@ -154,6 +159,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitFunction(long)
 	 */
+	@Override
 	public void exitFunction(long address) {
 		if (paramCount > -1) {
 			paramCount = -1;
@@ -175,6 +181,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCodeBlock(long)
 	 */
+	@Override
 	public void enterCodeBlock(long offset) {
 		if (paramCount > -1) {
 			paramCount = -1;
@@ -191,6 +198,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCodeBlock(long)
 	 */
+	@Override
 	public void exitCodeBlock(long offset) {
 		bracket--;
 		write(printTabs() + "} " + "/* " + offset + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -202,6 +210,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptStatement(int, long)
 	 */
+	@Override
 	public void acceptStatement(int line, long address) {
 		if (paramCount > -1) {
 			write(")"); //$NON-NLS-1$
@@ -220,6 +229,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptIntegerConst(java.lang.String, long)
 	 */
+	@Override
 	public void acceptIntegerConst(String name, int value) {
 		write("const int " + name + " = " + value + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		newLine();
@@ -230,6 +240,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptFloatConst(java.lang.String, double)
 	 */
+	@Override
 	public void acceptFloatConst(String name, double value) {
 		write("const float " + name + " = " + value + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		newLine();
@@ -241,6 +252,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeConst(java.lang.String,
 	 *      org.eclipse.cdt.utils.debug.DebugType, int)
 	 */
+	@Override
 	public void acceptTypeConst(String name, DebugType type, int value) {
 		write("const " + type.toString() + " " + name + " = " + value + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		newLine();
@@ -251,6 +263,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptParameter(java.lang.String, int, int, long)
 	 */
+	@Override
 	public void acceptParameter(String name, DebugType type, DebugParameterKind kind, long offset) {
 		if (paramCount > 0) {
 			write(", "); //$NON-NLS-1$
@@ -264,6 +277,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptVariable(java.lang.String, int, int, long)
 	 */
+	@Override
 	public void acceptVariable(String name, DebugType type, DebugVariableKind kind, long address) {
 		write(printTabs() + type.toString() + " " + name + ";" + "/* " + Long.toHexString(address) + " */"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 		newLine();
@@ -275,6 +289,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptCaughtException(java.lang.String,
 	 *      org.eclipse.cdt.utils.debug.DebugType, long)
 	 */
+	@Override
 	public void acceptCaughtException(String name, DebugType type, long address) {
 	}
 
@@ -283,6 +298,7 @@ public class DebugDump implements IDebugEntryRequestor {
 	 * 
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeDef(java.lang.String, org.eclipse.cdt.utils.debug.DebugType)
 	 */
+	@Override
 	public void acceptTypeDef(String name, DebugType type) {
 		if (!name.equals(type.toString())) {
 			write("typedef " + type.toString() + " " + name + ";"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java
index 71055866ed4..185fe9a7c42 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSym.java
@@ -25,6 +25,7 @@ public class DebugSym implements Comparable<Object> {
 	public DebugSym() {
 	}
 
+	@Override
 	public int compareTo(Object obj) {
 		long thisVal = 0;
 		long anotherVal = 0;
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java
index d04e7fd11f9..d78c90e5d24 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/debug/tools/DebugSymsRequestor.java
@@ -71,6 +71,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCompilationUnit(java.lang.String, long)
 	 */
+	@Override
 	public void enterCompilationUnit(String name, long address) {
 		DebugSym sym = new DebugSym();
 		sym.name = name;
@@ -84,6 +85,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCompilationUnit(long)
 	 */
+	@Override
 	public void exitCompilationUnit(long address) {
 		if (currentCU != null) {
 			currentCU.size = address;
@@ -94,18 +96,21 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterInclude(java.lang.String)
 	 */
+	@Override
 	public void enterInclude(String name) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitInclude()
 	 */
+	@Override
 	public void exitInclude() {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterFunction(java.lang.String, int, boolean, long)
 	 */
+	@Override
 	public void enterFunction(String name, DebugType type, boolean isGlobal, long address) {
 		DebugSym sym = new DebugSym();
 		sym.name = name;
@@ -121,6 +126,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitFunction(long)
 	 */
+	@Override
 	public void exitFunction(long address) {
 		if (currentFunction != null) {
 			currentFunction.size = address;
@@ -131,18 +137,21 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#enterCodeBlock(long)
 	 */
+	@Override
 	public void enterCodeBlock(long offset) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#exitCodeBlock(long)
 	 */
+	@Override
 	public void exitCodeBlock(long offset) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptStatement(int, long)
 	 */
+	@Override
 	public void acceptStatement(int line, long address) {
 		DebugSym sym = new DebugSym();
 		sym.name = ""; //$NON-NLS-1$
@@ -164,24 +173,28 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptIntegerConst(java.lang.String, long)
 	 */
+	@Override
 	public void acceptIntegerConst(String name, int value) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptFloatConst(java.lang.String, double)
 	 */
+	@Override
 	public void acceptFloatConst(String name, double value) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeConst(java.lang.String, org.eclipse.cdt.utils.debug.DebugType, int)
 	 */
+	@Override
 	public void acceptTypeConst(String name, DebugType type, int value) {
 	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptParameter(java.lang.String, int, int, long)
 	 */
+	@Override
 	public void acceptParameter(String name, DebugType type, DebugParameterKind kind, long offset) {
 		DebugSym sym = new DebugSym();
 		sym.name = name;
@@ -196,6 +209,7 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptVariable(java.lang.String, int, int, long)
 	 */
+	@Override
 	public void acceptVariable(String name, DebugType type, DebugVariableKind kind, long address) {
 		DebugSym sym = new DebugSym();
 		sym.name = name;
@@ -210,12 +224,14 @@ public class DebugSymsRequestor implements IDebugEntryRequestor {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptCaughtException(java.lang.String, org.eclipse.cdt.utils.debug.DebugType, long)
 	 */
+	@Override
 	public void acceptCaughtException(String name, DebugType type, long address) {
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.utils.debug.IDebugEntryRequestor#acceptTypeDef(java.lang.String, org.eclipse.cdt.utils.debug.DebugType)
 	 */
+	@Override
 	public void acceptTypeDef(String name, DebugType type) {		
 	}
 
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java
index 3bb15faba03..f5df628e78a 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/Elf.java
@@ -461,6 +461,7 @@ public class Elf {
 			return (st_info >> 4) & 0xf;
 		}
 
+		@Override
 		public int compareTo(Object obj) {
 			/*
 			 * long thisVal = 0; long anotherVal = 0; if ( obj instanceof Symbol ) {
@@ -499,6 +500,7 @@ public class Elf {
 	class SymbolComparator implements Comparator<Object> {
 
 		IAddress val1, val2;
+		@Override
 		public int compare(Object o1, Object o2) {
 
 			if (o1 instanceof IAddress) {
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java
index 102a1154779..ce914c45f62 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/SymbolSortCompare.java
@@ -19,6 +19,7 @@ import java.util.Comparator;
 @SuppressWarnings("rawtypes")
 @Deprecated
 public class SymbolSortCompare implements Comparator {
+	@Override
 	public int compare( Object o1, Object o2 ) {
         String s1 = o1.toString();
         String s2 = o2.toString();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java
index c2b7fecf8d4..6a2d9aa1f25 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfBinaryArchive.java
@@ -38,6 +38,7 @@ public class ElfBinaryArchive extends BinaryFile implements IBinaryArchive {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects()
 	 */
+	@Override
 	public IBinaryObject[] getObjects() {
 		if (hasChanged()) {
 			children.clear();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java
index 3ffd0b0f061..2d6f51ed2a1 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java
@@ -29,11 +29,13 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(IPath path) throws IOException {
 		return getBinary(null, path);
 	}
 
 
+	@Override
 	public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException {
 		if (path == null) {
 			throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$
@@ -92,6 +94,7 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser#getFormat()
 	 */
+	@Override
 	public String getFormat() {
 		return "ELF"; //$NON-NLS-1$
 	}
@@ -99,6 +102,7 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public boolean isBinary(byte[] array, IPath path) {
 		return Elf.isElfHeader(array) || AR.isARHeader(array);
 	}
@@ -106,6 +110,7 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize()
 	 */
+	@Override
 	public int getHintBufferSize() {
 		return 128;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java
index d1c7586d090..4af997ba3e7 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/GNUElfBinaryObject.java
@@ -66,6 +66,7 @@ public class GNUElfBinaryObject extends ElfBinaryObject {
 				starttime = System.currentTimeMillis();
 				Runnable worker = new Runnable() {
 
+					@Override
 					public void run() {
 
 						long diff = System.currentTimeMillis() - starttime;
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java
index 6238f79fd03..b67d3e431d9 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO.java
@@ -737,6 +737,7 @@ public class MachO {
 			return (n_type & REFERENCE_TYPE) == val;
 		}
 
+		@Override
 		public int compareTo(Object obj) {
 			long thisVal = 0;
 			long anotherVal = 0;
@@ -887,6 +888,7 @@ public class MachO {
 	 */
 	public static class SymbolComparator implements Comparator<Object> {
 		long val1, val2;
+		@Override
 		public int compare(Object o1, Object o2) {
 
 			if(o1 instanceof Long) {
@@ -918,6 +920,7 @@ public class MachO {
 		public String file;
 		public String function;
 		
+		@Override
 		public int compareTo(Object obj) {
 			long thisVal = 0;
 			long anotherVal = 0;
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java
index 47f37450682..030b0eeb0f7 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/MachO64.java
@@ -793,6 +793,7 @@ public class MachO64 {
 			return (n_type & REFERENCE_TYPE) == val;
 		}
 
+		@Override
 		public int compareTo(Object obj) {
 			long thisVal = 0;
 			long anotherVal = 0;
@@ -943,6 +944,7 @@ public class MachO64 {
 	 */
 	public static class SymbolComparator implements Comparator<Object> {
 		long val1, val2;
+		@Override
 		public int compare(Object o1, Object o2) {
 			if (o1 instanceof Long) {
 				val1 = ((Long) o1).longValue();
@@ -972,6 +974,7 @@ public class MachO64 {
 		public String file;
 		public String function;
 		
+		@Override
 		public int compareTo(Object obj) {
 			long thisVal = 0;
 			long anotherVal = 0;
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java
index 1f5d687e6c3..604c9f20cb3 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive.java
@@ -39,6 +39,7 @@ public class MachOBinaryArchive extends BinaryFile implements IBinaryArchive {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects()
 	 */
+	@Override
 	public IBinaryObject[] getObjects() {
 		if (hasChanged()) {
 			children.clear();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java
index 417ea8c1d07..fc35e5df84b 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOBinaryArchive64.java
@@ -37,6 +37,7 @@ public class MachOBinaryArchive64 extends BinaryFile implements IBinaryArchive {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects()
 	 */
+	@Override
 	public IBinaryObject[] getObjects() {
 		if (hasChanged()) {
 			children.clear();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java
index b3e6e625d27..dad32fc5b18 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser.java
@@ -33,11 +33,13 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(IPath path) throws IOException {
 		return getBinary(null, path);
 	}
 
 
+	@Override
 	public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException {
 		if (path == null) {
 			throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$
@@ -87,6 +89,7 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser#getFormat()
 	 */
+	@Override
 	public String getFormat() {
 		return "MACHO"; //$NON-NLS-1$
 	}
@@ -94,6 +97,7 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public boolean isBinary(byte[] array, IPath path) {
 		return MachO.isMachOHeader(array) || AR.isARHeader(array);
 	}
@@ -101,6 +105,7 @@ public class MachOParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize()
 	 */
+	@Override
 	public int getHintBufferSize() {
 		return 128;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java
index 8144d63ba0e..cb456ebe9a0 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/macho/parser/MachOParser64.java
@@ -31,11 +31,13 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(IPath path) throws IOException {
 		return getBinary(null, path);
 	}
 
 
+	@Override
 	public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException {
 		if (path == null) {
 			throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$
@@ -85,6 +87,7 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser {
 	/**
 	 * @see org.eclipse.cdt.core.IBinaryParser#getFormat()
 	 */
+	@Override
 	public String getFormat() {
 		return "MACHO"; //$NON-NLS-1$
 	}
@@ -92,6 +95,7 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public boolean isBinary(byte[] array, IPath path) {
 		return MachO64.isMachOHeader(array) || AR.isARHeader(array);
 	}
@@ -99,6 +103,7 @@ public class MachOParser64 extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBufferSize()
 	 */
+	@Override
 	public int getHintBufferSize() {
 		return 128;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java
index e122d1b8185..66ad8f7a107 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryArchive.java
@@ -43,6 +43,7 @@ public class SOMBinaryArchive extends BinaryFile implements IBinaryArchive {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects()
 	 */
+	@Override
 	public IBinaryObject[] getObjects() {
 		if (hasChanged()) {
 			children.clear();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java
index 23da07e2377..e217c2d388c 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMBinaryObject.java
@@ -254,6 +254,7 @@ public class SOMBinaryObject extends BinaryObjectAdapter {
 				starttime = System.currentTimeMillis();
 				Runnable worker = new Runnable() {
 
+					@Override
 					public void run() {
 						long diff = System.currentTimeMillis() - starttime;
 						while (diff < 10000) {
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java
index fc8e2f4cc2a..8a8b0cff044 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/som/parser/SOMParser.java
@@ -33,6 +33,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[], org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException {
 		if (path == null) {
 			throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$
@@ -82,6 +83,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(IPath path) throws IOException {
 		return getBinary(null, path);
 	}
@@ -89,6 +91,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getFormat()
 	 */
+	@Override
 	public String getFormat() {
 		return "SOM"; //$NON-NLS-1$
 	}
@@ -96,6 +99,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[], org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public boolean isBinary(byte[] hints, IPath path) {
 		return SOM.isSOMHeader(hints) || AR.isARHeader(hints);
 	}
@@ -103,6 +107,7 @@ public class SOMParser extends AbstractCExtension implements IBinaryParser {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize()
 	 */
+	@Override
 	public int getHintBufferSize() {
 		return 512;	// size of file header
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java
index 7997eec8e69..3913eff1eb3 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFF32Parser.java
@@ -37,6 +37,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser {
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(byte[],
 	 *      org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(byte[] hints, IPath path) throws IOException {
 		if (path == null) {
 			throw new IOException(CCorePlugin.getResourceString("Util.exception.nullPath")); //$NON-NLS-1$
@@ -88,6 +89,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser#getBinary(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public IBinaryFile getBinary(IPath path) throws IOException {
 		return getBinary(null, path);
 	}
@@ -97,6 +99,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser#getFormat()
 	 */
+	@Override
 	public String getFormat() {
 		return "XCOFF32"; //$NON-NLS-1$
 	}
@@ -107,6 +110,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser {
 	 * @see org.eclipse.cdt.core.IBinaryParser#isBinary(byte[],
 	 *      org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public boolean isBinary(byte[] hints, IPath path) {
 		return XCoff32.isXCOFF32Header(hints) || AR.isARHeader(hints);
 	}
@@ -116,6 +120,7 @@ public class XCOFF32Parser extends AbstractCExtension implements IBinaryParser {
 	 * 
 	 * @see org.eclipse.cdt.core.IBinaryParser#getHintBufferSize()
 	 */
+	@Override
 	public int getHintBufferSize() {
 		return 512;
 	}
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java
index 8d3fe7ade1f..56b67470943 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryArchive.java
@@ -44,6 +44,7 @@ public class XCOFFBinaryArchive extends BinaryFile implements IBinaryArchive {
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.IBinaryParser.IBinaryArchive#getObjects()
 	 */
+	@Override
 	public IBinaryObject[] getObjects() {
 		if (hasChanged()) {
 			children.clear();
diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java
index 9e225c08f78..4975447d5c2 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/xcoff/parser/XCOFFBinaryObject.java
@@ -246,6 +246,7 @@ public class XCOFFBinaryObject extends BinaryObjectAdapter {
 				starttime = System.currentTimeMillis();
 				Runnable worker = new Runnable() {
 
+					@Override
 					public void run() {
 						long diff = System.currentTimeMillis() - starttime;
 						while (diff < 10000) {