Attachment #169322 for bug #313706

Lines 84-91 Link Here

(-)buildnotes_jdt-core.html (-3 / +3 lines)
84	* }	84	* }
85	*	85	*
86	* Important notes:	86	* Important notes:
87	* 1. This new behavior is automatically activated (ie. the default value for this preference is {@link #TRUE}).	87	* 1. This new behavior is automatically activated (i.e. the default value for this preference is {@link #TRUE}).
88	* If the backward compatibility regarding previous versions' formatter behavior (ie. before 3.6 version) is necessary,	88	* If the backward compatibility regarding previous versions' formatter behavior (i.e. before 3.6 version) is necessary,
89	* then the preference needs to be set to {@link #FALSE} to retrieve the previous formatter behavior.	89	* then the preference needs to be set to {@link #FALSE} to retrieve the previous formatter behavior.
90	* 2. The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions	90	* 2. The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions
91	*	91	*
Lines 938-944 Link Here
938	<h2>What's new in this drop</h2>	938	<h2>What's new in this drop</h2>
939	<ul>	939	<ul>
940	<li>	940	<li>
941	Added a new formatter preferences to align annotation arguments (ie. element-value pairs).	941	Added a new formatter preferences to align annotation arguments (i.e. element-value pairs).
942	<p>	942	<p>
943	This new preference is controlled with the option:</p>	943	This new preference is controlled with the option:</p>
944	<code>DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_ANNOTATION</code>	944	<code>DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_ANNOTATION</code>

Lines 47-53 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java (-2 / +2 lines)
47	protected static final int K_NEXT_TYPEREF_IS_CLASS = COMPLETION_PARSER + 5; // whether the next type reference is a class	47	protected static final int K_NEXT_TYPEREF_IS_CLASS = COMPLETION_PARSER + 5; // whether the next type reference is a class
48	protected static final int K_NEXT_TYPEREF_IS_INTERFACE = COMPLETION_PARSER + 6; // whether the next type reference is an interface	48	protected static final int K_NEXT_TYPEREF_IS_INTERFACE = COMPLETION_PARSER + 6; // whether the next type reference is an interface
49	protected static final int K_NEXT_TYPEREF_IS_EXCEPTION = COMPLETION_PARSER + 7; // whether the next type reference is an exception	49	protected static final int K_NEXT_TYPEREF_IS_EXCEPTION = COMPLETION_PARSER + 7; // whether the next type reference is an exception
50	protected static final int K_BETWEEN_NEW_AND_LEFT_BRACKET = COMPLETION_PARSER + 8; // whether we are between the keyword 'new' and the following left braket, ie. '[', '(' or '{'	50	protected static final int K_BETWEEN_NEW_AND_LEFT_BRACKET = COMPLETION_PARSER + 8; // whether we are between the keyword 'new' and the following left braket, i.e. '[', '(' or '{'
51	protected static final int K_INSIDE_THROW_STATEMENT = COMPLETION_PARSER + 9; // whether we are between the keyword 'throw' and the end of a throw statement	51	protected static final int K_INSIDE_THROW_STATEMENT = COMPLETION_PARSER + 9; // whether we are between the keyword 'throw' and the end of a throw statement
52	protected static final int K_INSIDE_RETURN_STATEMENT = COMPLETION_PARSER + 10; // whether we are between the keyword 'return' and the end of a return statement	52	protected static final int K_INSIDE_RETURN_STATEMENT = COMPLETION_PARSER + 10; // whether we are between the keyword 'return' and the end of a return statement
53	protected static final int K_CAST_STATEMENT = COMPLETION_PARSER + 11; // whether we are between ')' and the end of a cast statement	53	protected static final int K_CAST_STATEMENT = COMPLETION_PARSER + 11; // whether we are between ')' and the end of a cast statement
Lines 1630-1636 Link Here
1630	return false;	1630	return false;
1631	}	1631	}
1632	/**	1632	/**
1633	* Checks if the completion is on a member access (ie. in an identifier following a dot).	1633	* Checks if the completion is on a member access (i.e. in an identifier following a dot).
1634	* Returns whether we found a completion node.	1634	* Returns whether we found a completion node.
1635	*/	1635	*/
1636	private boolean checkMemberAccess() {	1636	private boolean checkMemberAccess() {

Lines 359-365 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java (-2 / +2 lines)
359	}	359	}
360	protected void consumeForceNoDiet() {	360	protected void consumeForceNoDiet() {
361	super.consumeForceNoDiet();	361	super.consumeForceNoDiet();
362	// if we are not in a method (ie. we are not in a local variable initializer)	362	// if we are not in a method (i.e. we are not in a local variable initializer)
363	// then we are entering a field initializer	363	// then we are entering a field initializer
364	if (!isInsideMethod()) {	364	if (!isInsideMethod()) {
365	if(topKnownElementKind(ASSIST_PARSER) != K_ENUM_CONSTANT_DELIMITER) {	365	if(topKnownElementKind(ASSIST_PARSER) != K_ENUM_CONSTANT_DELIMITER) {
Lines 580-586 Link Here
580	}	580	}
581	protected void consumeRestoreDiet() {	581	protected void consumeRestoreDiet() {
582	super.consumeRestoreDiet();	582	super.consumeRestoreDiet();
583	// if we are not in a method (ie. we were not in a local variable initializer)	583	// if we are not in a method (i.e. we were not in a local variable initializer)
584	// then we are exiting a field initializer	584	// then we are exiting a field initializer
585	if (!isInsideMethod()) {	585	if (!isInsideMethod()) {
586	popElement(K_FIELD_INITIALIZER_DELIMITER);	586	popElement(K_FIELD_INITIALIZER_DELIMITER);

Lines 1-5 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 12-18 Link Here
12		12
13	// clinit methods (synthetics too?) can be returned from IBinaryType>>getMethods()	13	// clinit methods (synthetics too?) can be returned from IBinaryType>>getMethods()
14	// BUT do not have to be... the compiler will ignore them when building the binding.	14	// BUT do not have to be... the compiler will ignore them when building the binding.
15	// The synthetic argument of a member type's constructor (ie. the first arg of a non-static	15	// The synthetic argument of a member type's constructor (i.e. the first arg of a non-static
16	// member type) is also ignored by the compiler, BUT in this case it must be included	16	// member type) is also ignored by the compiler, BUT in this case it must be included
17	// in the constructor's signature.	17	// in the constructor's signature.
18		18

Lines 35-41 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java (-1 / +1 lines)
35	- extending a final class	35	- extending a final class
36	- extending an interface instead of a class	36	- extending an interface instead of a class
37	- implementing a class instead of an interface	37	- implementing a class instead of an interface
38	- implementing the same interface more than once (ie. duplicate interfaces)	38	- implementing the same interface more than once (i.e. duplicate interfaces)
39	- with nested types:	39	- with nested types:
40	- shadowing an enclosing type's source name	40	- shadowing an enclosing type's source name
41	- defining a static class or interface inside a non-static nested class	41	- defining a static class or interface inside a non-static nested class




											}
										}
										if (receiverType == fieldBinding.declaringClass || compilerOptions().complianceLevel >= ClassFileConstants.JDK1_4) {
											// found a valid field in the 'immediate' scope (i.e. not inherited)
											// OR in 1.4 mode (inherited shadows enclosing)
											if (foundField == null) {
												if (depth > 0){

											if (foundField.isValidBinding())
												// if a valid field was found, complain when another is found in an 'immediate' enclosing type (that is, not inherited)
												if (foundField.declaringClass != fieldBinding.declaringClass)
													// i.e. have we found the same field - do not trust field identity yet
													return new ProblemFieldBinding(
														foundField, // closest match
														foundField.declaringClass,

									if (inheritedHasPrecedence
											|| receiverType == methodBinding.declaringClass
											|| (receiverType.getMethods(selector)) != Binding.NO_METHODS) {
										// found a valid method in the 'immediate' scope (i.e. not inherited)
										// OR in 1.4 mode (inherited visible shadows enclosing)
										// OR the receiverType implemented a method with the correct name
										// return the methodBinding if it is not declared in a superclass of the scope's binding (that is, inherited)

									if (sourceType == memberType.enclosingType() || inheritedHasPrecedence) {
										if (insideStaticContext && !memberType.isStatic() && sourceType.isGenericType())
											return new ProblemReferenceBinding(new char[][]{name}, memberType, ProblemReasons.NonStaticReferenceInStaticContext);
										// found a valid type in the 'immediate' scope (i.e. not inherited)
										// OR in 1.4 mode (inherited visible shadows enclosing)
										if (foundType == null || (inheritedHasPrecedence && foundType.problemId() == ProblemReasons.NotVisible))
											return memberType;
										// if a valid type was found, complain when another is found in an 'immediate' enclosing type (i.e. not inherited)
										if (foundType.isValidBinding() && foundType != memberType)
											return new ProblemReferenceBinding(new char[][]{name}, foundType, ProblemReasons.InheritedNameHidesEnclosingName);
									}

Lines 294-300 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/util/Util.java (-2 / +2 lines)
294	*/	294	*/
295	/**	295	/**
296	* Returns the given input stream's contents as a byte array.	296	* Returns the given input stream's contents as a byte array.
297	* If a length is specified (ie. if length != -1), only length bytes	297	* If a length is specified (i.e. if length != -1), only length bytes
298	* are returned. Otherwise all bytes in the stream are returned.	298	* are returned. Otherwise all bytes in the stream are returned.
299	* Note this doesn't close the stream.	299	* Note this doesn't close the stream.
300	* @throws IOException if a problem occured reading the stream.	300	* @throws IOException if a problem occured reading the stream.
Lines 377-383 Link Here
377	*/	377	*/
378	/**	378	/**
379	* Returns the given input stream's contents as a character array.	379	* Returns the given input stream's contents as a character array.
380	* If a length is specified (ie. if length != -1), this represents the number of bytes in the stream.	380	* If a length is specified (i.e. if length != -1), this represents the number of bytes in the stream.
381	* Note this doesn't close the stream.	381	* Note this doesn't close the stream.
382	* @throws IOException if a problem occured reading the stream.	382	* @throws IOException if a problem occured reading the stream.
383	*/	383	*/

Lines 1-5 Link Here

(-)eval/org/eclipse/jdt/internal/eval/EvaluationContext.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 512-518 Link Here
512	return this.packageName;	512	return this.packageName;
513	}	513	}
514	/**	514	/**
515	* Return the binary for the root code snippet class (ie. org.eclipse.jdt.internal.eval.target.CodeSnippet).	515	* Return the binary for the root code snippet class (i.e. org.eclipse.jdt.internal.eval.target.CodeSnippet).
516	*/	516	*/
517	IBinaryType getRootCodeSnippetBinary() {	517	IBinaryType getRootCodeSnippetBinary() {
518	if (this.codeSnippetBinary == null) {	518	if (this.codeSnippetBinary == null) {

Lines 1-5 Link Here

(-)eval/org/eclipse/jdt/internal/eval/GlobalVariable.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 31-37 Link Here
31	}	31	}
32	/**	32	/**
33	* Returns the initializer of this global variable. The initializer is a	33	* Returns the initializer of this global variable. The initializer is a
34	* variable initializer (ie. an expression or an array initializer) as defined	34	* variable initializer (i.e. an expression or an array initializer) as defined
35	* in the Java Language Specifications.	35	* in the Java Language Specifications.
36	*/	36	*/
37	public char[] getInitializer() {	37	public char[] getInitializer() {

Lines 3532-3539 Link Here

(-)formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java (-2 / +2 lines)
3532	* </p>	3532	* </p>
3533	* <p><b><u>Important notes</u></b>:</p>	3533	* <p><b><u>Important notes</u></b>:</p>
3534	* <ol>	3534	* <ol>
3535	* <li>This new behavior is automatically activated (ie. the default value for this preference is {@link #TRUE}).	3535	* <li>This new behavior is automatically activated (i.e. the default value for this preference is {@link #TRUE}).
3536	* If the backward compatibility regarding previous versions' formatter behavior (ie. before 3.6 version) is necessary,	3536	* If the backward compatibility regarding previous versions' formatter behavior (i.e. before 3.6 version) is necessary,
3537	* then the preference needs to be set to {@link #FALSE} to retrieve the previous formatter behavior.</li>	3537	* then the preference needs to be set to {@link #FALSE} to retrieve the previous formatter behavior.</li>
3538	* <li>The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions</li>	3538	* <li>The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions</li>
3539	* </ol>	3539	* </ol>

Lines 2336-2342 Link Here

(-)model/org/eclipse/jdt/internal/core/DeltaProcessor.java (-1 / +1 lines)
2336	}	2336	}
2337		2337
2338	/*	2338	/*
2339	* Update the current delta (ie. add/remove/change the given element) and update the correponding index.	2339	* Update the current delta (i.e. add/remove/change the given element) and update the correponding index.
2340	* Returns whether the children of the given delta must be processed.	2340	* Returns whether the children of the given delta must be processed.
2341	* @throws a JavaModelException if the delta doesn't correspond to a java element of the given type.	2341	* @throws a JavaModelException if the delta doesn't correspond to a java element of the given type.
2342	*/	2342	*/




/*******************************************************************************
 * 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


	/**
	 * A set of external files ({@link #existingExternalFiles}) which have
	 * been confirmed as file (i.e. which returns true to {@link java.io.File#isFile()}.
	 * Note this cache is kept for the whole session.
	 */
	public static HashSet existingExternalConfirmedFiles = new HashSet();

}

/**
 * Helper method - returns whether an object is afile (i.e. which returns true to {@link java.io.File#isFile()}.
 */
public static boolean isFile(Object target) {
	return getFile(target) != null;
}

/**
 * Helper method - returns the file item (i.e. which returns true to {@link java.io.File#isFile()},
 * or null if unbound
 */
public static synchronized File getFile(Object target) {

Lines 1-5 Link Here

(-)model/org/eclipse/jdt/internal/core/builder/AdditionalTypeCollection.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 16-22 Link Here
16		16
17	protected AdditionalTypeCollection(char[][] definedTypeNames, char[][][] qualifiedReferences, char[][] simpleNameReferences, char[][] rootReferences) {	17	protected AdditionalTypeCollection(char[][] definedTypeNames, char[][][] qualifiedReferences, char[][] simpleNameReferences, char[][] rootReferences) {
18	super(qualifiedReferences, simpleNameReferences, rootReferences);	18	super(qualifiedReferences, simpleNameReferences, rootReferences);
19	this.definedTypeNames = definedTypeNames; // do not bother interning member type names (ie. 'A$M')	19	this.definedTypeNames = definedTypeNames; // do not bother interning member type names (i.e. 'A$M')
20	}	20	}
21	}	21	}
22		22

Lines 1-5 Link Here

(-)model/org/eclipse/jdt/internal/core/builder/State.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 29-35 Link Here
29	String javaProjectName;	29	String javaProjectName;
30	ClasspathMultiDirectory[] sourceLocations;	30	ClasspathMultiDirectory[] sourceLocations;
31	ClasspathLocation[] binaryLocations;	31	ClasspathLocation[] binaryLocations;
32	// keyed by the project relative path of the type (ie. "src1/p1/p2/A.java"), value is a ReferenceCollection or an AdditionalTypeCollection	32	// keyed by the project relative path of the type (i.e. "src1/p1/p2/A.java"), value is a ReferenceCollection or an AdditionalTypeCollection
33	SimpleLookupTable references;	33	SimpleLookupTable references;
34	// keyed by qualified type name "p1/p2/A", value is the project relative path which defines this type "src1/p1/p2/A.java"	34	// keyed by qualified type name "p1/p2/A", value is the project relative path which defines this type "src1/p1/p2/A.java"
35	public SimpleLookupTable typeLocators;	35	public SimpleLookupTable typeLocators;

Lines 755-761 Link Here

(-)model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java (-2 / +2 lines)
755	}	755	}
756	}	756	}
757		757
758	// complete type bindings (ie. connect super types)	758	// complete type bindings (i.e. connect super types)
759	for (int i = 0; i < unitsIndex; i++) {	759	for (int i = 0; i < unitsIndex; i++) {
760	CompilationUnitDeclaration parsedUnit = parsedUnits[i];	760	CompilationUnitDeclaration parsedUnit = parsedUnits[i];
761	if (parsedUnit != null) {	761	if (parsedUnit != null) {
Lines 826-832 Link Here
826	}	826	}
827		827
828	/*	828	/*
829	* Set the focus type (ie. the type that this resolver is computing the hierarch for.	829	* Set the focus type (i.e. the type that this resolver is computing the hierarch for.
830	* Returns the binding of this focus type or null if it could not be found.	830	* Returns the binding of this focus type or null if it could not be found.
831	*/	831	*/
832	public ReferenceBinding setFocusType(char[][] compoundName) {	832	public ReferenceBinding setFocusType(char[][] compoundName) {

Lines 1704-1710 Link Here

(-)notes/R31_buildnotes_jdt-core.html (-2 / +2 lines)
1704	</ul>	1704	</ul>
1705	</li>	1705	</li>
1706	<li>Code select now works into Javadoc comment wherever a reference can be specified	1706	<li>Code select now works into Javadoc comment wherever a reference can be specified
1707	(ie. @see, @link, @linkplain, @throws, @exception, @param or @value tags)<br>	1707	(i.e. @see, @link, @linkplain, @throws, @exception, @param or @value tags)<br>
1708	(see bug <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54968">54968</a>).<br>	1708	(see bug <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54968">54968</a>).<br>
1709	For example, hit F3 with cursor located in <code>MyClass</code>, in following Javadoc comment:	1709	For example, hit F3 with cursor located in <code>MyClass</code>, in following Javadoc comment:
1710	<pre>	1710	<pre>
Lines 1898-1904 Link Here
1898	*/	1898	*/
1899	int IGNORE_RETURN_TYPE = 0x20;	1899	int IGNORE_RETURN_TYPE = 0x20;
1900	</pre>	1900	</pre>
1901	Note that these flags are active only for search of declarations (ie. <code>IJavaSearchConstants.DECLARATIONS</code> and <code>IJavaSearchConstants.ALL_OCCURRENCES</code>)	1901	Note that these flags are active only for search of declarations (i.e. <code>IJavaSearchConstants.DECLARATIONS</code> and <code>IJavaSearchConstants.ALL_OCCURRENCES</code>)
1902	and while searching for IJavaElement (see doc of <code>SearchPattern.createPattern(IJavaElement, int)</code> API method).	1902	and while searching for IJavaElement (see doc of <code>SearchPattern.createPattern(IJavaElement, int)</code> API method).
1903	</li>	1903	</li>
1904	<li>Improved API for type name requestor. Abstract class <code>TypeNameRequestor</code> replaces interface <code>ITypeNameRequestor</code> which is deprecated.<br>	1904	<li>Improved API for type name requestor. Abstract class <code>TypeNameRequestor</code> replaces interface <code>ITypeNameRequestor</code> which is deprecated.<br>

Lines 2330-2336 Link Here

(-)notes/R32_buildnotes_jdt-core.html (-2 / +2 lines)
2330	/**	2330	/**
2331	* Validate compatibility between given string pattern and match rule.	2331	* Validate compatibility between given string pattern and match rule.
2332	*	2332	*
2333	* Optimized (ie. returned match rule is modified) combinations are:	2333	* Optimized (i.e. returned match rule is modified) combinations are:
2334	* - {@link #R_PATTERN_MATCH} without any '*' or '?' in string pattern:	2334	* - {@link #R_PATTERN_MATCH} without any '*' or '?' in string pattern:
2335	* pattern match bit is unset,	2335	* pattern match bit is unset,
2336	* - {@link #R_PATTERN_MATCH} and {@link #R_PREFIX_MATCH} bits simultaneously set:	2336	* - {@link #R_PATTERN_MATCH} and {@link #R_PREFIX_MATCH} bits simultaneously set:
Lines 2342-2348 Link Here
2342	* - {@link #R_CAMELCASE_MATCH} combined with {@link #R_PREFIX_MATCH} and {@link #R_CASE_SENSITIVE}	2342	* - {@link #R_CAMELCASE_MATCH} combined with {@link #R_PREFIX_MATCH} and {@link #R_CASE_SENSITIVE}
2343	* bits is reduced to only {@link #R_CAMELCASE_MATCH} as Camel Case search is already prefix and case sensitive.	2343	* bits is reduced to only {@link #R_CAMELCASE_MATCH} as Camel Case search is already prefix and case sensitive.
2344	*	2344	*
2345	* Rejected (ie. returned match rule -1) combinations are:	2345	* Rejected (i.e. returned match rule -1) combinations are:
2346	* - {@link #R_REGEXP_MATCH} with any other match mode bit set.	2346	* - {@link #R_REGEXP_MATCH} with any other match mode bit set.
2347	*	2347	*
2348	* @param stringPattern The string pattern	2348	* @param stringPattern The string pattern




public static TypeNameMatch createTypeNameMatch(IType type, int modifiers)
</pre>
Early performance tests using added <code>searchAllTypeNames</code> method with <code>TypeNameMatchRequestor</code>
requestor (i.e. a la Open Type dialog) show interesting memory footprint reduction (around 30%). More precise measures of this
performance improvement will be done later...
</li>
<li>Added new <code>SearchEngine</code> API method for search all type names with multiple qualifications and type names

and <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=156491">bug 156491</a>).
<br>
When a search requestor (<code>SearchRequestor</code>) accepts this kind of match,
it knows if a method reference match is a polymorphic method (i.e. implemented in a super or sub type) or not.
<p>
For example, in example below:</p>
<pre>

 *     . {@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type
 *     . {@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations
 *     . {@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces
 *     . {@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)
 * @param scope the scope to search in
 * @param nameRequestor the requestor that collects the results of the search
 * @param waitingPolicy one of




	 *		<li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>
	 * 	<li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>
	 *		<li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>
	 * 	<li>{@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)</li>
	 *	</ul>
	 * @param scope the scope to search in
	 * @param nameRequestor the requestor that collects the results of the search

	 *		<li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>
	 * 	<li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>
	 *		<li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>
	 * 	<li>{@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)</li>
	 *	</ul>
	 * @param scope the scope to search in
	 * @param nameRequestor the requestor that collects the results of the search

	 *		<li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>
	 * 	<li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>
	 *		<li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>
	 * 	<li>{@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)</li>
	 *	</ul>
	 * @param scope the scope to search in
	 * @param nameMatchRequestor the {@link TypeNameMatchRequestor requestor} that collects

Lines 1-5 Link Here

(-)search/org/eclipse/jdt/core/search/TypeNameMatch.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 74-80 Link Here
74	* @see IJavaElement#getAncestor(int)	74	* @see IJavaElement#getAncestor(int)
75	*	75	*
76	* @throws NullPointerException if matched type is <code> null</code>	76	* @throws NullPointerException if matched type is <code> null</code>
77	* @return the existing java model package fragment root (ie. cannot be <code>null</code>	77	* @return the existing java model package fragment root (i.e. cannot be <code>null</code>
78	* and will return <code>true</code> to <code>exists()</code> message).	78	* and will return <code>true</code> to <code>exists()</code> message).
79	*/	79	*/
80	public IPackageFragmentRoot getPackageFragmentRoot() {	80	public IPackageFragmentRoot getPackageFragmentRoot() {




/*******************************************************************************
 * 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

	 * </p>
	 *
	 * @param modifiers the modifier flags of the type. Note that for source type,
	 *		these flags may slightly differ from those get after resolution.
	 *		For example an interface defined by <code>interface A {}</code>,
	 *		although obviously public, will be returned false by <code>Flags.isPublic(modifiers)</code>
	 *		due to the fact that its declaration does not explicitly define public flag.
	 *		@see org.eclipse.jdt.core.Flags
	 * @param packageName the package name as specified in the package declaration (i.e. a dot-separated name)
	 * @param simpleTypeName the simple name of the type
	 * @param enclosingTypeNames if the type is a member type,
	 *          the simple names of the enclosing types from the outer-most to the




			this.progressMonitor.beginTask("", searchDocuments.length); //$NON-NLS-1$
		}

		// initialize pattern for polymorphic search (i.e. method reference pattern)
		this.patternLocator.initializePolymorphicSearch(this);

		JavaProject previousJavaProject = null;

	if (match.getRule() == 0) return;
	if (!encloses((IJavaElement)match.getElement())) return;

	// If there's type arguments, look for end (i.e. char '>') of last one.
	int start = match.getOffset();
	if (typeArguments != null && typeArguments.length > 0) {
		boolean isErasureMatch= (this.pattern instanceof OrPattern) ? ((OrPattern)this.pattern).isErasureMatch() : ((JavaSearchPattern)this.pattern).isErasureMatch();

	if (match.getRule() == 0) return;
	if (!encloses((IJavaElement)match.getElement())) return;

	// If there's type arguments, look for end (i.e. char '>') of last one.
	int end = typeRef.sourceEnd;
	if (typeArguments != null) {


}
/**
 * Visit the given method declaration and report the nodes that match exactly the
 * search pattern (i.e. the ones in the matching nodes set)
 * Note that the method declaration has already been checked.
 */
protected void reportMatching(AbstractMethodDeclaration method, TypeDeclaration type, IJavaElement parent, int accuracy, boolean typeInHierarchy, MatchingNodeSet nodeSet) throws CoreException {

}
/**
 * Visit the given field declaration and report the nodes that match exactly the
 * search pattern (i.e. the ones in the matching nodes set)
 */
protected void reportMatching(FieldDeclaration field, FieldDeclaration[] otherFields, TypeDeclaration type, IJavaElement parent, int accuracy, boolean typeInHierarchy, MatchingNodeSet nodeSet) throws CoreException {
	IJavaElement enclosingElement = null;

}
/**
 * Visit the given type declaration and report the nodes that match exactly the
 * search pattern (i.e. the ones in the matching nodes set)
 */
protected void reportMatching(TypeDeclaration type, IJavaElement parent, int accuracy, MatchingNodeSet nodeSet, int occurrenceCount) throws CoreException {
	// create type handle




/*******************************************************************************
 * 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

 * 		<li>{@link #EXACT_FLAVOR}: Given name is equals to pattern</li>
 * 		<li>{@link #PREFIX_FLAVOR}: Given name prefix equals to pattern</li>
 * 		<li>{@link #CAMELCASE_FLAVOR}: Given name matches pattern as Camel Case</li>
 * 		<li>{@link #PATTERN_FLAVOR}: Given name matches pattern as Pattern (i.e. using '*' and '?' characters)</li>
 * 		</ul>
 * 	</li>
 * </ul>

/**
 * Finds out whether the given ast node matches this search pattern.
 * Returns IMPOSSIBLE_MATCH if it doesn't.
 * Returns INACCURATE_MATCH if it potentially matches this search pattern (i.e.
 * it has already been resolved but resolving failed.)
 * Returns ACCURATE_MATCH if it matches exactly this search pattern (i.e.
 * it doesn't need to be resolved or it has already been resolved.)
 */
public int resolveLevel(ASTNode possibleMatchingNode) {

 * Returns whether the given type binding matches the given simple name pattern
 * and qualification pattern.
 * Note that from since 3.1, this method resolve to accurate member or local types
 * even if they are not fully qualified (i.e. X.Member instead of p.X.Member).
 * Returns ACCURATE_MATCH if it does.
 * Returns INACCURATE_MATCH if resolve failed.
 * Returns IMPOSSIBLE_MATCH if it doesn't.

		return level;
	}

	// Standard types (i.e. neither generic nor parameterized nor raw types)
	// cannot match pattern with type parameters or arguments
	TypeBinding leafType = type.leafComponentType();
	if (!leafType.isParameterizedType()) {

Lines 1-5 Link Here

(-)search/org/eclipse/jdt/internal/core/search/matching/TypeParameterLocator.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 31-37 Link Here
31		31
32	/*	32	/*
33	* Verify whether a type reference matches name pattern.	33	* Verify whether a type reference matches name pattern.
34	* Type parameter references (ie. type arguments) are compiler type reference nodes	34	* Type parameter references (i.e. type arguments) are compiler type reference nodes
35	*/	35	*/
36	public int match(TypeReference node, MatchingNodeSet nodeSet) {	36	public int match(TypeReference node, MatchingNodeSet nodeSet) {
37	if (this.pattern.findReferences) {	37	if (this.pattern.findReferences) {

Return to bug 313706

Lines 1653-1659 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java (-5 / +5 lines)
1653	}	1653	}
1654	}	1654	}
1655	if (receiverType == fieldBinding.declaringClass \|\| compilerOptions().complianceLevel >= ClassFileConstants.JDK1_4) {	1655	if (receiverType == fieldBinding.declaringClass \|\| compilerOptions().complianceLevel >= ClassFileConstants.JDK1_4) {
1656	// found a valid field in the 'immediate' scope (ie. not inherited)	1656	// found a valid field in the 'immediate' scope (i.e. not inherited)
1657	// OR in 1.4 mode (inherited shadows enclosing)	1657	// OR in 1.4 mode (inherited shadows enclosing)
1658	if (foundField == null) {	1658	if (foundField == null) {
1659	if (depth > 0){	1659	if (depth > 0){
Lines 1666-1672 Link Here
1666	if (foundField.isValidBinding())	1666	if (foundField.isValidBinding())
1667	// if a valid field was found, complain when another is found in an 'immediate' enclosing type (that is, not inherited)	1667	// if a valid field was found, complain when another is found in an 'immediate' enclosing type (that is, not inherited)
1668	if (foundField.declaringClass != fieldBinding.declaringClass)	1668	if (foundField.declaringClass != fieldBinding.declaringClass)
1669	// ie. have we found the same field - do not trust field identity yet	1669	// i.e. have we found the same field - do not trust field identity yet
1670	return new ProblemFieldBinding(	1670	return new ProblemFieldBinding(
1671	foundField, // closest match	1671	foundField, // closest match
1672	foundField.declaringClass,	1672	foundField.declaringClass,
Lines 1988-1994 Link Here
1988	if (inheritedHasPrecedence	1988	if (inheritedHasPrecedence
1989	\|\| receiverType == methodBinding.declaringClass	1989	\|\| receiverType == methodBinding.declaringClass
1990	\|\| (receiverType.getMethods(selector)) != Binding.NO_METHODS) {	1990	\|\| (receiverType.getMethods(selector)) != Binding.NO_METHODS) {
1991	// found a valid method in the 'immediate' scope (ie. not inherited)	1991	// found a valid method in the 'immediate' scope (i.e. not inherited)
1992	// OR in 1.4 mode (inherited visible shadows enclosing)	1992	// OR in 1.4 mode (inherited visible shadows enclosing)
1993	// OR the receiverType implemented a method with the correct name	1993	// OR the receiverType implemented a method with the correct name
1994	// return the methodBinding if it is not declared in a superclass of the scope's binding (that is, inherited)	1994	// return the methodBinding if it is not declared in a superclass of the scope's binding (that is, inherited)
Lines 2520-2530 Link Here
2520	if (sourceType == memberType.enclosingType() \|\| inheritedHasPrecedence) {	2520	if (sourceType == memberType.enclosingType() \|\| inheritedHasPrecedence) {
2521	if (insideStaticContext && !memberType.isStatic() && sourceType.isGenericType())	2521	if (insideStaticContext && !memberType.isStatic() && sourceType.isGenericType())
2522	return new ProblemReferenceBinding(new char[][]{name}, memberType, ProblemReasons.NonStaticReferenceInStaticContext);	2522	return new ProblemReferenceBinding(new char[][]{name}, memberType, ProblemReasons.NonStaticReferenceInStaticContext);
2523	// found a valid type in the 'immediate' scope (ie. not inherited)	2523	// found a valid type in the 'immediate' scope (i.e. not inherited)
2524	// OR in 1.4 mode (inherited visible shadows enclosing)	2524	// OR in 1.4 mode (inherited visible shadows enclosing)
2525	if (foundType == null \|\| (inheritedHasPrecedence && foundType.problemId() == ProblemReasons.NotVisible))	2525	if (foundType == null \|\| (inheritedHasPrecedence && foundType.problemId() == ProblemReasons.NotVisible))
2526	return memberType;	2526	return memberType;
2527	// if a valid type was found, complain when another is found in an 'immediate' enclosing type (ie. not inherited)	2527	// if a valid type was found, complain when another is found in an 'immediate' enclosing type (i.e. not inherited)
2528	if (foundType.isValidBinding() && foundType != memberType)	2528	if (foundType.isValidBinding() && foundType != memberType)
2529	return new ProblemReferenceBinding(new char[][]{name}, foundType, ProblemReasons.InheritedNameHidesEnclosingName);	2529	return new ProblemReferenceBinding(new char[][]{name}, foundType, ProblemReasons.InheritedNameHidesEnclosingName);
2530	}	2530	}

Lines 1-5 Link Here

(-)model/org/eclipse/jdt/internal/core/JavaModel.java (-4 / +4 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 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 49-55 Link Here
49		49
50	/**	50	/**
51	* A set of external files ({@link #existingExternalFiles}) which have	51	* A set of external files ({@link #existingExternalFiles}) which have
52	* been confirmed as file (ie. which returns true to {@link java.io.File#isFile()}.	52	* been confirmed as file (i.e. which returns true to {@link java.io.File#isFile()}.
53	* Note this cache is kept for the whole session.	53	* Note this cache is kept for the whole session.
54	*/	54	*/
55	public static HashSet existingExternalConfirmedFiles = new HashSet();	55	public static HashSet existingExternalConfirmedFiles = new HashSet();
Lines 366-379 Link Here
366	}	366	}
367		367
368	/**	368	/**
369	* Helper method - returns whether an object is afile (ie. which returns true to {@link java.io.File#isFile()}.	369	* Helper method - returns whether an object is afile (i.e. which returns true to {@link java.io.File#isFile()}.
370	*/	370	*/
371	public static boolean isFile(Object target) {	371	public static boolean isFile(Object target) {
372	return getFile(target) != null;	372	return getFile(target) != null;
373	}	373	}
374		374
375	/**	375	/**
376	* Helper method - returns the file item (ie. which returns true to {@link java.io.File#isFile()},	376	* Helper method - returns the file item (i.e. which returns true to {@link java.io.File#isFile()},
377	* or null if unbound	377	* or null if unbound
378	*/	378	*/
379	public static synchronized File getFile(Object target) {	379	public static synchronized File getFile(Object target) {

Lines 2156-2162 Link Here

(-)notes/R33_buildnotes_jdt-core.html (-3 / +3 lines)
2156	public static TypeNameMatch createTypeNameMatch(IType type, int modifiers)	2156	public static TypeNameMatch createTypeNameMatch(IType type, int modifiers)
2157	</pre>	2157	</pre>
2158	Early performance tests using added <code>searchAllTypeNames</code> method with <code>TypeNameMatchRequestor</code>	2158	Early performance tests using added <code>searchAllTypeNames</code> method with <code>TypeNameMatchRequestor</code>
2159	requestor (ie. a la Open Type dialog) show interesting memory footprint reduction (around 30%). More precise measures of this	2159	requestor (i.e. a la Open Type dialog) show interesting memory footprint reduction (around 30%). More precise measures of this
2160	performance improvement will be done later...	2160	performance improvement will be done later...
2161	</li>	2161	</li>
2162	<li>Added new <code>SearchEngine</code> API method for search all type names with multiple qualifications and type names	2162	<li>Added new <code>SearchEngine</code> API method for search all type names with multiple qualifications and type names
Lines 2605-2611 Link Here
2605	and <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=156491">bug 156491</a>).	2605	and <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=156491">bug 156491</a>).
2606	<br>	2606	<br>
2607	When a search requestor (<code>SearchRequestor</code>) accepts this kind of match,	2607	When a search requestor (<code>SearchRequestor</code>) accepts this kind of match,
2608	it knows if a method reference match is a polymorphic method (ie. implemented in a super or sub type) or not.	2608	it knows if a method reference match is a polymorphic method (i.e. implemented in a super or sub type) or not.
2609	<p>	2609	<p>
2610	For example, in example below:</p>	2610	For example, in example below:</p>
2611	<pre>	2611	<pre>
Lines 2995-3001 Link Here
2995	* . {@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type	2995	* . {@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type
2996	* . {@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations	2996	* . {@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations
2997	* . {@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces	2997	* . {@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces
2998	* . {@link IJavaSearchConstants#TYPE}: look for all types (ie. classes, interfaces, enum and annotation types)	2998	* . {@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)
2999	* @param scope the scope to search in	2999	* @param scope the scope to search in
3000	* @param nameRequestor the requestor that collects the results of the search	3000	* @param nameRequestor the requestor that collects the results of the search
3001	* @param waitingPolicy one of	3001	* @param waitingPolicy one of

Lines 620-626 Link Here

(-)search/org/eclipse/jdt/core/search/SearchEngine.java (-3 / +3 lines)
620	* <li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>	620	* <li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>
621	* <li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>	621	* <li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>
622	* <li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>	622	* <li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>
623	* <li>{@link IJavaSearchConstants#TYPE}: look for all types (ie. classes, interfaces, enum and annotation types)</li>	623	* <li>{@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)</li>
624	* </ul>	624	* </ul>
625	* @param scope the scope to search in	625	* @param scope the scope to search in
626	* @param nameRequestor the requestor that collects the results of the search	626	* @param nameRequestor the requestor that collects the results of the search
Lines 709-715 Link Here
709	* <li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>	709	* <li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>
710	* <li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>	710	* <li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>
711	* <li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>	711	* <li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>
712	* <li>{@link IJavaSearchConstants#TYPE}: look for all types (ie. classes, interfaces, enum and annotation types)</li>	712	* <li>{@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)</li>
713	* </ul>	713	* </ul>
714	* @param scope the scope to search in	714	* @param scope the scope to search in
715	* @param nameRequestor the requestor that collects the results of the search	715	* @param nameRequestor the requestor that collects the results of the search
Lines 810-816 Link Here
810	* <li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>	810	* <li>{@link IJavaSearchConstants#ANNOTATION_TYPE}: only look for annotation type</li>
811	* <li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>	811	* <li>{@link IJavaSearchConstants#CLASS_AND_ENUM}: only look for classes and enumerations</li>
812	* <li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>	812	* <li>{@link IJavaSearchConstants#CLASS_AND_INTERFACE}: only look for classes and interfaces</li>
813	* <li>{@link IJavaSearchConstants#TYPE}: look for all types (ie. classes, interfaces, enum and annotation types)</li>	813	* <li>{@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)</li>
814	* </ul>	814	* </ul>
815	* @param scope the scope to search in	815	* @param scope the scope to search in
816	* @param nameMatchRequestor the {@link TypeNameMatchRequestor requestor} that collects	816	* @param nameMatchRequestor the {@link TypeNameMatchRequestor requestor} that collects

Lines 1149-1155 Link Here

(-)search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java (-6 / +6 lines)
1149	this.progressMonitor.beginTask("", searchDocuments.length); //$NON-NLS-1$	1149	this.progressMonitor.beginTask("", searchDocuments.length); //$NON-NLS-1$
1150	}	1150	}
1151		1151
1152	// initialize pattern for polymorphic search (ie. method reference pattern)	1152	// initialize pattern for polymorphic search (i.e. method reference pattern)
1153	this.patternLocator.initializePolymorphicSearch(this);	1153	this.patternLocator.initializePolymorphicSearch(this);
1154		1154
1155	JavaProject previousJavaProject = null;	1155	JavaProject previousJavaProject = null;
Lines 1833-1839 Link Here
1833	if (match.getRule() == 0) return;	1833	if (match.getRule() == 0) return;
1834	if (!encloses((IJavaElement)match.getElement())) return;	1834	if (!encloses((IJavaElement)match.getElement())) return;
1835		1835
1836	// If there's type arguments, look for end (ie. char '>') of last one.	1836	// If there's type arguments, look for end (i.e. char '>') of last one.
1837	int start = match.getOffset();	1837	int start = match.getOffset();
1838	if (typeArguments != null && typeArguments.length > 0) {	1838	if (typeArguments != null && typeArguments.length > 0) {
1839	boolean isErasureMatch= (this.pattern instanceof OrPattern) ? ((OrPattern)this.pattern).isErasureMatch() : ((JavaSearchPattern)this.pattern).isErasureMatch();	1839	boolean isErasureMatch= (this.pattern instanceof OrPattern) ? ((OrPattern)this.pattern).isErasureMatch() : ((JavaSearchPattern)this.pattern).isErasureMatch();
Lines 1889-1895 Link Here
1889	if (match.getRule() == 0) return;	1889	if (match.getRule() == 0) return;
1890	if (!encloses((IJavaElement)match.getElement())) return;	1890	if (!encloses((IJavaElement)match.getElement())) return;
1891		1891
1892	// If there's type arguments, look for end (ie. char '>') of last one.	1892	// If there's type arguments, look for end (i.e. char '>') of last one.
1893	int end = typeRef.sourceEnd;	1893	int end = typeRef.sourceEnd;
1894	if (typeArguments != null) {	1894	if (typeArguments != null) {
1895		1895
Lines 2081-2087 Link Here
2081	}	2081	}
2082	/**	2082	/**
2083	* Visit the given method declaration and report the nodes that match exactly the	2083	* Visit the given method declaration and report the nodes that match exactly the
2084	* search pattern (ie. the ones in the matching nodes set)	2084	* search pattern (i.e. the ones in the matching nodes set)
2085	* Note that the method declaration has already been checked.	2085	* Note that the method declaration has already been checked.
2086	*/	2086	*/
2087	protected void reportMatching(AbstractMethodDeclaration method, TypeDeclaration type, IJavaElement parent, int accuracy, boolean typeInHierarchy, MatchingNodeSet nodeSet) throws CoreException {	2087	protected void reportMatching(AbstractMethodDeclaration method, TypeDeclaration type, IJavaElement parent, int accuracy, boolean typeInHierarchy, MatchingNodeSet nodeSet) throws CoreException {
Lines 2396-2402 Link Here
2396	}	2396	}
2397	/**	2397	/**
2398	* Visit the given field declaration and report the nodes that match exactly the	2398	* Visit the given field declaration and report the nodes that match exactly the
2399	* search pattern (ie. the ones in the matching nodes set)	2399	* search pattern (i.e. the ones in the matching nodes set)
2400	*/	2400	*/
2401	protected void reportMatching(FieldDeclaration field, FieldDeclaration[] otherFields, TypeDeclaration type, IJavaElement parent, int accuracy, boolean typeInHierarchy, MatchingNodeSet nodeSet) throws CoreException {	2401	protected void reportMatching(FieldDeclaration field, FieldDeclaration[] otherFields, TypeDeclaration type, IJavaElement parent, int accuracy, boolean typeInHierarchy, MatchingNodeSet nodeSet) throws CoreException {
2402	IJavaElement enclosingElement = null;	2402	IJavaElement enclosingElement = null;
Lines 2524-2530 Link Here
2524	}	2524	}
2525	/**	2525	/**
2526	* Visit the given type declaration and report the nodes that match exactly the	2526	* Visit the given type declaration and report the nodes that match exactly the
2527	* search pattern (ie. the ones in the matching nodes set)	2527	* search pattern (i.e. the ones in the matching nodes set)
2528	*/	2528	*/
2529	protected void reportMatching(TypeDeclaration type, IJavaElement parent, int accuracy, MatchingNodeSet nodeSet, int occurrenceCount) throws CoreException {	2529	protected void reportMatching(TypeDeclaration type, IJavaElement parent, int accuracy, MatchingNodeSet nodeSet, int occurrenceCount) throws CoreException {
2530	// create type handle	2530	// create type handle