Marked deprecated APIs with @noreference tags to be able to remove them

later.

Change-Id: I8438401eeffe7591daf405786c1e94d40d10290c

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

@@ -30,31 +30,31 @@ public interface ITypeInfo {
 	};
 		
 	/**
-	 * Gets the CElement type.
+	 * Returns the CElement type.
 	 * @return ICElement.C_NAMESPACE, C_CLASS, C_STRUCT, C_UNION, C_ENUMERATION, or C_TYPEDEF,
 	 * or zero if unknown type.
 	 */
 	public int getCElementType();
 
 	/**
-	 * Gets the type name.
+	 * Returns the type name.
 	 */
 	public String getName();
 
 	/**
-	 * Gets the qualified type name.
+	 * Returns the qualified type name.
 	 */
 	public IQualifiedTypeName getQualifiedTypeName();
 
 	/** 
-	 * Gets the originating locations where this type was declared.
+	 * Returns the originating locations where this type was declared.
 	 * @return all known source references, or an empty
 	 * array if none found.
 	 */
 	public ITypeReference[] getReferences();
 
 	/**
-	 * Gets the real location where type was declared.
+	 * Returns the real location where type was declared.
 	 * 
 	 * @return the parsed source reference (with offset and length), 
 	 * or <code>null</code> if not found.
@@ -62,7 +62,7 @@ public interface ITypeInfo {
 	public ITypeReference getResolvedReference();
 			
 	/**
-	 * Gets the enclosing project.
+	 * Returns the enclosing project.
 	 */
 	public ICProject getEnclosingProject();
 

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

