From b50f68c053ab5f1cd3b870f5fc21daaaf65ec73c Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 14 Mar 2016 18:23:10 -0700 Subject: [PATCH] Removed few deprecated *_last constants. Change-Id: I62de6fbb05d2b707147e851126d486c1e943e120 --- .../eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java | 7 ------- .../cdt/core/dom/ast/IASTLiteralExpression.java | 7 ------- .../cdt/core/dom/ast/IASTSimpleDeclSpecifier.java | 7 ------- .../cdt/core/dom/ast/IASTTypeIdExpression.java | 12 ++---------- .../cdt/core/dom/ast/IASTUnaryExpression.java | 7 ------- .../cdt/core/dom/ast/c/ICASTSimpleDeclSpecifier.java | 8 -------- .../dom/ast/cpp/ICPPASTCompositeTypeSpecifier.java | 3 +-- .../cdt/core/dom/ast/cpp/ICPPASTDeclSpecifier.java | 7 ------- .../core/dom/ast/cpp/ICPPASTSimpleDeclSpecifier.java | 7 ------- .../cpp/ICPPASTSimpleTypeConstructorExpression.java | 5 ----- .../core/dom/ast/cpp/ICPPASTTypeIdExpression.java | 7 ------- .../cdt/core/dom/ast/cpp/ICPPASTUnaryExpression.java | 7 ------- .../core/dom/ast/gnu/IGNUASTTypeIdExpression.java | 7 ------- .../dom/ast/gnu/c/IGCCASTSimpleDeclSpecifier.java | 12 ------------ .../dom/ast/gnu/cpp/IGPPASTSimpleDeclSpecifier.java | 8 -------- 15 files changed, 3 insertions(+), 108 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java index ba7bdc8ef15..6980d6d89bb 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTDeclSpecifier.java @@ -111,11 +111,4 @@ public interface IASTDeclSpecifier extends IASTNode { */ @Deprecated public void setAlignmentSpecifiers(IASTAlignmentSpecifier[] alignmentSpecifiers); - - /** - * @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; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java index 2758d3384ee..1b1a7d8cd31 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/IASTLiteralExpression.java @@ -38,13 +38,6 @@ public interface IASTLiteralExpression extends IASTExpression { */ public static final int lk_string_literal = 3; - /** - * @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; - /** * {@code lk_this} represents the '{@code this}' keyword for C++ only. * @since 5.1 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 fcc2217bb40..de288a83df0 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 @@ -253,11 +253,4 @@ public interface IASTSimpleDeclSpecifier extends IASTDeclSpecifier { * @since 5.2 */ public void setDeclTypeExpression(IASTExpression expression); - - /** - * @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 } 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 4189af30eca..567c2221330 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 @@ -165,22 +165,14 @@ public interface IASTTypeIdExpression extends IASTExpression { public static final int op_is_trivially_copyable = 24; /** - * @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; - - /** - * Get the operator for the expression. + * Returns the operator for the expression. * * @return int */ public int getOperator(); /** - * Set the operator for the expression. + * Sets the operator for the expression. * @param value int */ public void setOperator(int value); 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 75ccc9ed2e3..52f680a6117 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 @@ -131,13 +131,6 @@ public interface IASTUnaryExpression extends IASTExpression { */ public static final int op_labelReference = 18; - /** - * @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; - /** * {@code OPERAND} represents the relationship between an {@code IASTUnaryExpression} and * it's nested {@code IASTExpression}. 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 23858a3d351..3574607054a 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 @@ -20,7 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; * @noimplement This interface is not intended to be implemented by clients. */ public interface ICASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICASTDeclSpecifier { - /** * @since 5.1 */ @@ -39,11 +38,4 @@ public interface ICASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICAST */ @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; } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCompositeTypeSpecifier.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCompositeTypeSpecifier.java index 85f261ec3a5..e370d71331a 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCompositeTypeSpecifier.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTCompositeTypeSpecifier.java @@ -34,8 +34,7 @@ public interface ICPPASTCompositeTypeSpecifier extends IASTCompositeTypeSpecifie public static final int k_last = k_class; /** - * VISIBILITY_LABEL is used to express the relationship for a - * visibility label "declaration". + * VISIBILITY_LABEL is used to express the relationship for a visibility label "declaration". */ public static final ASTNodeProperty VISIBILITY_LABEL = new ASTNodeProperty( "ICPPASTCompositeTypeSpecifier.VISIBILITY_LABEL - Visibility label \"declaration\""); //$NON-NLS-1$ 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 5b0657ba2b3..0f94581b1bd 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 @@ -108,11 +108,4 @@ public interface ICPPASTDeclSpecifier extends IASTDeclSpecifier, IASTAttributeOw */ @Override public ICPPASTDeclSpecifier copy(CopyStyle style); - - /** - * @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; } 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 986cd3b3abf..4518c491c1f 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 @@ -31,11 +31,4 @@ public interface ICPPASTSimpleDeclSpecifier extends IASTSimpleDeclSpecifier, ICP */ @Override public ICPPASTSimpleDeclSpecifier copy(CopyStyle style); - - /** - * @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; } 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 681bebbeee2..d582a544c87 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 @@ -134,11 +134,6 @@ public interface ICPPASTSimpleTypeConstructorExpression extends ICPPASTExpressio * @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()}. 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 41050f2f120..c9cddb7a006 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 @@ -20,13 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; public interface ICPPASTTypeIdExpression extends IASTTypeIdExpression, ICPPASTExpression { public static final int op_typeid = IASTTypeIdExpression.op_typeid; - /** - * @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; - /** * @since 5.1 */ 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 621552a01cc..28a08a89eaf 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 @@ -30,13 +30,6 @@ public interface ICPPASTUnaryExpression extends IASTUnaryExpression, ICPPASTExpr */ public static final int op_typeid = IASTUnaryExpression.op_typeid; - /** - * @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; - /** * @since 5.1 */ 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 0366ea71181..35e7fe0cc55 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 @@ -19,7 +19,6 @@ import org.eclipse.cdt.core.dom.ast.IASTTypeIdExpression; */ @Deprecated public interface IGNUASTTypeIdExpression extends IASTTypeIdExpression { - /** * op_typeof is used for typeof( typeId ) type expressions. */ @@ -30,12 +29,6 @@ public interface IGNUASTTypeIdExpression extends IASTTypeIdExpression { * expressions. */ public static final int op_alignof = IASTTypeIdExpression.op_alignof; - - /** - * @deprecated all constants must be declared in {@link IASTTypeIdExpression} - */ - @Deprecated - public static final int op_last = IASTTypeIdExpression.op_last; /** * @since 5.1 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 91c597d3a7f..2d437431a5d 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 @@ -21,18 +21,6 @@ import org.eclipse.cdt.core.dom.ast.c.ICASTSimpleDeclSpecifier; */ @Deprecated public interface IGCCASTSimpleDeclSpecifier extends ICASTSimpleDeclSpecifier { - /** - * @deprecated Replaced by {@link IASTSimpleDeclSpecifier#t_typeof}. - */ - @Deprecated - public static final int t_typeof = ICASTSimpleDeclSpecifier.t_last + 1; - - /** - * @deprecated All constants must be defined in {@link IASTSimpleDeclSpecifier}. - */ - @Deprecated - public static final int t_last = t_typeof; - /** * @deprecated Replaced by {@link IASTSimpleDeclSpecifier#DECLTYPE_EXPRESSION}. */ 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 c506b56b773..1deb90b5f0d 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 @@ -12,7 +12,6 @@ package org.eclipse.cdt.core.dom.ast.gnu.cpp; import org.eclipse.cdt.core.dom.ast.ASTNodeProperty; import org.eclipse.cdt.core.dom.ast.IASTExpression; -import org.eclipse.cdt.core.dom.ast.IASTSimpleDeclSpecifier; import org.eclipse.cdt.core.dom.ast.cpp.ICPPASTSimpleDeclSpecifier; /** @@ -39,17 +38,10 @@ public interface IGPPASTSimpleDeclSpecifier extends IGPPASTDeclSpecifier, ICPPAS @Override public IGPPASTSimpleDeclSpecifier copy(); - /** - * @deprecated All constants must be defined in {@link IASTSimpleDeclSpecifier}. - */ - @Deprecated - public static final int t_last = t_typeof; - /** * @deprecated Replaced by {@link ICPPASTSimpleDeclSpecifier#DECLTYPE_EXPRESSION}. */ @Deprecated public static final ASTNodeProperty TYPEOF_EXPRESSION = new ASTNodeProperty( "IGPPASTSimpleDeclSpecifier.TYPEOF_EXPRESSION - typeof() Expression"); //$NON-NLS-1$ - }