### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: model/org/eclipse/jdt/core/IAnnotation.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IAnnotation.java,v retrieving revision 1.4 diff -u -r1.4 IAnnotation.java --- model/org/eclipse/jdt/core/IAnnotation.java 7 Mar 2009 01:08:10 -0000 1.4 +++ model/org/eclipse/jdt/core/IAnnotation.java 31 Aug 2010 18:54:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2010 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 @@ -56,19 +56,6 @@ IMemberValuePair[] getMemberValuePairs() throws JavaModelException; /** - * Returns the source range of this annotation's name, - * or null if this annotation does not have - * associated source code (for example, in a binary type). - * - * @exception JavaModelException if this element does not exist or if an - * exception occurs while accessing its corresponding resource. - * @return the source range of this annotation's name, - * or null if this annotation does not have - * associated source code (for example, in a binary type) - */ - ISourceRange getNameRange() throws JavaModelException; - - /** * Returns the position relative to the order this annotation is defined in the source. * Numbering starts at 1 (thus the first occurrence is occurrence 1, not occurrence 0). *

Index: model/org/eclipse/jdt/core/IImportDeclaration.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IImportDeclaration.java,v retrieving revision 1.26 diff -u -r1.26 IImportDeclaration.java --- model/org/eclipse/jdt/core/IImportDeclaration.java 28 Jul 2010 16:36:34 -0000 1.26 +++ model/org/eclipse/jdt/core/IImportDeclaration.java 31 Aug 2010 18:54:44 -0000 @@ -39,25 +39,6 @@ * @since 3.0 */ int getFlags() throws JavaModelException; - -/** - * Returns the source range of this import declaration's name, - * or null if this import declaration does not have - * associated source code (for example, a binary type). - * - *

The source range for the name includes the trailing '*' if the call to - * {@link #isOnDemand()} returns true. - *

- * - * @exception JavaModelException if this element does not exist or if an - * exception occurs while accessing its corresponding resource. - * @return the source range of this import declaration's name, - * or null if this import declaration does not have - * associated source code (for example, a binary type) - * @since 3.7 - */ -ISourceRange getNameRange() throws JavaModelException; - /** * Returns whether the import is on-demand. An import is on-demand if it ends * with ".*". Index: model/org/eclipse/jdt/core/IMember.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IMember.java,v retrieving revision 1.29 diff -u -r1.29 IMember.java --- model/org/eclipse/jdt/core/IMember.java 11 May 2010 18:47:10 -0000 1.29 +++ model/org/eclipse/jdt/core/IMember.java 31 Aug 2010 18:54:44 -0000 @@ -93,20 +93,6 @@ */ ISourceRange getJavadocRange() throws JavaModelException; /** - * Returns the source range of this member's simple name, - * or null if this member does not have a name - * (for example, an initializer), or if this member does not have - * associated source code (for example, a binary type). - * - * @exception JavaModelException if this element does not exist or if an - * exception occurs while accessing its corresponding resource. - * @return the source range of this member's simple name, - * or null if this member does not have a name - * (for example, an initializer), or if this member does not have - * associated source code (for example, a binary type) - */ -ISourceRange getNameRange() throws JavaModelException; -/** * Returns the position relative to the order this member is defined in the source. * Numbering starts at 1 (thus the first occurrence is occurrence 1, not occurrence 0). *

Index: model/org/eclipse/jdt/core/IPackageDeclaration.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/IPackageDeclaration.java,v retrieving revision 1.18 diff -u -r1.18 IPackageDeclaration.java --- model/org/eclipse/jdt/core/IPackageDeclaration.java 28 Jul 2010 16:17:01 -0000 1.18 +++ model/org/eclipse/jdt/core/IPackageDeclaration.java 31 Aug 2010 18:54:44 -0000 @@ -24,18 +24,4 @@ * @return the name of the package the statement */ String getElementName(); -/** - * Returns the source range of this package declaration's name, - * or null if this package declaration does not have - * associated source code (for example, a binary type). - * - * @exception JavaModelException if this element does not exist or if an - * exception occurs while accessing its corresponding resource. - * @return the source range of this package declaration's name, - * or null if this package declaration does not have - * associated source code (for example, a binary type) - * @since 3.7 - */ -ISourceRange getNameRange() throws JavaModelException; - } Index: model/org/eclipse/jdt/core/ISourceReference.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ISourceReference.java,v retrieving revision 1.24 diff -u -r1.24 ISourceReference.java --- model/org/eclipse/jdt/core/ISourceReference.java 9 Nov 2009 19:52:18 -0000 1.24 +++ model/org/eclipse/jdt/core/ISourceReference.java 31 Aug 2010 18:54:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2010 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 @@ -72,4 +72,40 @@ * @see SourceRange#isAvailable(ISourceRange) */ ISourceRange getSourceRange() throws JavaModelException; + +/** + * Returns the name range associated with this element. + * + *