@@ -12,12 +12,10 @@ package org.eclipse.cdt.core.browser;
 
 /**
  * @deprecated not used anywhere
- * @noimplement This interface is not intended to be implemented by clients.
+ * @noreference This interface is not intended to be referenced by clients.
- * @noextend This interface is not intended to be extended by clients.
  */
 @Deprecated
 public interface ITypeInfoVisitor {
-	
 	public boolean visit(ITypeInfo info);
 
 	public boolean shouldContinue();

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

@@ -14,6 +14,7 @@ import org.eclipse.cdt.core.model.IWorkingCopy;
 
 /**
  * @deprecated use {@link org.eclipse.cdt.core.model.IWorkingCopyProvider}, instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IWorkingCopyProvider {

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ICElement.java

@@ -241,56 +241,56 @@ public interface ICElement extends IAdaptable {
 	static final int ASM_LABEL= 94;
 
 	/**
-	 * Modifier indicating a class constructor
 	 * @deprecated use {@link IMethodDeclaration#isConstructor()}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int C_CLASS_CTOR = 0x100;
 
 	/**
-	 * Modifier indicating a class destructor
 	 * @deprecated use {@link IMethodDeclaration#isDestructor()}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int C_CLASS_DTOR = 0x200;
 
 	/**
-	 * Modifier indicating a static storage attribute
 	 * @deprecated use {@link IDeclaration#isStatic()}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int C_STORAGE_STATIC = 0x400;
 
 	/**
-	 * Modifier indicating an extern storage attribute
 	 * @deprecated not used anymore
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int C_STORAGE_EXTERN = 0x800;
 
 	/**
-	 * Modifier indicating a private class
 	 * @deprecated use {@link IMember#getVisibility()}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int CPP_PRIVATE = 0x1000;
 
 	/**
-	 * Modifier indicating a public class
 	 * @deprecated use {@link IMember#getVisibility()}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int CPP_PUBLIC = 0x2000;
 
 	/**
-	 * Modifier indicating a protected class
 	 * @deprecated use {@link IMember#getVisibility()}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int CPP_PROTECTED = 0x4000;
 	/**
-	 * Modifier indicating a friend class
 	 * @deprecated use {@link IMethodDeclaration#isFriend()}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	static final int CPP_FRIEND = 0x8000;

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IEnumeration.java

@@ -18,11 +18,9 @@ package org.eclipse.cdt.core.model;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IEnumeration extends IParent, IDeclaration {
-
 	/**
-	 * Return "enum"
+	 * @deprecated Useless method that always returns "enum".
-	 * @throws CModelException 
+	 * @noreference This method is not intended to be referenced by clients.
-	 * @deprecated
 	 */
 	@Deprecated
 	String getTypeName() throws CModelException;

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ILanguage.java

@@ -34,7 +34,6 @@ import org.eclipse.core.runtime.IAdaptable;
  * @noextend This interface is not intended to be extended by clients.
  */
 public interface ILanguage extends IAdaptable {
-
 	/**
 	 * Option for {@link #getASTTranslationUnit(FileContent, IScannerInfo, IncludeFileContentProvider, IIndex, int, IParserLogService)}
 	 * Instructs the parser to skip function and method bodies.
@@ -43,6 +42,7 @@ public interface ILanguage extends IAdaptable {
 
 	/**
 	 * @deprecated, has no effect.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public final static int OPTION_ADD_COMMENTS= 0x2;
@@ -143,12 +143,14 @@ public interface ILanguage extends IAdaptable {
 	
 	/**
 	 * @deprecated replaced by {@link IASTTranslationUnit#getNodeSelector(String)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	IASTName[] getSelectedNames(IASTTranslationUnit ast, int start, int length);
 	/**
 	 * @deprecated replaced by {@link #getASTTranslationUnit(FileContent, IScannerInfo, 
 	 * IncludeFileContentProvider, IIndex, int, IParserLogService)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader,
@@ -158,6 +160,7 @@ public interface ILanguage extends IAdaptable {
 	/**
 	 * @deprecated replaced by {@link #getASTTranslationUnit(FileContent, IScannerInfo, 
 	 * IncludeFileContentProvider, IIndex, int, IParserLogService)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	IASTTranslationUnit getASTTranslationUnit(org.eclipse.cdt.core.parser.CodeReader reader,
@@ -167,6 +170,7 @@ public interface ILanguage extends IAdaptable {
 	/**
 	 * @deprecated replaced by {@link #getCompletionNode(FileContent, IScannerInfo, 
 	 * IncludeFileContentProvider, IIndex, IParserLogService, int)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	IASTCompletionNode getCompletionNode(org.eclipse.cdt.core.parser.CodeReader reader,

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/IStructureDeclaration.java

@@ -39,8 +39,8 @@ public interface IStructureDeclaration extends IDeclaration {
 	public boolean isStruct() throws CModelException;
 
 	/**
-	 * Return "class", "struct", "union"
 	 * @deprecated use isUnion(), isClass(), isStruct()
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	String getTypeName() throws CModelException;

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/model/ITranslationUnit.java

@@ -76,8 +76,9 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
 	public static final int AST_SKIP_IF_NO_BUILD_INFO = 0x8;
 
 	/**
-	 * @deprecated The option has no effect.
 	 * @since 4.0
+	 * @deprecated The option has no effect.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int AST_CREATE_COMMENT_NODES = 0x10;
@@ -498,10 +499,12 @@ public interface ITranslationUnit extends ICElement, IParent, IOpenable, ISource
 	@Deprecated IWorkingCopy getWorkingCopy(IProgressMonitor monitor, IBufferFactory factory) throws CModelException;
 	/**
 	 * @deprecated don't use this method.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated	Map<?, ?> parse();
 	/**
 	 * @deprecated, use {@link FileContent#create(ITranslationUnit)}, instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	org.eclipse.cdt.core.parser.CodeReader getCodeReader();

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICConfigurationDescription.java

@@ -13,7 +13,6 @@ package org.eclipse.cdt.core.settings.model;
 import java.util.Map;
 
 import org.eclipse.cdt.core.cdtvariables.ICdtVariablesContributor;
-import org.eclipse.cdt.core.language.settings.providers.LanguageSettingsManager;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
 import org.eclipse.cdt.core.settings.model.extension.CConfigurationDataProvider;
@@ -371,13 +370,7 @@ public interface ICConfigurationDescription extends ICSettingContainer, ICSettin
 
 	/**
 	 * @deprecated Deprecated as of CDT 8.1. This method returns settings supplied by MBS only.
-	 * For most cases, more generic Language Settings Providers mechanism should be used instead, see
+	 * @noreference This method is not intended to be referenced by clients.
-	 * {@link LanguageSettingsManager#getSettingEntriesByKind(ICConfigurationDescription, org.eclipse.core.resources.IResource, String, int)}.
-	 *
-	 * Convenience method to return a language setting for the file with the specified project-relative path.
-	 * 
-	 * @param path - file project relative path
-	 * @return ICLanguageSetting or null if not found
 	 */
 	@Deprecated
 	ICLanguageSetting getLanguageSettingForFile(IPath path, boolean ignoreExludeStatus);

core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/ICDescriptionDelta.java

@@ -54,9 +54,8 @@ public interface ICDescriptionDelta {
 	int SOURCE_CONTENT_TYPE = 1 << 5;
 	/** @since 5.4 */
 	int SOURCE_EXTENSIONS = 1 << 6;
-	/** @deprecated Use ICDescriptionDelta.SOURCE_EXTENSIONS */
+	/** @deprecated Use ICDescriptionDelta.SOURCE_EXTENSIONS @noreference This field is not intended to be referenced by clients. */
-	@Deprecated
+	@Deprecated	int SOURCE_ENTENSIONS = SOURCE_EXTENSIONS;
-	int SOURCE_ENTENSIONS = SOURCE_EXTENSIONS;
 //	int HEADER_CONTENT_TYPE = 1 << 7;
 //	int HEADER_ENTENSIONS = 1 << 8;
 	int SETTING_ENTRIES = 1 << 9;

core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/VariableInfo.java

@@ -8,11 +8,9 @@
  * Contributors:
  * Rational Software - Initial API and implementation
  *******************************************************************************/
-
 package org.eclipse.cdt.internal.core.model;
 
 class VariableInfo extends SourceManipulationInfo {
-
 	String typeStr = ""; //$NON-NLS-1$
 	boolean isConst = false;
 	boolean isVolatile = false;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ICodeReaderFactory.java

@@ -20,13 +20,11 @@ import org.eclipse.cdt.core.parser.IncludeFileContentProvider;
  * of a CodeReader.
  * 
  * @author jcamelon
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated replaced by {@link IncludeFileContentProvider}
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICodeReaderFactory {
-
 	/**
 	 * @return unique identifier as int
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ILinkage.java

@@ -50,6 +50,7 @@ public interface ILinkage {
 
 	/**
 	 * Additional linkage ids may be added in future.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	final static int MAX_LINKAGE_ID= FORTRAN_LINKAGE_ID;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IName.java

@@ -37,6 +37,7 @@ public interface IName {
 	 * index never contain qualification or template arguments, which is different
 	 * for names from the AST.
 	 * Use {@link #getSimpleID()}, instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public char[] toCharArray();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IPDOMManager.java

@@ -23,6 +23,7 @@ public interface IPDOMManager {
 	public static final String ID_FAST_INDEXER= "org.eclipse.cdt.core.fastIndexer"; //$NON-NLS-1$
 	/**
 	 * @deprecated The full indexer has been removed.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final String ID_FULL_INDEXER= "org.eclipse.cdt.core.domsourceindexer"; //$NON-NLS-1$

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/IParserConfiguration.java

@@ -13,13 +13,8 @@ package org.eclipse.cdt.core.dom;
 import org.eclipse.cdt.core.parser.IScannerInfo;
 
 /**
- * This interface represents a parser configuration as specified by the client
- * to the parser service.
- * 
- * @author jcamelon
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Used only by other deprecated interfaces
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IParserConfiguration {

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

@@ -51,15 +51,15 @@ public interface IASTArraySubscriptExpression extends IASTExpression {
 	public void setArgument(IASTInitializerClause expression);
 
 	/**
-	 * Returns the subscript expression, or <code>null</code>. Consider using {@link #getArgument()}.
 	 * @deprecated Replaced by {@link #getArgument()}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getSubscriptExpression();
 
 	/**
-	 * Not allowed on frozen ast.
 	 * @deprecated Replaced by {@link #setArgument(IASTInitializerClause)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setSubscriptExpression(IASTExpression expression);

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

@@ -21,7 +21,10 @@ public interface IASTAttributeOwner extends IASTNode {
 	/** @since 5.7 */
 	public static final ASTNodeProperty ATTRIBUTE_SPECIFIER = 
 			new ASTNodeProperty("IASTAttributeOwner.ATTRIBUTE_SPECIFIER"); //$NON-NLS-1$
-	/** @deprecated Not used. */
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final ASTNodeProperty ATTRIBUTE = 
 			new ASTNodeProperty("IASTAttributeOwner.ATTRIBUTE"); //$NON-NLS-1$
@@ -44,8 +47,9 @@ public interface IASTAttributeOwner extends IASTNode {
 	public IASTAttribute[] getAttributes();
 
 	/**
-	 * @deprecated Ignored. Attributes should not be assigned to nodes directly, but have to be
+	 * @deprecated Ignored. Attributes should not be assigned to nodes directly,
-	 * wrapped by attribute specifiers.
+	 * but have to be wrapped by attribute specifiers.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void addAttribute(IASTAttribute attribute);

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

@@ -25,15 +25,15 @@ public interface IASTAttributeSpecifier extends IASTNode {
 			new ASTNodeProperty("IASTAttributeSpecifier.ATTRIBUTE"); //$NON-NLS-1$
 
 	/**
-	 * Returns the attributes of the specifier.
 	 * @deprecated Use IASTAttributeList.getAttributes() instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public abstract IASTAttribute[] getAttributes();
 
 	/**
-	 * Adds an attribute to the specifier.
 	 * @deprecated Use IASTAttributeList.addAttribute() instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public abstract void addAttribute(IASTAttribute attribute);

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

@@ -224,7 +224,8 @@ public interface IASTBinaryExpression extends IASTExpression {
 	public static final int op_ellipses= 34;
 	
 	/**
-	 * @deprecated all constants must be defined here, to avoid using the same value twice.
+	 * @deprecated All constants must be defined here, to avoid using the same value twice.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_last = op_ellipses;

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

@@ -31,6 +31,8 @@ public interface IASTDeclSpecifier extends IASTNode {
 	public static final int sc_mutable = 6;
 
 	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
 	 * @since 5.10
 	 */
 	@Deprecated
@@ -55,9 +57,9 @@ public interface IASTDeclSpecifier extends IASTNode {
 	public boolean isInline();
 
 	/**
-	 * Get any alignment-specifiers in this decl-specifier sequence.
 	 * @deprecated Use ICASTDeclSpecifier.getAlignmentSpecifiers() for C code.
 	 * In C++ code, alignment specifiers are now stored in the attribute specifier sequence.
+	 * @noreference This method is not intended to be referenced by clients.
 	 * @since 5.10
 	 */
 	@Deprecated
@@ -102,9 +104,9 @@ public interface IASTDeclSpecifier extends IASTNode {
 	public void setInline(boolean value);
 
 	/**
-	 * Not allowed on frozen ast.
 	 * @deprecated Use ICASTDeclSpecifier.setAlignmentSpecifiers() for C code.
 	 * In C++ code, alignment specifiers are now stored in the attribute specifier sequence.
+	 * @noreference This method is not intended to be referenced by clients.
 	 * @since 5.10
 	 */
 	@Deprecated
@@ -112,6 +114,7 @@ public interface IASTDeclSpecifier extends IASTNode {
 
 	/**
 	 * @deprecated All constants must be defined in this interface.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int sc_last = sc_register;

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

@@ -13,9 +13,8 @@ package org.eclipse.cdt.core.dom.ast;
 /**
  * This is an initializer that is simply an expression.
  * 
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Replaced by {@link IASTEqualsInitializer}.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IASTInitializerExpression extends IASTEqualsInitializer {

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

@@ -58,12 +58,14 @@ public interface IASTInitializerList extends IASTInitializer, IASTInitializerCla
 
 	/**
 	 * @deprecated Replaced by {@link #getClauses()}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTInitializer[] getInitializers();
 
 	/**
 	 * @deprecated Replaced by {@link #addClause(IASTInitializerClause)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void addInitializer(IASTInitializer initializer);

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

@@ -22,6 +22,7 @@ public interface IASTLabelStatement extends IASTStatement, IASTNameOwner {
 	/**
 	 * @since 5.4
 	 * @deprecated use {@link #EMPTY_ARRAY} instead 
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final IASTStatement[] EMPTY_LABEL_STATEMENT_ARRAY = {};

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

@@ -39,8 +39,8 @@ public interface IASTLiteralExpression extends IASTExpression {
 	public static final int lk_string_literal = 3;
 
 	/**
-	 * A constant defined for subclasses to extend from.
+	 * @deprecated All possible values must be defined in {@link IASTLiteralExpression}.
-	 * @deprecated all possible values must be defined in {@link IASTLiteralExpression}.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int lk_last = lk_string_literal;
@@ -113,6 +113,7 @@ public interface IASTLiteralExpression extends IASTExpression {
 
 	/**
 	 * @deprecated Replaced by {@link #setValue(char[])}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setValue(String value);

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

@@ -13,6 +13,7 @@ package org.eclipse.cdt.core.dom.ast;
 
 /**
  * @deprecated, use IASTMacroExpansionLocation instead
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IASTMacroExpansion extends IASTNodeLocation {

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

@@ -255,7 +255,8 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier {
 	public void setDeclTypeExpression(IASTExpression expression);
 	
 	/**
-	 * @deprecated all constants must be defined in this interface
+	 * @deprecated All constants must be defined in this interface
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_last = t_double; // used only in subclasses

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

@@ -59,6 +59,7 @@ public interface IASTTranslationUnit extends IASTDeclarationListOwner, IFileNomi
     /**
      * @deprecated names for macro expansions are nested inside of
      * {@link IASTPreprocessorMacroExpansion}.
+     * @noreference This field is not intended to be referenced by clients.
      */
     @Deprecated
 	public static final ASTNodeProperty EXPANSION_NAME = new ASTNodeProperty(
@@ -150,6 +151,7 @@ public interface IASTTranslationUnit extends IASTDeclarationListOwner, IFileNomi
  
 	/**
 	 * @deprecated use {@link #getNodeSelector(String)}, instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTNode selectNodeForLocation(String path, int offset, int length);
@@ -241,7 +243,8 @@ public interface IASTTranslationUnit extends IASTDeclarationListOwner, IFileNomi
 	public String getContainingFilename(int offset);
 
 	/**
-	 * @deprecated don't use it.
+	 * @deprecated Use {@link #getLinkage()} instead
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
     @Deprecated
 	public ParserLanguage getParserLanguage();

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

@@ -167,6 +167,7 @@ public interface IASTTypeIdExpression extends IASTExpression {
 	/**
 	 * @deprecated constants should be declared here, to avoid using the same constant in different
 	 * interfaces.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_last = op_alignof;

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

@@ -102,6 +102,7 @@ public interface IASTUnaryExpression extends IASTExpression {
 
 	/**
 	 * @deprecated Shall not be used, 'typeof something' is not an expression, it's a declaration specifier.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_typeof = 14;
@@ -131,8 +132,8 @@ public interface IASTUnaryExpression extends IASTExpression {
 	public static final int op_labelReference = 18;
 
 	/**
-	 * {@code op_last} is made available for subclasses.
+	 * @deprecated All constants must be defined in this interface.
-	 * @deprecated all constants must be defined in this interface
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_last = op_alignOf;

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

@@ -35,8 +35,8 @@ public interface IArrayType extends IType {
     boolean hasSize();
 
     /**
-     * Returns the expression that represents the size of this array
+     * @deprecated Replaced by {@link #getSize()}.
-     * @throws DOMException
+     * @noreference This method is not intended to be referenced by clients.
      */
     @Deprecated
     IASTExpression getArraySizeExpression() throws DOMException;

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

@@ -81,44 +81,52 @@ public interface IBasicType extends IType {
 	public boolean isImaginary();
 
 	/**
-	 * @deprecated, use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public int getType() throws DOMException;
 
 	/**
-	 * @deprecated, types don't have values.
+	 * @deprecated Types don't have values.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getValue() throws DOMException;
 
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_unspecified = IASTSimpleDeclSpecifier.t_unspecified;
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_void = IASTSimpleDeclSpecifier.t_void;
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_char = IASTSimpleDeclSpecifier.t_char;
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_int = IASTSimpleDeclSpecifier.t_int;
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_float = IASTSimpleDeclSpecifier.t_float;
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_double = IASTSimpleDeclSpecifier.t_double;

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

@@ -23,6 +23,7 @@ public interface ILabel extends IBinding {
     /**
      * @since 5.4
      * @deprecated use {@link #EMPTY_ARRAY} instead
+     * @noreference This field is not intended to be referenced by clients.
      */
 	@Deprecated
     public static final IBinding[] EMPTY_LABEL_ARRAY = {};

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

@@ -65,6 +65,7 @@ public interface IProblemBinding extends IBinding, IScope, IType, ISemanticProbl
 
 	/**
 	 * @deprecated, there may be additional problems.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int LAST_PROBLEM = 0x00E;

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

@@ -58,6 +58,7 @@ public interface IScope {
 
 	/**
 	 * @deprecated Use {{@link #find(String, IASTTranslationUnit)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IBinding[] find(String name);
@@ -88,12 +89,14 @@ public interface IScope {
 
 	/**
 	 * @deprecated Use {@link #getBindings(ScopeLookupData)} instead
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup);
 
 	/**
 	 * @deprecated Use {@link #getBindings(ScopeLookupData)} instead
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IBinding[] getBindings(IASTName name, boolean resolve, boolean prefixLookup,

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

@@ -42,12 +42,14 @@ public interface IValue {
 
 	/**
 	 * @deprecated Returns an empty character array.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	char[] getInternalExpression(); 
 
 	/**
 	 * @deprecated Returns an empty array.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	IBinding[] getUnknownBindings();

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

@@ -67,12 +67,14 @@ public interface ICASTDesignatedInitializer extends IASTInitializer, IASTInitial
 
 	/**
 	 * @deprecated Replaced by {@link #getOperand()};
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTInitializer getOperandInitializer();
 
 	/**
 	 * @deprecated Replaced by setOperand();
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setOperandInitializer(IASTInitializer rhs);

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

@@ -35,12 +35,14 @@ public interface ICASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICAST
 
 	/**
 	 * @deprecated Replaced by {@link IASTSimpleDeclSpecifier#t_bool}.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_Bool = t_bool;
 
 	/**
 	 * @deprecated All constants must be defined in {@link IASTSimpleDeclSpecifier}.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_last = t_Bool;

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

@@ -18,7 +18,8 @@ import org.eclipse.cdt.core.dom.ast.IBasicType;
  */
 public interface ICBasicType extends IBasicType {
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_Bool = ICASTSimpleDeclSpecifier.t_Bool;

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

@@ -40,12 +40,14 @@ public interface ICPPASTAmbiguousTemplateArgument extends IASTNode {
 	
 	/**
 	 * @deprecated Replaced by {@link #addExpression(IASTExpression)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void addIdExpression(IASTExpression idExpression);
 	
 	/**
 	 * @deprecated Replaced by {@link #addIdExpression(IASTExpression)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void addIdExpression(IASTIdExpression idExpression);

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

@@ -35,6 +35,7 @@ public interface ICPPASTBinaryExpression extends IASTBinaryExpression, ICPPASTEx
 	/**
 	 * @deprecated all constants must be defined in {@link IASTBinaryExpression}, to avoid 
 	 * duplicate usage of the same constant.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_last = IASTBinaryExpression.op_last;

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

@@ -59,9 +59,8 @@ public interface ICPPASTCompositeTypeSpecifier extends IASTCompositeTypeSpecifie
 		public static final ICPPASTBaseSpecifier[] EMPTY_BASESPECIFIER_ARRAY = {};
 
 		/**
-		 * Relation between base specifier and its name.
+		 * @deprecated Use {@link ICPPASTBaseSpecifier#NAME_SPECIFIER} instead.
-		 * 
+		 * @noreference This field is not intended to be referenced by clients.
-		 * @deprecated Use ICPPASTBaseSpecifier.NAME_SPECIFIER instead.
 		 */
 		@Deprecated
 		public static final ASTNodeProperty NAME = new ASTNodeProperty(
@@ -90,9 +89,8 @@ public interface ICPPASTCompositeTypeSpecifier extends IASTCompositeTypeSpecifie
 		public int getVisibility();
 
 		/**
-		 * Returns the name of this specifier.
-		 * 
 		 * @deprecated Use getNameSpecifier() instead.
+		 * @noreference This method is not intended to be referenced by clients.
 		 */
 		@Deprecated
 		public IASTName getName();
@@ -117,9 +115,8 @@ public interface ICPPASTCompositeTypeSpecifier extends IASTCompositeTypeSpecifie
 		public ICPPASTBaseSpecifier copy(CopyStyle style);
 		
 		/**
-		 * Sets the name for this specifier, not allowed on frozen AST.
-		 * 
 		 * @deprecated Use setNameSpecifier() instead.
+		 * @noreference This method is not intended to be referenced by clients.
 		 */
 		@Deprecated
 		public void setName(IASTName name);

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

@@ -74,12 +74,14 @@ public interface ICPPASTConstructorChainInitializer extends IASTInitializer, ICP
 	
 	/**
 	 * @deprecated Replaced by {@link #getInitializer()}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getInitializerValue();
 
 	/**
 	 * @deprecated Replaced by {@link #setInitializer(IASTInitializer)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setInitializerValue(IASTExpression expression);

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

@@ -58,16 +58,22 @@ public interface ICPPASTConstructorInitializer extends IASTInitializer {
 
 	/**
 	 * @deprecated Replaced by {@link #getArguments()}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getExpression();
 
 	/**
 	 * @deprecated Replaced by {@link #setArguments(IASTInitializerClause[])}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setExpression(IASTExpression expression);
 
+	/**
+	 * @deprecated Use {@link #ARGUMENT} instead.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final ASTNodeProperty EXPRESSION = ARGUMENT;
 }

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

@@ -110,7 +110,8 @@ public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier, IASTAttributeOw
 	public ICPPASTDeclSpecifier copy(CopyStyle style);
 
 	/**
-	 * @deprecated All constants must be defined in {@link IASTDeclSpecifier}
+	 * @deprecated All constants must be defined in {@link IASTDeclSpecifier}.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int sc_last = sc_mutable;

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

@@ -174,20 +174,6 @@ public interface ICPPASTFunctionDeclarator extends IASTStandardFunctionDeclarato
 	@Override
 	public ICPPFunctionScope getFunctionScope();
 
-
-	@Deprecated
-	public static final ASTNodeProperty CONSTRUCTOR_CHAIN_MEMBER = new ASTNodeProperty(
-			"ICPPASTFunctionDeclarator.CONSTRUCTOR_CHAIN_MEMBER - Role of a Constructor Chain Initializer"); //$NON-NLS-1$
-	
-	/**
-	 * @deprecated  use {@link ICPPASTFunctionDefinition#getMemberInitializers}, instead.
-	 */
-	@Deprecated
-	public ICPPASTConstructorChainInitializer[] getConstructorChain();
-
-	@Deprecated
-	public void addConstructorToChain(ICPPASTConstructorChainInitializer initializer);
-	
 	/**
 	 * @since 5.1
 	 */
@@ -207,15 +193,6 @@ public interface ICPPASTFunctionDeclarator extends IASTStandardFunctionDeclarato
 	 */
 	public boolean isOverride();
 
-	/**
-	 * Sets whether this function is declared override.
-	 * 
-	 * @since 5.5
-	 * @deprecated Use addVirtSpecifier() instead.
-	 */
-	@Deprecated
-	public void setOverride(boolean isOverride);
-
 	/**
 	 * Returns whether this function is declared final.
 	 * 
@@ -223,15 +200,6 @@ public interface ICPPASTFunctionDeclarator extends IASTStandardFunctionDeclarato
 	 */
 	public boolean isFinal();
 
-	/**
-	 * Sets whether this function is declared final.
-	 * 
-	 * @since 5.5
-	 * @deprecated Use addVirtSpecifier() instead.
-	 */
-	@Deprecated
-	public void setFinal(boolean isFinal);
-	
 	/**
 	 * Returns the virt-specifiers of this function.
 	 * @since 5.7
@@ -243,4 +211,42 @@ public interface ICPPASTFunctionDeclarator extends IASTStandardFunctionDeclarato
 	 * @since 5.7
 	 */
 	public void addVirtSpecifier(ICPPASTVirtSpecifier virtSpecifier);
+
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
+	@Deprecated
+	public static final ASTNodeProperty CONSTRUCTOR_CHAIN_MEMBER = new ASTNodeProperty(
+			"ICPPASTFunctionDeclarator.CONSTRUCTOR_CHAIN_MEMBER - Role of a Constructor Chain Initializer"); //$NON-NLS-1$
+	
+	/**
+	 * @deprecated Use {@link ICPPASTFunctionDefinition#getMemberInitializers}, instead.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	@Deprecated
+	public ICPPASTConstructorChainInitializer[] getConstructorChain();
+
+	/**
+	 * @deprecated Use {@link ICPPASTFunctionDefinition#addMemberInitializer(ICPPASTConstructorChainInitializer)}.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	@Deprecated
+	public void addConstructorToChain(ICPPASTConstructorChainInitializer initializer);
+	
+	/**
+	 * @since 5.5
+	 * @deprecated Use {@link #addVirtSpecifier(ICPPASTVirtSpecifier)} instead.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	@Deprecated
+	public void setFinal(boolean isFinal);
+
+	/**
+	 * @since 5.5
+	 * @deprecated Use {@link #addVirtSpecifier(ICPPASTVirtSpecifier)} instead.
+	 * @noreference This method is not intended to be referenced by clients.
+	 */
+	@Deprecated
+	public void setOverride(boolean isOverride);
 }

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

@@ -15,7 +15,7 @@ import org.eclipse.cdt.core.dom.ast.ASTNodeProperty;
 
 /**
  * @deprecated, use {@link ICPPASTFunctionWithTryBlock}, instead.
- * @noimplement This interface is not intended to be implemented by clients.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICPPASTFunctionTryBlockDeclarator extends ICPPASTFunctionDeclarator {

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

@@ -38,6 +38,7 @@ public interface ICPPASTLiteralExpression extends IASTLiteralExpression, ICPPAST
 
 	/**
 	 * @deprecated All constants must be defined in {@link IASTLiteralExpression}.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int lk_last = lk_false;

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

@@ -112,6 +112,7 @@ public interface ICPPASTNewExpression extends ICPPASTExpression, IASTImplicitNam
 
 	/**
 	 * @deprecated the id-expressions are part of the type-id.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final ASTNodeProperty NEW_TYPEID_ARRAY_EXPRESSION = new ASTNodeProperty(
@@ -119,36 +120,42 @@ public interface ICPPASTNewExpression extends ICPPASTExpression, IASTImplicitNam
 
 	/**
 	 * @deprecated the id-expressions are part of the type-id.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression[] getNewTypeIdArrayExpressions();
 
 	/**
 	 * @deprecated the id-expressions are part of the type-id
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void addNewTypeIdArrayExpression(IASTExpression expression);
 	
 	/**
 	 * @deprecated Replaced by {@link #getPlacementArguments()}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getNewPlacement();
 	
 	/**
 	 * @deprecated Replaced by {@link #setPlacementArguments(IASTInitializerClause[])}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setNewPlacement(IASTExpression expression);
 
 	/**
 	 * @deprecated Replaced by {@link #getInitializer()}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getNewInitializer();
 
 	/**
 	 * @deprecated Replaced by {@link #setInitializer(IASTInitializer)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setNewInitializer(IASTExpression expression);

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

@@ -49,15 +49,12 @@ public interface ICPPASTQualifiedName extends ICPPASTName, IASTNameOwner {
 	public void setLastName(ICPPASTName name);
 
 	/**
-	 * Returns all name segments.
-	 *
-	 * @return <code>IASTName []</code>
-	 * 
 	 * @deprecated This cannot represent all qualified names in C++11,
 	 * where the first segment of a qualifier name may be a decltype-specifier.
 	 * Use {@link #getLastName()} and {@link #getQualifier()} instead.
 	 * If called on a name where a segment is a decltype-specifier,
 	 * UnsupportedOperationException is thrown.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTName[] getNames();

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

@@ -34,6 +34,7 @@ public interface ICPPASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICP
 
 	/**
 	 * @deprecated all constants must be defined in {@link IASTSimpleDeclSpecifier}.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_last = t_wchar_t;

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

@@ -74,47 +74,103 @@ public interface ICPPASTSimpleTypeConstructorExpression extends ICPPASTExpressio
 	 */
 	public void setInitializer(IASTInitializer initializer);
 
-	
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated	public static final int t_unspecified = 0;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_void = 1;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_char = 2;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_int = 3;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_float = 4;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_double = 5;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_bool = 6;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_wchar_t = 7;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_short = 8;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_long = 9;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_signed = 10;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_unsigned = 11;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated public static final int t_last = t_unsigned;
 
 	/**
 	 * @deprecated Replaced by {@link #getDeclSpecifier()}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public int getSimpleType();
 
 	/**
 	 * @deprecated Replaced by {@link #setDeclSpecifier(ICPPASTDeclSpecifier)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setSimpleType(int value);
 
 	/**
 	 * @deprecated Replaced by {@link #INITIALIZER}.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final ASTNodeProperty INITIALIZER_VALUE = INITIALIZER;
 
 	/**
 	 * @deprecated Replaced by {@link #getInitializer()}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getInitialValue();
 
 	/**
 	 * @deprecated Replaced by {@link #setInitializer(IASTInitializer)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void setInitialValue(IASTExpression expression);

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

@@ -68,7 +68,8 @@ public interface ICPPASTTemplateDeclaration extends IASTDeclaration {
 	public void addTemplateParameter(ICPPASTTemplateParameter paramm);
 
 	/**
-	 * @deprecated Use addTemplateParameter.
+	 * @deprecated Use {@link #addTemplateParameter(ICPPASTTemplateParameter)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void addTemplateParamter(ICPPASTTemplateParameter paramm);

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

@@ -101,7 +101,8 @@ public interface ICPPASTTemplatedTypeTemplateParameter extends ICPPASTTemplatePa
 	public ICPPScope asScope();
 
 	/**
-	 * @deprecated Use {@link #addTemplateParameter(ICPPASTTemplateParameter)};
+	 * @deprecated Use {@link #addTemplateParameter(ICPPASTTemplateParameter)}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public void addTemplateParamter(ICPPASTTemplateParameter parm);

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

@@ -27,6 +27,7 @@ public interface ICPPASTTranslationUnit extends IASTTranslationUnit {
 
 	/**
 	 * @deprecated Use {@link #getGlobalNamespace()}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IBinding resolveBinding();

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

@@ -22,6 +22,7 @@ public interface ICPPASTTypeIdExpression extends IASTTypeIdExpression, ICPPASTEx
 
 	/**
 	 * @deprecated all constants should be declared in {@link IASTTypeIdExpression}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_last = IASTTypeIdExpression.op_last;

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

@@ -17,13 +17,11 @@ import org.eclipse.cdt.core.dom.ast.IASTName;
 import org.eclipse.cdt.core.dom.ast.IASTNameOwner;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Unified with {@link ICPPASTSimpleTypeConstructorExpression}.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICPPASTTypenameExpression extends ICPPASTSimpleTypeConstructorExpression, IASTNameOwner {
-
 	/**
 	 * Was template token consumed?
 	 * 

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

@@ -31,7 +31,8 @@ public interface ICPPASTUnaryExpression extends IASTUnaryExpression, ICPPASTExpr
 	public static final int op_typeid = IASTUnaryExpression.op_typeid;
 
 	/**
-	 * @deprecated all constants to be defined in {@link IASTUnaryExpression}
+	 * @deprecated All constants to be defined in {@link IASTUnaryExpression}
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_last = IASTUnaryExpression.op_last;

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

@@ -46,6 +46,7 @@ public interface ICPPBase extends Cloneable {
 
 	/**
 	 * @deprecated Don't use it, a base class may be specified without the use of a name.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IName getBaseClassSpecifierName();

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

@@ -20,26 +20,29 @@ import org.eclipse.cdt.core.dom.ast.IBasicType;
 public interface ICPPBasicType extends IBasicType {
 	/**
 	 * @deprecated, don't use the constant, more flags may be added for supporting future c++ standards.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int LAST = IS_LONG_LONG;
 
 	/** 
-	 * @return a combination of qualifiers.
 	 * @since 4.0
 	 * @deprecated use {@link #getModifiers()}, instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public int getQualifierBits();
 
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_bool = ICPPASTSimpleDeclSpecifier.t_bool;
 
 	/**
-	 * @deprecated,  use the type-safe version getKind(), instead.
+	 * @deprecated Use the type-safe version getKind(), instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int t_wchar_t = ICPPASTSimpleDeclSpecifier.t_wchar_t;

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

@@ -28,6 +28,7 @@ public interface ICPPClassSpecialization extends ICPPTypeSpecialization, ICPPCla
 
 	/**
 	 * @deprecated Specializing a member may require a point of instantiation.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	IBinding specializeMember(IBinding binding);

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

@@ -25,7 +25,10 @@ package org.eclipse.cdt.core.dom.ast.cpp;
 public interface ICPPClassTemplatePartialSpecialization extends ICPPClassTemplate, ICPPPartialSpecialization {
 	/** @since 6.0 */
 	public static final ICPPClassTemplatePartialSpecialization[] EMPTY_ARRAY = {};
-	/** @deprecated Use {@link #EMPTY_ARRAY} */
+	/**
+	 * @deprecated Use {@link #EMPTY_ARRAY}
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final ICPPClassTemplatePartialSpecialization[] EMPTY_PARTIAL_SPECIALIZATION_ARRAY = EMPTY_ARRAY;
 	

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

@@ -15,6 +15,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPDeferredClassInstance;
 
 /**
  * @deprecated use {@link ICPPDeferredClassInstance} instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICPPDeferredTemplateInstance extends ICPPTemplateInstance {

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

@@ -22,6 +22,7 @@ import org.eclipse.cdt.core.dom.ast.IASTExpression;
 public interface ICPPTemplateNonTypeParameter extends ICPPTemplateParameter, ICPPVariable {
 	/** 
 	 * @deprecated, use {@link ICPPTemplateParameter#getDefaultValue()}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IASTExpression getDefault();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGCCASTAttributeSpecifier.java

@@ -15,12 +15,9 @@ import org.eclipse.cdt.core.dom.ast.IASTAttributeSpecifier;
 import org.eclipse.cdt.core.parser.util.InstanceOfPredicate;
 
 /**
- * Represents a GCC attribute specifier, introduced by __attribute__.
- *
- * @deprecated Use IGCCASTAttributeList instead.
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @since 5.7
+ * @deprecated Use IGCCASTAttributeList instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGCCASTAttributeSpecifier extends IASTAttributeSpecifier {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTTypeIdExpression.java

@@ -14,12 +14,8 @@ package org.eclipse.cdt.core.dom.ast.gnu;
 import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression;
 
 /**
- * There are GNU language extensions that apply to both GCC and G++. Unary
- * expressions for _alignOf() and typeof() along the lines of sizeof().
- * 
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Use {@link IASTTypeIdExpression}, instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGNUASTTypeIdExpression extends IASTTypeIdExpression {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/IGNUASTUnaryExpression.java

@@ -14,13 +14,10 @@ import org.eclipse.cdt.core.dom.ast.IASTUnaryExpression;
 
 /**
  * @deprecated Replaced by {@link IASTUnaryExpression}.
- * 
+ * @noreference This interface is not intended to be referenced by clients.
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  */
 @Deprecated
 public interface IGNUASTUnaryExpression extends IASTUnaryExpression {
-
 	/**
 	 * @since 5.1
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java

@@ -16,13 +16,11 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Everything can be expressed as {@link ICASTSimpleDeclSpecifier}.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGCCASTSimpleDeclSpecifier extends ICASTSimpleDeclSpecifier {
-	
 	/**
 	 * @deprecated Replaced by {@link IASTSimpleDeclSpecifier#t_typeof}.
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTBinaryExpression.java

@@ -31,8 +31,9 @@ public interface IGPPASTBinaryExpression extends ICPPASTBinaryExpression {
 	public static final int op_min = IASTBinaryExpression.op_min;
 
 	/**
-	 * @deprecated all constants must be defined in {@link IASTBinaryExpression} to avoid
+	 * @deprecated All constants must be defined in {@link IASTBinaryExpression} to avoid
 	 * using a constant twice.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int op_last = IASTBinaryExpression.op_last;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTDeclSpecifier.java

@@ -13,11 +13,8 @@ package org.eclipse.cdt.core.dom.ast.gnu.cpp;
 import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
 
 /**
- * G++ allows for restrict to be a modifier for the decl spec.
- * 
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Replaced by {@link IASTDeclSpecifier}.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGPPASTDeclSpecifier extends IASTDeclSpecifier {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTExplicitTemplateInstantiation.java

@@ -13,16 +13,11 @@ package org.eclipse.cdt.core.dom.ast.gnu.cpp;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTExplicitTemplateInstantiation;
 
 /**
- * G++ allows for instantiations to be qualified w/modifiers for scoping.
  * @deprecated Replaced by {@link ICPPASTExplicitTemplateInstantiation}
- * 
+ * @noreference This interface is not intended to be referenced by clients.
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  */
 @Deprecated
-public interface IGPPASTExplicitTemplateInstantiation extends
+public interface IGPPASTExplicitTemplateInstantiation extends ICPPASTExplicitTemplateInstantiation {
-		ICPPASTExplicitTemplateInstantiation {
-
 	/**
 	 * <code>ti_static</code> implies 'static' keyword is used.
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointer.java

@@ -13,12 +13,11 @@ package org.eclipse.cdt.core.dom.ast.gnu.cpp;
 import org.eclipse.cdt.core.dom.ast.IASTPointer;
 
 /**
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Use {@link IASTPointer}, instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGPPASTPointer extends IASTPointer {
-
 	/**
 	 * @since 5.1
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTPointerToMember.java

@@ -13,12 +13,11 @@ package org.eclipse.cdt.core.dom.ast.gnu.cpp;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTPointerToMember;
 
 /**
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Use {@link ICPPASTPointerToMember}, instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGPPASTPointerToMember extends IGPPASTPointer, ICPPASTPointerToMember {
-
 	/**
 	 * @since 5.1
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java

@@ -16,11 +16,8 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleDeclSpecifier;
 
 /**
- * G++ adds its own modifiers and types to the Simple Decl Specifier.
- * 
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Replaced by {@link ICPPASTSimpleDeclSpecifier}.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGPPASTSimpleDeclSpecifier extends IGPPASTDeclSpecifier, ICPPASTSimpleDeclSpecifier {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPBasicType.java

@@ -15,14 +15,11 @@ import org.eclipse.cdt.core.dom.ast.IType;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPBasicType;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated use {@link ICPPBasicType}, instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGPPBasicType extends ICPPBasicType {
-
-	
 	/**
 	 * @deprecated don't use this constant.
 	 */

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPPointerToMemberType.java

@@ -13,12 +13,9 @@ package org.eclipse.cdt.core.dom.ast.gnu.cpp;
 import org.eclipse.cdt.core.dom.ast.cpp.ICPPPointerToMemberType;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Use {@link ICPPPointerToMemberType}, instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
-public interface IGPPPointerToMemberType extends ICPPPointerToMemberType,
+public interface IGPPPointerToMemberType extends ICPPPointerToMemberType, IGPPPointerType {
-		IGPPPointerType {
-
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/gnu/cpp/IGPPPointerType.java

@@ -13,9 +13,8 @@ package org.eclipse.cdt.core.dom.ast.gnu.cpp;
 import org.eclipse.cdt.core.dom.ast.IPointerType;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated Use {@link IPointerType}, instead.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface IGPPPointerType extends IPointerType {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/IScannerExtensionConfiguration.java

@@ -24,11 +24,10 @@ import org.eclipse.cdt.core.parser.util.CharArrayIntMap;
  * @noextend This interface is not intended to be extended by clients.
  */
 public interface IScannerExtensionConfiguration {
-
 	/**
-	 * @return <code>true</code>, if macros should be initialized to 1
 	 * @deprecated empty macros are taken as they are. It is the task of configuration to provide the correct values.
 	 * See https://bugs.eclipse.org/bugs/show_bug.cgi?id=215789
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public boolean initializeMacroValuesTo1();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/c/ICParserExtensionConfiguration.java

@@ -118,12 +118,8 @@ public interface ICParserExtensionConfiguration {
 	public boolean supportFunctionStyleAssembler();
 	
 	/**
-	 * See http://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html for more
-	 * information on GCC's Other Built-in Symbols.
-	 * 
-	 * @return <code>true</code> if support for the extension should be
-	 *         enabled
 	 * @deprecated use {@link #getBuiltinBindingsProvider()} instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public boolean supportGCCOtherBuiltinSymbols();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/parser/cpp/ICPPParserExtensionConfiguration.java

@@ -163,18 +163,21 @@ public interface ICPPParserExtensionConfiguration {
 
 	/**
 	 * @deprecated use {@link #getBuiltinBindingsProvider()} instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public boolean supportGCCOtherBuiltinSymbols();
 
 	/**
 	 * @deprecated use {@link IScannerExtensionConfiguration#supportMinAndMaxOperators()}, instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public boolean supportMinAndMaxOperators();
 
 	/**
 	 * @deprecated configure extra keywords, via {@link IScannerExtensionConfiguration#getAdditionalKeywords()}
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public boolean supportRestrictKeyword();

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndex.java

@@ -132,16 +132,9 @@ public interface IIndex {
 	public long getLastWriteAccess();
 
 	/**
-	 * Returns the file object for the given location and linkage or {@code null} if the file
-	 * was not indexed in this linkage.
-	 * <p>
-	 * When a header file is stored in the index in multiple variants for different sets of macro
-	 * definitions, this method will return an arbitrary one of these variants.
-	 * @param location an IIndexFileLocation representing the location of the file
-	 * @return the file in the index or {@code null}
-	 * @throws CoreException
 	 * @deprecated Use {@link #getFile(int, IIndexFileLocation, ISignificantMacros)} or
 	 *     {@link #getFiles(int, IIndexFileLocation)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public IIndexFile getFile(int linkageID, IIndexFileLocation location) throws CoreException;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexFile.java

@@ -79,6 +79,7 @@ public interface IIndexFile extends IFileNomination {
 
 	/**
 	 * @deprecated Returns 0.
+	 * @noreference This method is not intended to be referenced by clients. 
 	 */
 	@Deprecated
 	int getScannerConfigurationHashcode() throws CoreException;
@@ -86,6 +87,7 @@ public interface IIndexFile extends IFileNomination {
 	/**
 	 * @since 5.3
 	 * @deprecated Returns 0.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	int getEncodingHashcode() throws CoreException;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/index/IIndexManager.java

@@ -45,6 +45,7 @@ public interface IIndexManager extends IPDOMManager {
 	/**
 	 * @deprecated Extension fragments are now used depending on their configuration.
 	 * Use one of the ADD_EXTENSION_XX flags instead.
+	 * @noreference This field is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static final int SKIP_PROVIDED    = 0x4;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ICodeReaderCache.java

@@ -20,13 +20,11 @@ import org.eclipse.core.runtime.CoreException;
  * 
  * For thread safety the implementations of this interface must ensure that their methods are thread safe. 
  * 
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICodeReaderCache {
-
 	/**
 	 * Retrieves the CodeReader corresponding to the key specified that represents the 
 	 * path for that CodeReader.  If no CodeReader is found in the cache then a new CodeReader

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IProblem.java

@@ -356,68 +356,190 @@ public interface IProblem {
 	 */
 	public final static int MISSING_SEMICOLON = SYNTAX_RELATED | 0x002;
 	
-
+	/**
-	
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static int SEMANTICS_RELATED = 0x08000000;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String A_PREPROC_POUND_ERROR = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String A_PREPROC_POUND_WARNING = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String A_PREPROC_INCLUDE_FILENAME = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String A_PREPROC_MACRO_NAME = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String A_PREPROC_CONDITION = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String A_PREPROC_UNKNOWN_DIRECTIVE = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String A_PREPROC_CONDITIONAL_MISMATCH = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final String A_SCANNER_BADCHAR = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final String A_SYMBOL_NAME = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final String A_NAMESPACE_NAME = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final String A_TYPE_NAME = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static String FILENAME_NOT_PROVIDED = ""; //$NON-NLS-1$
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static int SEMANTIC_UNIQUE_NAME_PREDEFINED = SEMANTICS_RELATED | 0x001;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static int SEMANTIC_NAME_NOT_FOUND = SEMANTICS_RELATED | 0x002;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public final static int SEMANTIC_NAME_NOT_PROVIDED = SEMANTICS_RELATED | 0x003;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_INVALID_OVERLOAD = SEMANTICS_RELATED | 0x004;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_INVALID_USING = SEMANTICS_RELATED | 0x005;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_AMBIGUOUS_LOOKUP = SEMANTICS_RELATED | 0x006;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_INVALID_TYPE = SEMANTICS_RELATED | 0x007;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_CIRCULAR_INHERITANCE = SEMANTICS_RELATED | 0x008;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_INVALID_TEMPLATE = SEMANTICS_RELATED | 0x009;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_BAD_VISIBILITY = SEMANTICS_RELATED | 0x00A;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_UNABLE_TO_RESOLVE_FUNCTION = SEMANTICS_RELATED | 0x00B;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_INVALID_TEMPLATE_ARGUMENT = SEMANTICS_RELATED | 0x00C;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_INVALID_TEMPLATE_PARAMETER = SEMANTICS_RELATED | 0x00D;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_REDECLARED_TEMPLATE_PARAMETER = SEMANTICS_RELATED | 0x00E;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_INVALID_CONVERSION_TYPE = SEMANTICS_RELATED | 0x00F;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_MALFORMED_EXPRESSION = SEMANTICS_RELATED | 0x010;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_ILLFORMED_FRIEND = SEMANTICS_RELATED | 0x011;
+	/**
+	 * @deprecated Not used.
+	 * @noreference This field is not intended to be referenced by clients.
+	 */
 	@Deprecated
 	public static final int SEMANTIC_RECURSIVE_TEMPLATE_INSTANTIATION = SEMANTICS_RELATED | 0x012;
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IScanner.java

@@ -114,6 +114,7 @@ public interface IScanner {
 	public int getCodeBranchNesting();
 	
 	/**
+	 * @deprecated Has no effect.
 	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IToken.java

@@ -98,12 +98,8 @@ public interface IToken {
 
 	/** @since 5.10*/ int t_alignas = 5900;
 	/** @since 5.10*/ int t_alignof = 5901;
-	/** @deprecated use {@link #tAND} */ @Deprecated int t_and = 54;
-	/** @deprecated use {@link #tAMPERASSIGN} */ @Deprecated int t_and_eq = 55;
 	int t_asm = 56;
 	int t_auto = 57;
-	/** @deprecated use {@link #tAMPER} */ @Deprecated int t_bitand = 58;
-	/** @deprecated use {@link #tBITOR} */ @Deprecated int t_bitor = 59;
 	int t_bool = 60;
 	int t_break = 61;
 	int t_case = 62;
@@ -112,8 +108,6 @@ public interface IToken {
 	/** @since 5.2 */ int t_char16_t= 5202;
 	/** @since 5.2 */ int t_char32_t= 5203;
 	int t_class = 65;
-	/** @deprecated use {@link #tBITCOMPLEMENT} */ @Deprecated int tCOMPL= tBITCOMPLEMENT;
-	/** @deprecated use {@link #tBITCOMPLEMENT} */ @Deprecated int t_compl = 66;
 	int t_const = 67;
 
 	/** @since 5.4 */ int t_constexpr = 5400;
@@ -144,11 +138,7 @@ public interface IToken {
 	int t_new = 92;
 	/** @since 5.4 */ int t_noexcept = 5401;
 	/** @since 5.4 */ int t_nullptr = 5402;
-	/** @deprecated use {@link #tNOT} */ @Deprecated int t_not = 93;
-	/** @deprecated use {@link #tNOTEQUAL} */ @Deprecated int t_not_eq = 94;
 	int t_operator = 95;
-	/** @deprecated use {@link #tOR} */ @Deprecated int t_or = 96;
-	/** @deprecated use {@link #tBITORASSIGN} */ @Deprecated int t_or_eq = 97;
 	int t_private = 98;
 	int t_protected = 99;
 	int t_public = 100;
@@ -180,8 +170,6 @@ public interface IToken {
 	int t_volatile = 124;
 	int t_wchar_t = 125;
 	int t_while = 126;
-	/** @deprecated use {@link #tXOR} */ @Deprecated int t_xor = 127;
-	/** @deprecated use {@link #tXORASSIGN} */ @Deprecated int t_xor_eq = 128;
 	int tFLOATINGPT = 129;
 
 	int tSTRING = 130;
@@ -202,13 +190,10 @@ public interface IToken {
 	int t__Complex = 135;
 	int t__Imaginary = 136;
 	int t_restrict = 137;
-	/** @deprecated don't use it */ @Deprecated int tMACROEXP = 138;
 	int tPOUND= 	  138;
 	int tPOUNDPOUND = 139;
 	int tCOMPLETION = 140;
 	int tEOC = 141; // End of Completion
-	/** @deprecated don't use it */ @Deprecated int tCOMMENT = 142;
-	/** @deprecated don't use it */ @Deprecated int tBLOCKCOMMENT = 143;
 	int tEND_OF_INPUT= 144;
 	/** @since 5.1 */ int tINACTIVE_CODE_START= 145;
 	/** @since 5.1 */ int tINACTIVE_CODE_SEPARATOR= 146;
@@ -234,4 +219,35 @@ public interface IToken {
 	 */
 	@Deprecated
 	public boolean isOperator();
+
+	/** @deprecated use {@link #tAND} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_and = 54;
+	/** @deprecated use {@link #tAMPERASSIGN} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_and_eq = 55;
+	/** @deprecated use {@link #tAMPER} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_bitand = 58;
+	/** @deprecated use {@link #tBITOR} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_bitor = 59;
+	/** @deprecated use {@link #tBITCOMPLEMENT} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int tCOMPL= tBITCOMPLEMENT;
+	/** @deprecated use {@link #tBITCOMPLEMENT} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_compl = 66;
+	/** @deprecated use {@link #tNOT} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_not = 93;
+	/** @deprecated use {@link #tNOTEQUAL} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_not_eq = 94;
+	/** @deprecated use {@link #tOR} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_or = 96;
+	/** @deprecated use {@link #tBITORASSIGN} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_or_eq = 97;
+	/** @deprecated use {@link #tXOR} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_xor = 127;
+	/** @deprecated use {@link #tXORASSIGN} @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int t_xor_eq = 128;
+	/** @deprecated don't use it @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int tMACROEXP = 138;
+	/** @deprecated don't use it @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int tCOMMENT = 142;
+	/** @deprecated don't use it @noreference This field is not intended to be referenced by clients. */
+	@Deprecated int tBLOCKCOMMENT = 143;
 }

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/ITokenDuple.java

@@ -16,13 +16,12 @@ import java.util.List;
 
 import org.eclipse.cdt.core.dom.ast.IASTNode;
 
-
 /**
- * @deprecated
+ * @deprecated Do not use.
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ITokenDuple {
-
 	public abstract IToken getFirstToken();
 	public abstract IToken getLastToken();
 	

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/parser/IncludeFileContentProvider.java

@@ -22,7 +22,6 @@ import org.eclipse.cdt.internal.core.parser.SavedFilesProvider;
  * @since 5.2
  */
 public abstract class IncludeFileContentProvider {
-
 	/**
 	 * Returns a provider that pretends that every include file is empty.
 	 */
@@ -40,6 +39,7 @@ public abstract class IncludeFileContentProvider {
 
 	/**
 	 * @deprecated Provided to achieve backwards compatibility.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static IncludeFileContentProvider adapt(org.eclipse.cdt.core.dom.ICodeReaderFactory factory) {

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IIndexFragment.java

@@ -90,21 +90,9 @@ public interface IIndexFragment {
 	public static final String PROPERTY_RESUME_INDEXER= "org.eclipse.cdt.internal.core.index.resume"; //$NON-NLS-1$
 
 	/**
-	 * Returns the file for the given location and linkage.
-	 * May return <code>null</code>, if no such file exists.
-	 * This method may only return files that are actually managed by this fragment.
-	 * This method returns files without content, also.
-	 * <p>
-	 * When a header file is stored in the index in multiple variants for different sets of macro
-	 * definitions, this method will return an arbitrary one of these variants.
-	 *
-	 * @param linkageID the id of the linkage in which the file has been parsed.
-	 * @param location the IIndexFileLocation representing the location of the file
-	 * @return the file for the location, or <code>null</code> if the file is not present in
-	 *     the index
-	 * @throws CoreException
 	 * @deprecated Use {@link #getFile(int, IIndexFileLocation, ISignificantMacros)} or
 	 *     {@link #getFiles(int, IIndexFileLocation)}.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	IIndexFragmentFile getFile(int linkageID, IIndexFileLocation location) throws CoreException;

core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/InternalParserUtil.java

@@ -54,9 +54,8 @@ public class InternalParserUtil extends ParserFactory {
 	}
 
 	/**
-	 * Creates a code reader for an external location, normalizing path to 
-	 * canonical path. The cache is consulted after the path has been normalized.
 	 * @deprecated, use {@link FileContent}, instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public static org.eclipse.cdt.core.parser.CodeReader createExternalFileReader(String externalLocation, CodeReaderLRUCache cache) throws IOException {

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptor.java

@@ -19,20 +19,10 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.w3c.dom.Element;
 /**
- * Models meta-data stored with a CDT project
- *
- * Consumers should ensure that changes made to an ICDescriptor are done
- * in the context of an {@link ICDescriptorOperation}
- * via {@link ICDescriptorManager#runDescriptorOperation}
- *
- * @see ICDescriptorOperation
- * @see ICDescriptorManager
- * 
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated as this API is not configuration aware. Replaced by 
  * {@link ICConfigurationDescription} which can be fetched with 
  * {@link ICProjectDescription#getConfigurations()}
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICDescriptor {

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorListener.java

@@ -15,6 +15,7 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener;
 
 /**
  * @deprecated register {@link ICProjectDescriptionListener} for {@link CProjectDescriptionEvent}
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICDescriptorListener {

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorManager.java

@@ -18,13 +18,11 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated replace with {@link ICProjectDescriptionManager} & {@link ICProjectDescription}
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICDescriptorManager {
-
 	public void configure(IProject project, String id) throws CoreException;
 
 	public void convert(IProject project, String id) throws CoreException;

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICDescriptorOperation.java

@@ -16,13 +16,11 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICDescriptorOperation {
-	
 	/**
 	 * Call-back method executed atomically on a ICDescriptor in a runnable.
 	 * 
@@ -33,5 +31,4 @@ public interface ICDescriptorOperation {
 	 * @throws CoreException
 	 */
 	void execute(ICDescriptor descriptor, IProgressMonitor monitor) throws CoreException;
-
 }

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICExtension.java

@@ -24,6 +24,7 @@ public interface ICExtension {
 
 	/**
 	 * @deprecated Use {@link #getConfigExtensionReference()} instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public ICExtensionReference getExtensionReference();

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICExtensionReference.java

@@ -26,9 +26,8 @@ import org.eclipse.core.runtime.IConfigurationElement;
  * @see ICExtension
  * @see ICDescriptor
  * 
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated replaced with {@link ICConfigExtensionReference} obtained from an {@link ICConfigurationDescription}
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICExtensionReference {

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICOwner.java

@@ -13,9 +13,8 @@ package org.eclipse.cdt.core;
 import org.eclipse.core.runtime.CoreException;
 
 /**
- * @noextend This interface is not intended to be extended by clients.
- * @noimplement This interface is not intended to be implemented by clients.
  * @deprecated
+ * @noreference This interface is not intended to be referenced by clients.
  */
 @Deprecated
 public interface ICOwner {

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/ICommandLauncher.java

@@ -96,11 +96,12 @@ public interface ICommandLauncher {
 	 * @param env The list of environment variables in variable=value format.
 	 * @throws CoreException if there is an error executing the command.
 	 */
-	public Process execute(IPath commandPath, String[] args, String[] env, IPath workingDirectory, IProgressMonitor monitor) throws CoreException;
+	public Process execute(IPath commandPath, String[] args, String[] env, IPath workingDirectory,
+			IProgressMonitor monitor) throws CoreException;
 
 	/**
-	 * Reads output form the process to the streams.
+	 * @deprecated Use {@link #waitAndRead(OutputStream, OutputStream, IProgressMonitor)} instead.
-	 * @deprecated Deprecated as of CDT 8.1. Use method taking IProgressMonitor instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	public int waitAndRead(OutputStream out, OutputStream err);
@@ -112,5 +113,4 @@ public interface ICommandLauncher {
 	 * way to read the process inputs
 	 */
 	public int waitAndRead(OutputStream output, OutputStream err, IProgressMonitor monitor);
-
 }

core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/IMarkerGenerator.java

@@ -24,8 +24,8 @@ public interface IMarkerGenerator {
 	int SEVERITY_ERROR_BUILD = 3;
 
 	/**
-	 * callback from Output Parser
 	 * @deprecated Use 	public void addMarker(org.eclipse.cdt.core.ProblemMarkerInfo problem) instead.
+	 * @noreference This method is not intended to be referenced by clients.
 	 */
 	@Deprecated
 	void addMarker(IResource file, int lineNumber, String errorDesc, int severity, String errorVar);