Attachment #18782 for bug #69657

View | Details | Raw Unified | Return to bug 69657
Collapse All | Expand All




     * up to and including J2SE 1.4.
     *
	 * @since 3.0
	 * @deprecated Clients should use the {@link #JLS3} AST API instead.
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Clients should use the JLS3 API.
	public static final int JLS2 = 2;
	
	/**
	 * Internal synonym for {@link #JLS2}. Use to alleviate
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ static final int JLS2_INTERNAL = JLS2;

	/**
	 * Constant for indicating the AST API that handles JLS3.
	 * This API is capable of handling all constructs in the
	 * Java language as described in the Java Language

     * JLS3 is a superset of all earlier versions of the
     * Java language, and the JLS3 API can be used to manipulate
     * programs written in all versions of the Java language
     * up to and including J2SE 5 (aka JDK 1.5). 
     * <p>
     * <b>NOTE:</b>In Eclipse 3.0, there is no underlying parser support for
     * JLS3 ASTs. This support is planned for the follow-on release of
     * Eclipse which includes support for J2SE 1.5. Without a parser to create
     * JLS3 ASTs, they are not much use. Use JLS2 ASTs instead.
     * </p>
     *
	 * @since 3.1
	 */
	public static final int JLS3 = 3;
	

	 * Creates a new, empty abstract syntax tree using default options.
	 * 
	 * @see JavaCore#getDefaultOptions()
	 * @deprecated Clients should port their code to use the new JLS3 AST API and call
	 *    {@link #newAST(int) AST.newAST(AST.JLS3)} instead of using this constructor.
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Clients should port their code to use the new JLS3 API and call {@link #newAST(int)} instead of using this constructor.
	public AST() {
		this(JavaCore.getDefaultOptions());
	}

	 * @param options the table of options (key type: <code>String</code>;
	 *    value type: <code>String</code>)
	 * @see JavaCore#getDefaultOptions()
	 * @deprecated Clients should port their code to use the new JLS3 AST API and call
	 *    {@link #newAST(int) AST.newAST(AST.JLS3)} instead of using this constructor.
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Clients should port their code to use the new JLS3 API and call {@link #newAST(int)} instead of using this constructor.
	public AST(Map options) {
		this(JLS2);
		Object sourceLevelOption = options.get(JavaCore.COMPILER_SOURCE);

	 * Creates a new Java abstract syntax tree
     * (AST) following the specified set of API rules. 
     * <p>
     * Clients should use this method specifing {@link #JLS3} as the
     * AST level in all cases, even when dealing with JDK 1.3 or 1.4..
     * </p>
     * 
 	 * @param level the API level; one of the LEVEL constants

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public ParameterizedType newParameterizedType(Type type) {
		ParameterizedType result = new ParameterizedType(this);

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public QualifiedType newQualifiedType(Type qualifier, SimpleName name) {
		QualifiedType result = new QualifiedType(this);

	 * @return a new unparented wildcard type node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public WildcardType newWildcardType() {
		WildcardType result = new WildcardType(this);

	 * @return a new unparented enum constant declaration node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public EnumConstantDeclaration newEnumConstantDeclaration() {
		EnumConstantDeclaration result = new EnumConstantDeclaration(this);

	 * @return a new unparented enum declaration node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public EnumDeclaration newEnumDeclaration() {
		EnumDeclaration result = new EnumDeclaration(this);

	 * @return a new unparented type parameter node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public TypeParameter newTypeParameter() {
		TypeParameter result = new TypeParameter(this);

	 * @return a new unparented annotation type declaration node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public AnnotationTypeDeclaration newAnnotationTypeDeclaration() {
		AnnotationTypeDeclaration result = new AnnotationTypeDeclaration(this);

	 * @return a new unparented annotation type member declaration node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public AnnotationTypeMemberDeclaration newAnnotationTypeMemberDeclaration() {
		AnnotationTypeMemberDeclaration result = new AnnotationTypeMemberDeclaration(this);

	 * @exception IllegalArgumentException if the primitive type code is invalid
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public Modifier newModifier(Modifier.ModifierKeyword keyword) {
		Modifier result = new Modifier(this);

			newTypeDeclarationStatement(AbstractTypeDeclaration decl) {
		TypeDeclarationStatement result = new TypeDeclarationStatement(this);
		if (this.apiLevel == AST.JLS2) {
			result.internalSetTypeDeclaration((TypeDeclaration) decl);
		}
		if (this.apiLevel >= AST.JLS3) {
			result.setDeclaration(decl);

	 * @return a new unparented throw statement node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public EnhancedForStatement newEnhancedForStatement() {
		return new EnhancedForStatement(this);

	 * @return a new unparented normal annotation node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public NormalAnnotation newNormalAnnotation() {
		NormalAnnotation result = new NormalAnnotation(this);

	 * @return a new unparented marker annotation node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public MarkerAnnotation newMarkerAnnotation() {
		MarkerAnnotation result = new MarkerAnnotation(this);

	 * @return a new unparented single member annotation node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public SingleMemberAnnotation newSingleMemberAnnotation() {
		SingleMemberAnnotation result = new SingleMemberAnnotation(this);

	 * @return a new unparented member value pair node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */
	public MemberValuePair newMemberValuePair() {
		MemberValuePair result = new MemberValuePair(this);




			org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration constructorDeclaration = (org.eclipse.jdt.internal.compiler.ast.ConstructorDeclaration) methodDeclaration;
			explicitConstructorCall = constructorDeclaration.constructorCall;
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					// set the return type to VOID
					PrimitiveType returnType = this.ast.newPrimitiveType(PrimitiveType.VOID);
					returnType.setSourceRange(methodDeclaration.sourceStart, 0);
					methodDecl.internalSetReturnType(returnType);
					break;
				case AST.JLS3 :
					methodDecl.setReturnType2(null);

		org.eclipse.jdt.internal.compiler.ast.TypeParameter[] typeParameters = methodDeclaration.typeParameters();
		if (typeParameters != null) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					methodDecl.setFlags(methodDecl.getFlags() | ASTNode.MALFORMED);
					break;
				case AST.JLS3 :

		}
		if (expression.typeArguments != null) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					classInstanceCreation.setFlags(classInstanceCreation.getFlags() | ASTNode.MALFORMED);
					break;
				case AST.JLS3 :

			}
		}
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				classInstanceCreation.internalSetName(convert(expression.type));
				break;
			case AST.JLS3 :
				classInstanceCreation.setType(convertType(expression.type));

	
	public ASTNode convert(org.eclipse.jdt.internal.compiler.ast.AnnotationMethodDeclaration annotationTypeMemberDeclaration) {
		checkCanceled();
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			return null;
		}
		AnnotationTypeMemberDeclaration annotationTypeMemberDeclaration2 = this.ast.newAnnotationTypeMemberDeclaration();

		
		if (isVarArgs) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					variableDecl.setFlags(variableDecl.getFlags() | ASTNode.MALFORMED);
					break;
				case AST.JLS3 :

					sourceStart = statement.typeArgumentsSourceStart;
				}
				switch(this.ast.apiLevel) {
					case AST.JLS2_INTERNAL :
						superConstructorInvocation.setFlags(superConstructorInvocation.getFlags() | ASTNode.MALFORMED);
						break;
					case AST.JLS3 :

					sourceStart = statement.typeArgumentsSourceStart;
				}
				switch(this.ast.apiLevel) {
					case AST.JLS2_INTERNAL :
						constructorInvocation.setFlags(constructorInvocation.getFlags() | ASTNode.MALFORMED);
						break;
					case AST.JLS3 :

	
	public Statement convert(ForeachStatement statement) {
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				return createFakeEmptyStatement(statement);
			case AST.JLS3 :
				EnhancedForStatement enhancedForStatement = this.ast.newEnhancedForStatement();

			final TypeReference[] typeArguments = expression.typeArguments;
			if (typeArguments != null) {
				switch(this.ast.apiLevel) {
					case AST.JLS2_INTERNAL :
						superMethodInvocation.setFlags(superMethodInvocation.getFlags() | ASTNode.MALFORMED);
						break;
					case AST.JLS3 :

			final TypeReference[] typeArguments = expression.typeArguments;
			if (typeArguments != null) {
				switch(this.ast.apiLevel) {
					case AST.JLS2_INTERNAL :
						methodInvocation.setFlags(methodInvocation.getFlags() | ASTNode.MALFORMED);
						break;
					case AST.JLS3 :

			classInstanceCreation.setExpression(convert(allocation.enclosingInstance));
		}
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				classInstanceCreation.internalSetName(convert(allocation.type));
				break;
			case AST.JLS3 :
				classInstanceCreation.setType(convertType(allocation.type));

		}
		if (allocation.typeArguments != null) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					classInstanceCreation.setFlags(classInstanceCreation.getFlags() | ASTNode.MALFORMED);
					break;
				case AST.JLS3 :

			switch(result.getNodeType()) {
				case ASTNode.ENUM_DECLARATION:
					switch(this.ast.apiLevel) {
						case AST.JLS2_INTERNAL :
							return createFakeEmptyStatement(statement);
						case AST.JLS3 :
							TypeDeclarationStatement typeDeclarationStatement = this.ast.newTypeDeclarationStatement((EnumDeclaration) result);
							AbstractTypeDeclaration typeDecl = typeDeclarationStatement.getDeclaration();
							typeDeclarationStatement.setSourceRange(typeDecl.getStartPosition(), typeDecl.getLength());
							return typeDeclarationStatement;
					}
					break;
				case ASTNode.ANNOTATION_TYPE_DECLARATION :
					switch(this.ast.apiLevel) {
						case AST.JLS2_INTERNAL :
							return createFakeEmptyStatement(statement);
						case AST.JLS3 :
							TypeDeclarationStatement typeDeclarationStatement = this.ast.newTypeDeclarationStatement((AnnotationTypeDeclaration) result);
							AbstractTypeDeclaration typeDecl = typeDeclarationStatement.getDeclaration();
							typeDeclarationStatement.setSourceRange(typeDecl.getStartPosition(), typeDecl.getLength());
							return typeDeclarationStatement;
					}

					} else {
						TypeDeclarationStatement typeDeclarationStatement = this.ast.newTypeDeclarationStatement(typeDeclaration);
						switch(this.ast.apiLevel) {
							case AST.JLS2_INTERNAL :
								TypeDeclaration typeDecl = typeDeclarationStatement.internalGetTypeDeclaration();
								typeDeclarationStatement.setSourceRange(typeDecl.getStartPosition(), typeDecl.getLength());					
								break;
							case AST.JLS3 :

	public ASTNode convert(org.eclipse.jdt.internal.compiler.ast.TypeDeclaration typeDeclaration) {
		switch (typeDeclaration.kind()) {
			case IGenericType.ENUM_DECL :
				if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
					return null;
				} else {
					return convertToEnumDeclaration(typeDeclaration);
				}
			case IGenericType.ANNOTATION_TYPE_DECL :
				if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
					return null;
				} else {
					return convertToAnnotationDeclaration(typeDeclaration);

		// the type references level.
		if (typeDeclaration.superclass != null) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					typeDecl.internalSetSuperclass(convert(typeDeclaration.superclass));
					break;
				case AST.JLS3 :
					typeDecl.setSuperclassType(convertType(typeDeclaration.superclass));

		org.eclipse.jdt.internal.compiler.ast.TypeReference[] superInterfaces = typeDeclaration.superInterfaces;
		if (superInterfaces != null) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					for (int index = 0, length = superInterfaces.length; index < length; index++) {
						typeDecl.internalSuperInterfaces().add(convert(superInterfaces[index]));
					}
					break;
				case AST.JLS3 :

		org.eclipse.jdt.internal.compiler.ast.TypeParameter[] typeParameters = typeDeclaration.typeParameters;
		if (typeParameters != null) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					typeDecl.setFlags(typeDecl.getFlags() | ASTNode.MALFORMED);
					break;
				case AST.JLS3 :

		int modifiers = importReference.modifiers;
		if (modifiers != IConstants.AccDefault) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					importDeclaration.setFlags(importDeclaration.getFlags() | ASTNode.MALFORMED);
					break;
				case AST.JLS3 :

		org.eclipse.jdt.internal.compiler.ast.Annotation[] annotations = importReference.annotations;
		if (annotations != null) {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					packageDeclaration.setFlags(packageDeclaration.getFlags() & ASTNode.MALFORMED);
					break;
				case AST.JLS3 :

				}
				simpleName.setSourceRange(sourceStart, end - sourceStart + 1);
				switch(this.ast.apiLevel) {
					case AST.JLS2_INTERNAL :
						type = this.ast.newSimpleType(simpleName);
						type.setFlags(type.getFlags() | ASTNode.MALFORMED);
						type.setSourceRange(sourceStart, end - sourceStart + 1);

				long[] positions = parameterizedQualifiedTypeReference.sourcePositions;
				sourceStart = (int)(positions[0]>>>32);
				switch(this.ast.apiLevel) {
					case AST.JLS2_INTERNAL : {
							char[][] name = ((org.eclipse.jdt.internal.compiler.ast.QualifiedTypeReference) typeReference).getTypeName();
							int nameLength = name.length;
							sourceStart = (int)(positions[0]>>>32);

						if (expression instanceof JavadocArgumentExpression) {
							JavadocArgumentExpression argExpr = (JavadocArgumentExpression) expression;
							org.eclipse.jdt.internal.compiler.ast.TypeReference typeRef = argExpr.argument.type;
							if (this.ast.apiLevel >= AST.JLS3) param.setVarargs(argExpr.argument.isVarArgs());
							recordNodes(param.getType(), typeRef);
							if (param.getType().isSimpleType()) {
								recordName(((SimpleType)param.getType()).getName(), typeRef);

	 */
	protected void setModifiers(FieldDeclaration fieldDeclaration, org.eclipse.jdt.internal.compiler.ast.FieldDeclaration fieldDecl) {
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				fieldDeclaration.internalSetModifiers(fieldDecl.modifiers & CompilerModifiers.AccJustFlag);
				if (fieldDecl.annotations != null) {
					fieldDeclaration.setFlags(fieldDeclaration.getFlags() | ASTNode.MALFORMED);
				}

	 */
	protected void setModifiers(Initializer initializer, org.eclipse.jdt.internal.compiler.ast.Initializer oldInitializer) {
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL: 
				initializer.internalSetModifiers(oldInitializer.modifiers & CompilerModifiers.AccJustFlag);
				if (oldInitializer.annotations != null) {
					initializer.setFlags(initializer.getFlags() | ASTNode.MALFORMED);
				}

	 */
	protected void setModifiers(MethodDeclaration methodDecl, AbstractMethodDeclaration methodDeclaration) {
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				methodDecl.internalSetModifiers(methodDeclaration.modifiers & CompilerModifiers.AccJustFlag);
				if (methodDeclaration.annotations != null) {
					methodDecl.setFlags(methodDecl.getFlags() | ASTNode.MALFORMED);
				}

	 */
	protected void setModifiers(SingleVariableDeclaration variableDecl, Argument argument) {
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				variableDecl.internalSetModifiers(argument.modifiers & CompilerModifiers.AccJustFlag);
				if (argument.annotations != null) {
					variableDecl.setFlags(variableDecl.getFlags() | ASTNode.MALFORMED);
				}

	
	protected void setModifiers(SingleVariableDeclaration variableDecl, LocalDeclaration localDeclaration) {
		switch(this.ast.apiLevel) {
		case AST.JLS2_INTERNAL :
			variableDecl.internalSetModifiers(localDeclaration.modifiers & CompilerModifiers.AccJustFlag);
			if (localDeclaration.annotations != null) {
				variableDecl.setFlags(variableDecl.getFlags() | ASTNode.MALFORMED);
			}

	 */
	protected void setModifiers(TypeDeclaration typeDecl, org.eclipse.jdt.internal.compiler.ast.TypeDeclaration typeDeclaration) {
		switch(this.ast.apiLevel) { 
			case AST.JLS2_INTERNAL :
				int modifiers = typeDeclaration.modifiers;
				modifiers &= ~IConstants.AccInterface; // remove AccInterface flags
				modifiers &= CompilerModifiers.AccJustFlag;
				typeDecl.internalSetModifiers(modifiers);
				if (typeDeclaration.annotations != null) {
					typeDecl.setFlags(typeDecl.getFlags() | ASTNode.MALFORMED);
				}

	 */
	protected void setModifiers(VariableDeclarationExpression variableDeclarationExpression, LocalDeclaration localDeclaration) {
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				int modifiers = localDeclaration.modifiers & CompilerModifiers.AccJustFlag;
				modifiers &= ~CompilerModifiers.AccBlankFinal;
				variableDeclarationExpression.internalSetModifiers(modifiers);
				if (localDeclaration.annotations != null) {
					variableDeclarationExpression.setFlags(variableDeclarationExpression.getFlags() | ASTNode.MALFORMED);
				}

	 */
	protected void setModifiers(VariableDeclarationStatement variableDeclarationStatement, LocalDeclaration localDeclaration) {
		switch(this.ast.apiLevel) {
			case AST.JLS2_INTERNAL :
				int modifiers = localDeclaration.modifiers & CompilerModifiers.AccJustFlag;
				modifiers &= ~CompilerModifiers.AccBlankFinal;
				variableDeclarationStatement.internalSetModifiers(modifiers);
				if (localDeclaration.annotations != null) {
					variableDeclarationStatement.setFlags(variableDeclarationStatement.getFlags() | ASTNode.MALFORMED);
				}

					elementType.setParent(null, null);
					this.ast.getBindingResolver().updateKey(type, elementType);
					switch(this.ast.apiLevel) {
						case AST.JLS2_INTERNAL :
							methodDeclaration.internalSetReturnType(elementType);
							break;
						case AST.JLS3 :
							methodDeclaration.setReturnType2(elementType);

					subarrayType.setParent(null, null);
					updateInnerPositions(subarrayType, remainingDimensions);
					switch(this.ast.apiLevel) {
						case AST.JLS2_INTERNAL :
							methodDeclaration.internalSetReturnType(subarrayType);
							break;
						case AST.JLS3 :
							methodDeclaration.setReturnType2(subarrayType);

				}
			} else {
				switch(this.ast.apiLevel) {
					case AST.JLS2_INTERNAL :
						methodDeclaration.internalSetReturnType(type);
						break;
					case AST.JLS3 :
						methodDeclaration.setReturnType2(type);

			}
		} else {
			switch(this.ast.apiLevel) {
				case AST.JLS2_INTERNAL :
					methodDeclaration.internalSetReturnType(type);
					break;
				case AST.JLS3 :
					methodDeclaration.setReturnType2(type);




	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(AnnotationTypeDeclaration node, Object other) {
		if (!(other instanceof AnnotationTypeDeclaration)) {

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(AnnotationTypeMemberDeclaration node, Object other) {
		if (!(other instanceof AnnotationTypeMemberDeclaration)) {

		}
		ClassInstanceCreation o = (ClassInstanceCreation) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (!safeSubtreeMatch(node.internalGetName(), o.internalGetName())) {
				return false;
			}
		}

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(EnhancedForStatement node, Object other) {
		if (!(other instanceof EnhancedForStatement)) {

	 * other object is a node of the same type with structurally isomorphic
	 * child subtrees. Subclasses may override this method as needed.
	 * </p>
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @param node the node
	 * @param other the other object, or <code>null</code>
	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(EnumConstantDeclaration node, Object other) {
		if (!(other instanceof EnumConstantDeclaration)) {

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(EnumDeclaration node, Object other) {
		if (!(other instanceof EnumDeclaration)) {

		}
		FieldDeclaration o = (FieldDeclaration) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (node.getModifiers() != o.getModifiers()) {
				return false;
			}

		}
		Initializer o = (Initializer) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (node.getModifiers() != o.getModifiers()) {
				return false;
			}

	 * @deprecated mark deprecated to hide deprecated usage
	 */
	private boolean compareDeprecatedComment(Javadoc first, Javadoc second) {
		if (first.getAST().apiLevel == AST.JLS2_INTERNAL) {
			return safeEquals(first.getComment(), second.getComment());
		} else {
			return true;

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(MarkerAnnotation node, Object other) {
		if (!(other instanceof MarkerAnnotation)) {

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(MemberValuePair node, Object other) {
		if (!(other instanceof MemberValuePair)) {

		}
		MethodDeclaration o = (MethodDeclaration) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (node.getModifiers() != o.getModifiers()) {
				return false;
			}
			if (!safeSubtreeMatch(node.internalGetReturnType(), o.internalGetReturnType())) {
				return false;
			}
		}

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(Modifier node, Object other) {
		if (!(other instanceof Modifier)) {

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(NormalAnnotation node, Object other) {
		if (!(other instanceof NormalAnnotation)) {

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(ParameterizedType node, Object other) {
		if (!(other instanceof ParameterizedType)) {

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(QualifiedType node, Object other) {
		if (!(other instanceof QualifiedType)) {

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(SingleMemberAnnotation node, Object other) {
		if (!(other instanceof SingleMemberAnnotation)) {

		}
		SingleVariableDeclaration o = (SingleVariableDeclaration) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (node.getModifiers() != o.getModifiers()) {
				return false;
			}

		}
		TypeDeclaration o = (TypeDeclaration) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (node.getModifiers() != o.getModifiers()) {
				return false;
			}
			if (!safeSubtreeMatch(node.internalGetSuperclass(), o.internalGetSuperclass())) {
				return false;
			}
			if (!safeSubtreeListMatch(node.internalSuperInterfaces(), o.internalSuperInterfaces())) {
				return false;
			}
		}

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(TypeParameter node, Object other) {
		if (!(other instanceof TypeParameter)) {

		}
		VariableDeclarationExpression o = (VariableDeclarationExpression) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (node.getModifiers() != o.getModifiers()) {
				return false;
			}

		}
		VariableDeclarationStatement o = (VariableDeclarationStatement) other;
		int level = node.getAST().apiLevel;
		if (level == AST.JLS2_INTERNAL) {
			if (node.getModifiers() != o.getModifiers()) {
				return false;
			}

	 * @return <code>true</code> if the subtree matches, or 
	 *   <code>false</code> if they do not match or the other object has a
	 *   different node type or is <code>null</code>
	 * @since 3.1
	 */
	public boolean match(WildcardType node, Object other) {
		if (!(other instanceof WildcardType)) {




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * Node type constant indicating a node of type 
	 * <code>EnhancedForStatement</code>.
	 * @see EnhancedForStatement
	 * @since 3.1
	 */
	public static final int ENHANCED_FOR_STATEMENT = 70;


	 * Node type constant indicating a node of type 
	 * <code>EnumDeclaration</code>.
	 * @see EnumDeclaration
	 * @since 3.1
	 */
	public static final int ENUM_DECLARATION = 71;
	

	 * Node type constant indicating a node of type 
	 * <code>EnumConstantDeclaration</code>.
	 * @see EnumConstantDeclaration
	 * @since 3.1
	 */
	public static final int ENUM_CONSTANT_DECLARATION = 72;
	

	 * Node type constant indicating a node of type 
	 * <code>TypeParameter</code>.
	 * @see TypeParameter
	 * @since 3.1
	 */
	public static final int TYPE_PARAMETER = 73;


	 * Node type constant indicating a node of type 
	 * <code>ParameterizedType</code>.
	 * @see ParameterizedType
	 * @since 3.1
	 */
	public static final int PARAMETERIZED_TYPE = 74;


	 * Node type constant indicating a node of type 
	 * <code>QualifiedType</code>.
	 * @see QualifiedType
	 * @since 3.1
	 */
	public static final int QUALIFIED_TYPE = 75;
	

	 * Node type constant indicating a node of type 
	 * <code>WildcardType</code>.
	 * @see WildcardType
	 * @since 3.1
	 */
	public static final int WILDCARD_TYPE = 76;
	

	 * Node type constant indicating a node of type 
	 * <code>NormalAnnotation</code>.
	 * @see NormalAnnotation
	 * @since 3.1
	 */
	public static final int NORMAL_ANNOTATION = 77;
	

	 * Node type constant indicating a node of type 
	 * <code>MarkerAnnotation</code>.
	 * @see MarkerAnnotation
	 * @since 3.1
	 */
	public static final int MARKER_ANNOTATION = 78;
	

	 * Node type constant indicating a node of type 
	 * <code>SingleMemberAnnotation</code>.
	 * @see SingleMemberAnnotation
	 * @since 3.1
	 */
	public static final int SINGLE_MEMBER_ANNOTATION = 79;
	

	 * Node type constant indicating a node of type 
	 * <code>MemberValuePair</code>.
	 * @see MemberValuePair
	 * @since 3.1
	 */
	public static final int MEMBER_VALUE_PAIR = 80;
	

	 * Node type constant indicating a node of type 
	 * <code>AnnotationTypeDeclaration</code>.
	 * @see AnnotationTypeDeclaration
	 * @since 3.1
	 */
	public static final int ANNOTATION_TYPE_DECLARATION = 81;
	

	 * Node type constant indicating a node of type 
	 * <code>AnnotationTypeMemberDeclaration</code>.
	 * @see AnnotationTypeMemberDeclaration
	 * @since 3.1
	 */
	public static final int ANNOTATION_TYPE_MEMBER_DECLARATION = 82;
	

	 * Node type constant indicating a node of type 
	 * <code>Modifier</code>.
	 * @see Modifier
	 * @since 3.1
	 */
	public static final int MODIFIER = 83;
	

	 * @since 3.0
     */
	final void unsupportedIn2() {
	  if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
	  	throw new UnsupportedOperationException("Operation not supported in JLS2 AST"); //$NON-NLS-1$
	  }
	}

	 * @since 3.0
     */
	final void supportedOnlyIn2() {
	  if (this.ast.apiLevel != AST.JLS2_INTERNAL) {
	  	throw new UnsupportedOperationException("Operation only supported in JLS2 AST"); //$NON-NLS-1$
	  }
	}




 * Example: Create basic AST from source string
 * <pre>
 * char[] source = ...;
 * ASTParser parser = ASTParser.newParser(AST.JLS3);  // handles JDK 1.0, 1.1, 1.2, 1.3, 1.4, 1.5
 * parser.setSource(source);
 * CompilationUnit result = (CompilationUnit) parser.createAST(null);
 * </pre>

	/**
	 * Creates a new object for creating a Java abstract syntax tree
     * (AST) following the specified set of API rules.
     * <p>
     * <b>NOTE:</b>In Eclipse 3.0, there is no parser support for
     * AST.JLS3. This support is planned for the follow-on release of
     * Eclipse which includes support for J2SE 1.5.
     * </p>
     *  
 	 * @param level the API level; one of the LEVEL constants
     * declared on <code>AST</code>

     * declared on <code>AST</code>
	 */
	ASTParser(int level) {
		if ((level != AST.JLS2_INTERNAL)
			&& (level != AST.JLS3)) {
			throw new IllegalArgumentException();
		}

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/ASTRequestor.java (-1 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at




	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(AnnotationTypeDeclaration node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(AnnotationTypeMemberDeclaration node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(EnhancedForStatement node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(EnumConstantDeclaration node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(EnumDeclaration node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(MarkerAnnotation node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(MemberValuePair node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(Modifier node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(NormalAnnotation node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(ParameterizedType node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(QualifiedType node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(SingleMemberAnnotation node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(TypeParameter node) {
		return true;

	 * @return <code>true</code> if the children of this node should be
	 * visited, and <code>false</code> if the children of this node should
	 * be skipped
	 * @since 3.1
	 */
	public boolean visit(WildcardType node) {
		return true;

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(AnnotationTypeDeclaration node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(AnnotationTypeMemberDeclaration node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(EnhancedForStatement node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(EnumConstantDeclaration node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(EnumDeclaration node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(MarkerAnnotation node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(MemberValuePair node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(Modifier node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(NormalAnnotation node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(ParameterizedType node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(QualifiedType node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(SingleMemberAnnotation node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(TypeParameter node) {
		// default implementation: do nothing

	 * </p>
	 * 
	 * @param node the node to visit
	 * @since 3.1
	 */
	public void endVisit(WildcardType node) {
		// default implementation: do nothing




/*******************************************************************************
 * Copyright (c) 2004, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *		SingleMemberAnnotation
 * </pre>
 * </p>
 * @since 3.1
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * @since 3.0
 */
public abstract class Annotation extends Expression implements IExtendedModifier {
	

	 * of this node.
	 * 
	 * @return the property descriptor
	 * @since 3.1
	 */
	public final ChildPropertyDescriptor getTypeNameProperty() {
		return internalTypeNameProperty();




/*******************************************************************************
 * Copyright (c) 2004, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * modifiers). The source range extends through the last character of the "}"
 * token following the body declarations.
 * </p>
 * <p>
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * 
 * @since 3.1
 */
public class AnnotationTypeDeclaration extends AbstractTypeDeclaration {
	




/*******************************************************************************
 * Copyright (c) 2004, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * The source range extends through the last character of the
 * ";" token.
 * </p>
 * <p>
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * 
 * @since 3.1
 */
public class AnnotationTypeMemberDeclaration extends BodyDeclaration {
	
	/**
	 * The "javadoc" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor JAVADOC_PROPERTY = 
		internalJavadocPropertyFactory(AnnotationTypeMemberDeclaration.class);

	/**
	 * The "modifiers" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		internalModifiers2PropertyFactory(AnnotationTypeMemberDeclaration.class);
	
	/**
	 * The "name" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor NAME_PROPERTY = 
		new ChildPropertyDescriptor(AnnotationTypeMemberDeclaration.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "type" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor TYPE_PROPERTY = 
		new ChildPropertyDescriptor(AnnotationTypeMemberDeclaration.class, "type", Type.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "default" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor DEFAULT_PROPERTY = 
		new ChildPropertyDescriptor(AnnotationTypeMemberDeclaration.class, "default", Expression.class, OPTIONAL, CYCLE_RISK); //$NON-NLS-1$

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/BodyDeclaration.java (-4 / +14 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 231-246 Link Here
231	* @exception UnsupportedOperationException if this operation is used in	231	* @exception UnsupportedOperationException if this operation is used in
232	* an AST later than JLS2	232	* an AST later than JLS2
233	* @see Modifier	233	* @see Modifier
		234	* @deprecated In the JLS3 API, this method is replaced by
		235	* {@link #modifiers()} which contains a list of a <code>Modifier</code> nodes.
234	*/	236	*/
235	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>modifiers()</code> which contains a list of a <code>Modifier</code> nodes.
236	public void setModifiers(int modifiers) {	237	public void setModifiers(int modifiers) {
		238	internalSetModifiers(modifiers);
		239	}
		240
		241	/**
		242	* Internal synonym for deprecated method. Used to avoid
		243	* deprecation warnings.
		244	* @since 3.1
		245	*/
		246	/package/ final void internalSetModifiers(int pmodifiers) {
237	// more efficient than just calling supportedOnlyIn2() to check	247	// more efficient than just calling supportedOnlyIn2() to check
238	if (this.modifiers != null) {	248	if (this.modifiers != null) {
239	supportedOnlyIn2();	249	supportedOnlyIn2();
240	}	250	}
241	SimplePropertyDescriptor p = internalModifiersProperty();	251	SimplePropertyDescriptor p = internalModifiersProperty();
242	preValueChange(p);	252	preValueChange(p);
243	this.modifierFlags = modifiers;	253	this.modifierFlags = pmodifiers;
244	postValueChange(p);	254	postValueChange(p);
245	}	255	}
246		256
Lines 252-258 Link Here
252	* (element type: <code>IExtendedModifier</code>)	262	* (element type: <code>IExtendedModifier</code>)
253	* @exception UnsupportedOperationException if this operation is used in	263	* @exception UnsupportedOperationException if this operation is used in
254	* a JLS2 AST	264	* a JLS2 AST
255	* @since 3.0	265	* @since 3.1
256	*/	266	*/
257	public List modifiers() {	267	public List modifiers() {
258	// more efficient than just calling unsupportedIn2() to check	268	// more efficient than just calling unsupportedIn2() to check




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


	/**
	 * The "typeArguments" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY = 
		new ChildListPropertyDescriptor(ClassInstanceCreation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$

	 * The "name" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #TYPE_PROPERTY} in the JLS3 API.
	public static final ChildPropertyDescriptor NAME_PROPERTY = 
		new ChildPropertyDescriptor(ClassInstanceCreation.class, "name", Name.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "type" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildPropertyDescriptor TYPE_PROPERTY = 
		new ChildPropertyDescriptor(ClassInstanceCreation.class, "type", Type.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The type arguments (element type: <code>Type</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList typeArguments = null;


		result.setSourceRange(this.getStartPosition(), this.getLength());
		result.setExpression(
			(Expression) ASTNode.copySubtree(target, getExpression()));
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.setName((Name) getName().clone(target));
		}
		if (this.ast.apiLevel >= AST.JLS3) {

		if (visitChildren) {
			// visit children in normal left to right reading order
			acceptChild(visitor, getExpression());
			if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
				acceptChild(visitor, getName());
			}
			if (this.ast.apiLevel >= AST.JLS3) {

	/**
	 * Returns the live ordered list of type arguments of this class
	 * instance creation (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of type arguments
	 *    (element type: <code>Type</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List typeArguments() {
		// more efficient than just calling unsupportedIn2() to check

	 * @return the type name node
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by
	 * {@link #getType()}, which returns a <code>Type</code> instead of a
	 * <code>Name</code>.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>getType</code>, which returns a <code>Type</code> instead of a <code>Name</code>.
	public Name getName() {
		return internalGetName();
	}

	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ Name internalGetName() {
	    supportedOnlyIn2();
		if (this.typeName == null) {
			// lazy init must be thread-safe for readers

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link #setType(Type)}, which expects a <code>Type</code> instead of
	 * a <code>Name</code>.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>setType</code>, which expects a <code>Type</code> instead of a <code>Name</code>.
	public void setName(Name name) {
		internalSetName(name);
	}

	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ public void internalSetName(Name name) {
	    supportedOnlyIn2();
		if (name == null) {
			throw new IllegalArgumentException();

	 * @return the type node
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public Type getType() {
	    unsupportedIn2();

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public void setType(Type type) {
	    unsupportedIn2();

Lines 348-354 Link Here

(-)dom/org/eclipse/jdt/core/dom/CompilationUnit.java (-1 / +1 lines)
348	* compilation unit, in order of appearance.	348	* compilation unit, in order of appearance.
349	* <p>	349	* <p>
350	* Note that in JLS3, the types may include both enum declarations	350	* Note that in JLS3, the types may include both enum declarations
351	* and annotation type declarations introduced in J2SE 1.5.	351	* and annotation type declarations introduced in J2SE 5.
352	* For JLS2, the elements are always <code>TypeDeclaration</code>.	352	* For JLS2, the elements are always <code>TypeDeclaration</code>.
353	* </p>	353	* </p>
354	*	354	*




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	
	/**
	 * The "typeArguments" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY = 
		new ChildListPropertyDescriptor(ConstructorInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The type arguments (element type: <code>Type</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList typeArguments = null;


	/**
	 * Returns the live ordered list of type arguments of this constructor
	 * invocation (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of type arguments
	 *    (element type: <code>Type</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List typeArguments() {
		// more efficient than just calling unsupportedIn2() to check

Lines 62-68 Link Here

(-)dom/org/eclipse/jdt/core/dom/DocCommentParser.java (-1 / +1 lines)
62	commentParse(start, start+length-1);	62	commentParse(start, start+length-1);
63	}	63	}
64	this.docComment.setSourceRange(start, length);	64	this.docComment.setSourceRange(start, length);
65	if (this.ast.apiLevel == AST.JLS2) {	65	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
66	setComment(start, length); // backward compatibility	66	setComment(start, length); // backward compatibility
67	}	67	}
68	return this.docComment;	68	return this.docComment;




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * </pre>
 * The FormalParameter is represented by a <code>SingleVariableDeclaration</code>
 * (without an initializer).
 * 
 * @since 3.1
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * @since 3.0
 */
public class EnhancedForStatement extends Statement {
	
	/**
	 * The "parameter" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor PARAMETER_PROPERTY = 
		new ChildPropertyDescriptor(EnhancedForStatement.class, "parameter", SingleVariableDeclaration.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "expression" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor EXPRESSION_PROPERTY = 
		new ChildPropertyDescriptor(EnhancedForStatement.class, "expression", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "body" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor BODY_PROPERTY = 
		new ChildPropertyDescriptor(EnhancedForStatement.class, "body", Statement.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$


	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;




 * arguments and no class body declarations, the source range extends through
 * the last character of the identifier.
 * </p>
 * <p>
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * 
 * @since 3.1
 */
public class EnumConstantDeclaration extends BodyDeclaration {
	

	
	/**
	 * The "anonymousClassDeclaration" structural property of this node type.
	 * @since 3.1
	 */
	public static final ChildPropertyDescriptor ANONYMOUS_CLASS_DECLARATION_PROPERTY = 
		new ChildPropertyDescriptor(EnumConstantDeclaration.class, "anonymousClassDeclaration", AnonymousClassDeclaration.class, OPTIONAL, CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The optional anonymous class declaration; <code>null</code> for none; 
	 * defaults to none.
	 * @since 3.1
	 */
	private AnonymousClassDeclaration optionalAnonymousClassDeclaration = null;
	

	 * enum constant declaration, if it has one.
	 * 
	 * @return the anonymous class declaration, or <code>null</code> if none
	 * @since 3.1
	 */ 
	public AnonymousClassDeclaration getAnonymousClassDeclaration() {
		return this.optionalAnonymousClassDeclaration;

	 * 
	 * @param decl the anonymous class declaration, or <code>null</code> 
	 *    if none
	 * @since 3.1
	 */ 
	public void setAnonymousClassDeclaration(AnonymousClassDeclaration decl) {
		ASTNode oldChild = this.optionalAnonymousClassDeclaration;

	 * 
	 * @return the constructor binding, or <code>null</code> if the binding
	 *    cannot be resolved
	 * @since 3.1
	 */	
	public IMethodBinding resolveConstructorBinding() {
		return this.ast.getBindingResolver().resolveConstructor(this);




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * modifiers or annotations). The source range extends through the last
 * character of the "}" token following the body declarations.
 * </p>
 * <p>
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * 
 * @since 3.1
 */
public class EnumDeclaration extends AbstractTypeDeclaration {
	

	
	/**
	 * The "enumConstants" structural property of this node type.
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor ENUM_CONSTANTS_PROPERTY = 
		new ChildListPropertyDescriptor(EnumDeclaration.class, "enumConstants", EnumConstantDeclaration.class, CYCLE_RISK); //$NON-NLS-1$

	 * The enum constant declarations
	 * (element type: <code>EnumConstantDeclaration</code>).
	 * Defaults to an empty list.
	 * @since 3.1
	 */
	private ASTNode.NodeList enumConstants = 
		new ASTNode.NodeList(ENUM_CONSTANTS_PROPERTY);

	 * 
	 * @return the live list of enum constant declarations
	 *    (element type: {@link EnumConstantDeclaration})
	 * @since 3.1
	 */ 
	public List enumConstants() {
		return enumConstants;




	 * The "modifiers" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
    // TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY = 
		internalModifiersPropertyFactory(FieldDeclaration.class);
	
	/**
	 * The "modifiers" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		internalModifiers2PropertyFactory(FieldDeclaration.class);

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

			if (get) {
				return getModifiers();
			} else {
				internalSetModifiers(value);
				return 0;
			}
		}

		result.setSourceRange(this.getStartPosition(), this.getLength());
		result.setJavadoc(
			(Javadoc) ASTNode.copySubtree(target, getJavadoc()));
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.internalSetModifiers(getModifiers());
		}
		if (this.ast.apiLevel >= AST.JLS3) {
			result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/IBinding.java (-1 / +1 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/IExtendedModifier.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 18-24 Link Here
18	* Modifier	18	* Modifier
19	* Annotation	19	* Annotation
20	* </pre>	20	* </pre>
21	* @since 3.0	21	* @since 3.1
22	*/	22	*/
23	public interface IExtendedModifier {	23	public interface IExtendedModifier {
24		24




	 * parameters (they instead have non-empty type arguments
	 * and non-trivial erasure).
	 * </p>
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the list of binding for the type variables for the type
	 * parameters of this method, or otherwise the empty list
	 * @see ITypeBinding#isTypeVariable()
	 * @since 3.1
	 */
	public ITypeBinding[] getTypeParameters();
	

	 * {@link #isParameterizedMethod()},
	 * and {@link #isRawMethod()} are mutually exclusive.
	 * </p>
	 * <p>
	 * Note: Support for new language features of the 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this method binding represents a 
	 * declaration of a generic method, and <code>false</code> otherwise

	 * {@link #isParameterizedMethod()},
	 * and {@link #isRawMethod()} are mutually exclusive.
	 * </p>
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this method binding represents a 
	 * an instance of a generic method corresponding to a parameterized

	 * which only occur on the method binding corresponding directly to the
	 * declaration of a generic method.
	 * </p> 
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the list of type bindings for the type arguments used to
	 * instantiate the corrresponding generic method, or otherwise the empty list

	 * and raw methods ({@link #isRawMethod()}), this method returns the binding
	 * for the corresponding generic method. For other method bindings, this
	 * returns the same binding.
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the method binding
	 * @since 3.1

	 * Note that {@link #isGenericMethod()},
	 * {@link #isParameterizedMethod()},
	 * and {@link #isRawMethod()} are mutually exclusive.
	 * </p>
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this method binding represents a 




 * <p>
 * This interface is not intended to be implemented by clients.
 * </p>
 * <p>
 * Note: Support for new language features proposed for the upcoming 1.5
 * release of J2SE is tentative and subject to change.
 * </p>
 * 
 * @see ITypeBinding#getDeclaredTypes()
 * @since 2.0

	
	/**
	 * Returns whether this type binding represents an enum type.
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this object represents an enum type,
	 *    and <code>false</code> otherwise
	 * @since 3.1
	 */
	public boolean isEnum();
	

	 * <p>
	 * Note that an annotation type is always an interface.
	 * </p>
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this object represents an annotation type,
	 *    and <code>false</code> otherwise
	 * @since 3.1
	 */
	public boolean isAnnotation();
	

	 * type do not carry type parameters (they instead have non-empty type arguments
	 * and non-trivial erasure).
	 * </p> 
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the list of binding for the type variables for the type
	 * parameters of this type, or otherwise the empty list
	 * @see #isTypeVariable()
	 * @since 3.1
	 */
	// TODO (jeem) - clarify whether binding for a generic type instance carries a copy of the generic type's type parameters as well as type arguments
	public ITypeBinding[] getTypeParameters();

	 * {@link #isParameterizedType()},
	 * and {@link #isRawType()} are mutually exclusive.
	 * </p>
	 * <p>
	 * Note: Support for new language features of the 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this type binding represents a 
	 * declaration of a generic class or interface, and <code>false</code> otherwise

	/**
	 * Returns whether this type binding represents a type variable.
	 * Type variables bindings carry the type variable's bounds.
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 * 
	 * @return <code>true</code> if this type binding is for a type variable,
	 *   and <code>false</code> otherwise
	 * @see #getName()
	 * @see #getTypeBounds()
	 * @since 3.1
	 */
	public boolean isTypeVariable();
	
	/**
	 * Returns the type bounds of this type variable.
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the list of type bindings for this type variable, or otherwise
	 * the empty list
	 * @see #isTypeVariable()
	 * @since 3.1
	 */
	public ITypeBinding[] getTypeBounds();
	

	 * type reference, and <code>false</code> otherwise
	 * @see #getTypeArguments()
	 * @see #getGenericType()
	 * @since 3.1
	 */
	public boolean isParameterizedType();
	

	 * type binding corresponding directly to the declaration of the 
	 * generic class or interface (e.g., <code>Collection&lt;T&gt;</code>).
	 * </p> 
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the list of type bindings for the type arguments used to
	 * instantiate the corrresponding generic type, or otherwise the empty list

	 * @see #isGenericType()
	 * @see #isParameterizedType()
	 * @see #isRawType()
	 * @since 3.1
	 */
	public ITypeBinding[] getTypeArguments();
	

	 * if it has bounds and java.lang.Object if it does not.</li>
	 * <li>For all other type bindings - returns the identical binding.</li>
	 * </ul>
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the erasure type binding
	 * @since 3.1
	 */
	public ITypeBinding getErasure();
	

	 * and raw types ({@link #isRawType()}), this method returns the binding
	 * for the corresponding generic type. For other type bindings, this
	 * returns the same binding.
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return the type binding
	 * @since 3.1

	 * {@link #isParameterizedType()},
	 * and {@link #isRawType()} are mutually exclusive.
	 * </p>
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this type binding represents a 
	 * an instance of a generic type corresponding to a raw
	 * type reference, and <code>false</code> otherwise
	 * @see #getGenericType()
	 * @see #getTypeArguments()
	 * @since 3.1
	 */
	public boolean isRawType();
	

	 * parameterized type binding whose type argument is a wildcard type
	 * with upper type bound <code>java.util.Object/code>.
	 * </p>
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this object represents a wildcard type,
	 *    and <code>false</code> otherwise
	 * @since 3.1
	 * @see #getBound()
	 * @see #isUpperbound()
	 */

	/**
	 * Returns the bound of this wildcard type if it has one.
	 * Returns <code>null</code> if this is not a wildcard type.
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 * 
	 * @return the bound of this wildcard type, or <code>null</code> if none
	 * @see #isWildcardType()
	 * @see #isUpperbound()
	 * @since 3.1
	 */
	public ITypeBinding getBound();
	

	 * ("extends") as opposed to a lower bound ("super").
	 * Note that this property is only relevant for wildcards
	 * that have a bound.
	 * <p>
	 * Note: Support for new language features proposed for the upcoming 1.5
	 * release of J2SE is tentative and subject to change.
	 * </p>
	 *
	 * @return <code>true</code> if this wildcard type has a bound that is
	 * an upper bound, and <code>false</code> in all other cases
	 * @see #isWildcardType()
	 * @see #getBound()
	 * @since 3.1
	 */
	public boolean isUpperbound();
	




	
	/**
	 * The "static" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final SimplePropertyDescriptor STATIC_PROPERTY = 
		new SimplePropertyDescriptor(ImportDeclaration.class, "static", boolean.class, MANDATORY); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	/**
	 * Static versus regular; defaults to regular import.
	 * Added in JLS3; not used in JLS2.
	 * @since 3.1
	 */
	private boolean isStatic = false;


	
	/**
	 * Returns whether this import declaration is a static import (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return <code>true</code> if this is a static import,
	 *    and <code>false</code> if this is a regular import
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public boolean isStatic() {
		unsupportedIn2();

		
	/**
	 * Sets whether this import declaration is a static import (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @param isStatic <code>true</code> if this is a static import,
	 *    and <code>false</code> if this is a regular import
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public void setStatic(boolean isStatic) {
		unsupportedIn2();




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * The "modifiers" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
    // TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY = 
		internalModifiersPropertyFactory(Initializer.class);
	
	/**
	 * The "modifiers" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		internalModifiers2PropertyFactory(Initializer.class);

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

			if (get) {
				return getModifiers();
			} else {
				internalSetModifiers(value);
				return 0;
			}
		}

	ASTNode clone0(AST target) {
		Initializer result = new Initializer(target);
		result.setSourceRange(this.getStartPosition(), this.getLength());
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.internalSetModifiers(getModifiers());
		}
		if (this.ast.apiLevel >= AST.JLS3) {
			result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	/**
	 * The "comment" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 * @deprecated Replaced by {@link #TAGS_PROPERTY} in the JLS3 API.
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #TAGS_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor COMMENT_PROPERTY = 
		new SimplePropertyDescriptor(Javadoc.class, "comment", String.class, MANDATORY); //$NON-NLS-1$
	
	/**
	 * The "tags" structural property of this node type.
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TAGS_PROPERTY = 
		new ChildListPropertyDescriptor(Javadoc.class, "tags", TagElement.class, CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	ASTNode clone0(AST target) {
		Javadoc result = new Javadoc(target);
		result.setSourceRange(this.getStartPosition(), this.getLength());
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.setComment(getComment());
		}
		result.tags().addAll(ASTNode.copySubtrees(target, tags()));




/*******************************************************************************
 * Copyright (c) 2004, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *   <b>@</b> TypeName
 * </pre>
 * </p>
 * 
 * @since 3.1
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * @since 3.0
 */
public final class MarkerAnnotation extends Annotation {

	/**
	 * The "typeName" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY = 
		internalTypeNamePropertyFactory(MarkerAnnotation.class);

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.0
	 */
	private static final List PROPERTY_DESCRIPTORS;
	

	 * @param apiLevel the API level; one of the AST.JLS* constants
	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;


	/* (omit javadoc for this method)
	 * Method declared on ASTNode.
	 * @since 3.0
	 */
	final List internalStructuralPropertiesForType(int apiLevel) {
		return propertyDescriptors(apiLevel);




/*******************************************************************************
 * Copyright (c) 2004, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * Within annotations, only certain kinds of expressions are meaningful,
 * including other annotations.
 * </p>
 *
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * @see NormalAnnotation
 * @since 3.1
 */
public class MemberValuePair extends ASTNode {
	
	/**
	 * The "name" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor NAME_PROPERTY = 
		new ChildPropertyDescriptor(MemberValuePair.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "value" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor VALUE_PROPERTY = 
		new ChildPropertyDescriptor(MemberValuePair.class, "value", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$




	 * The "modifiers" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
    // TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY = 
		internalModifiersPropertyFactory(MethodDeclaration.class);
	
	/**
	 * The "modifiers" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		internalModifiers2PropertyFactory(MethodDeclaration.class);

	 * The "returnType" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #RETURN_TYPE2_PROPERTY} in the JLS3 API.
	public static final ChildPropertyDescriptor RETURN_TYPE_PROPERTY = 
		new ChildPropertyDescriptor(MethodDeclaration.class, "returnType", Type.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "returnType2" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildPropertyDescriptor RETURN_TYPE2_PROPERTY = 
		new ChildPropertyDescriptor(MethodDeclaration.class, "returnType2", Type.class, OPTIONAL, NO_CYCLE_RISK); //$NON-NLS-1$

	
	/**
	 * The "typeParameters" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TYPE_PARAMETERS_PROPERTY = 
		new ChildListPropertyDescriptor(MethodDeclaration.class, "typeParameters", TypeParameter.class, NO_CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	
	/**
	 * Indicated whether the return type has been initialized.
	 * @since 3.1
	 */
	private boolean returnType2Initialized = false;
	

	 * The type paramters (element type: <code>TypeParameter</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList typeParameters = null;


			if (get) {
				return getModifiers();
			} else {
				internalSetModifiers(value);
				return 0;
			}
		}

		result.setSourceRange(this.getStartPosition(), this.getLength());
		result.setJavadoc(
			(Javadoc) ASTNode.copySubtree(target, getJavadoc()));
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.internalSetModifiers(getModifiers());
			result.setReturnType(
					(Type) ASTNode.copySubtree(target, getReturnType()));
		}

		if (visitChildren) {
			// visit children in normal left to right reading order
			acceptChild(visitor, getJavadoc());
			if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
				acceptChild(visitor, getReturnType());
			} else {
				acceptChildren(visitor, this.modifiers);

	/**
	 * Returns the live ordered list of type parameters of this method
	 * declaration (added in JLS3 API). This list is non-empty for parameterized methods.
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of type parameters
	 *    (element type: <code>TypeParameter</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List typeParameters() {
		// more efficient than just calling unsupportedIn2() to check

	 * Returns whether this method declaration declares a
	 * variable arity method (added in JLS3 API). The convenience method checks
	 * whether the last parameter is so marked.
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return <code>true</code> if this is a variable arity method declaration,
	 *    and <code>false</code> otherwise
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @see SingleVariableDeclaration#isVarargs()
	 * @since 3.1
	 */ 
	public boolean isVarargs() {
		// more efficient than just calling unsupportedIn2() to check

	 * @return the return type, possibly the void primitive type
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by {@link #getReturnType2()},
	 * which may return <code>null</code>.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>getReturnType2</code>, which may return <code>null</code>.
	public Type getReturnType() {
		return internalGetReturnType();
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final Type internalGetReturnType() {
		supportedOnlyIn2();
		if (this.returnType == null) {
			// lazy init must be thread-safe for readers
			synchronized (this) {

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link #setReturnType2(Type)}, which accepts <code>null</code>.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>setReturnType2</code>, which accepts <code>null</code>.
	public void setReturnType(Type type) {
		internalSetReturnType(type);
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ void internalSetReturnType(Type type) {
	    supportedOnlyIn2();
		if (type == null) {
			throw new IllegalArgumentException();

	 * or <code>null</code> if none
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public Type getReturnType2() {
	    unsupportedIn2();

	 * <li>the node belongs to a different AST</li>
	 * <li>the node already has a parent</li>
	 * </ul>
	 * @since 3.1
	 */ 
	public void setReturnType2(Type type) {
	    unsupportedIn2();




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


	/**
	 * The "typeArguments" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY = 
		new ChildListPropertyDescriptor(MethodInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The type arguments (element type: <code>Type</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList typeArguments = null;


	/**
	 * Returns the live ordered list of type arguments of this method
	 * invocation (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of type arguments
	 *    (element type: <code>Type</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List typeArguments() {
		// more efficient than just calling unsupportedIn2() to check

Lines 73-79 Link Here

(-)dom/org/eclipse/jdt/core/dom/MethodRefParameter.java (-2 / +2 lines)
73	* A list of property descriptors (element type:	73	* A list of property descriptors (element type:
74	* {@link StructuralPropertyDescriptor}),	74	* {@link StructuralPropertyDescriptor}),
75	* or null if uninitialized.	75	* or null if uninitialized.
76	* @since 3.0	76	* @since 3.1
77	*/	77	*/
78	private static final List PROPERTY_DESCRIPTORS_3_0;	78	private static final List PROPERTY_DESCRIPTORS_3_0;
79		79
Lines 102-108 Link Here
102	* @since 3.0	102	* @since 3.0
103	*/	103	*/
104	public static List propertyDescriptors(int apiLevel) {	104	public static List propertyDescriptors(int apiLevel) {
105	if (apiLevel == AST.JLS2) {	105	if (apiLevel == AST.JLS2_INTERNAL) {
106	return PROPERTY_DESCRIPTORS_2_0;	106	return PROPERTY_DESCRIPTORS_2_0;
107	} else {	107	} else {
108	return PROPERTY_DESCRIPTORS_3_0;	108	return PROPERTY_DESCRIPTORS_3_0;




	
	/*
	 * @see ASTVisitor#visit(AnnotationTypeDeclaration)
	 * @since 3.1
	 */
	public boolean visit(AnnotationTypeDeclaration node) {
		if (node.getJavadoc() != null) {

	
	/*
	 * @see ASTVisitor#visit(AnnotationTypeMemberDeclaration)
	 * @since 3.1
	 */
	public boolean visit(AnnotationTypeMemberDeclaration node) {
		if (node.getJavadoc() != null) {

			this.buffer.append(".");//$NON-NLS-1$
		}
		this.buffer.append("new ");//$NON-NLS-1$
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			node.internalGetName().accept(this);
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {
			if (!node.typeArguments().isEmpty()) {


	/*
	 * @see ASTVisitor#visit(EnhancedForStatement)
	 * @since 3.1
	 */
	public boolean visit(EnhancedForStatement node) {
		printIndent();


	/*
	 * @see ASTVisitor#visit(EnumConstantDeclaration)
	 * @since 3.1
	 */
	public boolean visit(EnumConstantDeclaration node) {
		if (node.getJavadoc() != null) {


	/*
	 * @see ASTVisitor#visit(EnumDeclaration)
	 * @since 3.1
	 */
	public boolean visit(EnumDeclaration node) {
		if (node.getJavadoc() != null) {

			node.getJavadoc().accept(this);
		}
		printIndent();
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			printModifiers(node.getModifiers());
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {

		if (node.getJavadoc() != null) {
			node.getJavadoc().accept(this);
		}
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			printModifiers(node.getModifiers());
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {


	/*
	 * @see ASTVisitor#visit(MarkerAnnotation)
	 * @since 3.1
	 */
	public boolean visit(MarkerAnnotation node) {
		this.buffer.append("@");//$NON-NLS-1$

	
	/*
	 * @see ASTVisitor#visit(MemberValuePair)
	 * @since 3.1
	 */
	public boolean visit(MemberValuePair node) {
		node.getName().accept(this);

			node.getJavadoc().accept(this);
		}
		printIndent();
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			printModifiers(node.getModifiers());
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {

			}
		}
		if (!node.isConstructor()) {
			if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
				node.internalGetReturnType().accept(this);
			} else {
				if (node.getReturnType2() != null) {
					node.getReturnType2().accept(this);


	/*
	 * @see ASTVisitor#visit(Modifier)
	 * @since 3.1
	 */
	public boolean visit(Modifier node) {
		this.buffer.append(node.getKeyword().toString());

	
	/*
	 * @see ASTVisitor#visit(NormalAnnotation)
	 * @since 3.1
	 */
	public boolean visit(NormalAnnotation node) {
		this.buffer.append("@");//$NON-NLS-1$


	/*
	 * @see ASTVisitor#visit(ParameterizedType)
	 * @since 3.1
	 */
	public boolean visit(ParameterizedType node) {
		node.getType().accept(this);


	/*
	 * @see ASTVisitor#visit(QualifiedType)
	 * @since 3.1
	 */
	public boolean visit(QualifiedType node) {
		node.getQualifier().accept(this);


	/*
	 * @see ASTVisitor#visit(SingleMemberAnnotation)
	 * @since 3.1
	 */
	public boolean visit(SingleMemberAnnotation node) {
		this.buffer.append("@");//$NON-NLS-1$

	 */
	public boolean visit(SingleVariableDeclaration node) {
		printIndent();
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			printModifiers(node.getModifiers());
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {

		if (node.getJavadoc() != null) {
			node.getJavadoc().accept(this);
		}
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			printModifiers(node.getModifiers());
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {

			}
		}
		this.buffer.append(" ");//$NON-NLS-1$
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			if (node.internalGetSuperclass() != null) {
				this.buffer.append("extends ");//$NON-NLS-1$
				node.internalGetSuperclass().accept(this);
				this.buffer.append(" ");//$NON-NLS-1$
			}
			if (!node.internalSuperInterfaces().isEmpty()) {
				this.buffer.append(node.isInterface() ? "extends " : "implements ");//$NON-NLS-2$//$NON-NLS-1$
				for (Iterator it = node.internalSuperInterfaces().iterator(); it.hasNext(); ) {
					Name n = (Name) it.next();
					n.accept(this);
					if (it.hasNext()) {

	 * @see ASTVisitor#visit(TypeDeclarationStatement)
	 */
	public boolean visit(TypeDeclarationStatement node) {
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			node.internalGetTypeDeclaration().accept(this);
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {
			node.getDeclaration().accept(this);


	/*
	 * @see ASTVisitor#visit(TypeParameter)
	 * @since 3.1
	 */
	public boolean visit(TypeParameter node) {
		node.getName().accept(this);

	 * @see ASTVisitor#visit(VariableDeclarationExpression)
	 */
	public boolean visit(VariableDeclarationExpression node) {
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			printModifiers(node.getModifiers());
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {

	 */
	public boolean visit(VariableDeclarationStatement node) {
		printIndent();
		if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
			printModifiers(node.getModifiers());
		}
		if (node.getAST().apiLevel() >= AST.JLS3) {


	/*
	 * @see ASTVisitor#visit(WildcardType)
	 * @since 3.1
	 */
	public boolean visit(WildcardType node) {
		this.buffer.append("?");//$NON-NLS-1$




/*******************************************************************************
 * Copyright (c) 2004, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *   <b>@</b> TypeName <b>(</b> [ MemberValuePair { <b>,</b> MemberValuePair } ] <b>)</b>
 * </pre>
 * </p>
 * 
 * @since 3.1
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * @since 3.0
 */
public final class NormalAnnotation extends Annotation {
	
	/**
	 * The "typeName" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY = 
		internalTypeNamePropertyFactory(NormalAnnotation.class);

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.0
	 */
	private static final List PROPERTY_DESCRIPTORS;
	

	 * @param apiLevel the API level; one of the AST.JLS* constants
	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;


	/* (omit javadoc for this method)
	 * Method declared on ASTNode.
	 * @since 3.0
	 */
	final List internalStructuralPropertiesForType(int apiLevel) {
		return propertyDescriptors(apiLevel);




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


	/**
	 * The "annotations" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor ANNOTATIONS_PROPERTY = 
		new ChildListPropertyDescriptor(PackageDeclaration.class, "annotations", Annotation.class, CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The annotations (element type: <code>Annotation</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList annotations = null;
	

	/**
	 * Returns the live ordered list of annotations of this 
	 * package declaration (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of annotations
	 *    (element type: <code>Annotation</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List annotations() {
		// more efficient than just calling unsupportedIn2() to check




 * </pre>
 * The first type may be a simple type or a qualified type;
 * other kinds of types are meaningless.
 * <p>
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * 
 * @since 3.1
 */
public class ParameterizedType extends Type {
    /**

	
	/**
	 * The "type" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor TYPE_PROPERTY = 
		new ChildPropertyDescriptor(ParameterizedType.class, "type", Type.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "typeArguments" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY = 
		new ChildListPropertyDescriptor(ParameterizedType.class, "typeArguments", Type.class, CYCLE_RISK); //$NON-NLS-1$


	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;




 * became possible as of JLS3; only the second form existed in JLS2 API.)
 * </p>
 * 
 * @since 3.1
 */
public class QualifiedType extends Type {
    /**

	
	/**
	 * The "qualifier" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor QUALIFIER_PROPERTY = 
		new ChildPropertyDescriptor(QualifiedType.class, "qualifier", Type.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "name" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor NAME_PROPERTY = 
		new ChildPropertyDescriptor(QualifiedType.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	 * <code>AST.JLS&ast;</code> constants
	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;




/*******************************************************************************
 * Copyright (c) 2004, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * Within annotations, only certain kinds of expressions are meaningful,
 * including other annotations.
 * </p>
 * 
 * @since 3.1
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * @since 3.0
 */
public final class SingleMemberAnnotation extends Annotation {
	
	/**
	 * The "typeName" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY = 
		internalTypeNamePropertyFactory(SingleMemberAnnotation.class);

	/**
	 * The "value" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor VALUE_PROPERTY = 
		new ChildPropertyDescriptor(SingleMemberAnnotation.class, "value", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.0
	 */
	private static final List PROPERTY_DESCRIPTORS;
	

	 * @param apiLevel the API level; one of the AST.JLS* constants
	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;


	/* (omit javadoc for this method)
	 * Method declared on ASTNode.
	 * @since 3.0
	 */
	final List internalStructuralPropertiesForType(int apiLevel) {
		return propertyDescriptors(apiLevel);




	 * The "modifiers" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
    // TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY = 
		new SimplePropertyDescriptor(SingleVariableDeclaration.class, "modifiers", int.class, MANDATORY); //$NON-NLS-1$
	
	/**
	 * The "modifiers" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		new ChildListPropertyDescriptor(SingleVariableDeclaration.class, "modifiers", IExtendedModifier.class, CYCLE_RISK); //$NON-NLS-1$


	/**
	 * The "varargs" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final SimplePropertyDescriptor VARARGS_PROPERTY = 
		new SimplePropertyDescriptor(SingleVariableDeclaration.class, "varargs", boolean.class, MANDATORY); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * 
	 * @since 3.1
	 */
	private ASTNode.NodeList modifiers = null;
	

	 * Indicates the last parameter of a variable arity method;
	 * defaults to false.
	 * 
	 * @since 3.1
	 */
	private boolean variableArity = false;


	ASTNode clone0(AST target) {
		SingleVariableDeclaration result = new SingleVariableDeclaration(target);
		result.setSourceRange(this.getStartPosition(), this.getLength());
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.setModifiers(getModifiers());
		} else {
			result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));

	 *    (element type: <code>IExtendedModifier</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List modifiers() {
		// more efficient than just calling unsupportedIn2() to check

	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @see Modifier
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link  #modifiers()} which contains a list of a <code>Modifier</code> nodes.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>modifiers()</code> which contains a list of  a <code>Modifier</code> nodes.
	public void setModifiers(int modifiers) {
		internalSetModifiers(modifiers);
	}

	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final void internalSetModifiers(int pmodifiers) {
	    supportedOnlyIn2();
		preValueChange(MODIFIERS_PROPERTY);
		this.modifierFlags = pmodifiers;
		postValueChange(MODIFIERS_PROPERTY);
	}


	 *    and <code>false</code> otherwise
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public boolean isVarargs() {
		// more efficient than just calling unsupportedIn2() to check

	/**
	 * Sets whether this declaration declares the last parameter of
	 * a variable arity method (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @param variableArity <code>true</code> if this is a variable arity
	 *    parameter declaration, and <code>false</code> otherwise
	 * @since 3.1
	 */ 
	public void setVarargs(boolean variableArity) {
		// more efficient than just calling unsupportedIn2() to check




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


	/**
	 * The "typeArguments" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY = 
		new ChildListPropertyDescriptor(SuperConstructorInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The type arguments (element type: <code>Type</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList typeArguments = null;


	/**
	 * Returns the live ordered list of type arguments of this constructor
	 * invocation (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of type arguments
	 *    (element type: <code>Type</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List typeArguments() {
		// more efficient than just calling unsupportedIn2() to check




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


	/**
	 * The "typeArguments" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY = 
		new ChildListPropertyDescriptor(SuperMethodInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The type arguments (element type: <code>Type</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList typeArguments = null;


	/**
	 * Returns the live ordered list of type arguments of this method
	 * invocation (added in JLS3 API).
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of type arguments
	 *    (element type: <code>Type</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List typeArguments() {
		// more efficient than just calling unsupportedIn2() to check




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * 
	 * @return <code>true</code> if this is a parameterized type, and 
	 *    <code>false</code> otherwise
	 * @since 3.1
	 */
	public final boolean isParameterizedType() {
		return (this instanceof ParameterizedType);

	 * 
	 * @return <code>true</code> if this is a qualified type, and 
	 *    <code>false</code> otherwise
	 * @since 3.1
	 */
	public final boolean isQualifiedType() {
		return (this instanceof QualifiedType);

	 * 
	 * @return <code>true</code> if this is a wildcard type, and 
	 *    <code>false</code> otherwise
	 * @since 3.1
	 */
	public final boolean isWildcardType() {
		return (this instanceof WildcardType);




	 * The "modifiers" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
    // TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY = 
		internalModifiersPropertyFactory(TypeDeclaration.class);
	
	/**
	 * The "modifiers" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		internalModifiers2PropertyFactory(TypeDeclaration.class);

	 * The "superclass" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #SUPERCLASS_TYPE_PROPERTY} in the JLS3 API.
	public static final ChildPropertyDescriptor SUPERCLASS_PROPERTY = 
		new ChildPropertyDescriptor(TypeDeclaration.class, "superclass", Name.class, OPTIONAL, NO_CYCLE_RISK); //$NON-NLS-1$


	 * The "superInterfaces" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #SUPER_INTERFACE_TYPES_PROPERTY} in the JLS3 API.
	public static final ChildListPropertyDescriptor SUPER_INTERFACES_PROPERTY = 
		new ChildListPropertyDescriptor(TypeDeclaration.class, "superInterfaces", Name.class, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "superclassType" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildPropertyDescriptor SUPERCLASS_TYPE_PROPERTY = 
		new ChildPropertyDescriptor(TypeDeclaration.class, "superclassType", Type.class, OPTIONAL, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "superInterfaceTypes" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor SUPER_INTERFACE_TYPES_PROPERTY = 
		new ChildListPropertyDescriptor(TypeDeclaration.class, "superInterfaceTypes", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$
	
	/**
	 * The "typeParameters" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor TYPE_PARAMETERS_PROPERTY = 
		new ChildListPropertyDescriptor(TypeDeclaration.class, "typeParameters", TypeParameter.class, NO_CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The type paramters (element type: <code>TypeParameter</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList typeParameters = null;


	 * The optional superclass type; <code>null</code> if none.
	 * Defaults to none. Note that this field is not used for
	 * interface declarations. Null in JLS2. Added in JLS3.
	 * @since 3.1
	 */
	private Type optionalSuperclassType = null;


	 * The superinterface types (element type: <code>Type</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList superInterfaceTypes = null;


	 */
	TypeDeclaration(AST ast) {
		super(ast);
		if (ast.apiLevel == AST.JLS2_INTERNAL) {
			this.superInterfaceNames = new ASTNode.NodeList(SUPER_INTERFACES_PROPERTY);
		}
		if (ast.apiLevel >= AST.JLS3) {

			if (get) {
				return getModifiers();
			} else {
				internalSetModifiers(value);
				return 0;
			}
		}

		result.setSourceRange(this.getStartPosition(), this.getLength());
		result.setJavadoc(
			(Javadoc) ASTNode.copySubtree(target, getJavadoc()));
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.internalSetModifiers(getModifiers());
			result.setSuperclass(
					(Name) ASTNode.copySubtree(target, getSuperclass()));
			result.superInterfaces().addAll(

		boolean visitChildren = visitor.visit(this);
		if (visitChildren) {
			// visit children in normal left to right reading order
			if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
				acceptChild(visitor, getJavadoc());
				acceptChild(visitor, getName());
				acceptChild(visitor, getSuperclass());

	/**
	 * Returns the live ordered list of type parameters of this type 
	 * declaration (added in JLS3 API). This list is non-empty for parameterized types.
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of type parameters
	 *    (element type: <code>TypeParameter</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List typeParameters() {
		// more efficient than just calling unsupportedIn2() to check

	 *    there is none
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by
	 * {@link #getSuperclassType()}, which returns a <code>Type</code>
	 * instead of a <code>Name</code>.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>getSuperclassType</code>, which returns a <code>Type</code> instead of a <code>Name</code>.
	public Name getSuperclass() {
		return internalGetSuperclass();
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final Name internalGetSuperclass() {
		supportedOnlyIn2();
		return this.optionalSuperclassName;
	}


	*    there is none
	* @exception UnsupportedOperationException if this operation is used in
	* a JLS2 AST
	* @since 3.1
	*/ 
	public Type getSuperclassType() {
	    unsupportedIn2();

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link #setSuperclassType(Type)}, which expects a
	 * <code>Type</code> instead of a <code>Name</code>.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>setType</code>, which expects a <code>Type</code> instead of a <code>Name</code>.
	public void setSuperclass(Name superclassName) {
		internalSetSuperclass(superclassName);
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final void internalSetSuperclass(Name superclassName) {
	    supportedOnlyIn2();
		ASTNode oldChild = this.optionalSuperclassName;
		preReplaceChild(oldChild, superclassName, SUPERCLASS_PROPERTY);

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public void setSuperclassType(Type superclassType) {
	    unsupportedIn2();

	 *    (element type: <code>Name</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link #superInterfaceTypes()}.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>superInterfaceTypes()</code>
	public List superInterfaces() {
		return internalSuperInterfaces();
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final List internalSuperInterfaces() {
		// more efficient than just calling supportedOnlyIn2() to check
		if (this.superInterfaceNames == null) {
			supportedOnlyIn2();

	 *    (element type: <code>Type</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List superInterfaceTypes() {
		// more efficient than just calling unsupportedIn2() to check




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * The "typeDeclaration" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #DECLARATION_PROPERTY} in the JLS3 API.
	public static final ChildPropertyDescriptor TYPE_DECLARATION_PROPERTY = 
		new ChildPropertyDescriptor(TypeDeclarationStatement.class, "typeDeclaration", TypeDeclaration.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "declaration" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildPropertyDescriptor DECLARATION_PROPERTY = 
		new ChildPropertyDescriptor(TypeDeclarationStatement.class, "declaration", AbstractTypeDeclaration.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * statement (added in JLS3 API).
	 * 
	 * @return the type declaration node
	 * @since 3.1
	 */ 
	public AbstractTypeDeclaration getDeclaration() {
		if (this.typeDecl == null) {

	 * <li>the node already has a parent</li>
	 * <li>a cycle in would be created</li>
	 * </ul>
	 * @since 3.1
	 */ 
	public void setDeclaration(AbstractTypeDeclaration decl) {
		if (decl == null) {

	 * @return the type declaration node
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link #getDeclaration()}, which returns <code>AbstractTypeDeclaration</code>
	 * instead of <code>TypeDeclaration</code>.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>getDeclaration</code>, which returns <code>AbstractTypeDeclaration</code> instead of <code>TypeDeclaration</code>.
	public TypeDeclaration getTypeDeclaration() {
		return internalGetTypeDeclaration();
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final TypeDeclaration internalGetTypeDeclaration() {
		supportedOnlyIn2();
		return (TypeDeclaration) getDeclaration();
	}
		

	 * </ul>
	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
     * @deprecated In the JLS3 API, this method is replaced by 
     * {@link #setDeclaration(AbstractTypeDeclaration)} which takes
     * <code>AbstractTypeDeclaration</code> instead of
     * <code>TypeDeclaration</code>.
	 */ 
    // TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>setDeclaration</code> which takes <code>AbstractTypeDeclaration</code> instead of <code>TypeDeclaration</code>.
	public void setTypeDeclaration(TypeDeclaration decl) {
		internalSetTypeDeclaration(decl);
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final void internalSetTypeDeclaration(TypeDeclaration decl) {
	    supportedOnlyIn2();
		// forward to non-deprecated replacement method
		setDeclaration(decl);




 * TypeParameter:
 *    TypeVariable [ <b>extends</b> Type { <b>&</b> Type } ]
 * </pre>
 * <p>
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * 
 * @since 3.1
 */
public class TypeParameter extends ASTNode {
	
	/**
	 * The "name" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor NAME_PROPERTY = 
		new ChildPropertyDescriptor(TypeParameter.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "typeBounds" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildListPropertyDescriptor TYPE_BOUNDS_PROPERTY = 
		new ChildListPropertyDescriptor(TypeParameter.class, "typeBounds", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$


	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;

	 * 
	 * @return the binding, or <code>null</code> if the binding cannot be 
	 *    resolved
	 * @since 3.1
	 */	
	public final ITypeBinding resolveBinding() {
		return this.ast.getBindingResolver().resolveTypeParameter(this);




/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * The "modifiers" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY = 
		new SimplePropertyDescriptor(VariableDeclarationExpression.class, "modifiers", int.class, MANDATORY); //$NON-NLS-1$
	
	/**
	 * The "modifiers" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		new ChildListPropertyDescriptor(VariableDeclarationExpression.class, "modifiers", IExtendedModifier.class, CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

		VariableDeclarationExpression result = 
			new VariableDeclarationExpression(target);
		result.setSourceRange(this.getStartPosition(), this.getLength());
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.setModifiers(getModifiers());
		}
		if (this.ast.apiLevel >= AST.JLS3) {

	 * Note that the final modifier is the only meaningful modifier for local
	 * variable declarations.
	 * </p>
	 * <p>
	 * Note: This API element is only needed for dealing with Java code that uses
	 * new language features of J2SE 1.5. It is included in anticipation of J2SE
	 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
	 * may change slightly before reaching its final form.
	 * </p>
	 * 
	 * @return the live list of modifiers and annotations
	 *    (element type: <code>IExtendedModifier</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List modifiers() {
		// more efficient than just calling unsupportedIn2() to check

	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @see Modifier
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link  #modifiers()} which contains a list of a <code>Modifier</code> nodes.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>modifiers()</code> which contains a list of a <code>Modifier</code> nodes.
	public void setModifiers(int modifiers) {
		internalSetModifiers(modifiers);
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final void internalSetModifiers(int pmodifiers) {
	    supportedOnlyIn2();
		preValueChange(MODIFIERS_PROPERTY);
		this.modifierFlags = pmodifiers;
		postValueChange(MODIFIERS_PROPERTY);
	}





/*******************************************************************************
 * Copyright (c) 2000, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * The "modifiers" structural property of this node type (JLS2 API only).
	 * @since 3.0
	 */
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY = 
		new SimplePropertyDescriptor(VariableDeclarationStatement.class, "modifiers", int.class, MANDATORY); //$NON-NLS-1$
	
	/**
	 * The "modifiers" structural property of this node type (added in JLS3 API).
	 * @since 3.1
	 */
	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY = 
		new ChildListPropertyDescriptor(VariableDeclarationStatement.class, "modifiers", IExtendedModifier.class, CYCLE_RISK); //$NON-NLS-1$

	 * A list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor}),
	 * or null if uninitialized.
	 * @since 3.1
	 */
	private static final List PROPERTY_DESCRIPTORS_3_0;
	

	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		if (apiLevel == AST.JLS2_INTERNAL) {
			return PROPERTY_DESCRIPTORS_2_0;
		} else {
			return PROPERTY_DESCRIPTORS_3_0;

	 * The extended modifiers (element type: <code>IExtendedModifier</code>). 
	 * Null in JLS2. Added in JLS3; defaults to an empty list
	 * (see constructor).
	 * @since 3.1
	 */
	private ASTNode.NodeList modifiers = null;
	

			new VariableDeclarationStatement(target);
		result.setSourceRange(this.getStartPosition(), this.getLength());
		result.copyLeadingComment(this);
		if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
			result.setModifiers(getModifiers());
		}
		if (this.ast.apiLevel >= AST.JLS3) {

	 *    (element type: <code>IExtendedModifier</code>)
	 * @exception UnsupportedOperationException if this operation is used in
	 * a JLS2 AST
	 * @since 3.1
	 */ 
	public List modifiers() {
		// more efficient than just calling unsupportedIn2() to check

	 * @exception UnsupportedOperationException if this operation is used in
	 * an AST later than JLS2
	 * @see Modifier
	 * @deprecated In the JLS3 API, this method is replaced by 
	 * {@link  #modifiers()} which contains a list of a <code>Modifier</code> nodes.
	 */ 
	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>modifiers()</code> which contains a list of a <code>Modifier</code> nodes.
	public void setModifiers(int modifiers) {
		internalSetModifiers(modifiers);
	}
	
	/**
	 * Internal synonym for deprecated method. Used to avoid
	 * deprecation warnings.
	 * @since 3.1
	 */
	/*package*/ final void internalSetModifiers(int pmodifiers) {
	    supportedOnlyIn2();
		preValueChange(MODIFIERS_PROPERTY);
		this.modifierFlags = pmodifiers;
		postValueChange(MODIFIERS_PROPERTY);
	}





/*******************************************************************************
 * Copyright (c) 2003, 2005 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * it is nonsense if a wildcard type node appears anywhere other than as an
 * argument of a <code>ParameterizedType</code> node.
 * </p>
 * <p>
 * Note: This API element is only needed for dealing with Java code that uses
 * new language features of J2SE 1.5. It is included in anticipation of J2SE
 * 1.5 support, which is planned for the next release of Eclipse after 3.0, and
 * may change slightly before reaching its final form.
 * </p>
 * 
 * @since 3.1
 */
public class WildcardType extends Type {
	
	/**
	 * The "bound" structural property of this node type.
	 * @since 3.0
	 */
	public static final ChildPropertyDescriptor BOUND_PROPERTY = 
		new ChildPropertyDescriptor(WildcardType.class, "bound", Type.class, OPTIONAL, CYCLE_RISK); //$NON-NLS-1$

	/**
	 * The "upperBound" structural property of this node type.
	 * @since 3.0
	 */
	public static final SimplePropertyDescriptor UPPER_BOUND_PROPERTY = 
		new SimplePropertyDescriptor(WildcardType.class, "upperBound", boolean.class, MANDATORY); //$NON-NLS-1$


	 * @return a list of property descriptors (element type: 
	 * {@link StructuralPropertyDescriptor})
	 * @since 3.0
	 */
	public static List propertyDescriptors(int apiLevel) {
		return PROPERTY_DESCRIPTORS;

Lines 51-57 Link Here

(-)dom/org/eclipse/jdt/core/dom/rewrite/ASTRewrite.java (-1 / +1 lines)
51	* </p>	51	* </p>
52	* <pre>	52	* <pre>
53	* Document doc = new Document("import java.util.List;\nclass X {}\n");	53	* Document doc = new Document("import java.util.List;\nclass X {}\n");
54	* ASTParser parser = ASTParser.newParser(AST.JLS2);	54	* ASTParser parser = ASTParser.newParser(AST.JLS3);
55	* parser.setSource(doc.get().toCharArray());	55	* parser.setSource(doc.get().toCharArray());
56	* CompilationUnit cu = (CompilationUnit) parser.createAST(null);	56	* CompilationUnit cu = (CompilationUnit) parser.createAST(null);
57	* AST ast = cu.getAST();	57	* AST ast = cu.getAST();

Lines 63-68 Link Here

(-)dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteAnalyzer.java (-12 / +19 lines)
63	*/	63	*/
64	public final class ASTRewriteAnalyzer extends ASTVisitor {	64	public final class ASTRewriteAnalyzer extends ASTVisitor {
65		65
		66	/**
		67	* Internal synonynm for deprecated constant AST.JLS2
		68	* to alleviate deprecation warnings.
		69	* @deprecated
		70	*/
		71	/package/ static final int JLS2_INTERNAL = AST.JLS2;
		72
66	TextEdit currentEdit;	73	TextEdit currentEdit;
67	final RewriteEventStore eventStore; // used from inner classes	74	final RewriteEventStore eventStore; // used from inner classes
68		75
Lines 1329-1335 Link Here
1329		1336
1330	int pos= rewriteJavadoc(node, TypeDeclaration.JAVADOC_PROPERTY);	1337	int pos= rewriteJavadoc(node, TypeDeclaration.JAVADOC_PROPERTY);
1331		1338
1332	if (apiLevel == AST.JLS2) {	1339	if (apiLevel == JLS2_INTERNAL) {
1333	rewriteModifiers(node, TypeDeclaration.MODIFIERS_PROPERTY, pos);	1340	rewriteModifiers(node, TypeDeclaration.MODIFIERS_PROPERTY, pos);
1334	} else {	1341	} else {
1335	rewriteModifiers2(node, TypeDeclaration.MODIFIERS2_PROPERTY, pos);	1342	rewriteModifiers2(node, TypeDeclaration.MODIFIERS2_PROPERTY, pos);
Lines 1362-1368 Link Here
1362		1369
1363	// superclass	1370	// superclass
1364	if (!isInterface \|\| invertType) {	1371	if (!isInterface \|\| invertType) {
1365	ChildPropertyDescriptor superClassProperty= (apiLevel == AST.JLS2) ? TypeDeclaration.SUPERCLASS_PROPERTY : TypeDeclaration.SUPERCLASS_TYPE_PROPERTY;	1372	ChildPropertyDescriptor superClassProperty= (apiLevel == JLS2_INTERNAL) ? TypeDeclaration.SUPERCLASS_PROPERTY : TypeDeclaration.SUPERCLASS_TYPE_PROPERTY;
1366		1373
1367	RewriteEvent superClassEvent= getEvent(node, superClassProperty);	1374	RewriteEvent superClassEvent= getEvent(node, superClassProperty);
1368		1375
Lines 1396-1402 Link Here
1396	}	1403	}
1397	}	1404	}
1398	// extended interfaces	1405	// extended interfaces
1399	ChildListPropertyDescriptor superInterfaceProperty= (apiLevel == AST.JLS2) ? TypeDeclaration.SUPER_INTERFACES_PROPERTY : TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY;	1406	ChildListPropertyDescriptor superInterfaceProperty= (apiLevel == JLS2_INTERNAL) ? TypeDeclaration.SUPER_INTERFACES_PROPERTY : TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY;
1400		1407
1401	RewriteEvent interfaceEvent= getEvent(node, superInterfaceProperty);	1408	RewriteEvent interfaceEvent= getEvent(node, superInterfaceProperty);
1402	if (interfaceEvent == null \|\| interfaceEvent.getChangeKind() == RewriteEvent.UNCHANGED) {	1409	if (interfaceEvent == null \|\| interfaceEvent.getChangeKind() == RewriteEvent.UNCHANGED) {
Lines 1436-1442 Link Here
1436	}	1443	}
1437		1444
1438	private void rewriteReturnType(MethodDeclaration node, boolean isConstructor, boolean isConstructorChange) {	1445	private void rewriteReturnType(MethodDeclaration node, boolean isConstructor, boolean isConstructorChange) {
1439	ChildPropertyDescriptor property= (node.getAST().apiLevel() == AST.JLS2) ? MethodDeclaration.RETURN_TYPE_PROPERTY : MethodDeclaration.RETURN_TYPE2_PROPERTY;	1446	ChildPropertyDescriptor property= (node.getAST().apiLevel() == JLS2_INTERNAL) ? MethodDeclaration.RETURN_TYPE_PROPERTY : MethodDeclaration.RETURN_TYPE2_PROPERTY;
1440		1447
1441	// weakness in the AST: return type can exist, even if missing in source	1448	// weakness in the AST: return type can exist, even if missing in source
1442	ASTNode originalReturnType= (ASTNode) getOriginalValue(node, property);	1449	ASTNode originalReturnType= (ASTNode) getOriginalValue(node, property);
Lines 1471-1477 Link Here
1471	return doVisitUnchangedChildren(node);	1478	return doVisitUnchangedChildren(node);
1472	}	1479	}
1473	int pos= rewriteJavadoc(node, MethodDeclaration.JAVADOC_PROPERTY);	1480	int pos= rewriteJavadoc(node, MethodDeclaration.JAVADOC_PROPERTY);
1474	if (node.getAST().apiLevel() == AST.JLS2) {	1481	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
1475	rewriteModifiers(node, MethodDeclaration.MODIFIERS_PROPERTY, pos);	1482	rewriteModifiers(node, MethodDeclaration.MODIFIERS_PROPERTY, pos);
1476	} else {	1483	} else {
1477	pos= rewriteModifiers2(node, MethodDeclaration.MODIFIERS2_PROPERTY, pos);	1484	pos= rewriteModifiers2(node, MethodDeclaration.MODIFIERS2_PROPERTY, pos);
Lines 1829-1835 Link Here
1829	}	1836	}
1830		1837
1831	int pos= rewriteOptionalQualifier(node, ClassInstanceCreation.EXPRESSION_PROPERTY, node.getStartPosition());	1838	int pos= rewriteOptionalQualifier(node, ClassInstanceCreation.EXPRESSION_PROPERTY, node.getStartPosition());
1832	if (node.getAST().apiLevel() == AST.JLS2) {	1839	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
1833	pos= rewriteRequiredNode(node, ClassInstanceCreation.NAME_PROPERTY);	1840	pos= rewriteRequiredNode(node, ClassInstanceCreation.NAME_PROPERTY);
1834	} else {	1841	} else {
1835	if (isChanged(node, ClassInstanceCreation.TYPE_ARGUMENTS_PROPERTY)) {	1842	if (isChanged(node, ClassInstanceCreation.TYPE_ARGUMENTS_PROPERTY)) {
Lines 1995-2001 Link Here
1995	}	2002	}
1996	int pos= rewriteJavadoc(node, FieldDeclaration.JAVADOC_PROPERTY);	2003	int pos= rewriteJavadoc(node, FieldDeclaration.JAVADOC_PROPERTY);
1997		2004
1998	if (node.getAST().apiLevel() == AST.JLS2) {	2005	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
1999	rewriteModifiers(node, FieldDeclaration.MODIFIERS_PROPERTY, pos);	2006	rewriteModifiers(node, FieldDeclaration.MODIFIERS_PROPERTY, pos);
2000	} else {	2007	} else {
2001	rewriteModifiers2(node, FieldDeclaration.MODIFIERS2_PROPERTY, pos);	2008	rewriteModifiers2(node, FieldDeclaration.MODIFIERS2_PROPERTY, pos);
Lines 2208-2214 Link Here
2208	return doVisitUnchangedChildren(node);	2215	return doVisitUnchangedChildren(node);
2209	}	2216	}
2210	int pos= rewriteJavadoc(node, Initializer.JAVADOC_PROPERTY);	2217	int pos= rewriteJavadoc(node, Initializer.JAVADOC_PROPERTY);
2211	if (node.getAST().apiLevel() == AST.JLS2) {	2218	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
2212	rewriteModifiers(node, Initializer.MODIFIERS_PROPERTY, pos);	2219	rewriteModifiers(node, Initializer.MODIFIERS_PROPERTY, pos);
2213	} else {	2220	} else {
2214	rewriteModifiers2(node, Initializer.MODIFIERS2_PROPERTY, pos);	2221	rewriteModifiers2(node, Initializer.MODIFIERS2_PROPERTY, pos);
Lines 2424-2430 Link Here
2424	return doVisitUnchangedChildren(node);	2431	return doVisitUnchangedChildren(node);
2425	}	2432	}
2426	int pos= node.getStartPosition();	2433	int pos= node.getStartPosition();
2427	if (node.getAST().apiLevel() == AST.JLS2) {	2434	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
2428	rewriteModifiers(node, SingleVariableDeclaration.MODIFIERS_PROPERTY, pos);	2435	rewriteModifiers(node, SingleVariableDeclaration.MODIFIERS_PROPERTY, pos);
2429	} else {	2436	} else {
2430	rewriteModifiers2(node, SingleVariableDeclaration.MODIFIERS2_PROPERTY, pos);	2437	rewriteModifiers2(node, SingleVariableDeclaration.MODIFIERS2_PROPERTY, pos);
Lines 2686-2692 Link Here
2686	if (!hasChildrenChanges(node)) {	2693	if (!hasChildrenChanges(node)) {
2687	return doVisitUnchangedChildren(node);	2694	return doVisitUnchangedChildren(node);
2688	}	2695	}
2689	if (node.getAST().apiLevel() == AST.JLS2) {	2696	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
2690	rewriteRequiredNode(node, TypeDeclarationStatement.TYPE_DECLARATION_PROPERTY);	2697	rewriteRequiredNode(node, TypeDeclarationStatement.TYPE_DECLARATION_PROPERTY);
2691	} else {	2698	} else {
2692	rewriteRequiredNode(node, TypeDeclarationStatement.DECLARATION_PROPERTY);	2699	rewriteRequiredNode(node, TypeDeclarationStatement.DECLARATION_PROPERTY);
Lines 2716-2722 Link Here
2716		2723
2717	// same code as FieldDeclaration	2724	// same code as FieldDeclaration
2718	int pos= node.getStartPosition();	2725	int pos= node.getStartPosition();
2719	if (node.getAST().apiLevel() == AST.JLS2) {	2726	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
2720	rewriteModifiers(node, VariableDeclarationExpression.MODIFIERS_PROPERTY, pos);	2727	rewriteModifiers(node, VariableDeclarationExpression.MODIFIERS_PROPERTY, pos);
2721	} else {	2728	} else {
2722	rewriteModifiers2(node, VariableDeclarationExpression.MODIFIERS2_PROPERTY, pos);	2729	rewriteModifiers2(node, VariableDeclarationExpression.MODIFIERS2_PROPERTY, pos);
Lines 2764-2770 Link Here
2764		2771
2765	// same code as FieldDeclaration	2772	// same code as FieldDeclaration
2766	int pos= node.getStartPosition();	2773	int pos= node.getStartPosition();
2767	if (node.getAST().apiLevel() == AST.JLS2) {	2774	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
2768	rewriteModifiers(node, VariableDeclarationStatement.MODIFIERS_PROPERTY, pos);	2775	rewriteModifiers(node, VariableDeclarationStatement.MODIFIERS_PROPERTY, pos);
2769	} else {	2776	} else {
2770	rewriteModifiers2(node, VariableDeclarationStatement.MODIFIERS2_PROPERTY, pos);	2777	rewriteModifiers2(node, VariableDeclarationStatement.MODIFIERS2_PROPERTY, pos);

Lines 16-21 Link Here

(-)dom/org/eclipse/jdt/internal/core/dom/rewrite/ASTRewriteFlattener.java (-12 / +19 lines)
16		16
17	public class ASTRewriteFlattener extends ASTVisitor {	17	public class ASTRewriteFlattener extends ASTVisitor {
18		18
		19	/**
		20	* Internal synonynm for deprecated constant AST.JSL2
		21	* to alleviate deprecation warnings.
		22	* @deprecated
		23	*/
		24	/package/ static final int JLS2_INTERNAL = AST.JLS2;
		25
19	public static String asString(ASTNode node, RewriteEventStore store) {	26	public static String asString(ASTNode node, RewriteEventStore store) {
20	ASTRewriteFlattener flattener= new ASTRewriteFlattener(store);	27	ASTRewriteFlattener flattener= new ASTRewriteFlattener(store);
21	node.accept(flattener);	28	node.accept(flattener);
Lines 315-321 Link Here
315	this.result.append('.');	322	this.result.append('.');
316	}	323	}
317	this.result.append("new ");//$NON-NLS-1$	324	this.result.append("new ");//$NON-NLS-1$
318	if (node.getAST().apiLevel() == AST.JLS2) {	325	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
319	getChildNode(node, ClassInstanceCreation.NAME_PROPERTY).accept(this);	326	getChildNode(node, ClassInstanceCreation.NAME_PROPERTY).accept(this);
320	} else {	327	} else {
321	visitList(node, ClassInstanceCreation.TYPE_ARGUMENTS_PROPERTY, String.valueOf(','), String.valueOf('<'), String.valueOf('>'));	328	visitList(node, ClassInstanceCreation.TYPE_ARGUMENTS_PROPERTY, String.valueOf(','), String.valueOf('<'), String.valueOf('>'));
Lines 431-437 Link Here
431	if (javadoc != null) {	438	if (javadoc != null) {
432	javadoc.accept(this);	439	javadoc.accept(this);
433	}	440	}
434	if (node.getAST().apiLevel() == AST.JLS2) {	441	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
435	printModifiers(getIntAttribute(node, FieldDeclaration.MODIFIERS_PROPERTY), this.result);	442	printModifiers(getIntAttribute(node, FieldDeclaration.MODIFIERS_PROPERTY), this.result);
436	} else {	443	} else {
437	visitList(node, FieldDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));	444	visitList(node, FieldDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));
Lines 535-541 Link Here
535	if (javadoc != null) {	542	if (javadoc != null) {
536	javadoc.accept(this);	543	javadoc.accept(this);
537	}	544	}
538	if (node.getAST().apiLevel() == AST.JLS2) {	545	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
539	printModifiers(getIntAttribute(node, Initializer.MODIFIERS_PROPERTY), this.result);	546	printModifiers(getIntAttribute(node, Initializer.MODIFIERS_PROPERTY), this.result);
540	} else {	547	} else {
541	visitList(node, Initializer.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));	548	visitList(node, Initializer.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));
Lines 576-582 Link Here
576	if (javadoc != null) {	583	if (javadoc != null) {
577	javadoc.accept(this);	584	javadoc.accept(this);
578	}	585	}
579	if (node.getAST().apiLevel() == AST.JLS2) {	586	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
580	printModifiers(getIntAttribute(node, MethodDeclaration.MODIFIERS_PROPERTY), this.result);	587	printModifiers(getIntAttribute(node, MethodDeclaration.MODIFIERS_PROPERTY), this.result);
581	} else {	588	} else {
582	visitList(node, MethodDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));	589	visitList(node, MethodDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));
Lines 584-590 Link Here
584	}	591	}
585		592
586	if (!getBooleanAttribute(node, MethodDeclaration.CONSTRUCTOR_PROPERTY)) {	593	if (!getBooleanAttribute(node, MethodDeclaration.CONSTRUCTOR_PROPERTY)) {
587	if (node.getAST().apiLevel() == AST.JLS2) {	594	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
588	getChildNode(node, MethodDeclaration.RETURN_TYPE_PROPERTY).accept(this);	595	getChildNode(node, MethodDeclaration.RETURN_TYPE_PROPERTY).accept(this);
589	} else {	596	} else {
590	ASTNode returnType = getChildNode(node, MethodDeclaration.RETURN_TYPE2_PROPERTY);	597	ASTNode returnType = getChildNode(node, MethodDeclaration.RETURN_TYPE2_PROPERTY);
Lines 747-753 Link Here
747	* @see ASTVisitor#visit(SingleVariableDeclaration)	754	* @see ASTVisitor#visit(SingleVariableDeclaration)
748	*/	755	*/
749	public boolean visit(SingleVariableDeclaration node) {	756	public boolean visit(SingleVariableDeclaration node) {
750	if (node.getAST().apiLevel() == AST.JLS2) {	757	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
751	printModifiers(getIntAttribute(node, SingleVariableDeclaration.MODIFIERS_PROPERTY), this.result);	758	printModifiers(getIntAttribute(node, SingleVariableDeclaration.MODIFIERS_PROPERTY), this.result);
752	} else {	759	} else {
753	visitList(node, SingleVariableDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));	760	visitList(node, SingleVariableDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));
Lines 921-927 Link Here
921	javadoc.accept(this);	928	javadoc.accept(this);
922	}	929	}
923		930
924	if (apiLevel == AST.JLS2) {	931	if (apiLevel == JLS2_INTERNAL) {
925	printModifiers(getIntAttribute(node, TypeDeclaration.MODIFIERS_PROPERTY), this.result);	932	printModifiers(getIntAttribute(node, TypeDeclaration.MODIFIERS_PROPERTY), this.result);
926	} else {	933	} else {
927	visitList(node, TypeDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));	934	visitList(node, TypeDeclaration.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));
Lines 936-942 Link Here
936		943
937	this.result.append(' ');	944	this.result.append(' ');
938		945
939	ChildPropertyDescriptor superClassProperty= (apiLevel == AST.JLS2) ? TypeDeclaration.SUPERCLASS_PROPERTY : TypeDeclaration.SUPERCLASS_TYPE_PROPERTY;	946	ChildPropertyDescriptor superClassProperty= (apiLevel == JLS2_INTERNAL) ? TypeDeclaration.SUPERCLASS_PROPERTY : TypeDeclaration.SUPERCLASS_TYPE_PROPERTY;
940	ASTNode superclass= getChildNode(node, superClassProperty);	947	ASTNode superclass= getChildNode(node, superClassProperty);
941	if (superclass != null) {	948	if (superclass != null) {
942	this.result.append("extends "); //$NON-NLS-1$	949	this.result.append("extends "); //$NON-NLS-1$
Lines 944-950 Link Here
944	this.result.append(' ');	951	this.result.append(' ');
945	}	952	}
946		953
947	ChildListPropertyDescriptor superInterfaceProperty= (apiLevel == AST.JLS2) ? TypeDeclaration.SUPER_INTERFACES_PROPERTY : TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY;	954	ChildListPropertyDescriptor superInterfaceProperty= (apiLevel == JLS2_INTERNAL) ? TypeDeclaration.SUPER_INTERFACES_PROPERTY : TypeDeclaration.SUPER_INTERFACE_TYPES_PROPERTY;
948	String lead= isInterface ? "extends " : "implements "; //$NON-NLS-1$//$NON-NLS-2$	955	String lead= isInterface ? "extends " : "implements "; //$NON-NLS-1$//$NON-NLS-2$
949	visitList(node, superInterfaceProperty, String.valueOf(','), lead, EMPTY);	956	visitList(node, superInterfaceProperty, String.valueOf(','), lead, EMPTY);
950	this.result.append('{');	957	this.result.append('{');
Lines 957-963 Link Here
957	* @see ASTVisitor#visit(TypeDeclarationStatement)	964	* @see ASTVisitor#visit(TypeDeclarationStatement)
958	*/	965	*/
959	public boolean visit(TypeDeclarationStatement node) {	966	public boolean visit(TypeDeclarationStatement node) {
960	if (node.getAST().apiLevel() == AST.JLS2) {	967	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
961	getChildNode(node, TypeDeclarationStatement.TYPE_DECLARATION_PROPERTY).accept(this);	968	getChildNode(node, TypeDeclarationStatement.TYPE_DECLARATION_PROPERTY).accept(this);
962	} else {	969	} else {
963	getChildNode(node, TypeDeclarationStatement.DECLARATION_PROPERTY).accept(this);	970	getChildNode(node, TypeDeclarationStatement.DECLARATION_PROPERTY).accept(this);
Lines 978-984 Link Here
978	* @see ASTVisitor#visit(VariableDeclarationExpression)	985	* @see ASTVisitor#visit(VariableDeclarationExpression)
979	*/	986	*/
980	public boolean visit(VariableDeclarationExpression node) {	987	public boolean visit(VariableDeclarationExpression node) {
981	if (node.getAST().apiLevel() == AST.JLS2) {	988	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
982	printModifiers(getIntAttribute(node, VariableDeclarationExpression.MODIFIERS_PROPERTY), this.result);	989	printModifiers(getIntAttribute(node, VariableDeclarationExpression.MODIFIERS_PROPERTY), this.result);
983	} else {	990	} else {
984	visitList(node, VariableDeclarationExpression.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));	991	visitList(node, VariableDeclarationExpression.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));
Lines 1010-1016 Link Here
1010	* @see ASTVisitor#visit(VariableDeclarationStatement)	1017	* @see ASTVisitor#visit(VariableDeclarationStatement)
1011	*/	1018	*/
1012	public boolean visit(VariableDeclarationStatement node) {	1019	public boolean visit(VariableDeclarationStatement node) {
1013	if (node.getAST().apiLevel() == AST.JLS2) {	1020	if (node.getAST().apiLevel() == JLS2_INTERNAL) {
1014	printModifiers(getIntAttribute(node, VariableDeclarationStatement.MODIFIERS_PROPERTY), this.result);	1021	printModifiers(getIntAttribute(node, VariableDeclarationStatement.MODIFIERS_PROPERTY), this.result);
1015	} else {	1022	} else {
1016	visitList(node, VariableDeclarationStatement.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));	1023	visitList(node, VariableDeclarationStatement.MODIFIERS2_PROPERTY, String.valueOf(' '), EMPTY, String.valueOf(' '));

Return to bug 69657

Lines 95-105 Link Here

(-)dom/org/eclipse/jdt/core/dom/AST.java (-28 / +31 lines)
95	* up to and including J2SE 1.4.	95	* up to and including J2SE 1.4.
96	*	96	*
97	* @since 3.0	97	* @since 3.0
		98	* @deprecated Clients should use the {@link #JLS3} AST API instead.
98	*/	99	*/
99	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Clients should use the JLS3 API.
100	public static final int JLS2 = 2;	100	public static final int JLS2 = 2;
101		101
102	/**	102	/**
		103	* Internal synonym for {@link #JLS2}. Use to alleviate
		104	* deprecation warnings.
		105	* @since 3.1
		106	*/
		107	/package/ static final int JLS2_INTERNAL = JLS2;
		108
		109	/**
103	* Constant for indicating the AST API that handles JLS3.	110	* Constant for indicating the AST API that handles JLS3.
104	* This API is capable of handling all constructs in the	111	* This API is capable of handling all constructs in the
105	* Java language as described in the Java Language	112	* Java language as described in the Java Language
Lines 107-121 Link Here
107	* JLS3 is a superset of all earlier versions of the	114	* JLS3 is a superset of all earlier versions of the
108	* Java language, and the JLS3 API can be used to manipulate	115	* Java language, and the JLS3 API can be used to manipulate
109	* programs written in all versions of the Java language	116	* programs written in all versions of the Java language
110	* up to and including J2SE 1.5.	117	* up to and including J2SE 5 (aka JDK 1.5).
111	* <p>
112	* <b>NOTE:</b>In Eclipse 3.0, there is no underlying parser support for
113	* JLS3 ASTs. This support is planned for the follow-on release of
114	* Eclipse which includes support for J2SE 1.5. Without a parser to create
115	* JLS3 ASTs, they are not much use. Use JLS2 ASTs instead.
116	* </p>
117	*	118	*
118	* @since 3.0	119	* @since 3.1
119	*/	120	*/
120	public static final int JLS3 = 3;	121	public static final int JLS3 = 3;
121		122
Lines 215-222 Link Here
215	* Creates a new, empty abstract syntax tree using default options.	216	* Creates a new, empty abstract syntax tree using default options.
216	*	217	*
217	* @see JavaCore#getDefaultOptions()	218	* @see JavaCore#getDefaultOptions()
		219	* @deprecated Clients should port their code to use the new JLS3 AST API and call
		220	* {@link #newAST(int) AST.newAST(AST.JLS3)} instead of using this constructor.
218	*/	221	*/
219	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Clients should port their code to use the new JLS3 API and call {@link #newAST(int)} instead of using this constructor.
220	public AST() {	222	public AST() {
221	this(JavaCore.getDefaultOptions());	223	this(JavaCore.getDefaultOptions());
222	}	224	}
Lines 282-289 Link Here
282	* @param options the table of options (key type: <code>String</code>;	284	* @param options the table of options (key type: <code>String</code>;
283	* value type: <code>String</code>)	285	* value type: <code>String</code>)
284	* @see JavaCore#getDefaultOptions()	286	* @see JavaCore#getDefaultOptions()
		287	* @deprecated Clients should port their code to use the new JLS3 AST API and call
		288	* {@link #newAST(int) AST.newAST(AST.JLS3)} instead of using this constructor.
285	*/	289	*/
286	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Clients should port their code to use the new JLS3 API and call {@link #newAST(int)} instead of using this constructor.
287	public AST(Map options) {	290	public AST(Map options) {
288	this(JLS2);	291	this(JLS2);
289	Object sourceLevelOption = options.get(JavaCore.COMPILER_SOURCE);	292	Object sourceLevelOption = options.get(JavaCore.COMPILER_SOURCE);
Lines 308-315 Link Here
308	* Creates a new Java abstract syntax tree	311	* Creates a new Java abstract syntax tree
309	* (AST) following the specified set of API rules.	312	* (AST) following the specified set of API rules.
310	* <p>	313	* <p>
311	* Clients should use this method. It is provided only so that	314	* Clients should use this method specifing {@link #JLS3} as the
312	* test suites can create AST instances that employ the JLS2 APIs.	315	* AST level in all cases, even when dealing with JDK 1.3 or 1.4..
313	* </p>	316	* </p>
314	*	317	*
315	* @param level the API level; one of the LEVEL constants	318	* @param level the API level; one of the LEVEL constants
Lines 1447-1453 Link Here
1447	* </ul>	1450	* </ul>
1448	* @exception UnsupportedOperationException if this operation is used in	1451	* @exception UnsupportedOperationException if this operation is used in
1449	* a JLS2 AST	1452	* a JLS2 AST
1450	* @since 3.0	1453	* @since 3.1
1451	*/	1454	*/
1452	public ParameterizedType newParameterizedType(Type type) {	1455	public ParameterizedType newParameterizedType(Type type) {
1453	ParameterizedType result = new ParameterizedType(this);	1456	ParameterizedType result = new ParameterizedType(this);
Lines 1469-1475 Link Here
1469	* </ul>	1472	* </ul>
1470	* @exception UnsupportedOperationException if this operation is used in	1473	* @exception UnsupportedOperationException if this operation is used in
1471	* a JLS2 AST	1474	* a JLS2 AST
1472	* @since 3.0	1475	* @since 3.1
1473	*/	1476	*/
1474	public QualifiedType newQualifiedType(Type qualifier, SimpleName name) {	1477	public QualifiedType newQualifiedType(Type qualifier, SimpleName name) {
1475	QualifiedType result = new QualifiedType(this);	1478	QualifiedType result = new QualifiedType(this);
Lines 1485-1491 Link Here
1485	* @return a new unparented wildcard type node	1488	* @return a new unparented wildcard type node
1486	* @exception UnsupportedOperationException if this operation is used in	1489	* @exception UnsupportedOperationException if this operation is used in
1487	* a JLS2 AST	1490	* a JLS2 AST
1488	* @since 3.0	1491	* @since 3.1
1489	*/	1492	*/
1490	public WildcardType newWildcardType() {	1493	public WildcardType newWildcardType() {
1491	WildcardType result = new WildcardType(this);	1494	WildcardType result = new WildcardType(this);
Lines 1621-1627 Link Here
1621	* @return a new unparented enum constant declaration node	1624	* @return a new unparented enum constant declaration node
1622	* @exception UnsupportedOperationException if this operation is used in	1625	* @exception UnsupportedOperationException if this operation is used in
1623	* a JLS2 AST	1626	* a JLS2 AST
1624	* @since 3.0	1627	* @since 3.1
1625	*/	1628	*/
1626	public EnumConstantDeclaration newEnumConstantDeclaration() {	1629	public EnumConstantDeclaration newEnumConstantDeclaration() {
1627	EnumConstantDeclaration result = new EnumConstantDeclaration(this);	1630	EnumConstantDeclaration result = new EnumConstantDeclaration(this);
Lines 1638-1644 Link Here
1638	* @return a new unparented enum declaration node	1641	* @return a new unparented enum declaration node
1639	* @exception UnsupportedOperationException if this operation is used in	1642	* @exception UnsupportedOperationException if this operation is used in
1640	* a JLS2 AST	1643	* a JLS2 AST
1641	* @since 3.0	1644	* @since 3.1
1642	*/	1645	*/
1643	public EnumDeclaration newEnumDeclaration() {	1646	public EnumDeclaration newEnumDeclaration() {
1644	EnumDeclaration result = new EnumDeclaration(this);	1647	EnumDeclaration result = new EnumDeclaration(this);
Lines 1652-1658 Link Here
1652	* @return a new unparented type parameter node	1655	* @return a new unparented type parameter node
1653	* @exception UnsupportedOperationException if this operation is used in	1656	* @exception UnsupportedOperationException if this operation is used in
1654	* a JLS2 AST	1657	* a JLS2 AST
1655	* @since 3.0	1658	* @since 3.1
1656	*/	1659	*/
1657	public TypeParameter newTypeParameter() {	1660	public TypeParameter newTypeParameter() {
1658	TypeParameter result = new TypeParameter(this);	1661	TypeParameter result = new TypeParameter(this);
Lines 1667-1673 Link Here
1667	* @return a new unparented annotation type declaration node	1670	* @return a new unparented annotation type declaration node
1668	* @exception UnsupportedOperationException if this operation is used in	1671	* @exception UnsupportedOperationException if this operation is used in
1669	* a JLS2 AST	1672	* a JLS2 AST
1670	* @since 3.0	1673	* @since 3.1
1671	*/	1674	*/
1672	public AnnotationTypeDeclaration newAnnotationTypeDeclaration() {	1675	public AnnotationTypeDeclaration newAnnotationTypeDeclaration() {
1673	AnnotationTypeDeclaration result = new AnnotationTypeDeclaration(this);	1676	AnnotationTypeDeclaration result = new AnnotationTypeDeclaration(this);
Lines 1683-1689 Link Here
1683	* @return a new unparented annotation type member declaration node	1686	* @return a new unparented annotation type member declaration node
1684	* @exception UnsupportedOperationException if this operation is used in	1687	* @exception UnsupportedOperationException if this operation is used in
1685	* a JLS2 AST	1688	* a JLS2 AST
1686	* @since 3.0	1689	* @since 3.1
1687	*/	1690	*/
1688	public AnnotationTypeMemberDeclaration newAnnotationTypeMemberDeclaration() {	1691	public AnnotationTypeMemberDeclaration newAnnotationTypeMemberDeclaration() {
1689	AnnotationTypeMemberDeclaration result = new AnnotationTypeMemberDeclaration(this);	1692	AnnotationTypeMemberDeclaration result = new AnnotationTypeMemberDeclaration(this);
Lines 1699-1705 Link Here
1699	* @exception IllegalArgumentException if the primitive type code is invalid	1702	* @exception IllegalArgumentException if the primitive type code is invalid
1700	* @exception UnsupportedOperationException if this operation is used in	1703	* @exception UnsupportedOperationException if this operation is used in
1701	* a JLS2 AST	1704	* a JLS2 AST
1702	* @since 3.0	1705	* @since 3.1
1703	*/	1706	*/
1704	public Modifier newModifier(Modifier.ModifierKeyword keyword) {	1707	public Modifier newModifier(Modifier.ModifierKeyword keyword) {
1705	Modifier result = new Modifier(this);	1708	Modifier result = new Modifier(this);
Lines 1980-1986 Link Here
1980	newTypeDeclarationStatement(AbstractTypeDeclaration decl) {	1983	newTypeDeclarationStatement(AbstractTypeDeclaration decl) {
1981	TypeDeclarationStatement result = new TypeDeclarationStatement(this);	1984	TypeDeclarationStatement result = new TypeDeclarationStatement(this);
1982	if (this.apiLevel == AST.JLS2) {	1985	if (this.apiLevel == AST.JLS2) {
1983	result.setTypeDeclaration((TypeDeclaration) decl);	1986	result.internalSetTypeDeclaration((TypeDeclaration) decl);
1984	}	1987	}
1985	if (this.apiLevel >= AST.JLS3) {	1988	if (this.apiLevel >= AST.JLS3) {
1986	result.setDeclaration(decl);	1989	result.setDeclaration(decl);
Lines 2200-2206 Link Here
2200	* @return a new unparented throw statement node	2203	* @return a new unparented throw statement node
2201	* @exception UnsupportedOperationException if this operation is used in	2204	* @exception UnsupportedOperationException if this operation is used in
2202	* a JLS2 AST	2205	* a JLS2 AST
2203	* @since 3.0	2206	* @since 3.1
2204	*/	2207	*/
2205	public EnhancedForStatement newEnhancedForStatement() {	2208	public EnhancedForStatement newEnhancedForStatement() {
2206	return new EnhancedForStatement(this);	2209	return new EnhancedForStatement(this);
Lines 2660-2666 Link Here
2660	* @return a new unparented normal annotation node	2663	* @return a new unparented normal annotation node
2661	* @exception UnsupportedOperationException if this operation is used in	2664	* @exception UnsupportedOperationException if this operation is used in
2662	* a JLS2 AST	2665	* a JLS2 AST
2663	* @since 3.0	2666	* @since 3.1
2664	*/	2667	*/
2665	public NormalAnnotation newNormalAnnotation() {	2668	public NormalAnnotation newNormalAnnotation() {
2666	NormalAnnotation result = new NormalAnnotation(this);	2669	NormalAnnotation result = new NormalAnnotation(this);
Lines 2674-2680 Link Here
2674	* @return a new unparented marker annotation node	2677	* @return a new unparented marker annotation node
2675	* @exception UnsupportedOperationException if this operation is used in	2678	* @exception UnsupportedOperationException if this operation is used in
2676	* a JLS2 AST	2679	* a JLS2 AST
2677	* @since 3.0	2680	* @since 3.1
2678	*/	2681	*/
2679	public MarkerAnnotation newMarkerAnnotation() {	2682	public MarkerAnnotation newMarkerAnnotation() {
2680	MarkerAnnotation result = new MarkerAnnotation(this);	2683	MarkerAnnotation result = new MarkerAnnotation(this);
Lines 2688-2694 Link Here
2688	* @return a new unparented single member annotation node	2691	* @return a new unparented single member annotation node
2689	* @exception UnsupportedOperationException if this operation is used in	2692	* @exception UnsupportedOperationException if this operation is used in
2690	* a JLS2 AST	2693	* a JLS2 AST
2691	* @since 3.0	2694	* @since 3.1
2692	*/	2695	*/
2693	public SingleMemberAnnotation newSingleMemberAnnotation() {	2696	public SingleMemberAnnotation newSingleMemberAnnotation() {
2694	SingleMemberAnnotation result = new SingleMemberAnnotation(this);	2697	SingleMemberAnnotation result = new SingleMemberAnnotation(this);
Lines 2702-2708 Link Here
2702	* @return a new unparented member value pair node	2705	* @return a new unparented member value pair node
2703	* @exception UnsupportedOperationException if this operation is used in	2706	* @exception UnsupportedOperationException if this operation is used in
2704	* a JLS2 AST	2707	* a JLS2 AST
2705	* @since 3.0	2708	* @since 3.1
2706	*/	2709	*/
2707	public MemberValuePair newMemberValuePair() {	2710	public MemberValuePair newMemberValuePair() {
2708	MemberValuePair result = new MemberValuePair(this);	2711	MemberValuePair result = new MemberValuePair(this);

Lines 172-178 Link Here

(-)dom/org/eclipse/jdt/core/dom/ASTMatcher.java (-33 / +27 lines)
172	* @return <code>true</code> if the subtree matches, or	172	* @return <code>true</code> if the subtree matches, or
173	* <code>false</code> if they do not match or the other object has a	173	* <code>false</code> if they do not match or the other object has a
174	* different node type or is <code>null</code>	174	* different node type or is <code>null</code>
175	* @since 3.0	175	* @since 3.1
176	*/	176	*/
177	public boolean match(AnnotationTypeDeclaration node, Object other) {	177	public boolean match(AnnotationTypeDeclaration node, Object other) {
178	if (!(other instanceof AnnotationTypeDeclaration)) {	178	if (!(other instanceof AnnotationTypeDeclaration)) {
Lines 199-205 Link Here
199	* @return <code>true</code> if the subtree matches, or	199	* @return <code>true</code> if the subtree matches, or
200	* <code>false</code> if they do not match or the other object has a	200	* <code>false</code> if they do not match or the other object has a
201	* different node type or is <code>null</code>	201	* different node type or is <code>null</code>
202	* @since 3.0	202	* @since 3.1
203	*/	203	*/
204	public boolean match(AnnotationTypeMemberDeclaration node, Object other) {	204	public boolean match(AnnotationTypeMemberDeclaration node, Object other) {
205	if (!(other instanceof AnnotationTypeMemberDeclaration)) {	205	if (!(other instanceof AnnotationTypeMemberDeclaration)) {
Lines 561-568 Link Here
561	}	561	}
562	ClassInstanceCreation o = (ClassInstanceCreation) other;	562	ClassInstanceCreation o = (ClassInstanceCreation) other;
563	int level = node.getAST().apiLevel;	563	int level = node.getAST().apiLevel;
564	if (level == AST.JLS2) {	564	if (level == AST.JLS2_INTERNAL) {
565	if (!safeSubtreeMatch(node.getName(), o.getName())) {	565	if (!safeSubtreeMatch(node.internalGetName(), o.internalGetName())) {
566	return false;	566	return false;
567	}	567	}
568	}	568	}
Lines 739-745 Link Here
739	* @return <code>true</code> if the subtree matches, or	739	* @return <code>true</code> if the subtree matches, or
740	* <code>false</code> if they do not match or the other object has a	740	* <code>false</code> if they do not match or the other object has a
741	* different node type or is <code>null</code>	741	* different node type or is <code>null</code>
742	* @since 3.0	742	* @since 3.1
743	*/	743	*/
744	public boolean match(EnhancedForStatement node, Object other) {	744	public boolean match(EnhancedForStatement node, Object other) {
745	if (!(other instanceof EnhancedForStatement)) {	745	if (!(other instanceof EnhancedForStatement)) {
Lines 759-777 Link Here
759	* other object is a node of the same type with structurally isomorphic	759	* other object is a node of the same type with structurally isomorphic
760	* child subtrees. Subclasses may override this method as needed.	760	* child subtrees. Subclasses may override this method as needed.
761	* </p>	761	* </p>
762	* <p>
763	* Note: This API element is only needed for dealing with Java code that uses
764	* new language features of J2SE 1.5. It is included in anticipation of J2SE
765	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
766	* may change slightly before reaching its final form.
767	* </p>
768	*	762	*
769	* @param node the node	763	* @param node the node
770	* @param other the other object, or <code>null</code>	764	* @param other the other object, or <code>null</code>
771	* @return <code>true</code> if the subtree matches, or	765	* @return <code>true</code> if the subtree matches, or
772	* <code>false</code> if they do not match or the other object has a	766	* <code>false</code> if they do not match or the other object has a
773	* different node type or is <code>null</code>	767	* different node type or is <code>null</code>
774	* @since 3.0	768	* @since 3.1
775	*/	769	*/
776	public boolean match(EnumConstantDeclaration node, Object other) {	770	public boolean match(EnumConstantDeclaration node, Object other) {
777	if (!(other instanceof EnumConstantDeclaration)) {	771	if (!(other instanceof EnumConstantDeclaration)) {
Lines 804-810 Link Here
804	* @return <code>true</code> if the subtree matches, or	798	* @return <code>true</code> if the subtree matches, or
805	* <code>false</code> if they do not match or the other object has a	799	* <code>false</code> if they do not match or the other object has a
806	* different node type or is <code>null</code>	800	* different node type or is <code>null</code>
807	* @since 3.0	801	* @since 3.1
808	*/	802	*/
809	public boolean match(EnumDeclaration node, Object other) {	803	public boolean match(EnumDeclaration node, Object other) {
810	if (!(other instanceof EnumDeclaration)) {	804	if (!(other instanceof EnumDeclaration)) {
Lines 888-894 Link Here
888	}	882	}
889	FieldDeclaration o = (FieldDeclaration) other;	883	FieldDeclaration o = (FieldDeclaration) other;
890	int level = node.getAST().apiLevel;	884	int level = node.getAST().apiLevel;
891	if (level == AST.JLS2) {	885	if (level == AST.JLS2_INTERNAL) {
892	if (node.getModifiers() != o.getModifiers()) {	886	if (node.getModifiers() != o.getModifiers()) {
893	return false;	887	return false;
894	}	888	}
Lines 1062-1068 Link Here
1062	}	1056	}
1063	Initializer o = (Initializer) other;	1057	Initializer o = (Initializer) other;
1064	int level = node.getAST().apiLevel;	1058	int level = node.getAST().apiLevel;
1065	if (level == AST.JLS2) {	1059	if (level == AST.JLS2_INTERNAL) {
1066	if (node.getModifiers() != o.getModifiers()) {	1060	if (node.getModifiers() != o.getModifiers()) {
1067	return false;	1061	return false;
1068	}	1062	}
Lines 1122-1128 Link Here
1122	* @deprecated mark deprecated to hide deprecated usage	1116	* @deprecated mark deprecated to hide deprecated usage
1123	*/	1117	*/
1124	private boolean compareDeprecatedComment(Javadoc first, Javadoc second) {	1118	private boolean compareDeprecatedComment(Javadoc first, Javadoc second) {
1125	if (first.getAST().apiLevel == AST.JLS2) {	1119	if (first.getAST().apiLevel == AST.JLS2_INTERNAL) {
1126	return safeEquals(first.getComment(), second.getComment());	1120	return safeEquals(first.getComment(), second.getComment());
1127	} else {	1121	} else {
1128	return true;	1122	return true;
Lines 1193-1199 Link Here
1193	* @return <code>true</code> if the subtree matches, or	1187	* @return <code>true</code> if the subtree matches, or
1194	* <code>false</code> if they do not match or the other object has a	1188	* <code>false</code> if they do not match or the other object has a
1195	* different node type or is <code>null</code>	1189	* different node type or is <code>null</code>
1196	* @since 3.0	1190	* @since 3.1
1197	*/	1191	*/
1198	public boolean match(MarkerAnnotation node, Object other) {	1192	public boolean match(MarkerAnnotation node, Object other) {
1199	if (!(other instanceof MarkerAnnotation)) {	1193	if (!(other instanceof MarkerAnnotation)) {
Lines 1241-1247 Link Here
1241	* @return <code>true</code> if the subtree matches, or	1235	* @return <code>true</code> if the subtree matches, or
1242	* <code>false</code> if they do not match or the other object has a	1236	* <code>false</code> if they do not match or the other object has a
1243	* different node type or is <code>null</code>	1237	* different node type or is <code>null</code>
1244	* @since 3.0	1238	* @since 3.1
1245	*/	1239	*/
1246	public boolean match(MemberValuePair node, Object other) {	1240	public boolean match(MemberValuePair node, Object other) {
1247	if (!(other instanceof MemberValuePair)) {	1241	if (!(other instanceof MemberValuePair)) {
Lines 1337-1347 Link Here
1337	}	1331	}
1338	MethodDeclaration o = (MethodDeclaration) other;	1332	MethodDeclaration o = (MethodDeclaration) other;
1339	int level = node.getAST().apiLevel;	1333	int level = node.getAST().apiLevel;
1340	if (level == AST.JLS2) {	1334	if (level == AST.JLS2_INTERNAL) {
1341	if (node.getModifiers() != o.getModifiers()) {	1335	if (node.getModifiers() != o.getModifiers()) {
1342	return false;	1336	return false;
1343	}	1337	}
1344	if (!safeSubtreeMatch(node.getReturnType(), o.getReturnType())) {	1338	if (!safeSubtreeMatch(node.internalGetReturnType(), o.internalGetReturnType())) {
1345	return false;	1339	return false;
1346	}	1340	}
1347	}	1341	}
Lines 1410-1416 Link Here
1410	* @return <code>true</code> if the subtree matches, or	1404	* @return <code>true</code> if the subtree matches, or
1411	* <code>false</code> if they do not match or the other object has a	1405	* <code>false</code> if they do not match or the other object has a
1412	* different node type or is <code>null</code>	1406	* different node type or is <code>null</code>
1413	* @since 3.0	1407	* @since 3.1
1414	*/	1408	*/
1415	public boolean match(Modifier node, Object other) {	1409	public boolean match(Modifier node, Object other) {
1416	if (!(other instanceof Modifier)) {	1410	if (!(other instanceof Modifier)) {
Lines 1433-1439 Link Here
1433	* @return <code>true</code> if the subtree matches, or	1427	* @return <code>true</code> if the subtree matches, or
1434	* <code>false</code> if they do not match or the other object has a	1428	* <code>false</code> if they do not match or the other object has a
1435	* different node type or is <code>null</code>	1429	* different node type or is <code>null</code>
1436	* @since 3.0	1430	* @since 3.1
1437	*/	1431	*/
1438	public boolean match(NormalAnnotation node, Object other) {	1432	public boolean match(NormalAnnotation node, Object other) {
1439	if (!(other instanceof NormalAnnotation)) {	1433	if (!(other instanceof NormalAnnotation)) {
Lines 1530-1536 Link Here
1530	* @return <code>true</code> if the subtree matches, or	1524	* @return <code>true</code> if the subtree matches, or
1531	* <code>false</code> if they do not match or the other object has a	1525	* <code>false</code> if they do not match or the other object has a
1532	* different node type or is <code>null</code>	1526	* different node type or is <code>null</code>
1533	* @since 3.0	1527	* @since 3.1
1534	*/	1528	*/
1535	public boolean match(ParameterizedType node, Object other) {	1529	public boolean match(ParameterizedType node, Object other) {
1536	if (!(other instanceof ParameterizedType)) {	1530	if (!(other instanceof ParameterizedType)) {
Lines 1670-1676 Link Here
1670	* @return <code>true</code> if the subtree matches, or	1664	* @return <code>true</code> if the subtree matches, or
1671	* <code>false</code> if they do not match or the other object has a	1665	* <code>false</code> if they do not match or the other object has a
1672	* different node type or is <code>null</code>	1666	* different node type or is <code>null</code>
1673	* @since 3.0	1667	* @since 3.1
1674	*/	1668	*/
1675	public boolean match(QualifiedType node, Object other) {	1669	public boolean match(QualifiedType node, Object other) {
1676	if (!(other instanceof QualifiedType)) {	1670	if (!(other instanceof QualifiedType)) {
Lines 1761-1767 Link Here
1761	* @return <code>true</code> if the subtree matches, or	1755	* @return <code>true</code> if the subtree matches, or
1762	* <code>false</code> if they do not match or the other object has a	1756	* <code>false</code> if they do not match or the other object has a
1763	* different node type or is <code>null</code>	1757	* different node type or is <code>null</code>
1764	* @since 3.0	1758	* @since 3.1
1765	*/	1759	*/
1766	public boolean match(SingleMemberAnnotation node, Object other) {	1760	public boolean match(SingleMemberAnnotation node, Object other) {
1767	if (!(other instanceof SingleMemberAnnotation)) {	1761	if (!(other instanceof SingleMemberAnnotation)) {
Lines 1796-1802 Link Here
1796	}	1790	}
1797	SingleVariableDeclaration o = (SingleVariableDeclaration) other;	1791	SingleVariableDeclaration o = (SingleVariableDeclaration) other;
1798	int level = node.getAST().apiLevel;	1792	int level = node.getAST().apiLevel;
1799	if (level == AST.JLS2) {	1793	if (level == AST.JLS2_INTERNAL) {
1800	if (node.getModifiers() != o.getModifiers()) {	1794	if (node.getModifiers() != o.getModifiers()) {
1801	return false;	1795	return false;
1802	}	1796	}
Lines 2128-2141 Link Here
2128	}	2122	}
2129	TypeDeclaration o = (TypeDeclaration) other;	2123	TypeDeclaration o = (TypeDeclaration) other;
2130	int level = node.getAST().apiLevel;	2124	int level = node.getAST().apiLevel;
2131	if (level == AST.JLS2) {	2125	if (level == AST.JLS2_INTERNAL) {
2132	if (node.getModifiers() != o.getModifiers()) {	2126	if (node.getModifiers() != o.getModifiers()) {
2133	return false;	2127	return false;
2134	}	2128	}
2135	if (!safeSubtreeMatch(node.getSuperclass(), o.getSuperclass())) {	2129	if (!safeSubtreeMatch(node.internalGetSuperclass(), o.internalGetSuperclass())) {
2136	return false;	2130	return false;
2137	}	2131	}
2138	if (!safeSubtreeListMatch(node.superInterfaces(), o.superInterfaces())) {	2132	if (!safeSubtreeListMatch(node.internalSuperInterfaces(), o.internalSuperInterfaces())) {
2139	return false;	2133	return false;
2140	}	2134	}
2141	}	2135	}
Lines 2217-2223 Link Here
2217	* @return <code>true</code> if the subtree matches, or	2211	* @return <code>true</code> if the subtree matches, or
2218	* <code>false</code> if they do not match or the other object has a	2212	* <code>false</code> if they do not match or the other object has a
2219	* different node type or is <code>null</code>	2213	* different node type or is <code>null</code>
2220	* @since 3.0	2214	* @since 3.1
2221	*/	2215	*/
2222	public boolean match(TypeParameter node, Object other) {	2216	public boolean match(TypeParameter node, Object other) {
2223	if (!(other instanceof TypeParameter)) {	2217	if (!(other instanceof TypeParameter)) {
Lines 2248-2254 Link Here
2248	}	2242	}
2249	VariableDeclarationExpression o = (VariableDeclarationExpression) other;	2243	VariableDeclarationExpression o = (VariableDeclarationExpression) other;
2250	int level = node.getAST().apiLevel;	2244	int level = node.getAST().apiLevel;
2251	if (level == AST.JLS2) {	2245	if (level == AST.JLS2_INTERNAL) {
2252	if (node.getModifiers() != o.getModifiers()) {	2246	if (node.getModifiers() != o.getModifiers()) {
2253	return false;	2247	return false;
2254	}	2248	}
Lines 2310-2316 Link Here
2310	}	2304	}
2311	VariableDeclarationStatement o = (VariableDeclarationStatement) other;	2305	VariableDeclarationStatement o = (VariableDeclarationStatement) other;
2312	int level = node.getAST().apiLevel;	2306	int level = node.getAST().apiLevel;
2313	if (level == AST.JLS2) {	2307	if (level == AST.JLS2_INTERNAL) {
2314	if (node.getModifiers() != o.getModifiers()) {	2308	if (node.getModifiers() != o.getModifiers()) {
2315	return false;	2309	return false;
2316	}	2310	}
Lines 2361-2367 Link Here
2361	* @return <code>true</code> if the subtree matches, or	2355	* @return <code>true</code> if the subtree matches, or
2362	* <code>false</code> if they do not match or the other object has a	2356	* <code>false</code> if they do not match or the other object has a
2363	* different node type or is <code>null</code>	2357	* different node type or is <code>null</code>
2364	* @since 3.0	2358	* @since 3.1
2365	*/	2359	*/
2366	public boolean match(WildcardType node, Object other) {	2360	public boolean match(WildcardType node, Object other) {
2367	if (!(other instanceof WildcardType)) {	2361	if (!(other instanceof WildcardType)) {

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/ASTNode.java (-17 / +17 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 647-653 Link Here
647	* Node type constant indicating a node of type	647	* Node type constant indicating a node of type
648	* <code>EnhancedForStatement</code>.	648	* <code>EnhancedForStatement</code>.
649	* @see EnhancedForStatement	649	* @see EnhancedForStatement
650	* @since 3.0	650	* @since 3.1
651	*/	651	*/
652	public static final int ENHANCED_FOR_STATEMENT = 70;	652	public static final int ENHANCED_FOR_STATEMENT = 70;
653		653
Lines 655-661 Link Here
655	* Node type constant indicating a node of type	655	* Node type constant indicating a node of type
656	* <code>EnumDeclaration</code>.	656	* <code>EnumDeclaration</code>.
657	* @see EnumDeclaration	657	* @see EnumDeclaration
658	* @since 3.0	658	* @since 3.1
659	*/	659	*/
660	public static final int ENUM_DECLARATION = 71;	660	public static final int ENUM_DECLARATION = 71;
661		661
Lines 663-669 Link Here
663	* Node type constant indicating a node of type	663	* Node type constant indicating a node of type
664	* <code>EnumConstantDeclaration</code>.	664	* <code>EnumConstantDeclaration</code>.
665	* @see EnumConstantDeclaration	665	* @see EnumConstantDeclaration
666	* @since 3.0	666	* @since 3.1
667	*/	667	*/
668	public static final int ENUM_CONSTANT_DECLARATION = 72;	668	public static final int ENUM_CONSTANT_DECLARATION = 72;
669		669
Lines 671-677 Link Here
671	* Node type constant indicating a node of type	671	* Node type constant indicating a node of type
672	* <code>TypeParameter</code>.	672	* <code>TypeParameter</code>.
673	* @see TypeParameter	673	* @see TypeParameter
674	* @since 3.0	674	* @since 3.1
675	*/	675	*/
676	public static final int TYPE_PARAMETER = 73;	676	public static final int TYPE_PARAMETER = 73;
677		677
Lines 679-685 Link Here
679	* Node type constant indicating a node of type	679	* Node type constant indicating a node of type
680	* <code>ParameterizedType</code>.	680	* <code>ParameterizedType</code>.
681	* @see ParameterizedType	681	* @see ParameterizedType
682	* @since 3.0	682	* @since 3.1
683	*/	683	*/
684	public static final int PARAMETERIZED_TYPE = 74;	684	public static final int PARAMETERIZED_TYPE = 74;
685		685
Lines 687-693 Link Here
687	* Node type constant indicating a node of type	687	* Node type constant indicating a node of type
688	* <code>QualifiedType</code>.	688	* <code>QualifiedType</code>.
689	* @see QualifiedType	689	* @see QualifiedType
690	* @since 3.0	690	* @since 3.1
691	*/	691	*/
692	public static final int QUALIFIED_TYPE = 75;	692	public static final int QUALIFIED_TYPE = 75;
693		693
Lines 695-701 Link Here
695	* Node type constant indicating a node of type	695	* Node type constant indicating a node of type
696	* <code>WildcardType</code>.	696	* <code>WildcardType</code>.
697	* @see WildcardType	697	* @see WildcardType
698	* @since 3.0	698	* @since 3.1
699	*/	699	*/
700	public static final int WILDCARD_TYPE = 76;	700	public static final int WILDCARD_TYPE = 76;
701		701
Lines 703-709 Link Here
703	* Node type constant indicating a node of type	703	* Node type constant indicating a node of type
704	* <code>NormalAnnotation</code>.	704	* <code>NormalAnnotation</code>.
705	* @see NormalAnnotation	705	* @see NormalAnnotation
706	* @since 3.0	706	* @since 3.1
707	*/	707	*/
708	public static final int NORMAL_ANNOTATION = 77;	708	public static final int NORMAL_ANNOTATION = 77;
709		709
Lines 711-717 Link Here
711	* Node type constant indicating a node of type	711	* Node type constant indicating a node of type
712	* <code>MarkerAnnotation</code>.	712	* <code>MarkerAnnotation</code>.
713	* @see MarkerAnnotation	713	* @see MarkerAnnotation
714	* @since 3.0	714	* @since 3.1
715	*/	715	*/
716	public static final int MARKER_ANNOTATION = 78;	716	public static final int MARKER_ANNOTATION = 78;
717		717
Lines 719-725 Link Here
719	* Node type constant indicating a node of type	719	* Node type constant indicating a node of type
720	* <code>SingleMemberAnnotation</code>.	720	* <code>SingleMemberAnnotation</code>.
721	* @see SingleMemberAnnotation	721	* @see SingleMemberAnnotation
722	* @since 3.0	722	* @since 3.1
723	*/	723	*/
724	public static final int SINGLE_MEMBER_ANNOTATION = 79;	724	public static final int SINGLE_MEMBER_ANNOTATION = 79;
725		725
Lines 727-733 Link Here
727	* Node type constant indicating a node of type	727	* Node type constant indicating a node of type
728	* <code>MemberValuePair</code>.	728	* <code>MemberValuePair</code>.
729	* @see MemberValuePair	729	* @see MemberValuePair
730	* @since 3.0	730	* @since 3.1
731	*/	731	*/
732	public static final int MEMBER_VALUE_PAIR = 80;	732	public static final int MEMBER_VALUE_PAIR = 80;
733		733
Lines 735-741 Link Here
735	* Node type constant indicating a node of type	735	* Node type constant indicating a node of type
736	* <code>AnnotationTypeDeclaration</code>.	736	* <code>AnnotationTypeDeclaration</code>.
737	* @see AnnotationTypeDeclaration	737	* @see AnnotationTypeDeclaration
738	* @since 3.0	738	* @since 3.1
739	*/	739	*/
740	public static final int ANNOTATION_TYPE_DECLARATION = 81;	740	public static final int ANNOTATION_TYPE_DECLARATION = 81;
741		741
Lines 743-749 Link Here
743	* Node type constant indicating a node of type	743	* Node type constant indicating a node of type
744	* <code>AnnotationTypeMemberDeclaration</code>.	744	* <code>AnnotationTypeMemberDeclaration</code>.
745	* @see AnnotationTypeMemberDeclaration	745	* @see AnnotationTypeMemberDeclaration
746	* @since 3.0	746	* @since 3.1
747	*/	747	*/
748	public static final int ANNOTATION_TYPE_MEMBER_DECLARATION = 82;	748	public static final int ANNOTATION_TYPE_MEMBER_DECLARATION = 82;
749		749
Lines 751-757 Link Here
751	* Node type constant indicating a node of type	751	* Node type constant indicating a node of type
752	* <code>Modifier</code>.	752	* <code>Modifier</code>.
753	* @see Modifier	753	* @see Modifier
754	* @since 3.0	754	* @since 3.1
755	*/	755	*/
756	public static final int MODIFIER = 83;	756	public static final int MODIFIER = 83;
757		757
Lines 1754-1760 Link Here
1754	* @since 3.0	1754	* @since 3.0
1755	*/	1755	*/
1756	final void unsupportedIn2() {	1756	final void unsupportedIn2() {
1757	if (this.ast.apiLevel == AST.JLS2) {	1757	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
1758	throw new UnsupportedOperationException("Operation not supported in JLS2 AST"); //$NON-NLS-1$	1758	throw new UnsupportedOperationException("Operation not supported in JLS2 AST"); //$NON-NLS-1$
1759	}	1759	}
1760	}	1760	}
Lines 1767-1773 Link Here
1767	* @since 3.0	1767	* @since 3.0
1768	*/	1768	*/
1769	final void supportedOnlyIn2() {	1769	final void supportedOnlyIn2() {
1770	if (this.ast.apiLevel != AST.JLS2) {	1770	if (this.ast.apiLevel != AST.JLS2_INTERNAL) {
1771	throw new UnsupportedOperationException("Operation only supported in JLS2 AST"); //$NON-NLS-1$	1771	throw new UnsupportedOperationException("Operation only supported in JLS2 AST"); //$NON-NLS-1$
1772	}	1772	}
1773	}	1773	}

Lines 38-44 Link Here

(-)dom/org/eclipse/jdt/core/dom/ASTParser.java (-7 / +2 lines)
38	* Example: Create basic AST from source string	38	* Example: Create basic AST from source string
39	* <pre>	39	* <pre>
40	* char[] source = ...;	40	* char[] source = ...;
41	* ASTParser parser = ASTParser.newParser(AST.JLS2); // handles JLS2 (J2SE 1.4)	41	* ASTParser parser = ASTParser.newParser(AST.JLS3); // handles JDK 1.0, 1.1, 1.2, 1.3, 1.4, 1.5
42	* parser.setSource(source);	42	* parser.setSource(source);
43	* CompilationUnit result = (CompilationUnit) parser.createAST(null);	43	* CompilationUnit result = (CompilationUnit) parser.createAST(null);
44	* </pre>	44	* </pre>
Lines 100-110 Link Here
100	/**	100	/**
101	* Creates a new object for creating a Java abstract syntax tree	101	* Creates a new object for creating a Java abstract syntax tree
102	* (AST) following the specified set of API rules.	102	* (AST) following the specified set of API rules.
103	* <p>
104	* <b>NOTE:</b>In Eclipse 3.0, there is no parser support for
105	* AST.JLS3. This support is planned for the follow-on release of
106	* Eclipse which includes support for J2SE 1.5.
107	* </p>
108	*	103	*
109	* @param level the API level; one of the LEVEL constants	104	* @param level the API level; one of the LEVEL constants
110	* declared on <code>AST</code>	105	* declared on <code>AST</code>
Lines 201-207 Link Here
201	* declared on <code>AST</code>	196	* declared on <code>AST</code>
202	*/	197	*/
203	ASTParser(int level) {	198	ASTParser(int level) {
204	if ((level != AST.JLS2)	199	if ((level != AST.JLS2_INTERNAL)
205	&& (level != AST.JLS3)) {	200	&& (level != AST.JLS3)) {
206	throw new IllegalArgumentException();	201	throw new IllegalArgumentException();
207	}	202	}

Lines 173-179 Link Here

(-)dom/org/eclipse/jdt/core/dom/ASTVisitor.java (-28 / +28 lines)
173	* @return <code>true</code> if the children of this node should be	173	* @return <code>true</code> if the children of this node should be
174	* visited, and <code>false</code> if the children of this node should	174	* visited, and <code>false</code> if the children of this node should
175	* be skipped	175	* be skipped
176	* @since 3.0	176	* @since 3.1
177	*/	177	*/
178	public boolean visit(AnnotationTypeDeclaration node) {	178	public boolean visit(AnnotationTypeDeclaration node) {
179	return true;	179	return true;
Lines 191-197 Link Here
191	* @return <code>true</code> if the children of this node should be	191	* @return <code>true</code> if the children of this node should be
192	* visited, and <code>false</code> if the children of this node should	192	* visited, and <code>false</code> if the children of this node should
193	* be skipped	193	* be skipped
194	* @since 3.0	194	* @since 3.1
195	*/	195	*/
196	public boolean visit(AnnotationTypeMemberDeclaration node) {	196	public boolean visit(AnnotationTypeMemberDeclaration node) {
197	return true;	197	return true;
Lines 551-557 Link Here
551	* @return <code>true</code> if the children of this node should be	551	* @return <code>true</code> if the children of this node should be
552	* visited, and <code>false</code> if the children of this node should	552	* visited, and <code>false</code> if the children of this node should
553	* be skipped	553	* be skipped
554	* @since 3.0	554	* @since 3.1
555	*/	555	*/
556	public boolean visit(EnhancedForStatement node) {	556	public boolean visit(EnhancedForStatement node) {
557	return true;	557	return true;
Lines 568-574 Link Here
568	* @return <code>true</code> if the children of this node should be	568	* @return <code>true</code> if the children of this node should be
569	* visited, and <code>false</code> if the children of this node should	569	* visited, and <code>false</code> if the children of this node should
570	* be skipped	570	* be skipped
571	* @since 3.0	571	* @since 3.1
572	*/	572	*/
573	public boolean visit(EnumConstantDeclaration node) {	573	public boolean visit(EnumConstantDeclaration node) {
574	return true;	574	return true;
Lines 585-591 Link Here
585	* @return <code>true</code> if the children of this node should be	585	* @return <code>true</code> if the children of this node should be
586	* visited, and <code>false</code> if the children of this node should	586	* visited, and <code>false</code> if the children of this node should
587	* be skipped	587	* be skipped
588	* @since 3.0	588	* @since 3.1
589	*/	589	*/
590	public boolean visit(EnumDeclaration node) {	590	public boolean visit(EnumDeclaration node) {
591	return true;	591	return true;
Lines 808-814 Link Here
808	* @return <code>true</code> if the children of this node should be	808	* @return <code>true</code> if the children of this node should be
809	* visited, and <code>false</code> if the children of this node should	809	* visited, and <code>false</code> if the children of this node should
810	* be skipped	810	* be skipped
811	* @since 3.0	811	* @since 3.1
812	*/	812	*/
813	public boolean visit(MarkerAnnotation node) {	813	public boolean visit(MarkerAnnotation node) {
814	return true;	814	return true;
Lines 844-850 Link Here
844	* @return <code>true</code> if the children of this node should be	844	* @return <code>true</code> if the children of this node should be
845	* visited, and <code>false</code> if the children of this node should	845	* visited, and <code>false</code> if the children of this node should
846	* be skipped	846	* be skipped
847	* @since 3.0	847	* @since 3.1
848	*/	848	*/
849	public boolean visit(MemberValuePair node) {	849	public boolean visit(MemberValuePair node) {
850	return true;	850	return true;
Lines 931-937 Link Here
931	* @return <code>true</code> if the children of this node should be	931	* @return <code>true</code> if the children of this node should be
932	* visited, and <code>false</code> if the children of this node should	932	* visited, and <code>false</code> if the children of this node should
933	* be skipped	933	* be skipped
934	* @since 3.0	934	* @since 3.1
935	*/	935	*/
936	public boolean visit(Modifier node) {	936	public boolean visit(Modifier node) {
937	return true;	937	return true;
Lines 949-955 Link Here
949	* @return <code>true</code> if the children of this node should be	949	* @return <code>true</code> if the children of this node should be
950	* visited, and <code>false</code> if the children of this node should	950	* visited, and <code>false</code> if the children of this node should
951	* be skipped	951	* be skipped
952	* @since 3.0	952	* @since 3.1
953	*/	953	*/
954	public boolean visit(NormalAnnotation node) {	954	public boolean visit(NormalAnnotation node) {
955	return true;	955	return true;
Lines 1015-1021 Link Here
1015	* @return <code>true</code> if the children of this node should be	1015	* @return <code>true</code> if the children of this node should be
1016	* visited, and <code>false</code> if the children of this node should	1016	* visited, and <code>false</code> if the children of this node should
1017	* be skipped	1017	* be skipped
1018	* @since 3.0	1018	* @since 3.1
1019	*/	1019	*/
1020	public boolean visit(ParameterizedType node) {	1020	public boolean visit(ParameterizedType node) {
1021	return true;	1021	return true;
Lines 1112-1118 Link Here
1112	* @return <code>true</code> if the children of this node should be	1112	* @return <code>true</code> if the children of this node should be
1113	* visited, and <code>false</code> if the children of this node should	1113	* visited, and <code>false</code> if the children of this node should
1114	* be skipped	1114	* be skipped
1115	* @since 3.0	1115	* @since 3.1
1116	*/	1116	*/
1117	public boolean visit(QualifiedType node) {	1117	public boolean visit(QualifiedType node) {
1118	return true;	1118	return true;
Lines 1178-1184 Link Here
1178	* @return <code>true</code> if the children of this node should be	1178	* @return <code>true</code> if the children of this node should be
1179	* visited, and <code>false</code> if the children of this node should	1179	* visited, and <code>false</code> if the children of this node should
1180	* be skipped	1180	* be skipped
1181	* @since 3.0	1181	* @since 3.1
1182	*/	1182	*/
1183	public boolean visit(SingleMemberAnnotation node) {	1183	public boolean visit(SingleMemberAnnotation node) {
1184	return true;	1184	return true;
Lines 1457-1463 Link Here
1457	* @return <code>true</code> if the children of this node should be	1457	* @return <code>true</code> if the children of this node should be
1458	* visited, and <code>false</code> if the children of this node should	1458	* visited, and <code>false</code> if the children of this node should
1459	* be skipped	1459	* be skipped
1460	* @since 3.0	1460	* @since 3.1
1461	*/	1461	*/
1462	public boolean visit(TypeParameter node) {	1462	public boolean visit(TypeParameter node) {
1463	return true;	1463	return true;
Lines 1538-1544 Link Here
1538	* @return <code>true</code> if the children of this node should be	1538	* @return <code>true</code> if the children of this node should be
1539	* visited, and <code>false</code> if the children of this node should	1539	* visited, and <code>false</code> if the children of this node should
1540	* be skipped	1540	* be skipped
1541	* @since 3.0	1541	* @since 3.1
1542	*/	1542	*/
1543	public boolean visit(WildcardType node) {	1543	public boolean visit(WildcardType node) {
1544	return true;	1544	return true;
Lines 1551-1557 Link Here
1551	* </p>	1551	* </p>
1552	*	1552	*
1553	* @param node the node to visit	1553	* @param node the node to visit
1554	* @since 3.0	1554	* @since 3.1
1555	*/	1555	*/
1556	public void endVisit(AnnotationTypeDeclaration node) {	1556	public void endVisit(AnnotationTypeDeclaration node) {
1557	// default implementation: do nothing	1557	// default implementation: do nothing
Lines 1564-1570 Link Here
1564	* </p>	1564	* </p>
1565	*	1565	*
1566	* @param node the node to visit	1566	* @param node the node to visit
1567	* @since 3.0	1567	* @since 3.1
1568	*/	1568	*/
1569	public void endVisit(AnnotationTypeMemberDeclaration node) {	1569	public void endVisit(AnnotationTypeMemberDeclaration node) {
1570	// default implementation: do nothing	1570	// default implementation: do nothing
Lines 1835-1841 Link Here
1835	* </p>	1835	* </p>
1836	*	1836	*
1837	* @param node the node to visit	1837	* @param node the node to visit
1838	* @since 3.0	1838	* @since 3.1
1839	*/	1839	*/
1840	public void endVisit(EnhancedForStatement node) {	1840	public void endVisit(EnhancedForStatement node) {
1841	// default implementation: do nothing	1841	// default implementation: do nothing
Lines 1848-1854 Link Here
1848	* </p>	1848	* </p>
1849	*	1849	*
1850	* @param node the node to visit	1850	* @param node the node to visit
1851	* @since 3.0	1851	* @since 3.1
1852	*/	1852	*/
1853	public void endVisit(EnumConstantDeclaration node) {	1853	public void endVisit(EnumConstantDeclaration node) {
1854	// default implementation: do nothing	1854	// default implementation: do nothing
Lines 1861-1867 Link Here
1861	* </p>	1861	* </p>
1862	*	1862	*
1863	* @param node the node to visit	1863	* @param node the node to visit
1864	* @since 3.0	1864	* @since 3.1
1865	*/	1865	*/
1866	public void endVisit(EnumDeclaration node) {	1866	public void endVisit(EnumDeclaration node) {
1867	// default implementation: do nothing	1867	// default implementation: do nothing
Lines 2024-2030 Link Here
2024	* </p>	2024	* </p>
2025	*	2025	*
2026	* @param node the node to visit	2026	* @param node the node to visit
2027	* @since 3.0	2027	* @since 3.1
2028	*/	2028	*/
2029	public void endVisit(MarkerAnnotation node) {	2029	public void endVisit(MarkerAnnotation node) {
2030	// default implementation: do nothing	2030	// default implementation: do nothing
Lines 2050-2056 Link Here
2050	* </p>	2050	* </p>
2051	*	2051	*
2052	* @param node the node to visit	2052	* @param node the node to visit
2053	* @since 3.0	2053	* @since 3.1
2054	*/	2054	*/
2055	public void endVisit(MemberValuePair node) {	2055	public void endVisit(MemberValuePair node) {
2056	// default implementation: do nothing	2056	// default implementation: do nothing
Lines 2113-2119 Link Here
2113	* </p>	2113	* </p>
2114	*	2114	*
2115	* @param node the node to visit	2115	* @param node the node to visit
2116	* @since 3.0	2116	* @since 3.1
2117	*/	2117	*/
2118	public void endVisit(Modifier node) {	2118	public void endVisit(Modifier node) {
2119	// default implementation: do nothing	2119	// default implementation: do nothing
Lines 2126-2132 Link Here
2126	* </p>	2126	* </p>
2127	*	2127	*
2128	* @param node the node to visit	2128	* @param node the node to visit
2129	* @since 3.0	2129	* @since 3.1
2130	*/	2130	*/
2131	public void endVisit(NormalAnnotation node) {	2131	public void endVisit(NormalAnnotation node) {
2132	// default implementation: do nothing	2132	// default implementation: do nothing
Lines 2175-2181 Link Here
2175	* </p>	2175	* </p>
2176	*	2176	*
2177	* @param node the node to visit	2177	* @param node the node to visit
2178	* @since 3.0	2178	* @since 3.1
2179	*/	2179	*/
2180	public void endVisit(ParameterizedType node) {	2180	public void endVisit(ParameterizedType node) {
2181	// default implementation: do nothing	2181	// default implementation: do nothing
Lines 2248-2254 Link Here
2248	* </p>	2248	* </p>
2249	*	2249	*
2250	* @param node the node to visit	2250	* @param node the node to visit
2251	* @since 3.0	2251	* @since 3.1
2252	*/	2252	*/
2253	public void endVisit(QualifiedType node) {	2253	public void endVisit(QualifiedType node) {
2254	// default implementation: do nothing	2254	// default implementation: do nothing
Lines 2297-2303 Link Here
2297	* </p>	2297	* </p>
2298	*	2298	*
2299	* @param node the node to visit	2299	* @param node the node to visit
2300	* @since 3.0	2300	* @since 3.1
2301	*/	2301	*/
2302	public void endVisit(SingleMemberAnnotation node) {	2302	public void endVisit(SingleMemberAnnotation node) {
2303	// default implementation: do nothing	2303	// default implementation: do nothing
Lines 2504-2510 Link Here
2504	* </p>	2504	* </p>
2505	*	2505	*
2506	* @param node the node to visit	2506	* @param node the node to visit
2507	* @since 3.0	2507	* @since 3.1
2508	*/	2508	*/
2509	public void endVisit(TypeParameter node) {	2509	public void endVisit(TypeParameter node) {
2510	// default implementation: do nothing	2510	// default implementation: do nothing
Lines 2565-2571 Link Here
2565	* </p>	2565	* </p>
2566	*	2566	*
2567	* @param node the node to visit	2567	* @param node the node to visit
2568	* @since 3.0	2568	* @since 3.1
2569	*/	2569	*/
2570	public void endVisit(WildcardType node) {	2570	public void endVisit(WildcardType node) {
2571	// default implementation: do nothing	2571	// default implementation: do nothing

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/Annotation.java (-9 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 20-32 Link Here
20	* SingleMemberAnnotation	20	* SingleMemberAnnotation
21	* </pre>	21	* </pre>
22	* </p>	22	* </p>
23	* <p>	23	* @since 3.1
24	* Note: This API element is only needed for dealing with Java code that uses
25	* new language features of J2SE 1.5. It is included in anticipation of J2SE
26	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
27	* may change slightly before reaching its final form.
28	* </p>
29	* @since 3.0
30	*/	24	*/
31	public abstract class Annotation extends Expression implements IExtendedModifier {	25	public abstract class Annotation extends Expression implements IExtendedModifier {
32		26
Lines 43-49 Link Here
43	* of this node.	37	* of this node.
44	*	38	*
45	* @return the property descriptor	39	* @return the property descriptor
46	* @since 3.1
47	*/	40	*/
48	public final ChildPropertyDescriptor getTypeNameProperty() {	41	public final ChildPropertyDescriptor getTypeNameProperty() {
49	return internalTypeNameProperty();	42	return internalTypeNameProperty();

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/ClassInstanceCreation.java (-20 / +35 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 63-69 Link Here
63		63
64	/**	64	/**
65	* The "typeArguments" structural property of this node type (added in JLS3 API).	65	* The "typeArguments" structural property of this node type (added in JLS3 API).
66	* @since 3.0	66	* @since 3.1
67	*/	67	*/
68	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =	68	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =
69	new ChildListPropertyDescriptor(ClassInstanceCreation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$	69	new ChildListPropertyDescriptor(ClassInstanceCreation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 79-91 Link Here
79	* The "name" structural property of this node type (JLS2 API only).	79	* The "name" structural property of this node type (JLS2 API only).
80	* @since 3.0	80	* @since 3.0
81	*/	81	*/
82	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #TYPE_PROPERTY} in the JLS3 API.
83	public static final ChildPropertyDescriptor NAME_PROPERTY =	82	public static final ChildPropertyDescriptor NAME_PROPERTY =
84	new ChildPropertyDescriptor(ClassInstanceCreation.class, "name", Name.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$	83	new ChildPropertyDescriptor(ClassInstanceCreation.class, "name", Name.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$
85		84
86	/**	85	/**
87	* The "type" structural property of this node type (added in JLS3 API).	86	* The "type" structural property of this node type (added in JLS3 API).
88	* @since 3.0	87	* @since 3.1
89	*/	88	*/
90	public static final ChildPropertyDescriptor TYPE_PROPERTY =	89	public static final ChildPropertyDescriptor TYPE_PROPERTY =
91	new ChildPropertyDescriptor(ClassInstanceCreation.class, "type", Type.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$	90	new ChildPropertyDescriptor(ClassInstanceCreation.class, "type", Type.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 116-122 Link Here
116	* A list of property descriptors (element type:	115	* A list of property descriptors (element type:
117	* {@link StructuralPropertyDescriptor}),	116	* {@link StructuralPropertyDescriptor}),
118	* or null if uninitialized.	117	* or null if uninitialized.
119	* @since 3.0	118	* @since 3.1
120	*/	119	*/
121	private static final List PROPERTY_DESCRIPTORS_3_0;	120	private static final List PROPERTY_DESCRIPTORS_3_0;
122		121
Lines 151-157 Link Here
151	* @since 3.0	150	* @since 3.0
152	*/	151	*/
153	public static List propertyDescriptors(int apiLevel) {	152	public static List propertyDescriptors(int apiLevel) {
154	if (apiLevel == AST.JLS2) {	153	if (apiLevel == AST.JLS2_INTERNAL) {
155	return PROPERTY_DESCRIPTORS_2_0;	154	return PROPERTY_DESCRIPTORS_2_0;
156	} else {	155	} else {
157	return PROPERTY_DESCRIPTORS_3_0;	156	return PROPERTY_DESCRIPTORS_3_0;
Lines 167-173 Link Here
167	* The type arguments (element type: <code>Type</code>).	166	* The type arguments (element type: <code>Type</code>).
168	* Null in JLS2. Added in JLS3; defaults to an empty list	167	* Null in JLS2. Added in JLS3; defaults to an empty list
169	* (see constructor).	168	* (see constructor).
170	* @since 3.0	169	* @since 3.1
171	*/	170	*/
172	private ASTNode.NodeList typeArguments = null;	171	private ASTNode.NodeList typeArguments = null;
173		172
Lines 294-300 Link Here
294	result.setSourceRange(this.getStartPosition(), this.getLength());	293	result.setSourceRange(this.getStartPosition(), this.getLength());
295	result.setExpression(	294	result.setExpression(
296	(Expression) ASTNode.copySubtree(target, getExpression()));	295	(Expression) ASTNode.copySubtree(target, getExpression()));
297	if (this.ast.apiLevel == AST.JLS2) {	296	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
298	result.setName((Name) getName().clone(target));	297	result.setName((Name) getName().clone(target));
299	}	298	}
300	if (this.ast.apiLevel >= AST.JLS3) {	299	if (this.ast.apiLevel >= AST.JLS3) {
Lines 324-330 Link Here
324	if (visitChildren) {	323	if (visitChildren) {
325	// visit children in normal left to right reading order	324	// visit children in normal left to right reading order
326	acceptChild(visitor, getExpression());	325	acceptChild(visitor, getExpression());
327	if (this.ast.apiLevel == AST.JLS2) {	326	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
328	acceptChild(visitor, getName());	327	acceptChild(visitor, getName());
329	}	328	}
330	if (this.ast.apiLevel >= AST.JLS3) {	329	if (this.ast.apiLevel >= AST.JLS3) {
Lines 371-388 Link Here
371	/**	370	/**
372	* Returns the live ordered list of type arguments of this class	371	* Returns the live ordered list of type arguments of this class
373	* instance creation (added in JLS3 API).	372	* instance creation (added in JLS3 API).
374	* <p>
375	* Note: This API element is only needed for dealing with Java code that uses
376	* new language features of J2SE 1.5. It is included in anticipation of J2SE
377	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
378	* may change slightly before reaching its final form.
379	* </p>
380	*	373	*
381	* @return the live list of type arguments	374	* @return the live list of type arguments
382	* (element type: <code>Type</code>)	375	* (element type: <code>Type</code>)
383	* @exception UnsupportedOperationException if this operation is used in	376	* @exception UnsupportedOperationException if this operation is used in
384	* a JLS2 AST	377	* a JLS2 AST
385	* @since 3.0	378	* @since 3.1
386	*/	379	*/
387	public List typeArguments() {	380	public List typeArguments() {
388	// more efficient than just calling unsupportedIn2() to check	381	// more efficient than just calling unsupportedIn2() to check
Lines 399-407 Link Here
399	* @return the type name node	392	* @return the type name node
400	* @exception UnsupportedOperationException if this operation is used in	393	* @exception UnsupportedOperationException if this operation is used in
401	* an AST later than JLS2	394	* an AST later than JLS2
		395	* @deprecated In the JLS3 API, this method is replaced by
		396	* {@link #getType()}, which returns a <code>Type</code> instead of a
		397	* <code>Name</code>.
402	*/	398	*/
403	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>getType</code>, which returns a <code>Type</code> instead of a <code>Name</code>.
404	public Name getName() {	399	public Name getName() {
		400	return internalGetName();
		401	}
		402
		403	/**
		404	* Internal synonym for deprecated method. Used to avoid
		405	* deprecation warnings.
		406	* @since 3.1
		407	*/
		408	/package/ Name internalGetName() {
405	supportedOnlyIn2();	409	supportedOnlyIn2();
406	if (this.typeName == null) {	410	if (this.typeName == null) {
407	// lazy init must be thread-safe for readers	411	// lazy init must be thread-safe for readers
Lines 428-436 Link Here
428	* </ul>	432	* </ul>
429	* @exception UnsupportedOperationException if this operation is used in	433	* @exception UnsupportedOperationException if this operation is used in
430	* an AST later than JLS2	434	* an AST later than JLS2
		435	* @deprecated In the JLS3 API, this method is replaced by
		436	* {@link #setType(Type)}, which expects a <code>Type</code> instead of
		437	* a <code>Name</code>.
431	*/	438	*/
432	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>setType</code>, which expects a <code>Type</code> instead of a <code>Name</code>.
433	public void setName(Name name) {	439	public void setName(Name name) {
		440	internalSetName(name);
		441	}
		442
		443	/**
		444	* Internal synonym for deprecated method. Used to avoid
		445	* deprecation warnings.
		446	* @since 3.1
		447	*/
		448	/package/ public void internalSetName(Name name) {
434	supportedOnlyIn2();	449	supportedOnlyIn2();
435	if (name == null) {	450	if (name == null) {
436	throw new IllegalArgumentException();	451	throw new IllegalArgumentException();
Lines 448-454 Link Here
448	* @return the type node	463	* @return the type node
449	* @exception UnsupportedOperationException if this operation is used in	464	* @exception UnsupportedOperationException if this operation is used in
450	* a JLS2 AST	465	* a JLS2 AST
451	* @since 3.0	466	* @since 3.1
452	*/	467	*/
453	public Type getType() {	468	public Type getType() {
454	unsupportedIn2();	469	unsupportedIn2();
Lines 477-483 Link Here
477	* </ul>	492	* </ul>
478	* @exception UnsupportedOperationException if this operation is used in	493	* @exception UnsupportedOperationException if this operation is used in
479	* a JLS2 AST	494	* a JLS2 AST
480	* @since 3.0	495	* @since 3.1
481	*/	496	*/
482	public void setType(Type type) {	497	public void setType(Type type) {
483	unsupportedIn2();	498	unsupportedIn2();

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/ConstructorInvocation.java (-12 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 34-40 Link Here
34		34
35	/**	35	/**
36	* The "typeArguments" structural property of this node type (added in JLS3 API).	36	* The "typeArguments" structural property of this node type (added in JLS3 API).
37	* @since 3.0	37	* @since 3.1
38	*/	38	*/
39	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =	39	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =
40	new ChildListPropertyDescriptor(ConstructorInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$	40	new ChildListPropertyDescriptor(ConstructorInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 58-64 Link Here
58	* A list of property descriptors (element type:	58	* A list of property descriptors (element type:
59	* {@link StructuralPropertyDescriptor}),	59	* {@link StructuralPropertyDescriptor}),
60	* or null if uninitialized.	60	* or null if uninitialized.
61	* @since 3.0	61	* @since 3.1
62	*/	62	*/
63	private static final List PROPERTY_DESCRIPTORS_3_0;	63	private static final List PROPERTY_DESCRIPTORS_3_0;
64		64
Lines 87-93 Link Here
87	* @since 3.0	87	* @since 3.0
88	*/	88	*/
89	public static List propertyDescriptors(int apiLevel) {	89	public static List propertyDescriptors(int apiLevel) {
90	if (apiLevel == AST.JLS2) {	90	if (apiLevel == AST.JLS2_INTERNAL) {
91	return PROPERTY_DESCRIPTORS_2_0;	91	return PROPERTY_DESCRIPTORS_2_0;
92	} else {	92	} else {
93	return PROPERTY_DESCRIPTORS_3_0;	93	return PROPERTY_DESCRIPTORS_3_0;
Lines 98-104 Link Here
98	* The type arguments (element type: <code>Type</code>).	98	* The type arguments (element type: <code>Type</code>).
99	* Null in JLS2. Added in JLS3; defaults to an empty list	99	* Null in JLS2. Added in JLS3; defaults to an empty list
100	* (see constructor).	100	* (see constructor).
101	* @since 3.0	101	* @since 3.1
102	*/	102	*/
103	private ASTNode.NodeList typeArguments = null;	103	private ASTNode.NodeList typeArguments = null;
104		104
Lines 189-206 Link Here
189	/**	189	/**
190	* Returns the live ordered list of type arguments of this constructor	190	* Returns the live ordered list of type arguments of this constructor
191	* invocation (added in JLS3 API).	191	* invocation (added in JLS3 API).
192	* <p>
193	* Note: This API element is only needed for dealing with Java code that uses
194	* new language features of J2SE 1.5. It is included in anticipation of J2SE
195	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
196	* may change slightly before reaching its final form.
197	* </p>
198	*	192	*
199	* @return the live list of type arguments	193	* @return the live list of type arguments
200	* (element type: <code>Type</code>)	194	* (element type: <code>Type</code>)
201	* @exception UnsupportedOperationException if this operation is used in	195	* @exception UnsupportedOperationException if this operation is used in
202	* a JLS2 AST	196	* a JLS2 AST
203	* @since 3.0	197	* @since 3.1
204	*/	198	*/
205	public List typeArguments() {	199	public List typeArguments() {
206	// more efficient than just calling unsupportedIn2() to check	200	// more efficient than just calling unsupportedIn2() to check

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/EnhancedForStatement.java (-12 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 24-56 Link Here
24	* </pre>	24	* </pre>
25	* The FormalParameter is represented by a <code>SingleVariableDeclaration</code>	25	* The FormalParameter is represented by a <code>SingleVariableDeclaration</code>
26	* (without an initializer).	26	* (without an initializer).
27	* <p>	27	*
28	* Note: This API element is only needed for dealing with Java code that uses	28	* @since 3.1
29	* new language features of J2SE 1.5. It is included in anticipation of J2SE
30	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
31	* may change slightly before reaching its final form.
32	* </p>
33	* @since 3.0
34	*/	29	*/
35	public class EnhancedForStatement extends Statement {	30	public class EnhancedForStatement extends Statement {
36		31
37	/**	32	/**
38	* The "parameter" structural property of this node type.	33	* The "parameter" structural property of this node type.
39	* @since 3.0
40	*/	34	*/
41	public static final ChildPropertyDescriptor PARAMETER_PROPERTY =	35	public static final ChildPropertyDescriptor PARAMETER_PROPERTY =
42	new ChildPropertyDescriptor(EnhancedForStatement.class, "parameter", SingleVariableDeclaration.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$	36	new ChildPropertyDescriptor(EnhancedForStatement.class, "parameter", SingleVariableDeclaration.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$
43		37
44	/**	38	/**
45	* The "expression" structural property of this node type.	39	* The "expression" structural property of this node type.
46	* @since 3.0
47	*/	40	*/
48	public static final ChildPropertyDescriptor EXPRESSION_PROPERTY =	41	public static final ChildPropertyDescriptor EXPRESSION_PROPERTY =
49	new ChildPropertyDescriptor(EnhancedForStatement.class, "expression", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$	42	new ChildPropertyDescriptor(EnhancedForStatement.class, "expression", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$
50		43
51	/**	44	/**
52	* The "body" structural property of this node type.	45	* The "body" structural property of this node type.
53	* @since 3.0
54	*/	46	*/
55	public static final ChildPropertyDescriptor BODY_PROPERTY =	47	public static final ChildPropertyDescriptor BODY_PROPERTY =
56	new ChildPropertyDescriptor(EnhancedForStatement.class, "body", Statement.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$	48	new ChildPropertyDescriptor(EnhancedForStatement.class, "body", Statement.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$
Lines 80-86 Link Here
80		72
81	* @return a list of property descriptors (element type:	73	* @return a list of property descriptors (element type:
82	* {@link StructuralPropertyDescriptor})	74	* {@link StructuralPropertyDescriptor})
83	* @since 3.0
84	*/	75	*/
85	public static List propertyDescriptors(int apiLevel) {	76	public static List propertyDescriptors(int apiLevel) {
86	return PROPERTY_DESCRIPTORS;	77	return PROPERTY_DESCRIPTORS;

Lines 35-48 Link Here

(-)dom/org/eclipse/jdt/core/dom/EnumConstantDeclaration.java (-12 / +1 lines)
35	* arguments and no class body declarations, the source range extends through	35	* arguments and no class body declarations, the source range extends through
36	* the last character of the identifier.	36	* the last character of the identifier.
37	* </p>	37	* </p>
38	* <p>
39	* Note: This API element is only needed for dealing with Java code that uses
40	* new language features of J2SE 1.5. It is included in anticipation of J2SE
41	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
42	* may change slightly before reaching its final form.
43	* </p>
44	*	38	*
45	* @since 3.0	39	* @since 3.1
46	*/	40	*/
47	public class EnumConstantDeclaration extends BodyDeclaration {	41	public class EnumConstantDeclaration extends BodyDeclaration {
48		42
Lines 80-86 Link Here
80		74
81	/**	75	/**
82	* The "anonymousClassDeclaration" structural property of this node type.	76	* The "anonymousClassDeclaration" structural property of this node type.
83	* @since 3.1
84	*/	77	*/
85	public static final ChildPropertyDescriptor ANONYMOUS_CLASS_DECLARATION_PROPERTY =	78	public static final ChildPropertyDescriptor ANONYMOUS_CLASS_DECLARATION_PROPERTY =
86	new ChildPropertyDescriptor(EnumConstantDeclaration.class, "anonymousClassDeclaration", AnonymousClassDeclaration.class, OPTIONAL, CYCLE_RISK); //$NON-NLS-1$	79	new ChildPropertyDescriptor(EnumConstantDeclaration.class, "anonymousClassDeclaration", AnonymousClassDeclaration.class, OPTIONAL, CYCLE_RISK); //$NON-NLS-1$
Lines 143-149 Link Here
143	/**	136	/**
144	* The optional anonymous class declaration; <code>null</code> for none;	137	* The optional anonymous class declaration; <code>null</code> for none;
145	* defaults to none.	138	* defaults to none.
146	* @since 3.1
147	*/	139	*/
148	private AnonymousClassDeclaration optionalAnonymousClassDeclaration = null;	140	private AnonymousClassDeclaration optionalAnonymousClassDeclaration = null;
149		141
Lines 373-379 Link Here
373	* enum constant declaration, if it has one.	365	* enum constant declaration, if it has one.
374	*	366	*
375	* @return the anonymous class declaration, or <code>null</code> if none	367	* @return the anonymous class declaration, or <code>null</code> if none
376	* @since 3.1
377	*/	368	*/
378	public AnonymousClassDeclaration getAnonymousClassDeclaration() {	369	public AnonymousClassDeclaration getAnonymousClassDeclaration() {
379	return this.optionalAnonymousClassDeclaration;	370	return this.optionalAnonymousClassDeclaration;
Lines 385-391 Link Here
385	*	376	*
386	* @param decl the anonymous class declaration, or <code>null</code>	377	* @param decl the anonymous class declaration, or <code>null</code>
387	* if none	378	* if none
388	* @since 3.1
389	*/	379	*/
390	public void setAnonymousClassDeclaration(AnonymousClassDeclaration decl) {	380	public void setAnonymousClassDeclaration(AnonymousClassDeclaration decl) {
391	ASTNode oldChild = this.optionalAnonymousClassDeclaration;	381	ASTNode oldChild = this.optionalAnonymousClassDeclaration;
Lines 404-410 Link Here
404	*	394	*
405	* @return the constructor binding, or <code>null</code> if the binding	395	* @return the constructor binding, or <code>null</code> if the binding
406	* cannot be resolved	396	* cannot be resolved
407	* @since 3.1
408	*/	397	*/
409	public IMethodBinding resolveConstructorBinding() {	398	public IMethodBinding resolveConstructorBinding() {
410	return this.ast.getBindingResolver().resolveConstructor(this);	399	return this.ast.getBindingResolver().resolveConstructor(this);

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/EnumDeclaration.java (-11 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 38-51 Link Here
38	* modifiers or annotations). The source range extends through the last	38	* modifiers or annotations). The source range extends through the last
39	* character of the "}" token following the body declarations.	39	* character of the "}" token following the body declarations.
40	* </p>	40	* </p>
41	* <p>
42	* Note: This API element is only needed for dealing with Java code that uses
43	* new language features of J2SE 1.5. It is included in anticipation of J2SE
44	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
45	* may change slightly before reaching its final form.
46	* </p>
47	*	41	*
48	* @since 3.0	42	* @since 3.1
49	*/	43	*/
50	public class EnumDeclaration extends AbstractTypeDeclaration {	44	public class EnumDeclaration extends AbstractTypeDeclaration {
51		45
Lines 75-81 Link Here
75		69
76	/**	70	/**
77	* The "enumConstants" structural property of this node type.	71	* The "enumConstants" structural property of this node type.
78	* @since 3.1
79	*/	72	*/
80	public static final ChildListPropertyDescriptor ENUM_CONSTANTS_PROPERTY =	73	public static final ChildListPropertyDescriptor ENUM_CONSTANTS_PROPERTY =
81	new ChildListPropertyDescriptor(EnumDeclaration.class, "enumConstants", EnumConstantDeclaration.class, CYCLE_RISK); //$NON-NLS-1$	74	new ChildListPropertyDescriptor(EnumDeclaration.class, "enumConstants", EnumConstantDeclaration.class, CYCLE_RISK); //$NON-NLS-1$
Lines 130-136 Link Here
130	* The enum constant declarations	123	* The enum constant declarations
131	* (element type: <code>EnumConstantDeclaration</code>).	124	* (element type: <code>EnumConstantDeclaration</code>).
132	* Defaults to an empty list.	125	* Defaults to an empty list.
133	* @since 3.1
134	*/	126	*/
135	private ASTNode.NodeList enumConstants =	127	private ASTNode.NodeList enumConstants =
136	new ASTNode.NodeList(ENUM_CONSTANTS_PROPERTY);	128	new ASTNode.NodeList(ENUM_CONSTANTS_PROPERTY);
Lines 308-314 Link Here
308	*	300	*
309	* @return the live list of enum constant declarations	301	* @return the live list of enum constant declarations
310	* (element type: {@link EnumConstantDeclaration})	302	* (element type: {@link EnumConstantDeclaration})
311	* @since 3.1
312	*/	303	*/
313	public List enumConstants() {	304	public List enumConstants() {
314	return enumConstants;	305	return enumConstants;

Lines 48-60 Link Here

(-)dom/org/eclipse/jdt/core/dom/FieldDeclaration.java (-7 / +6 lines)
48	* The "modifiers" structural property of this node type (JLS2 API only).	48	* The "modifiers" structural property of this node type (JLS2 API only).
49	* @since 3.0	49	* @since 3.0
50	*/	50	*/
51	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
52	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =	51	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =
53	internalModifiersPropertyFactory(FieldDeclaration.class);	52	internalModifiersPropertyFactory(FieldDeclaration.class);
54		53
55	/**	54	/**
56	* The "modifiers" structural property of this node type (added in JLS3 API).	55	* The "modifiers" structural property of this node type (added in JLS3 API).
57	* @since 3.0	56	* @since 3.1
58	*/	57	*/
59	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =	58	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =
60	internalModifiers2PropertyFactory(FieldDeclaration.class);	59	internalModifiers2PropertyFactory(FieldDeclaration.class);
Lines 85-91 Link Here
85	* A list of property descriptors (element type:	84	* A list of property descriptors (element type:
86	* {@link StructuralPropertyDescriptor}),	85	* {@link StructuralPropertyDescriptor}),
87	* or null if uninitialized.	86	* or null if uninitialized.
88	* @since 3.0	87	* @since 3.1
89	*/	88	*/
90	private static final List PROPERTY_DESCRIPTORS_3_0;	89	private static final List PROPERTY_DESCRIPTORS_3_0;
91		90
Lines 119-125 Link Here
119	* @since 3.0	118	* @since 3.0
120	*/	119	*/
121	public static List propertyDescriptors(int apiLevel) {	120	public static List propertyDescriptors(int apiLevel) {
122	if (apiLevel == AST.JLS2) {	121	if (apiLevel == AST.JLS2_INTERNAL) {
123	return PROPERTY_DESCRIPTORS_2_0;	122	return PROPERTY_DESCRIPTORS_2_0;
124	} else {	123	} else {
125	return PROPERTY_DESCRIPTORS_3_0;	124	return PROPERTY_DESCRIPTORS_3_0;
Lines 170-176 Link Here
170	if (get) {	169	if (get) {
171	return getModifiers();	170	return getModifiers();
172	} else {	171	} else {
173	setModifiers(value);	172	internalSetModifiers(value);
174	return 0;	173	return 0;
175	}	174	}
176	}	175	}
Lines 252-259 Link Here
252	result.setSourceRange(this.getStartPosition(), this.getLength());	251	result.setSourceRange(this.getStartPosition(), this.getLength());
253	result.setJavadoc(	252	result.setJavadoc(
254	(Javadoc) ASTNode.copySubtree(target, getJavadoc()));	253	(Javadoc) ASTNode.copySubtree(target, getJavadoc()));
255	if (this.ast.apiLevel == AST.JLS2) {	254	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
256	result.setModifiers(getModifiers());	255	result.internalSetModifiers(getModifiers());
257	}	256	}
258	if (this.ast.apiLevel >= AST.JLS3) {	257	if (this.ast.apiLevel >= AST.JLS3) {
259	result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));	258	result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));

Lines 138-152 Link Here

(-)dom/org/eclipse/jdt/core/dom/IMethodBinding.java (-25 / +1 lines)
138	* parameters (they instead have non-empty type arguments	138	* parameters (they instead have non-empty type arguments
139	* and non-trivial erasure).	139	* and non-trivial erasure).
140	* </p>	140	* </p>
141	* <p>
142	* Note: Support for new language features proposed for the upcoming 1.5
143	* release of J2SE is tentative and subject to change.
144	* </p>
145	*	141	*
146	* @return the list of binding for the type variables for the type	142	* @return the list of binding for the type variables for the type
147	* parameters of this method, or otherwise the empty list	143	* parameters of this method, or otherwise the empty list
148	* @see ITypeBinding#isTypeVariable()	144	* @see ITypeBinding#isTypeVariable()
149	* @since 3.0	145	* @since 3.1
150	*/	146	*/
151	public ITypeBinding[] getTypeParameters();	147	public ITypeBinding[] getTypeParameters();
152		148
Lines 166-175 Link Here
166	* {@link #isParameterizedMethod()},	162	* {@link #isParameterizedMethod()},
167	* and {@link #isRawMethod()} are mutually exclusive.	163	* and {@link #isRawMethod()} are mutually exclusive.
168	* </p>	164	* </p>
169	* <p>
170	* Note: Support for new language features of the 1.5
171	* release of J2SE is tentative and subject to change.
172	* </p>
173	*	165	*
174	* @return <code>true</code> if this method binding represents a	166	* @return <code>true</code> if this method binding represents a
175	* declaration of a generic method, and <code>false</code> otherwise	167	* declaration of a generic method, and <code>false</code> otherwise
Lines 186-195 Link Here
186	* {@link #isParameterizedMethod()},	178	* {@link #isParameterizedMethod()},
187	* and {@link #isRawMethod()} are mutually exclusive.	179	* and {@link #isRawMethod()} are mutually exclusive.
188	* </p>	180	* </p>
189	* <p>
190	* Note: Support for new language features proposed for the upcoming 1.5
191	* release of J2SE is tentative and subject to change.
192	* </p>
193	*	181	*
194	* @return <code>true</code> if this method binding represents a	182	* @return <code>true</code> if this method binding represents a
195	* an instance of a generic method corresponding to a parameterized	183	* an instance of a generic method corresponding to a parameterized
Lines 210-219 Link Here
210	* which only occur on the method binding corresponding directly to the	198	* which only occur on the method binding corresponding directly to the
211	* declaration of a generic method.	199	* declaration of a generic method.
212	* </p>	200	* </p>
213	* <p>
214	* Note: Support for new language features proposed for the upcoming 1.5
215	* release of J2SE is tentative and subject to change.
216	* </p>
217	*	201	*
218	* @return the list of type bindings for the type arguments used to	202	* @return the list of type bindings for the type arguments used to
219	* instantiate the corrresponding generic method, or otherwise the empty list	203	* instantiate the corrresponding generic method, or otherwise the empty list
Lines 237-246 Link Here
237	* and raw methods ({@link #isRawMethod()}), this method returns the binding	221	* and raw methods ({@link #isRawMethod()}), this method returns the binding
238	* for the corresponding generic method. For other method bindings, this	222	* for the corresponding generic method. For other method bindings, this
239	* returns the same binding.	223	* returns the same binding.
240	* <p>
241	* Note: Support for new language features proposed for the upcoming 1.5
242	* release of J2SE is tentative and subject to change.
243	* </p>
244	*	224	*
245	* @return the method binding	225	* @return the method binding
246	* @since 3.1	226	* @since 3.1
Lines 261-270 Link Here
261	* Note that {@link #isGenericMethod()},	241	* Note that {@link #isGenericMethod()},
262	* {@link #isParameterizedMethod()},	242	* {@link #isParameterizedMethod()},
263	* and {@link #isRawMethod()} are mutually exclusive.	243	* and {@link #isRawMethod()} are mutually exclusive.
264	* </p>
265	* <p>
266	* Note: Support for new language features proposed for the upcoming 1.5
267	* release of J2SE is tentative and subject to change.
268	* </p>	244	* </p>
269	*	245	*
270	* @return <code>true</code> if this method binding represents a	246	* @return <code>true</code> if this method binding represents a

Lines 40-49 Link Here

(-)dom/org/eclipse/jdt/core/dom/ITypeBinding.java (-68 / +12 lines)
40	* <p>	40	* <p>
41	* This interface is not intended to be implemented by clients.	41	* This interface is not intended to be implemented by clients.
42	* </p>	42	* </p>
43	* <p>
44	* Note: Support for new language features proposed for the upcoming 1.5
45	* release of J2SE is tentative and subject to change.
46	* </p>
47	*	43	*
48	* @see ITypeBinding#getDeclaredTypes()	44	* @see ITypeBinding#getDeclaredTypes()
49	* @since 2.0	45	* @since 2.0
Lines 165-178 Link Here
165		161
166	/**	162	/**
167	* Returns whether this type binding represents an enum type.	163	* Returns whether this type binding represents an enum type.
168	* <p>
169	* Note: Support for new language features proposed for the upcoming 1.5
170	* release of J2SE is tentative and subject to change.
171	* </p>
172	*	164	*
173	* @return <code>true</code> if this object represents an enum type,	165	* @return <code>true</code> if this object represents an enum type,
174	* and <code>false</code> otherwise	166	* and <code>false</code> otherwise
175	* @since 3.0	167	* @since 3.1
176	*/	168	*/
177	public boolean isEnum();	169	public boolean isEnum();
178		170
Lines 181-194 Link Here
181	* <p>	173	* <p>
182	* Note that an annotation type is always an interface.	174	* Note that an annotation type is always an interface.
183	* </p>	175	* </p>
184	* <p>
185	* Note: Support for new language features proposed for the upcoming 1.5
186	* release of J2SE is tentative and subject to change.
187	* </p>
188	*	176	*
189	* @return <code>true</code> if this object represents an annotation type,	177	* @return <code>true</code> if this object represents an annotation type,
190	* and <code>false</code> otherwise	178	* and <code>false</code> otherwise
191	* @since 3.0	179	* @since 3.1
192	*/	180	*/
193	public boolean isAnnotation();	181	public boolean isAnnotation();
194		182
Lines 201-215 Link Here
201	* type do not carry type parameters (they instead have non-empty type arguments	189	* type do not carry type parameters (they instead have non-empty type arguments
202	* and non-trivial erasure).	190	* and non-trivial erasure).
203	* </p>	191	* </p>
204	* <p>
205	* Note: Support for new language features proposed for the upcoming 1.5
206	* release of J2SE is tentative and subject to change.
207	* </p>
208	*	192	*
209	* @return the list of binding for the type variables for the type	193	* @return the list of binding for the type variables for the type
210	* parameters of this type, or otherwise the empty list	194	* parameters of this type, or otherwise the empty list
211	* @see #isTypeVariable()	195	* @see #isTypeVariable()
212	* @since 3.0	196	* @since 3.1
213	*/	197	*/
214	// TODO (jeem) - clarify whether binding for a generic type instance carries a copy of the generic type's type parameters as well as type arguments	198	// TODO (jeem) - clarify whether binding for a generic type instance carries a copy of the generic type's type parameters as well as type arguments
215	public ITypeBinding[] getTypeParameters();	199	public ITypeBinding[] getTypeParameters();
Lines 230-239 Link Here
230	* {@link #isParameterizedType()},	214	* {@link #isParameterizedType()},
231	* and {@link #isRawType()} are mutually exclusive.	215	* and {@link #isRawType()} are mutually exclusive.
232	* </p>	216	* </p>
233	* <p>
234	* Note: Support for new language features of the 1.5
235	* release of J2SE is tentative and subject to change.
236	* </p>
237	*	217	*
238	* @return <code>true</code> if this type binding represents a	218	* @return <code>true</code> if this type binding represents a
239	* declaration of a generic class or interface, and <code>false</code> otherwise	219	* declaration of a generic class or interface, and <code>false</code> otherwise
Lines 245-274 Link Here
245	/**	225	/**
246	* Returns whether this type binding represents a type variable.	226	* Returns whether this type binding represents a type variable.
247	* Type variables bindings carry the type variable's bounds.	227	* Type variables bindings carry the type variable's bounds.
248	* <p>
249	* Note: Support for new language features proposed for the upcoming 1.5
250	* release of J2SE is tentative and subject to change.
251	* </p>
252	*	228	*
253	* @return <code>true</code> if this type binding is for a type variable,	229	* @return <code>true</code> if this type binding is for a type variable,
254	* and <code>false</code> otherwise	230	* and <code>false</code> otherwise
255	* @see #getName()	231	* @see #getName()
256	* @see #getTypeBounds()	232	* @see #getTypeBounds()
257	* @since 3.0	233	* @since 3.1
258	*/	234	*/
259	public boolean isTypeVariable();	235	public boolean isTypeVariable();
260		236
261	/**	237	/**
262	* Returns the type bounds of this type variable.	238	* Returns the type bounds of this type variable.
263	* <p>
264	* Note: Support for new language features proposed for the upcoming 1.5
265	* release of J2SE is tentative and subject to change.
266	* </p>
267	*	239	*
268	* @return the list of type bindings for this type variable, or otherwise	240	* @return the list of type bindings for this type variable, or otherwise
269	* the empty list	241	* the empty list
270	* @see #isTypeVariable()	242	* @see #isTypeVariable()
271	* @since 3.0	243	* @since 3.1
272	*/	244	*/
273	public ITypeBinding[] getTypeBounds();	245	public ITypeBinding[] getTypeBounds();
274		246
Lines 292-298 Link Here
292	* type reference, and <code>false</code> otherwise	264	* type reference, and <code>false</code> otherwise
293	* @see #getTypeArguments()	265	* @see #getTypeArguments()
294	* @see #getGenericType()	266	* @see #getGenericType()
295	* @since 3.0	267	* @since 3.1
296	*/	268	*/
297	public boolean isParameterizedType();	269	public boolean isParameterizedType();
298		270
Lines 308-317 Link Here
308	* type binding corresponding directly to the declaration of the	280	* type binding corresponding directly to the declaration of the
309	* generic class or interface (e.g., <code>Collection<T></code>).	281	* generic class or interface (e.g., <code>Collection<T></code>).
310	* </p>	282	* </p>
311	* <p>
312	* Note: Support for new language features proposed for the upcoming 1.5
313	* release of J2SE is tentative and subject to change.
314	* </p>
315	*	283	*
316	* @return the list of type bindings for the type arguments used to	284	* @return the list of type bindings for the type arguments used to
317	* instantiate the corrresponding generic type, or otherwise the empty list	285	* instantiate the corrresponding generic type, or otherwise the empty list
Lines 319-325 Link Here
319	* @see #isGenericType()	287	* @see #isGenericType()
320	* @see #isParameterizedType()	288	* @see #isParameterizedType()
321	* @see #isRawType()	289	* @see #isRawType()
322	* @since 3.0	290	* @since 3.1
323	*/	291	*/
324	public ITypeBinding[] getTypeArguments();	292	public ITypeBinding[] getTypeArguments();
325		293
Lines 339-351 Link Here
339	* if it has bounds and java.lang.Object if it does not.</li>	307	* if it has bounds and java.lang.Object if it does not.</li>
340	* <li>For all other type bindings - returns the identical binding.</li>	308	* <li>For all other type bindings - returns the identical binding.</li>
341	* </ul>	309	* </ul>
342	* <p>
343	* Note: Support for new language features proposed for the upcoming 1.5
344	* release of J2SE is tentative and subject to change.
345	* </p>
346	*	310	*
347	* @return the erasure type binding	311	* @return the erasure type binding
348	* @since 3.0	312	* @since 3.1
349	*/	313	*/
350	public ITypeBinding getErasure();	314	public ITypeBinding getErasure();
351		315
Lines 362-371 Link Here
362	* and raw types ({@link #isRawType()}), this method returns the binding	326	* and raw types ({@link #isRawType()}), this method returns the binding
363	* for the corresponding generic type. For other type bindings, this	327	* for the corresponding generic type. For other type bindings, this
364	* returns the same binding.	328	* returns the same binding.
365	* <p>
366	* Note: Support for new language features proposed for the upcoming 1.5
367	* release of J2SE is tentative and subject to change.
368	* </p>
369	*	329	*
370	* @return the type binding	330	* @return the type binding
371	* @since 3.1	331	* @since 3.1
Lines 390-406 Link Here
390	* {@link #isParameterizedType()},	350	* {@link #isParameterizedType()},
391	* and {@link #isRawType()} are mutually exclusive.	351	* and {@link #isRawType()} are mutually exclusive.
392	* </p>	352	* </p>
393	* <p>
394	* Note: Support for new language features proposed for the upcoming 1.5
395	* release of J2SE is tentative and subject to change.
396	* </p>
397	*	353	*
398	* @return <code>true</code> if this type binding represents a	354	* @return <code>true</code> if this type binding represents a
399	* an instance of a generic type corresponding to a raw	355	* an instance of a generic type corresponding to a raw
400	* type reference, and <code>false</code> otherwise	356	* type reference, and <code>false</code> otherwise
401	* @see #getGenericType()	357	* @see #getGenericType()
402	* @see #getTypeArguments()	358	* @see #getTypeArguments()
403	* @since 3.0	359	* @since 3.1
404	*/	360	*/
405	public boolean isRawType();	361	public boolean isRawType();
406		362
Lines 413-426 Link Here
413	* parameterized type binding whose type argument is a wildcard type	369	* parameterized type binding whose type argument is a wildcard type
414	* with upper type bound <code>java.util.Object/code>.	370	* with upper type bound <code>java.util.Object/code>.
415	* </p>	371	* </p>
416	* <p>
417	* Note: Support for new language features proposed for the upcoming 1.5
418	* release of J2SE is tentative and subject to change.
419	* </p>
420	*	372	*
421	* @return <code>true</code> if this object represents a wildcard type,	373	* @return <code>true</code> if this object represents a wildcard type,
422	* and <code>false</code> otherwise	374	* and <code>false</code> otherwise
423	* @since 3.0	375	* @since 3.1
424	* @see #getBound()	376	* @see #getBound()
425	* @see #isUpperbound()	377	* @see #isUpperbound()
426	*/	378	*/
Lines 429-443 Link Here
429	/**	381	/**
430	* Returns the bound of this wildcard type if it has one.	382	* Returns the bound of this wildcard type if it has one.
431	* Returns <code>null</code> if this is not a wildcard type.	383	* Returns <code>null</code> if this is not a wildcard type.
432	* <p>
433	* Note: Support for new language features proposed for the upcoming 1.5
434	* release of J2SE is tentative and subject to change.
435	* </p>
436	*	384	*
437	* @return the bound of this wildcard type, or <code>null</code> if none	385	* @return the bound of this wildcard type, or <code>null</code> if none
438	* @see #isWildcardType()	386	* @see #isWildcardType()
439	* @see #isUpperbound()	387	* @see #isUpperbound()
440	* @since 3.0	388	* @since 3.1
441	*/	389	*/
442	public ITypeBinding getBound();	390	public ITypeBinding getBound();
443		391
Lines 446-461 Link Here
446	* ("extends") as opposed to a lower bound ("super").	394	* ("extends") as opposed to a lower bound ("super").
447	* Note that this property is only relevant for wildcards	395	* Note that this property is only relevant for wildcards
448	* that have a bound.	396	* that have a bound.
449	* <p>
450	* Note: Support for new language features proposed for the upcoming 1.5
451	* release of J2SE is tentative and subject to change.
452	* </p>
453	*	397	*
454	* @return <code>true</code> if this wildcard type has a bound that is	398	* @return <code>true</code> if this wildcard type has a bound that is
455	* an upper bound, and <code>false</code> in all other cases	399	* an upper bound, and <code>false</code> in all other cases
456	* @see #isWildcardType()	400	* @see #isWildcardType()
457	* @see #getBound()	401	* @see #getBound()
458	* @since 3.0	402	* @since 3.1
459	*/	403	*/
460	public boolean isUpperbound();	404	public boolean isUpperbound();
461		405

Lines 47-53 Link Here

(-)dom/org/eclipse/jdt/core/dom/ImportDeclaration.java (-18 / +6 lines)
47		47
48	/**	48	/**
49	* The "static" structural property of this node type (added in JLS3 API).	49	* The "static" structural property of this node type (added in JLS3 API).
50	* @since 3.0	50	* @since 3.1
51	*/	51	*/
52	public static final SimplePropertyDescriptor STATIC_PROPERTY =	52	public static final SimplePropertyDescriptor STATIC_PROPERTY =
53	new SimplePropertyDescriptor(ImportDeclaration.class, "static", boolean.class, MANDATORY); //$NON-NLS-1$	53	new SimplePropertyDescriptor(ImportDeclaration.class, "static", boolean.class, MANDATORY); //$NON-NLS-1$
Lines 64-70 Link Here
64	* A list of property descriptors (element type:	64	* A list of property descriptors (element type:
65	* {@link StructuralPropertyDescriptor}),	65	* {@link StructuralPropertyDescriptor}),
66	* or null if uninitialized.	66	* or null if uninitialized.
67	* @since 3.0	67	* @since 3.1
68	*/	68	*/
69	private static final List PROPERTY_DESCRIPTORS_3_0;	69	private static final List PROPERTY_DESCRIPTORS_3_0;
70		70
Lines 95-101 Link Here
95	* @since 3.0	95	* @since 3.0
96	*/	96	*/
97	public static List propertyDescriptors(int apiLevel) {	97	public static List propertyDescriptors(int apiLevel) {
98	if (apiLevel == AST.JLS2) {	98	if (apiLevel == AST.JLS2_INTERNAL) {
99	return PROPERTY_DESCRIPTORS_2_0;	99	return PROPERTY_DESCRIPTORS_2_0;
100	} else {	100	} else {
101	return PROPERTY_DESCRIPTORS_3_0;	101	return PROPERTY_DESCRIPTORS_3_0;
Lines 116-122 Link Here
116	/**	116	/**
117	* Static versus regular; defaults to regular import.	117	* Static versus regular; defaults to regular import.
118	* Added in JLS3; not used in JLS2.	118	* Added in JLS3; not used in JLS2.
119	* @since 3.0	119	* @since 3.1
120	*/	120	*/
121	private boolean isStatic = false;	121	private boolean isStatic = false;
122		122
Lines 303-320 Link Here
303		303
304	/**	304	/**
305	* Returns whether this import declaration is a static import (added in JLS3 API).	305	* Returns whether this import declaration is a static import (added in JLS3 API).
306	* <p>
307	* Note: This API element is only needed for dealing with Java code that uses
308	* new language features of J2SE 1.5. It is included in anticipation of J2SE
309	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
310	* may change slightly before reaching its final form.
311	* </p>
312	*	306	*
313	* @return <code>true</code> if this is a static import,	307	* @return <code>true</code> if this is a static import,
314	* and <code>false</code> if this is a regular import	308	* and <code>false</code> if this is a regular import
315	* @exception UnsupportedOperationException if this operation is used in	309	* @exception UnsupportedOperationException if this operation is used in
316	* a JLS2 AST	310	* a JLS2 AST
317	* @since 3.0	311	* @since 3.1
318	*/	312	*/
319	public boolean isStatic() {	313	public boolean isStatic() {
320	unsupportedIn2();	314	unsupportedIn2();
Lines 323-340 Link Here
323		317
324	/**	318	/**
325	* Sets whether this import declaration is a static import (added in JLS3 API).	319	* Sets whether this import declaration is a static import (added in JLS3 API).
326	* <p>
327	* Note: This API element is only needed for dealing with Java code that uses
328	* new language features of J2SE 1.5. It is included in anticipation of J2SE
329	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
330	* may change slightly before reaching its final form.
331	* </p>
332	*	320	*
333	* @param isStatic <code>true</code> if this is a static import,	321	* @param isStatic <code>true</code> if this is a static import,
334	* and <code>false</code> if this is a regular import	322	* and <code>false</code> if this is a regular import
335	* @exception UnsupportedOperationException if this operation is used in	323	* @exception UnsupportedOperationException if this operation is used in
336	* a JLS2 AST	324	* a JLS2 AST
337	* @since 3.0	325	* @since 3.1
338	*/	326	*/
339	public void setStatic(boolean isStatic) {	327	public void setStatic(boolean isStatic) {
340	unsupportedIn2();	328	unsupportedIn2();

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/Initializer.java (-8 / +7 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 36-48 Link Here
36	* The "modifiers" structural property of this node type (JLS2 API only).	36	* The "modifiers" structural property of this node type (JLS2 API only).
37	* @since 3.0	37	* @since 3.0
38	*/	38	*/
39	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
40	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =	39	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =
41	internalModifiersPropertyFactory(Initializer.class);	40	internalModifiersPropertyFactory(Initializer.class);
42		41
43	/**	42	/**
44	* The "modifiers" structural property of this node type (added in JLS3 API).	43	* The "modifiers" structural property of this node type (added in JLS3 API).
45	* @since 3.0	44	* @since 3.1
46	*/	45	*/
47	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =	46	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =
48	internalModifiers2PropertyFactory(Initializer.class);	47	internalModifiers2PropertyFactory(Initializer.class);
Lines 66-72 Link Here
66	* A list of property descriptors (element type:	65	* A list of property descriptors (element type:
67	* {@link StructuralPropertyDescriptor}),	66	* {@link StructuralPropertyDescriptor}),
68	* or null if uninitialized.	67	* or null if uninitialized.
69	* @since 3.0	68	* @since 3.1
70	*/	69	*/
71	private static final List PROPERTY_DESCRIPTORS_3_0;	70	private static final List PROPERTY_DESCRIPTORS_3_0;
72		71
Lines 98-104 Link Here
98	* @since 3.0	97	* @since 3.0
99	*/	98	*/
100	public static List propertyDescriptors(int apiLevel) {	99	public static List propertyDescriptors(int apiLevel) {
101	if (apiLevel == AST.JLS2) {	100	if (apiLevel == AST.JLS2_INTERNAL) {
102	return PROPERTY_DESCRIPTORS_2_0;	101	return PROPERTY_DESCRIPTORS_2_0;
103	} else {	102	} else {
104	return PROPERTY_DESCRIPTORS_3_0;	103	return PROPERTY_DESCRIPTORS_3_0;
Lines 140-146 Link Here
140	if (get) {	139	if (get) {
141	return getModifiers();	140	return getModifiers();
142	} else {	141	} else {
143	setModifiers(value);	142	internalSetModifiers(value);
144	return 0;	143	return 0;
145	}	144	}
146	}	145	}
Lines 217-224 Link Here
217	ASTNode clone0(AST target) {	216	ASTNode clone0(AST target) {
218	Initializer result = new Initializer(target);	217	Initializer result = new Initializer(target);
219	result.setSourceRange(this.getStartPosition(), this.getLength());	218	result.setSourceRange(this.getStartPosition(), this.getLength());
220	if (this.ast.apiLevel == AST.JLS2) {	219	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
221	result.setModifiers(getModifiers());	220	result.internalSetModifiers(getModifiers());
222	}	221	}
223	if (this.ast.apiLevel >= AST.JLS3) {	222	if (this.ast.apiLevel >= AST.JLS3) {
224	result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));	223	result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/Javadoc.java (-6 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 32-45 Link Here
32	/**	32	/**
33	* The "comment" structural property of this node type (JLS2 API only).	33	* The "comment" structural property of this node type (JLS2 API only).
34	* @since 3.0	34	* @since 3.0
		35	* @deprecated Replaced by {@link #TAGS_PROPERTY} in the JLS3 API.
35	*/	36	*/
36	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #TAGS_PROPERTY} in the JLS3 API.
37	public static final SimplePropertyDescriptor COMMENT_PROPERTY =	37	public static final SimplePropertyDescriptor COMMENT_PROPERTY =
38	new SimplePropertyDescriptor(Javadoc.class, "comment", String.class, MANDATORY); //$NON-NLS-1$	38	new SimplePropertyDescriptor(Javadoc.class, "comment", String.class, MANDATORY); //$NON-NLS-1$
39		39
40	/**	40	/**
41	* The "tags" structural property of this node type.	41	* The "tags" structural property of this node type.
42	* @since 3.0	42	* @since 3.1
43	*/	43	*/
44	public static final ChildListPropertyDescriptor TAGS_PROPERTY =	44	public static final ChildListPropertyDescriptor TAGS_PROPERTY =
45	new ChildListPropertyDescriptor(Javadoc.class, "tags", TagElement.class, CYCLE_RISK); //$NON-NLS-1$	45	new ChildListPropertyDescriptor(Javadoc.class, "tags", TagElement.class, CYCLE_RISK); //$NON-NLS-1$
Lines 57-63 Link Here
57	* A list of property descriptors (element type:	57	* A list of property descriptors (element type:
58	* {@link StructuralPropertyDescriptor}),	58	* {@link StructuralPropertyDescriptor}),
59	* or null if uninitialized.	59	* or null if uninitialized.
60	* @since 3.0	60	* @since 3.1
61	*/	61	*/
62	private static final List PROPERTY_DESCRIPTORS_3_0;	62	private static final List PROPERTY_DESCRIPTORS_3_0;
63		63
Lines 85-91 Link Here
85	* @since 3.0	85	* @since 3.0
86	*/	86	*/
87	public static List propertyDescriptors(int apiLevel) {	87	public static List propertyDescriptors(int apiLevel) {
88	if (apiLevel == AST.JLS2) {	88	if (apiLevel == AST.JLS2_INTERNAL) {
89	return PROPERTY_DESCRIPTORS_2_0;	89	return PROPERTY_DESCRIPTORS_2_0;
90	} else {	90	} else {
91	return PROPERTY_DESCRIPTORS_3_0;	91	return PROPERTY_DESCRIPTORS_3_0;
Lines 178-184 Link Here
178	ASTNode clone0(AST target) {	178	ASTNode clone0(AST target) {
179	Javadoc result = new Javadoc(target);	179	Javadoc result = new Javadoc(target);
180	result.setSourceRange(this.getStartPosition(), this.getLength());	180	result.setSourceRange(this.getStartPosition(), this.getLength());
181	if (this.ast.apiLevel == AST.JLS2) {	181	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
182	result.setComment(getComment());	182	result.setComment(getComment());
183	}	183	}
184	result.tags().addAll(ASTNode.copySubtrees(target, tags()));	184	result.tags().addAll(ASTNode.copySubtrees(target, tags()));

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/MarkerAnnotation.java (-12 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 22-40 Link Here
22	* <b>@</b> TypeName	22	* <b>@</b> TypeName
23	* </pre>	23	* </pre>
24	* </p>	24	* </p>
25	* <p>	25	*
26	* Note: This API element is only needed for dealing with Java code that uses	26	* @since 3.1
27	* new language features of J2SE 1.5. It is included in anticipation of J2SE
28	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
29	* may change slightly before reaching its final form.
30	* </p>
31	* @since 3.0
32	*/	27	*/
33	public final class MarkerAnnotation extends Annotation {	28	public final class MarkerAnnotation extends Annotation {
34		29
35	/**	30	/**
36	* The "typeName" structural property of this node type.	31	* The "typeName" structural property of this node type.
37	* @since 3.0
38	*/	32	*/
39	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY =	33	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY =
40	internalTypeNamePropertyFactory(MarkerAnnotation.class);	34	internalTypeNamePropertyFactory(MarkerAnnotation.class);
Lines 43-49 Link Here
43	* A list of property descriptors (element type:	37	* A list of property descriptors (element type:
44	* {@link StructuralPropertyDescriptor}),	38	* {@link StructuralPropertyDescriptor}),
45	* or null if uninitialized.	39	* or null if uninitialized.
46	* @since 3.0
47	*/	40	*/
48	private static final List PROPERTY_DESCRIPTORS;	41	private static final List PROPERTY_DESCRIPTORS;
49		42
Lines 61-67 Link Here
61	* @param apiLevel the API level; one of the AST.JLS* constants	54	* @param apiLevel the API level; one of the AST.JLS* constants
62	* @return a list of property descriptors (element type:	55	* @return a list of property descriptors (element type:
63	* {@link StructuralPropertyDescriptor})	56	* {@link StructuralPropertyDescriptor})
64	* @since 3.0
65	*/	57	*/
66	public static List propertyDescriptors(int apiLevel) {	58	public static List propertyDescriptors(int apiLevel) {
67	return PROPERTY_DESCRIPTORS;	59	return PROPERTY_DESCRIPTORS;
Lines 84-90 Link Here
84		76
85	/* (omit javadoc for this method)	77	/* (omit javadoc for this method)
86	* Method declared on ASTNode.	78	* Method declared on ASTNode.
87	* @since 3.0
88	*/	79	*/
89	final List internalStructuralPropertiesForType(int apiLevel) {	80	final List internalStructuralPropertiesForType(int apiLevel) {
90	return propertyDescriptors(apiLevel);	81	return propertyDescriptors(apiLevel);

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/MemberValuePair.java (-10 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 24-50 Link Here
24	* Within annotations, only certain kinds of expressions are meaningful,	24	* Within annotations, only certain kinds of expressions are meaningful,
25	* including other annotations.	25	* including other annotations.
26	* </p>	26	* </p>
27	* <p>	27	*
28	* Note: This API element is only needed for dealing with Java code that uses
29	* new language features of J2SE 1.5. It is included in anticipation of J2SE
30	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
31	* may change slightly before reaching its final form.
32	* </p>
33	* @see NormalAnnotation	28	* @see NormalAnnotation
34	* @since 3.0	29	* @since 3.1
35	*/	30	*/
36	public class MemberValuePair extends ASTNode {	31	public class MemberValuePair extends ASTNode {
37		32
38	/**	33	/**
39	* The "name" structural property of this node type.	34	* The "name" structural property of this node type.
40	* @since 3.0
41	*/	35	*/
42	public static final ChildPropertyDescriptor NAME_PROPERTY =	36	public static final ChildPropertyDescriptor NAME_PROPERTY =
43	new ChildPropertyDescriptor(MemberValuePair.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$	37	new ChildPropertyDescriptor(MemberValuePair.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$
44		38
45	/**	39	/**
46	* The "value" structural property of this node type.	40	* The "value" structural property of this node type.
47	* @since 3.0
48	*/	41	*/
49	public static final ChildPropertyDescriptor VALUE_PROPERTY =	42	public static final ChildPropertyDescriptor VALUE_PROPERTY =
50	new ChildPropertyDescriptor(MemberValuePair.class, "value", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$	43	new ChildPropertyDescriptor(MemberValuePair.class, "value", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$

Lines 75-87 Link Here

(-)dom/org/eclipse/jdt/core/dom/MethodDeclaration.java (-32 / +38 lines)
75	* The "modifiers" structural property of this node type (JLS2 API only).	75	* The "modifiers" structural property of this node type (JLS2 API only).
76	* @since 3.0	76	* @since 3.0
77	*/	77	*/
78	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
79	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =	78	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =
80	internalModifiersPropertyFactory(MethodDeclaration.class);	79	internalModifiersPropertyFactory(MethodDeclaration.class);
81		80
82	/**	81	/**
83	* The "modifiers" structural property of this node type (added in JLS3 API).	82	* The "modifiers" structural property of this node type (added in JLS3 API).
84	* @since 3.0	83	* @since 3.1
85	*/	84	*/
86	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =	85	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =
87	internalModifiers2PropertyFactory(MethodDeclaration.class);	86	internalModifiers2PropertyFactory(MethodDeclaration.class);
Lines 104-116 Link Here
104	* The "returnType" structural property of this node type (JLS2 API only).	103	* The "returnType" structural property of this node type (JLS2 API only).
105	* @since 3.0	104	* @since 3.0
106	*/	105	*/
107	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #RETURN_TYPE2_PROPERTY} in the JLS3 API.
108	public static final ChildPropertyDescriptor RETURN_TYPE_PROPERTY =	106	public static final ChildPropertyDescriptor RETURN_TYPE_PROPERTY =
109	new ChildPropertyDescriptor(MethodDeclaration.class, "returnType", Type.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$	107	new ChildPropertyDescriptor(MethodDeclaration.class, "returnType", Type.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$
110		108
111	/**	109	/**
112	* The "returnType2" structural property of this node type (added in JLS3 API).	110	* The "returnType2" structural property of this node type (added in JLS3 API).
113	* @since 3.0	111	* @since 3.1
114	*/	112	*/
115	public static final ChildPropertyDescriptor RETURN_TYPE2_PROPERTY =	113	public static final ChildPropertyDescriptor RETURN_TYPE2_PROPERTY =
116	new ChildPropertyDescriptor(MethodDeclaration.class, "returnType2", Type.class, OPTIONAL, NO_CYCLE_RISK); //$NON-NLS-1$	114	new ChildPropertyDescriptor(MethodDeclaration.class, "returnType2", Type.class, OPTIONAL, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 124-130 Link Here
124		122
125	/**	123	/**
126	* The "typeParameters" structural property of this node type (added in JLS3 API).	124	* The "typeParameters" structural property of this node type (added in JLS3 API).
127	* @since 3.0	125	* @since 3.1
128	*/	126	*/
129	public static final ChildListPropertyDescriptor TYPE_PARAMETERS_PROPERTY =	127	public static final ChildListPropertyDescriptor TYPE_PARAMETERS_PROPERTY =
130	new ChildListPropertyDescriptor(MethodDeclaration.class, "typeParameters", TypeParameter.class, NO_CYCLE_RISK); //$NON-NLS-1$	128	new ChildListPropertyDescriptor(MethodDeclaration.class, "typeParameters", TypeParameter.class, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 162-168 Link Here
162	* A list of property descriptors (element type:	160	* A list of property descriptors (element type:
163	* {@link StructuralPropertyDescriptor}),	161	* {@link StructuralPropertyDescriptor}),
164	* or null if uninitialized.	162	* or null if uninitialized.
165	* @since 3.0	163	* @since 3.1
166	*/	164	*/
167	private static final List PROPERTY_DESCRIPTORS_3_0;	165	private static final List PROPERTY_DESCRIPTORS_3_0;
168		166
Lines 205-211 Link Here
205	* @since 3.0	203	* @since 3.0
206	*/	204	*/
207	public static List propertyDescriptors(int apiLevel) {	205	public static List propertyDescriptors(int apiLevel) {
208	if (apiLevel == AST.JLS2) {	206	if (apiLevel == AST.JLS2_INTERNAL) {
209	return PROPERTY_DESCRIPTORS_2_0;	207	return PROPERTY_DESCRIPTORS_2_0;
210	} else {	208	} else {
211	return PROPERTY_DESCRIPTORS_3_0;	209	return PROPERTY_DESCRIPTORS_3_0;
Lines 242-248 Link Here
242		240
243	/**	241	/**
244	* Indicated whether the return type has been initialized.	242	* Indicated whether the return type has been initialized.
245	* @since 3.0	243	* @since 3.1
246	*/	244	*/
247	private boolean returnType2Initialized = false;	245	private boolean returnType2Initialized = false;
248		246
Lines 250-256 Link Here
250	* The type paramters (element type: <code>TypeParameter</code>).	248	* The type paramters (element type: <code>TypeParameter</code>).
251	* Null in JLS2. Added in JLS3; defaults to an empty list	249	* Null in JLS2. Added in JLS3; defaults to an empty list
252	* (see constructor).	250	* (see constructor).
253	* @since 3.0	251	* @since 3.1
254	*/	252	*/
255	private ASTNode.NodeList typeParameters = null;	253	private ASTNode.NodeList typeParameters = null;
256		254
Lines 313-319 Link Here
313	if (get) {	311	if (get) {
314	return getModifiers();	312	return getModifiers();
315	} else {	313	} else {
316	setModifiers(value);	314	internalSetModifiers(value);
317	return 0;	315	return 0;
318	}	316	}
319	}	317	}
Lines 449-456 Link Here
449	result.setSourceRange(this.getStartPosition(), this.getLength());	447	result.setSourceRange(this.getStartPosition(), this.getLength());
450	result.setJavadoc(	448	result.setJavadoc(
451	(Javadoc) ASTNode.copySubtree(target, getJavadoc()));	449	(Javadoc) ASTNode.copySubtree(target, getJavadoc()));
452	if (this.ast.apiLevel == AST.JLS2) {	450	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
453	result.setModifiers(getModifiers());	451	result.internalSetModifiers(getModifiers());
454	result.setReturnType(	452	result.setReturnType(
455	(Type) ASTNode.copySubtree(target, getReturnType()));	453	(Type) ASTNode.copySubtree(target, getReturnType()));
456	}	454	}
Lines 489-495 Link Here
489	if (visitChildren) {	487	if (visitChildren) {
490	// visit children in normal left to right reading order	488	// visit children in normal left to right reading order
491	acceptChild(visitor, getJavadoc());	489	acceptChild(visitor, getJavadoc());
492	if (this.ast.apiLevel == AST.JLS2) {	490	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
493	acceptChild(visitor, getReturnType());	491	acceptChild(visitor, getReturnType());
494	} else {	492	} else {
495	acceptChildren(visitor, this.modifiers);	493	acceptChildren(visitor, this.modifiers);
Lines 530-547 Link Here
530	/**	528	/**
531	* Returns the live ordered list of type parameters of this method	529	* Returns the live ordered list of type parameters of this method
532	* declaration (added in JLS3 API). This list is non-empty for parameterized methods.	530	* declaration (added in JLS3 API). This list is non-empty for parameterized methods.
533	* <p>
534	* Note: This API element is only needed for dealing with Java code that uses
535	* new language features of J2SE 1.5. It is included in anticipation of J2SE
536	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
537	* may change slightly before reaching its final form.
538	* </p>
539	*	531	*
540	* @return the live list of type parameters	532	* @return the live list of type parameters
541	* (element type: <code>TypeParameter</code>)	533	* (element type: <code>TypeParameter</code>)
542	* @exception UnsupportedOperationException if this operation is used in	534	* @exception UnsupportedOperationException if this operation is used in
543	* a JLS2 AST	535	* a JLS2 AST
544	* @since 3.0	536	* @since 3.1
545	*/	537	*/
546	public List typeParameters() {	538	public List typeParameters() {
547	// more efficient than just calling unsupportedIn2() to check	539	// more efficient than just calling unsupportedIn2() to check
Lines 609-627 Link Here
609	* Returns whether this method declaration declares a	601	* Returns whether this method declaration declares a
610	* variable arity method (added in JLS3 API). The convenience method checks	602	* variable arity method (added in JLS3 API). The convenience method checks
611	* whether the last parameter is so marked.	603	* whether the last parameter is so marked.
612	* <p>
613	* Note: This API element is only needed for dealing with Java code that uses
614	* new language features of J2SE 1.5. It is included in anticipation of J2SE
615	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
616	* may change slightly before reaching its final form.
617	* </p>
618	*	604	*
619	* @return <code>true</code> if this is a variable arity method declaration,	605	* @return <code>true</code> if this is a variable arity method declaration,
620	* and <code>false</code> otherwise	606	* and <code>false</code> otherwise
621	* @exception UnsupportedOperationException if this operation is used in	607	* @exception UnsupportedOperationException if this operation is used in
622	* a JLS2 AST	608	* a JLS2 AST
623	* @see SingleVariableDeclaration#isVarargs()	609	* @see SingleVariableDeclaration#isVarargs()
624	* @since 3.0	610	* @since 3.1
625	*/	611	*/
626	public boolean isVarargs() {	612	public boolean isVarargs() {
627	// more efficient than just calling unsupportedIn2() to check	613	// more efficient than just calling unsupportedIn2() to check
Lines 661-670 Link Here
661	* @return the return type, possibly the void primitive type	647	* @return the return type, possibly the void primitive type
662	* @exception UnsupportedOperationException if this operation is used in	648	* @exception UnsupportedOperationException if this operation is used in
663	* an AST later than JLS2	649	* an AST later than JLS2
		650	* @deprecated In the JLS3 API, this method is replaced by {@link #getReturnType2()},
		651	* which may return <code>null</code>.
664	*/	652	*/
665	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>getReturnType2</code>, which may return <code>null</code>.
666	public Type getReturnType() {	653	public Type getReturnType() {
667	supportedOnlyIn2();	654	return internalGetReturnType();
		655	}
		656
		657	/**
		658	* Internal synonym for deprecated method. Used to avoid
		659	* deprecation warnings.
		660	* @since 3.1
		661	*/
		662	/package/ final Type internalGetReturnType() {
		663	supportedOnlyIn2();
668	if (this.returnType == null) {	664	if (this.returnType == null) {
669	// lazy init must be thread-safe for readers	665	// lazy init must be thread-safe for readers
670	synchronized (this) {	666	synchronized (this) {
Lines 695-703 Link Here
695	* </ul>	691	* </ul>
696	* @exception UnsupportedOperationException if this operation is used in	692	* @exception UnsupportedOperationException if this operation is used in
697	* an AST later than JLS2	693	* an AST later than JLS2
		694	* @deprecated In the JLS3 API, this method is replaced by
		695	* {@link #setReturnType2(Type)}, which accepts <code>null</code>.
698	*/	696	*/
699	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>setReturnType2</code>, which accepts <code>null</code>.
700	public void setReturnType(Type type) {	697	public void setReturnType(Type type) {
		698	internalSetReturnType(type);
		699	}
		700
		701	/**
		702	* Internal synonym for deprecated method. Used to avoid
		703	* deprecation warnings.
		704	* @since 3.1
		705	*/
		706	/package/ void internalSetReturnType(Type type) {
701	supportedOnlyIn2();	707	supportedOnlyIn2();
702	if (type == null) {	708	if (type == null) {
703	throw new IllegalArgumentException();	709	throw new IllegalArgumentException();
Lines 724-730 Link Here
724	* or <code>null</code> if none	730	* or <code>null</code> if none
725	* @exception UnsupportedOperationException if this operation is used in	731	* @exception UnsupportedOperationException if this operation is used in
726	* a JLS2 AST	732	* a JLS2 AST
727	* @since 3.0	733	* @since 3.1
728	*/	734	*/
729	public Type getReturnType2() {	735	public Type getReturnType2() {
730	unsupportedIn2();	736	unsupportedIn2();
Lines 762-768 Link Here
762	* <li>the node belongs to a different AST</li>	768	* <li>the node belongs to a different AST</li>
763	* <li>the node already has a parent</li>	769	* <li>the node already has a parent</li>
764	* </ul>	770	* </ul>
765	* @since 3.0	771	* @since 3.1
766	*/	772	*/
767	public void setReturnType2(Type type) {	773	public void setReturnType2(Type type) {
768	unsupportedIn2();	774	unsupportedIn2();

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/MethodInvocation.java (-12 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 43-49 Link Here
43		43
44	/**	44	/**
45	* The "typeArguments" structural property of this node type (added in JLS3 API).	45	* The "typeArguments" structural property of this node type (added in JLS3 API).
46	* @since 3.0	46	* @since 3.1
47	*/	47	*/
48	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =	48	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =
49	new ChildListPropertyDescriptor(MethodInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$	49	new ChildListPropertyDescriptor(MethodInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 74-80 Link Here
74	* A list of property descriptors (element type:	74	* A list of property descriptors (element type:
75	* {@link StructuralPropertyDescriptor}),	75	* {@link StructuralPropertyDescriptor}),
76	* or null if uninitialized.	76	* or null if uninitialized.
77	* @since 3.0	77	* @since 3.1
78	*/	78	*/
79	private static final List PROPERTY_DESCRIPTORS_3_0;	79	private static final List PROPERTY_DESCRIPTORS_3_0;
80		80
Lines 107-113 Link Here
107	* @since 3.0	107	* @since 3.0
108	*/	108	*/
109	public static List propertyDescriptors(int apiLevel) {	109	public static List propertyDescriptors(int apiLevel) {
110	if (apiLevel == AST.JLS2) {	110	if (apiLevel == AST.JLS2_INTERNAL) {
111	return PROPERTY_DESCRIPTORS_2_0;	111	return PROPERTY_DESCRIPTORS_2_0;
112	} else {	112	} else {
113	return PROPERTY_DESCRIPTORS_3_0;	113	return PROPERTY_DESCRIPTORS_3_0;
Lines 123-129 Link Here
123	* The type arguments (element type: <code>Type</code>).	123	* The type arguments (element type: <code>Type</code>).
124	* Null in JLS2. Added in JLS3; defaults to an empty list	124	* Null in JLS2. Added in JLS3; defaults to an empty list
125	* (see constructor).	125	* (see constructor).
126	* @since 3.0	126	* @since 3.1
127	*/	127	*/
128	private ASTNode.NodeList typeArguments = null;	128	private ASTNode.NodeList typeArguments = null;
129		129
Lines 279-296 Link Here
279	/**	279	/**
280	* Returns the live ordered list of type arguments of this method	280	* Returns the live ordered list of type arguments of this method
281	* invocation (added in JLS3 API).	281	* invocation (added in JLS3 API).
282	* <p>
283	* Note: This API element is only needed for dealing with Java code that uses
284	* new language features of J2SE 1.5. It is included in anticipation of J2SE
285	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
286	* may change slightly before reaching its final form.
287	* </p>
288	*	282	*
289	* @return the live list of type arguments	283	* @return the live list of type arguments
290	* (element type: <code>Type</code>)	284	* (element type: <code>Type</code>)
291	* @exception UnsupportedOperationException if this operation is used in	285	* @exception UnsupportedOperationException if this operation is used in
292	* a JLS2 AST	286	* a JLS2 AST
293	* @since 3.0	287	* @since 3.1
294	*/	288	*/
295	public List typeArguments() {	289	public List typeArguments() {
296	// more efficient than just calling unsupportedIn2() to check	290	// more efficient than just calling unsupportedIn2() to check

Lines 131-137 Link Here

(-)dom/org/eclipse/jdt/core/dom/NaiveASTFlattener.java (-32 / +32 lines)
131		131
132	/*	132	/*
133	* @see ASTVisitor#visit(AnnotationTypeDeclaration)	133	* @see ASTVisitor#visit(AnnotationTypeDeclaration)
134	* @since 3.0	134	* @since 3.1
135	*/	135	*/
136	public boolean visit(AnnotationTypeDeclaration node) {	136	public boolean visit(AnnotationTypeDeclaration node) {
137	if (node.getJavadoc() != null) {	137	if (node.getJavadoc() != null) {
Lines 152-158 Link Here
152		152
153	/*	153	/*
154	* @see ASTVisitor#visit(AnnotationTypeMemberDeclaration)	154	* @see ASTVisitor#visit(AnnotationTypeMemberDeclaration)
155	* @since 3.0	155	* @since 3.1
156	*/	156	*/
157	public boolean visit(AnnotationTypeMemberDeclaration node) {	157	public boolean visit(AnnotationTypeMemberDeclaration node) {
158	if (node.getJavadoc() != null) {	158	if (node.getJavadoc() != null) {
Lines 366-373 Link Here
366	this.buffer.append(".");//$NON-NLS-1$	366	this.buffer.append(".");//$NON-NLS-1$
367	}	367	}
368	this.buffer.append("new ");//$NON-NLS-1$	368	this.buffer.append("new ");//$NON-NLS-1$
369	if (node.getAST().apiLevel() == AST.JLS2) {	369	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
370	node.getName().accept(this);	370	node.internalGetName().accept(this);
371	}	371	}
372	if (node.getAST().apiLevel() >= AST.JLS3) {	372	if (node.getAST().apiLevel() >= AST.JLS3) {
373	if (!node.typeArguments().isEmpty()) {	373	if (!node.typeArguments().isEmpty()) {
Lines 496-502 Link Here
496		496
497	/*	497	/*
498	* @see ASTVisitor#visit(EnhancedForStatement)	498	* @see ASTVisitor#visit(EnhancedForStatement)
499	* @since 3.0	499	* @since 3.1
500	*/	500	*/
501	public boolean visit(EnhancedForStatement node) {	501	public boolean visit(EnhancedForStatement node) {
502	printIndent();	502	printIndent();
Lines 511-517 Link Here
511		511
512	/*	512	/*
513	* @see ASTVisitor#visit(EnumConstantDeclaration)	513	* @see ASTVisitor#visit(EnumConstantDeclaration)
514	* @since 3.0	514	* @since 3.1
515	*/	515	*/
516	public boolean visit(EnumConstantDeclaration node) {	516	public boolean visit(EnumConstantDeclaration node) {
517	if (node.getJavadoc() != null) {	517	if (node.getJavadoc() != null) {
Lines 539-545 Link Here
539		539
540	/*	540	/*
541	* @see ASTVisitor#visit(EnumDeclaration)	541	* @see ASTVisitor#visit(EnumDeclaration)
542	* @since 3.0	542	* @since 3.1
543	*/	543	*/
544	public boolean visit(EnumDeclaration node) {	544	public boolean visit(EnumDeclaration node) {
545	if (node.getJavadoc() != null) {	545	if (node.getJavadoc() != null) {
Lines 611-617 Link Here
611	node.getJavadoc().accept(this);	611	node.getJavadoc().accept(this);
612	}	612	}
613	printIndent();	613	printIndent();
614	if (node.getAST().apiLevel() == AST.JLS2) {	614	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
615	printModifiers(node.getModifiers());	615	printModifiers(node.getModifiers());
616	}	616	}
617	if (node.getAST().apiLevel() >= AST.JLS3) {	617	if (node.getAST().apiLevel() >= AST.JLS3) {
Lines 727-733 Link Here
727	if (node.getJavadoc() != null) {	727	if (node.getJavadoc() != null) {
728	node.getJavadoc().accept(this);	728	node.getJavadoc().accept(this);
729	}	729	}
730	if (node.getAST().apiLevel() == AST.JLS2) {	730	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
731	printModifiers(node.getModifiers());	731	printModifiers(node.getModifiers());
732	}	732	}
733	if (node.getAST().apiLevel() >= AST.JLS3) {	733	if (node.getAST().apiLevel() >= AST.JLS3) {
Lines 773-779 Link Here
773		773
774	/*	774	/*
775	* @see ASTVisitor#visit(MarkerAnnotation)	775	* @see ASTVisitor#visit(MarkerAnnotation)
776	* @since 3.0	776	* @since 3.1
777	*/	777	*/
778	public boolean visit(MarkerAnnotation node) {	778	public boolean visit(MarkerAnnotation node) {
779	this.buffer.append("@");//$NON-NLS-1$	779	this.buffer.append("@");//$NON-NLS-1$
Lines 796-802 Link Here
796		796
797	/*	797	/*
798	* @see ASTVisitor#visit(MemberValuePair)	798	* @see ASTVisitor#visit(MemberValuePair)
799	* @since 3.0	799	* @since 3.1
800	*/	800	*/
801	public boolean visit(MemberValuePair node) {	801	public boolean visit(MemberValuePair node) {
802	node.getName().accept(this);	802	node.getName().accept(this);
Lines 853-859 Link Here
853	node.getJavadoc().accept(this);	853	node.getJavadoc().accept(this);
854	}	854	}
855	printIndent();	855	printIndent();
856	if (node.getAST().apiLevel() == AST.JLS2) {	856	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
857	printModifiers(node.getModifiers());	857	printModifiers(node.getModifiers());
858	}	858	}
859	if (node.getAST().apiLevel() >= AST.JLS3) {	859	if (node.getAST().apiLevel() >= AST.JLS3) {
Lines 871-878 Link Here
871	}	871	}
872	}	872	}
873	if (!node.isConstructor()) {	873	if (!node.isConstructor()) {
874	if (node.getAST().apiLevel() == AST.JLS2) {	874	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
875	node.getReturnType().accept(this);	875	node.internalGetReturnType().accept(this);
876	} else {	876	} else {
877	if (node.getReturnType2() != null) {	877	if (node.getReturnType2() != null) {
878	node.getReturnType2().accept(this);	878	node.getReturnType2().accept(this);
Lines 951-957 Link Here
951		951
952	/*	952	/*
953	* @see ASTVisitor#visit(Modifier)	953	* @see ASTVisitor#visit(Modifier)
954	* @since 3.0	954	* @since 3.1
955	*/	955	*/
956	public boolean visit(Modifier node) {	956	public boolean visit(Modifier node) {
957	this.buffer.append(node.getKeyword().toString());	957	this.buffer.append(node.getKeyword().toString());
Lines 960-966 Link Here
960		960
961	/*	961	/*
962	* @see ASTVisitor#visit(NormalAnnotation)	962	* @see ASTVisitor#visit(NormalAnnotation)
963	* @since 3.0	963	* @since 3.1
964	*/	964	*/
965	public boolean visit(NormalAnnotation node) {	965	public boolean visit(NormalAnnotation node) {
966	this.buffer.append("@");//$NON-NLS-1$	966	this.buffer.append("@");//$NON-NLS-1$
Lines 1016-1022 Link Here
1016		1016
1017	/*	1017	/*
1018	* @see ASTVisitor#visit(ParameterizedType)	1018	* @see ASTVisitor#visit(ParameterizedType)
1019	* @since 3.0	1019	* @since 3.1
1020	*/	1020	*/
1021	public boolean visit(ParameterizedType node) {	1021	public boolean visit(ParameterizedType node) {
1022	node.getType().accept(this);	1022	node.getType().accept(this);
Lines 1080-1086 Link Here
1080		1080
1081	/*	1081	/*
1082	* @see ASTVisitor#visit(QualifiedType)	1082	* @see ASTVisitor#visit(QualifiedType)
1083	* @since 3.0	1083	* @since 3.1
1084	*/	1084	*/
1085	public boolean visit(QualifiedType node) {	1085	public boolean visit(QualifiedType node) {
1086	node.getQualifier().accept(this);	1086	node.getQualifier().accept(this);
Lines 1120-1126 Link Here
1120		1120
1121	/*	1121	/*
1122	* @see ASTVisitor#visit(SingleMemberAnnotation)	1122	* @see ASTVisitor#visit(SingleMemberAnnotation)
1123	* @since 3.0	1123	* @since 3.1
1124	*/	1124	*/
1125	public boolean visit(SingleMemberAnnotation node) {	1125	public boolean visit(SingleMemberAnnotation node) {
1126	this.buffer.append("@");//$NON-NLS-1$	1126	this.buffer.append("@");//$NON-NLS-1$
Lines 1136-1142 Link Here
1136	*/	1136	*/
1137	public boolean visit(SingleVariableDeclaration node) {	1137	public boolean visit(SingleVariableDeclaration node) {
1138	printIndent();	1138	printIndent();
1139	if (node.getAST().apiLevel() == AST.JLS2) {	1139	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
1140	printModifiers(node.getModifiers());	1140	printModifiers(node.getModifiers());
1141	}	1141	}
1142	if (node.getAST().apiLevel() >= AST.JLS3) {	1142	if (node.getAST().apiLevel() >= AST.JLS3) {
Lines 1394-1400 Link Here
1394	if (node.getJavadoc() != null) {	1394	if (node.getJavadoc() != null) {
1395	node.getJavadoc().accept(this);	1395	node.getJavadoc().accept(this);
1396	}	1396	}
1397	if (node.getAST().apiLevel() == AST.JLS2) {	1397	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
1398	printModifiers(node.getModifiers());	1398	printModifiers(node.getModifiers());
1399	}	1399	}
1400	if (node.getAST().apiLevel() >= AST.JLS3) {	1400	if (node.getAST().apiLevel() >= AST.JLS3) {
Lines 1416-1430 Link Here
1416	}	1416	}
1417	}	1417	}
1418	this.buffer.append(" ");//$NON-NLS-1$	1418	this.buffer.append(" ");//$NON-NLS-1$
1419	if (node.getAST().apiLevel() == AST.JLS2) {	1419	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
1420	if (node.getSuperclass() != null) {	1420	if (node.internalGetSuperclass() != null) {
1421	this.buffer.append("extends ");//$NON-NLS-1$	1421	this.buffer.append("extends ");//$NON-NLS-1$
1422	node.getSuperclass().accept(this);	1422	node.internalGetSuperclass().accept(this);
1423	this.buffer.append(" ");//$NON-NLS-1$	1423	this.buffer.append(" ");//$NON-NLS-1$
1424	}	1424	}
1425	if (!node.superInterfaces().isEmpty()) {	1425	if (!node.internalSuperInterfaces().isEmpty()) {
1426	this.buffer.append(node.isInterface() ? "extends " : "implements ");//$NON-NLS-2$//$NON-NLS-1$	1426	this.buffer.append(node.isInterface() ? "extends " : "implements ");//$NON-NLS-2$//$NON-NLS-1$
1427	for (Iterator it = node.superInterfaces().iterator(); it.hasNext(); ) {	1427	for (Iterator it = node.internalSuperInterfaces().iterator(); it.hasNext(); ) {
1428	Name n = (Name) it.next();	1428	Name n = (Name) it.next();
1429	n.accept(this);	1429	n.accept(this);
1430	if (it.hasNext()) {	1430	if (it.hasNext()) {
Lines 1480-1487 Link Here
1480	* @see ASTVisitor#visit(TypeDeclarationStatement)	1480	* @see ASTVisitor#visit(TypeDeclarationStatement)
1481	*/	1481	*/
1482	public boolean visit(TypeDeclarationStatement node) {	1482	public boolean visit(TypeDeclarationStatement node) {
1483	if (node.getAST().apiLevel() == AST.JLS2) {	1483	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
1484	node.getTypeDeclaration().accept(this);	1484	node.internalGetTypeDeclaration().accept(this);
1485	}	1485	}
1486	if (node.getAST().apiLevel() >= AST.JLS3) {	1486	if (node.getAST().apiLevel() >= AST.JLS3) {
1487	node.getDeclaration().accept(this);	1487	node.getDeclaration().accept(this);
Lines 1500-1506 Link Here
1500		1500
1501	/*	1501	/*
1502	* @see ASTVisitor#visit(TypeParameter)	1502	* @see ASTVisitor#visit(TypeParameter)
1503	* @since 3.0	1503	* @since 3.1
1504	*/	1504	*/
1505	public boolean visit(TypeParameter node) {	1505	public boolean visit(TypeParameter node) {
1506	node.getName().accept(this);	1506	node.getName().accept(this);
Lines 1521-1527 Link Here
1521	* @see ASTVisitor#visit(VariableDeclarationExpression)	1521	* @see ASTVisitor#visit(VariableDeclarationExpression)
1522	*/	1522	*/
1523	public boolean visit(VariableDeclarationExpression node) {	1523	public boolean visit(VariableDeclarationExpression node) {
1524	if (node.getAST().apiLevel() == AST.JLS2) {	1524	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
1525	printModifiers(node.getModifiers());	1525	printModifiers(node.getModifiers());
1526	}	1526	}
1527	if (node.getAST().apiLevel() >= AST.JLS3) {	1527	if (node.getAST().apiLevel() >= AST.JLS3) {
Lines 1559-1565 Link Here
1559	*/	1559	*/
1560	public boolean visit(VariableDeclarationStatement node) {	1560	public boolean visit(VariableDeclarationStatement node) {
1561	printIndent();	1561	printIndent();
1562	if (node.getAST().apiLevel() == AST.JLS2) {	1562	if (node.getAST().apiLevel() == AST.JLS2_INTERNAL) {
1563	printModifiers(node.getModifiers());	1563	printModifiers(node.getModifiers());
1564	}	1564	}
1565	if (node.getAST().apiLevel() >= AST.JLS3) {	1565	if (node.getAST().apiLevel() >= AST.JLS3) {
Lines 1580-1586 Link Here
1580		1580
1581	/*	1581	/*
1582	* @see ASTVisitor#visit(WildcardType)	1582	* @see ASTVisitor#visit(WildcardType)
1583	* @since 3.0	1583	* @since 3.1
1584	*/	1584	*/
1585	public boolean visit(WildcardType node) {	1585	public boolean visit(WildcardType node) {
1586	this.buffer.append("?");//$NON-NLS-1$	1586	this.buffer.append("?");//$NON-NLS-1$

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/NormalAnnotation.java (-12 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 21-39 Link Here
21	* <b>@</b> TypeName <b>(</b> [ MemberValuePair { <b>,</b> MemberValuePair } ] <b>)</b>	21	* <b>@</b> TypeName <b>(</b> [ MemberValuePair { <b>,</b> MemberValuePair } ] <b>)</b>
22	* </pre>	22	* </pre>
23	* </p>	23	* </p>
24	* <p>	24	*
25	* Note: This API element is only needed for dealing with Java code that uses	25	* @since 3.1
26	* new language features of J2SE 1.5. It is included in anticipation of J2SE
27	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
28	* may change slightly before reaching its final form.
29	* </p>
30	* @since 3.0
31	*/	26	*/
32	public final class NormalAnnotation extends Annotation {	27	public final class NormalAnnotation extends Annotation {
33		28
34	/**	29	/**
35	* The "typeName" structural property of this node type.	30	* The "typeName" structural property of this node type.
36	* @since 3.0
37	*/	31	*/
38	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY =	32	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY =
39	internalTypeNamePropertyFactory(NormalAnnotation.class);	33	internalTypeNamePropertyFactory(NormalAnnotation.class);
Lines 48-54 Link Here
48	* A list of property descriptors (element type:	42	* A list of property descriptors (element type:
49	* {@link StructuralPropertyDescriptor}),	43	* {@link StructuralPropertyDescriptor}),
50	* or null if uninitialized.	44	* or null if uninitialized.
51	* @since 3.0
52	*/	45	*/
53	private static final List PROPERTY_DESCRIPTORS;	46	private static final List PROPERTY_DESCRIPTORS;
54		47
Lines 67-73 Link Here
67	* @param apiLevel the API level; one of the AST.JLS* constants	60	* @param apiLevel the API level; one of the AST.JLS* constants
68	* @return a list of property descriptors (element type:	61	* @return a list of property descriptors (element type:
69	* {@link StructuralPropertyDescriptor})	62	* {@link StructuralPropertyDescriptor})
70	* @since 3.0
71	*/	63	*/
72	public static List propertyDescriptors(int apiLevel) {	64	public static List propertyDescriptors(int apiLevel) {
73	return PROPERTY_DESCRIPTORS;	65	return PROPERTY_DESCRIPTORS;
Lines 98-104 Link Here
98		90
99	/* (omit javadoc for this method)	91	/* (omit javadoc for this method)
100	* Method declared on ASTNode.	92	* Method declared on ASTNode.
101	* @since 3.0
102	*/	93	*/
103	final List internalStructuralPropertiesForType(int apiLevel) {	94	final List internalStructuralPropertiesForType(int apiLevel) {
104	return propertyDescriptors(apiLevel);	95	return propertyDescriptors(apiLevel);

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/PackageDeclaration.java (-12 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 41-47 Link Here
41		41
42	/**	42	/**
43	* The "annotations" structural property of this node type (added in JLS3 API).	43	* The "annotations" structural property of this node type (added in JLS3 API).
44	* @since 3.0	44	* @since 3.1
45	*/	45	*/
46	public static final ChildListPropertyDescriptor ANNOTATIONS_PROPERTY =	46	public static final ChildListPropertyDescriptor ANNOTATIONS_PROPERTY =
47	new ChildListPropertyDescriptor(PackageDeclaration.class, "annotations", Annotation.class, CYCLE_RISK); //$NON-NLS-1$	47	new ChildListPropertyDescriptor(PackageDeclaration.class, "annotations", Annotation.class, CYCLE_RISK); //$NON-NLS-1$
Lines 65-71 Link Here
65	* A list of property descriptors (element type:	65	* A list of property descriptors (element type:
66	* {@link StructuralPropertyDescriptor}),	66	* {@link StructuralPropertyDescriptor}),
67	* or null if uninitialized.	67	* or null if uninitialized.
68	* @since 3.0	68	* @since 3.1
69	*/	69	*/
70	private static final List PROPERTY_DESCRIPTORS_3_0;	70	private static final List PROPERTY_DESCRIPTORS_3_0;
71		71
Lines 95-101 Link Here
95	* @since 3.0	95	* @since 3.0
96	*/	96	*/
97	public static List propertyDescriptors(int apiLevel) {	97	public static List propertyDescriptors(int apiLevel) {
98	if (apiLevel == AST.JLS2) {	98	if (apiLevel == AST.JLS2_INTERNAL) {
99	return PROPERTY_DESCRIPTORS_2_0;	99	return PROPERTY_DESCRIPTORS_2_0;
100	} else {	100	} else {
101	return PROPERTY_DESCRIPTORS_3_0;	101	return PROPERTY_DESCRIPTORS_3_0;
Lines 113-119 Link Here
113	* The annotations (element type: <code>Annotation</code>).	113	* The annotations (element type: <code>Annotation</code>).
114	* Null in JLS2. Added in JLS3; defaults to an empty list	114	* Null in JLS2. Added in JLS3; defaults to an empty list
115	* (see constructor).	115	* (see constructor).
116	* @since 3.0	116	* @since 3.1
117	*/	117	*/
118	private ASTNode.NodeList annotations = null;	118	private ASTNode.NodeList annotations = null;
119		119
Lines 231-248 Link Here
231	/**	231	/**
232	* Returns the live ordered list of annotations of this	232	* Returns the live ordered list of annotations of this
233	* package declaration (added in JLS3 API).	233	* package declaration (added in JLS3 API).
234	* <p>
235	* Note: This API element is only needed for dealing with Java code that uses
236	* new language features of J2SE 1.5. It is included in anticipation of J2SE
237	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
238	* may change slightly before reaching its final form.
239	* </p>
240	*	234	*
241	* @return the live list of annotations	235	* @return the live list of annotations
242	* (element type: <code>Annotation</code>)	236	* (element type: <code>Annotation</code>)
243	* @exception UnsupportedOperationException if this operation is used in	237	* @exception UnsupportedOperationException if this operation is used in
244	* a JLS2 AST	238	* a JLS2 AST
245	* @since 3.0	239	* @since 3.1
246	*/	240	*/
247	public List annotations() {	241	public List annotations() {
248	// more efficient than just calling unsupportedIn2() to check	242	// more efficient than just calling unsupportedIn2() to check

Lines 24-37 Link Here

(-)dom/org/eclipse/jdt/core/dom/ParameterizedType.java (-10 / +1 lines)
24	* </pre>	24	* </pre>
25	* The first type may be a simple type or a qualified type;	25	* The first type may be a simple type or a qualified type;
26	* other kinds of types are meaningless.	26	* other kinds of types are meaningless.
27	* <p>
28	* Note: This API element is only needed for dealing with Java code that uses
29	* new language features of J2SE 1.5. It is included in anticipation of J2SE
30	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
31	* may change slightly before reaching its final form.
32	* </p>
33	*	27	*
34	* @since 3.0	28	* @since 3.1
35	*/	29	*/
36	public class ParameterizedType extends Type {	30	public class ParameterizedType extends Type {
37	/**	31	/**
Lines 41-54 Link Here
41		35
42	/**	36	/**
43	* The "type" structural property of this node type.	37	* The "type" structural property of this node type.
44	* @since 3.0
45	*/	38	*/
46	public static final ChildPropertyDescriptor TYPE_PROPERTY =	39	public static final ChildPropertyDescriptor TYPE_PROPERTY =
47	new ChildPropertyDescriptor(ParameterizedType.class, "type", Type.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$	40	new ChildPropertyDescriptor(ParameterizedType.class, "type", Type.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$
48		41
49	/**	42	/**
50	* The "typeArguments" structural property of this node type.	43	* The "typeArguments" structural property of this node type.
51	* @since 3.0
52	*/	44	*/
53	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =	45	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =
54	new ChildListPropertyDescriptor(ParameterizedType.class, "typeArguments", Type.class, CYCLE_RISK); //$NON-NLS-1$	46	new ChildListPropertyDescriptor(ParameterizedType.class, "typeArguments", Type.class, CYCLE_RISK); //$NON-NLS-1$
Lines 77-83 Link Here
77		69
78	* @return a list of property descriptors (element type:	70	* @return a list of property descriptors (element type:
79	* {@link StructuralPropertyDescriptor})	71	* {@link StructuralPropertyDescriptor})
80	* @since 3.0
81	*/	72	*/
82	public static List propertyDescriptors(int apiLevel) {	73	public static List propertyDescriptors(int apiLevel) {
83	return PROPERTY_DESCRIPTORS;	74	return PROPERTY_DESCRIPTORS;

Lines 41-47 Link Here

(-)dom/org/eclipse/jdt/core/dom/QualifiedType.java (-4 / +1 lines)
41	* became possible as of JLS3; only the second form existed in JLS2 API.)	41	* became possible as of JLS3; only the second form existed in JLS2 API.)
42	* </p>	42	* </p>
43	*	43	*
44	* @since 3.0	44	* @since 3.1
45	*/	45	*/
46	public class QualifiedType extends Type {	46	public class QualifiedType extends Type {
47	/**	47	/**
Lines 51-64 Link Here
51		51
52	/**	52	/**
53	* The "qualifier" structural property of this node type.	53	* The "qualifier" structural property of this node type.
54	* @since 3.0
55	*/	54	*/
56	public static final ChildPropertyDescriptor QUALIFIER_PROPERTY =	55	public static final ChildPropertyDescriptor QUALIFIER_PROPERTY =
57	new ChildPropertyDescriptor(QualifiedType.class, "qualifier", Type.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$	56	new ChildPropertyDescriptor(QualifiedType.class, "qualifier", Type.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$
58		57
59	/**	58	/**
60	* The "name" structural property of this node type.	59	* The "name" structural property of this node type.
61	* @since 3.0
62	*/	60	*/
63	public static final ChildPropertyDescriptor NAME_PROPERTY =	61	public static final ChildPropertyDescriptor NAME_PROPERTY =
64	new ChildPropertyDescriptor(QualifiedType.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$	62	new ChildPropertyDescriptor(QualifiedType.class, "name", SimpleName.class, MANDATORY, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 86-92 Link Here
86	* <code>AST.JLS&ast;</code> constants	84	* <code>AST.JLS&ast;</code> constants
87	* @return a list of property descriptors (element type:	85	* @return a list of property descriptors (element type:
88	* {@link StructuralPropertyDescriptor})	86	* {@link StructuralPropertyDescriptor})
89	* @since 3.0
90	*/	87	*/
91	public static List propertyDescriptors(int apiLevel) {	88	public static List propertyDescriptors(int apiLevel) {
92	return PROPERTY_DESCRIPTORS;	89	return PROPERTY_DESCRIPTORS;

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/SingleMemberAnnotation.java (-13 / +3 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2004 IBM Corporation and others.	2	* Copyright (c) 2004, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 24-49 Link Here
24	* Within annotations, only certain kinds of expressions are meaningful,	24	* Within annotations, only certain kinds of expressions are meaningful,
25	* including other annotations.	25	* including other annotations.
26	* </p>	26	* </p>
27	* <p>	27	*
28	* Note: This API element is only needed for dealing with Java code that uses	28	* @since 3.1
29	* new language features of J2SE 1.5. It is included in anticipation of J2SE
30	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
31	* may change slightly before reaching its final form.
32	* </p>
33	* @since 3.0
34	*/	29	*/
35	public final class SingleMemberAnnotation extends Annotation {	30	public final class SingleMemberAnnotation extends Annotation {
36		31
37	/**	32	/**
38	* The "typeName" structural property of this node type.	33	* The "typeName" structural property of this node type.
39	* @since 3.0
40	*/	34	*/
41	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY =	35	public static final ChildPropertyDescriptor TYPE_NAME_PROPERTY =
42	internalTypeNamePropertyFactory(SingleMemberAnnotation.class);	36	internalTypeNamePropertyFactory(SingleMemberAnnotation.class);
43		37
44	/**	38	/**
45	* The "value" structural property of this node type.	39	* The "value" structural property of this node type.
46	* @since 3.0
47	*/	40	*/
48	public static final ChildPropertyDescriptor VALUE_PROPERTY =	41	public static final ChildPropertyDescriptor VALUE_PROPERTY =
49	new ChildPropertyDescriptor(SingleMemberAnnotation.class, "value", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$	42	new ChildPropertyDescriptor(SingleMemberAnnotation.class, "value", Expression.class, MANDATORY, CYCLE_RISK); //$NON-NLS-1$
Lines 52-58 Link Here
52	* A list of property descriptors (element type:	45	* A list of property descriptors (element type:
53	* {@link StructuralPropertyDescriptor}),	46	* {@link StructuralPropertyDescriptor}),
54	* or null if uninitialized.	47	* or null if uninitialized.
55	* @since 3.0
56	*/	48	*/
57	private static final List PROPERTY_DESCRIPTORS;	49	private static final List PROPERTY_DESCRIPTORS;
58		50
Lines 71-77 Link Here
71	* @param apiLevel the API level; one of the AST.JLS* constants	63	* @param apiLevel the API level; one of the AST.JLS* constants
72	* @return a list of property descriptors (element type:	64	* @return a list of property descriptors (element type:
73	* {@link StructuralPropertyDescriptor})	65	* {@link StructuralPropertyDescriptor})
74	* @since 3.0
75	*/	66	*/
76	public static List propertyDescriptors(int apiLevel) {	67	public static List propertyDescriptors(int apiLevel) {
77	return PROPERTY_DESCRIPTORS;	68	return PROPERTY_DESCRIPTORS;
Lines 100-106 Link Here
100		91
101	/* (omit javadoc for this method)	92	/* (omit javadoc for this method)
102	* Method declared on ASTNode.	93	* Method declared on ASTNode.
103	* @since 3.0
104	*/	94	*/
105	final List internalStructuralPropertiesForType(int apiLevel) {	95	final List internalStructuralPropertiesForType(int apiLevel) {
106	return propertyDescriptors(apiLevel);	96	return propertyDescriptors(apiLevel);

Lines 41-53 Link Here

(-)dom/org/eclipse/jdt/core/dom/SingleVariableDeclaration.java (-19 / +22 lines)
41	* The "modifiers" structural property of this node type (JLS2 API only).	41	* The "modifiers" structural property of this node type (JLS2 API only).
42	* @since 3.0	42	* @since 3.0
43	*/	43	*/
44	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated Replaced by {@link #MODIFIERS2_PROPERTY} in the JLS3 API.
45	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =	44	public static final SimplePropertyDescriptor MODIFIERS_PROPERTY =
46	new SimplePropertyDescriptor(SingleVariableDeclaration.class, "modifiers", int.class, MANDATORY); //$NON-NLS-1$	45	new SimplePropertyDescriptor(SingleVariableDeclaration.class, "modifiers", int.class, MANDATORY); //$NON-NLS-1$
47		46
48	/**	47	/**
49	* The "modifiers" structural property of this node type (added in JLS3 API).	48	* The "modifiers" structural property of this node type (added in JLS3 API).
50	* @since 3.0	49	* @since 3.1
51	*/	50	*/
52	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =	51	public static final ChildListPropertyDescriptor MODIFIERS2_PROPERTY =
53	new ChildListPropertyDescriptor(SingleVariableDeclaration.class, "modifiers", IExtendedModifier.class, CYCLE_RISK); //$NON-NLS-1$	52	new ChildListPropertyDescriptor(SingleVariableDeclaration.class, "modifiers", IExtendedModifier.class, CYCLE_RISK); //$NON-NLS-1$
Lines 68-74 Link Here
68		67
69	/**	68	/**
70	* The "varargs" structural property of this node type (added in JLS3 API).	69	* The "varargs" structural property of this node type (added in JLS3 API).
71	* @since 3.0	70	* @since 3.1
72	*/	71	*/
73	public static final SimplePropertyDescriptor VARARGS_PROPERTY =	72	public static final SimplePropertyDescriptor VARARGS_PROPERTY =
74	new SimplePropertyDescriptor(SingleVariableDeclaration.class, "varargs", boolean.class, MANDATORY); //$NON-NLS-1$	73	new SimplePropertyDescriptor(SingleVariableDeclaration.class, "varargs", boolean.class, MANDATORY); //$NON-NLS-1$
Lines 99-105 Link Here
99	* A list of property descriptors (element type:	98	* A list of property descriptors (element type:
100	* {@link StructuralPropertyDescriptor}),	99	* {@link StructuralPropertyDescriptor}),
101	* or null if uninitialized.	100	* or null if uninitialized.
102	* @since 3.0	101	* @since 3.1
103	*/	102	*/
104	private static final List PROPERTY_DESCRIPTORS_3_0;	103	private static final List PROPERTY_DESCRIPTORS_3_0;
105		104
Lines 135-141 Link Here
135	* @since 3.0	134	* @since 3.0
136	*/	135	*/
137	public static List propertyDescriptors(int apiLevel) {	136	public static List propertyDescriptors(int apiLevel) {
138	if (apiLevel == AST.JLS2) {	137	if (apiLevel == AST.JLS2_INTERNAL) {
139	return PROPERTY_DESCRIPTORS_2_0;	138	return PROPERTY_DESCRIPTORS_2_0;
140	} else {	139	} else {
141	return PROPERTY_DESCRIPTORS_3_0;	140	return PROPERTY_DESCRIPTORS_3_0;
Lines 147-153 Link Here
147	* Null in JLS2. Added in JLS3; defaults to an empty list	146	* Null in JLS2. Added in JLS3; defaults to an empty list
148	* (see constructor).	147	* (see constructor).
149	*	148	*
150	* @since 3.0	149	* @since 3.1
151	*/	150	*/
152	private ASTNode.NodeList modifiers = null;	151	private ASTNode.NodeList modifiers = null;
153		152
Lines 173-179 Link Here
173	* Indicates the last parameter of a variable arity method;	172	* Indicates the last parameter of a variable arity method;
174	* defaults to false.	173	* defaults to false.
175	*	174	*
176	* @since 3.0	175	* @since 3.1
177	*/	176	*/
178	private boolean variableArity = false;	177	private boolean variableArity = false;
179		178
Lines 336-342 Link Here
336	ASTNode clone0(AST target) {	335	ASTNode clone0(AST target) {
337	SingleVariableDeclaration result = new SingleVariableDeclaration(target);	336	SingleVariableDeclaration result = new SingleVariableDeclaration(target);
338	result.setSourceRange(this.getStartPosition(), this.getLength());	337	result.setSourceRange(this.getStartPosition(), this.getLength());
339	if (this.ast.apiLevel == AST.JLS2) {	338	if (this.ast.apiLevel == AST.JLS2_INTERNAL) {
340	result.setModifiers(getModifiers());	339	result.setModifiers(getModifiers());
341	} else {	340	} else {
342	result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));	341	result.modifiers().addAll(ASTNode.copySubtrees(target, modifiers()));
Lines 387-393 Link Here
387	* (element type: <code>IExtendedModifier</code>)	386	* (element type: <code>IExtendedModifier</code>)
388	* @exception UnsupportedOperationException if this operation is used in	387	* @exception UnsupportedOperationException if this operation is used in
389	* a JLS2 AST	388	* a JLS2 AST
390	* @since 3.0	389	* @since 3.1
391	*/	390	*/
392	public List modifiers() {	391	public List modifiers() {
393	// more efficient than just calling unsupportedIn2() to check	392	// more efficient than just calling unsupportedIn2() to check
Lines 439-450 Link Here
439	* @exception UnsupportedOperationException if this operation is used in	438	* @exception UnsupportedOperationException if this operation is used in
440	* an AST later than JLS2	439	* an AST later than JLS2
441	* @see Modifier	440	* @see Modifier
		441	* @deprecated In the JLS3 API, this method is replaced by
		442	* {@link #modifiers()} which contains a list of a <code>Modifier</code> nodes.
442	*/	443	*/
443	// TODO (jeem) When JLS3 support is complete (post 3.0) - deprecated In the JLS3 API, this method is replaced by <code>modifiers()</code> which contains a list of a <code>Modifier</code> nodes.
444	public void setModifiers(int modifiers) {	444	public void setModifiers(int modifiers) {
		445	internalSetModifiers(modifiers);
		446	}
		447
		448	/**
		449	* Internal synonym for deprecated method. Used to avoid
		450	* deprecation warnings.
		451	* @since 3.1
		452	*/
		453	/package/ final void internalSetModifiers(int pmodifiers) {
445	supportedOnlyIn2();	454	supportedOnlyIn2();
446	preValueChange(MODIFIERS_PROPERTY);	455	preValueChange(MODIFIERS_PROPERTY);
447	this.modifierFlags = modifiers;	456	this.modifierFlags = pmodifiers;
448	postValueChange(MODIFIERS_PROPERTY);	457	postValueChange(MODIFIERS_PROPERTY);
449	}	458	}
450		459
Lines 536-542 Link Here
536	* and <code>false</code> otherwise	545	* and <code>false</code> otherwise
537	* @exception UnsupportedOperationException if this operation is used in	546	* @exception UnsupportedOperationException if this operation is used in
538	* a JLS2 AST	547	* a JLS2 AST
539	* @since 3.0	548	* @since 3.1
540	*/	549	*/
541	public boolean isVarargs() {	550	public boolean isVarargs() {
542	// more efficient than just calling unsupportedIn2() to check	551	// more efficient than just calling unsupportedIn2() to check
Lines 549-564 Link Here
549	/**	558	/**
550	* Sets whether this declaration declares the last parameter of	559	* Sets whether this declaration declares the last parameter of
551	* a variable arity method (added in JLS3 API).	560	* a variable arity method (added in JLS3 API).
552	* <p>
553	* Note: This API element is only needed for dealing with Java code that uses
554	* new language features of J2SE 1.5. It is included in anticipation of J2SE
555	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
556	* may change slightly before reaching its final form.
557	* </p>
558	*	561	*
559	* @param variableArity <code>true</code> if this is a variable arity	562	* @param variableArity <code>true</code> if this is a variable arity
560	* parameter declaration, and <code>false</code> otherwise	563	* parameter declaration, and <code>false</code> otherwise
561	* @since 3.0	564	* @since 3.1
562	*/	565	*/
563	public void setVarargs(boolean variableArity) {	566	public void setVarargs(boolean variableArity) {
564	// more efficient than just calling unsupportedIn2() to check	567	// more efficient than just calling unsupportedIn2() to check

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/SuperConstructorInvocation.java (-12 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 42-48 Link Here
42		42
43	/**	43	/**
44	* The "typeArguments" structural property of this node type (added in JLS3 API).	44	* The "typeArguments" structural property of this node type (added in JLS3 API).
45	* @since 3.0	45	* @since 3.1
46	*/	46	*/
47	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =	47	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =
48	new ChildListPropertyDescriptor(SuperConstructorInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$	48	new ChildListPropertyDescriptor(SuperConstructorInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 66-72 Link Here
66	* A list of property descriptors (element type:	66	* A list of property descriptors (element type:
67	* {@link StructuralPropertyDescriptor}),	67	* {@link StructuralPropertyDescriptor}),
68	* or null if uninitialized.	68	* or null if uninitialized.
69	* @since 3.0	69	* @since 3.1
70	*/	70	*/
71	private static final List PROPERTY_DESCRIPTORS_3_0;	71	private static final List PROPERTY_DESCRIPTORS_3_0;
72		72
Lines 97-103 Link Here
97	* @since 3.0	97	* @since 3.0
98	*/	98	*/
99	public static List propertyDescriptors(int apiLevel) {	99	public static List propertyDescriptors(int apiLevel) {
100	if (apiLevel == AST.JLS2) {	100	if (apiLevel == AST.JLS2_INTERNAL) {
101	return PROPERTY_DESCRIPTORS_2_0;	101	return PROPERTY_DESCRIPTORS_2_0;
102	} else {	102	} else {
103	return PROPERTY_DESCRIPTORS_3_0;	103	return PROPERTY_DESCRIPTORS_3_0;
Lines 113-119 Link Here
113	* The type arguments (element type: <code>Type</code>).	113	* The type arguments (element type: <code>Type</code>).
114	* Null in JLS2. Added in JLS3; defaults to an empty list	114	* Null in JLS2. Added in JLS3; defaults to an empty list
115	* (see constructor).	115	* (see constructor).
116	* @since 3.0	116	* @since 3.1
117	*/	117	*/
118	private ASTNode.NodeList typeArguments = null;	118	private ASTNode.NodeList typeArguments = null;
119		119
Lines 255-272 Link Here
255	/**	255	/**
256	* Returns the live ordered list of type arguments of this constructor	256	* Returns the live ordered list of type arguments of this constructor
257	* invocation (added in JLS3 API).	257	* invocation (added in JLS3 API).
258	* <p>
259	* Note: This API element is only needed for dealing with Java code that uses
260	* new language features of J2SE 1.5. It is included in anticipation of J2SE
261	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
262	* may change slightly before reaching its final form.
263	* </p>
264	*	258	*
265	* @return the live list of type arguments	259	* @return the live list of type arguments
266	* (element type: <code>Type</code>)	260	* (element type: <code>Type</code>)
267	* @exception UnsupportedOperationException if this operation is used in	261	* @exception UnsupportedOperationException if this operation is used in
268	* a JLS2 AST	262	* a JLS2 AST
269	* @since 3.0	263	* @since 3.1
270	*/	264	*/
271	public List typeArguments() {	265	public List typeArguments() {
272	// more efficient than just calling unsupportedIn2() to check	266	// more efficient than just calling unsupportedIn2() to check

Lines 1-5 Link Here

(-)dom/org/eclipse/jdt/core/dom/SuperMethodInvocation.java (-12 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2004 IBM Corporation and others.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 43-49 Link Here
43		43
44	/**	44	/**
45	* The "typeArguments" structural property of this node type (added in JLS3 API).	45	* The "typeArguments" structural property of this node type (added in JLS3 API).
46	* @since 3.0	46	* @since 3.1
47	*/	47	*/
48	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =	48	public static final ChildListPropertyDescriptor TYPE_ARGUMENTS_PROPERTY =
49	new ChildListPropertyDescriptor(SuperMethodInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$	49	new ChildListPropertyDescriptor(SuperMethodInvocation.class, "typeArguments", Type.class, NO_CYCLE_RISK); //$NON-NLS-1$
Lines 74-80 Link Here
74	* A list of property descriptors (element type:	74	* A list of property descriptors (element type:
75	* {@link StructuralPropertyDescriptor}),	75	* {@link StructuralPropertyDescriptor}),
76	* or null if uninitialized.	76	* or null if uninitialized.
77	* @since 3.0	77	* @since 3.1
78	*/	78	*/
79	private static final List PROPERTY_DESCRIPTORS_3_0;	79	private static final List PROPERTY_DESCRIPTORS_3_0;
80		80
Lines 107-113 Link Here
107	* @since 3.0	107	* @since 3.0
108	*/	108	*/
109	public static List propertyDescriptors(int apiLevel) {	109	public static List propertyDescriptors(int apiLevel) {
110	if (apiLevel == AST.JLS2) {	110	if (apiLevel == AST.JLS2_INTERNAL) {
111	return PROPERTY_DESCRIPTORS_2_0;	111	return PROPERTY_DESCRIPTORS_2_0;
112	} else {	112	} else {
113	return PROPERTY_DESCRIPTORS_3_0;	113	return PROPERTY_DESCRIPTORS_3_0;
Lines 123-129 Link Here
123	* The type arguments (element type: <code>Type</code>).	123	* The type arguments (element type: <code>Type</code>).
124	* Null in JLS2. Added in JLS3; defaults to an empty list	124	* Null in JLS2. Added in JLS3; defaults to an empty list
125	* (see constructor).	125	* (see constructor).
126	* @since 3.0	126	* @since 3.1
127	*/	127	*/
128	private ASTNode.NodeList typeArguments = null;	128	private ASTNode.NodeList typeArguments = null;
129		129
Lines 277-294 Link Here
277	/**	277	/**
278	* Returns the live ordered list of type arguments of this method	278	* Returns the live ordered list of type arguments of this method
279	* invocation (added in JLS3 API).	279	* invocation (added in JLS3 API).
280	* <p>
281	* Note: This API element is only needed for dealing with Java code that uses
282	* new language features of J2SE 1.5. It is included in anticipation of J2SE
283	* 1.5 support, which is planned for the next release of Eclipse after 3.0, and
284	* may change slightly before reaching its final form.
285	* </p>
286	*	280	*
287	* @return the live list of type arguments	281	* @return the live list of type arguments
288	* (element type: <code>Type</code>)	282	* (element type: <code>Type</code>)
289	* @exception UnsupportedOperationException if this operation is used in	283	* @exception UnsupportedOperationException if this operation is used in
290	* a JLS2 AST	284	* a JLS2 AST
291	* @since 3.0	285	* @since 3.1
292	*/	286	*/
293	public List typeArguments() {	287	public List typeArguments() {
294	// more efficient than just calling unsupportedIn2() to check	288	// more efficient than just calling unsupportedIn2() to check