If the element is an {@link IMember}, it returns + * the source range of this member's simple name, + * or null if this member does not have a name + * (for example, an initializer), or if this member does not have + * associated source code (for example, a binary type).

+ * + *

If this element is an {@link IImportDeclaration}, the source range + * of this import declaration's name, or null if this import + * declaration does not have associated source code (for example, a binary type). + *
The source range for the name includes the trailing '*' if the call to + * {@link IImportDeclaration#isOnDemand()} returns true. + *

+ * + *

If this element is an {@link IPackageDeclaration}, the source range of + * this package declaration's name, or null if this package + * declaration does not have associated source code (for example, a binary type).

+ * + *

If this element is an {@link IAnnotation}, the source range of + * this annotation's name, or null if this annotation does not have + * associated source code (for example, in a binary type).

+ * + *

If this element is an {@link ITypeParameter}, the source range of this + * type parameter's name, or null if this type parameter does not have + * associated source code (for example, in a binary type).

+ * + *

If this element is an {@link ITypeRoot} or {@link IImportContainer}, it + * returns null.

+ * + * @return the name range associated with this element + * @since 3.7 + */ +ISourceRange getNameRange() throws JavaModelException; } Index: model/org/eclipse/jdt/core/ITypeParameter.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/ITypeParameter.java,v retrieving revision 1.11 diff -u -r1.11 ITypeParameter.java --- model/org/eclipse/jdt/core/ITypeParameter.java 24 Feb 2010 10:44:11 -0000 1.11 +++ model/org/eclipse/jdt/core/ITypeParameter.java 31 Aug 2010 18:54:44 -0000 @@ -66,17 +66,4 @@ * @return the declaring member of this type parameter. */ IMember getDeclaringMember(); - - /** - * Returns the source range of this type parameter's name, - * or null if this type parameter does not have - * associated source code (for example, in a binary type). - * - * @exception JavaModelException if this element does not exist or if an - * exception occurs while accessing its corresponding resource. - * @return the source range of this type parameter's name, - * or null if this type parameter does not have - * associated source code (for example, in a binary type) - */ - ISourceRange getNameRange() throws JavaModelException; } Index: model/org/eclipse/jdt/internal/core/ClassFile.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ClassFile.java,v retrieving revision 1.147 diff -u -r1.147 ClassFile.java --- model/org/eclipse/jdt/internal/core/ClassFile.java 27 Aug 2009 15:27:02 -0000 1.147 +++ model/org/eclipse/jdt/internal/core/ClassFile.java 31 Aug 2010 18:54:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2010 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 @@ -834,4 +834,7 @@ } return JavaModelStatus.VERIFIED_OK; } +public ISourceRange getNameRange() { + return null; +} } Index: model/org/eclipse/jdt/internal/core/CompilationUnit.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java,v retrieving revision 1.262 diff -u -r1.262 CompilationUnit.java --- model/org/eclipse/jdt/internal/core/CompilationUnit.java 7 Jan 2010 18:10:35 -0000 1.262 +++ model/org/eclipse/jdt/internal/core/CompilationUnit.java 31 Aug 2010 18:54:44 -0000 @@ -1340,4 +1340,7 @@ return JavaModelStatus.VERIFIED_OK; } +public ISourceRange getNameRange() { + return null; +} } Index: model/org/eclipse/jdt/internal/core/ImportContainer.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportContainer.java,v retrieving revision 1.39 diff -u -r1.39 ImportContainer.java --- model/org/eclipse/jdt/internal/core/ImportContainer.java 27 Aug 2009 15:27:02 -0000 1.39 +++ model/org/eclipse/jdt/internal/core/ImportContainer.java 31 Aug 2010 18:54:44 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2010 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 @@ -114,4 +114,7 @@ buffer.append(" (not open)"); //$NON-NLS-1$ } } +public ISourceRange getNameRange() { + return null; +} }