### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core Index: buildnotes_jdt-core.html =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/buildnotes_jdt-core.html,v retrieving revision 1.7464 diff -u -r1.7464 buildnotes_jdt-core.html --- buildnotes_jdt-core.html 20 May 2010 11:45:27 -0000 1.7464 +++ buildnotes_jdt-core.html 20 May 2010 12:56:10 -0000 @@ -84,8 +84,8 @@ * } * * Important notes: - * 1. This new behavior is automatically activated (ie. the default value for this preference is {@link #TRUE}). - * If the backward compatibility regarding previous versions' formatter behavior (ie. before 3.6 version) is necessary, + * 1. This new behavior is automatically activated (i.e. the default value for this preference is {@link #TRUE}). + * If the backward compatibility regarding previous versions' formatter behavior (i.e. before 3.6 version) is necessary, * then the preference needs to be set to {@link #FALSE} to retrieve the previous formatter behavior. * 2. The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions * @@ -938,7 +938,7 @@

What's new in this drop

  • Code select now works into Javadoc comment wherever a reference can be specified -(ie. @see, @link, @linkplain, @throws, @exception, @param or @value tags)
    +(i.e. @see, @link, @linkplain, @throws, @exception, @param or @value tags)
    (see bug 54968).
    For example, hit F3 with cursor located in MyClass, in following Javadoc comment: 
    @@ -1898,7 +1898,7 @@
  */
 int IGNORE_RETURN_TYPE = 0x20;
    -Note that these flags are active only for search of declarations (ie. IJavaSearchConstants.DECLARATIONS and IJavaSearchConstants.ALL_OCCURRENCES) +Note that these flags are active only for search of declarations (i.e. IJavaSearchConstants.DECLARATIONS and IJavaSearchConstants.ALL_OCCURRENCES) and while searching for IJavaElement (see doc of SearchPattern.createPattern(IJavaElement, int) API method).
  • Improved API for type name requestor. Abstract class TypeNameRequestor replaces interface ITypeNameRequestor which is deprecated.
    Index: notes/R32_buildnotes_jdt-core.html =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/notes/R32_buildnotes_jdt-core.html,v retrieving revision 1.4 diff -u -r1.4 R32_buildnotes_jdt-core.html --- notes/R32_buildnotes_jdt-core.html 26 May 2009 16:55:43 -0000 1.4 +++ notes/R32_buildnotes_jdt-core.html 20 May 2010 12:56:25 -0000 @@ -2330,7 +2330,7 @@ /** * Validate compatibility between given string pattern and match rule. * - * Optimized (ie. returned match rule is modified) combinations are: + * Optimized (i.e. returned match rule is modified) combinations are: * - {@link #R_PATTERN_MATCH} without any '*' or '?' in string pattern: * pattern match bit is unset, * - {@link #R_PATTERN_MATCH} and {@link #R_PREFIX_MATCH} bits simultaneously set: @@ -2342,7 +2342,7 @@ * - {@link #R_CAMELCASE_MATCH} combined with {@link #R_PREFIX_MATCH} and {@link #R_CASE_SENSITIVE} * bits is reduced to only {@link #R_CAMELCASE_MATCH} as Camel Case search is already prefix and case sensitive. * - * Rejected (ie. returned match rule -1) combinations are: + * Rejected (i.e. returned match rule -1) combinations are: * - {@link #R_REGEXP_MATCH} with any other match mode bit set. * * @param stringPattern The string pattern Index: notes/R33_buildnotes_jdt-core.html =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/notes/R33_buildnotes_jdt-core.html,v retrieving revision 1.3 diff -u -r1.3 R33_buildnotes_jdt-core.html --- notes/R33_buildnotes_jdt-core.html 26 May 2009 16:55:43 -0000 1.3 +++ notes/R33_buildnotes_jdt-core.html 20 May 2010 12:56:26 -0000 @@ -2156,7 +2156,7 @@ public static TypeNameMatch createTypeNameMatch(IType type, int modifiers) Early performance tests using added searchAllTypeNames method with TypeNameMatchRequestor -requestor (ie. a la Open Type dialog) show interesting memory footprint reduction (around 30%). More precise measures of this +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...
  • Added new SearchEngine API method for search all type names with multiple qualifications and type names @@ -2605,7 +2605,7 @@ and bug 156491).
    When a search requestor (SearchRequestor) accepts this kind of match, -it knows if a method reference match is a polymorphic method (ie. implemented in a super or sub type) or not. +it knows if a method reference match is a polymorphic method (i.e. implemented in a super or sub type) or not.

    For example, in example below:

    @@ -2995,7 +2995,7 @@
  *     . {@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 (ie. classes, interfaces, enum and annotation types)
+ *     . {@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
Index: search/org/eclipse/jdt/core/search/SearchEngine.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/SearchEngine.java,v
retrieving revision 1.150
diff -u -r1.150 SearchEngine.java
--- search/org/eclipse/jdt/core/search/SearchEngine.java	16 Mar 2010 13:39:52 -0000	1.150
+++ search/org/eclipse/jdt/core/search/SearchEngine.java	20 May 2010 12:56:27 -0000
@@ -620,7 +620,7 @@
 	 *		
  • {@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 (ie. classes, interfaces, enum and annotation types)
    • 
+	 * 	
  • {@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
@@ -709,7 +709,7 @@
 	 *		
  • {@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 (ie. classes, interfaces, enum and annotation types)
    • 
+	 * 	
  • {@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
@@ -810,7 +810,7 @@
 	 *		
  • {@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 (ie. classes, interfaces, enum and annotation types)
    • 
+	 * 	
  • {@link IJavaSearchConstants#TYPE}: look for all types (i.e. classes, interfaces, enum and annotation types)
    • 
 	 *	
 	 * @param scope the scope to search in
 	 * @param nameMatchRequestor the {@link TypeNameMatchRequestor requestor} that collects
Index: search/org/eclipse/jdt/core/search/TypeNameMatch.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/TypeNameMatch.java,v
retrieving revision 1.14
diff -u -r1.14 TypeNameMatch.java
--- search/org/eclipse/jdt/core/search/TypeNameMatch.java	4 Dec 2009 09:12:10 -0000	1.14
+++ search/org/eclipse/jdt/core/search/TypeNameMatch.java	20 May 2010 12:56:27 -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
@@ -74,7 +74,7 @@
  * @see IJavaElement#getAncestor(int)
  *
  * @throws NullPointerException if matched type is  null
- * @return the existing java model package fragment root (ie. cannot be null
+ * @return the existing java model package fragment root (i.e. cannot be null
  * 	and will return true to exists() message).
  */
 public IPackageFragmentRoot getPackageFragmentRoot() {
Index: search/org/eclipse/jdt/core/search/TypeNameRequestor.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/TypeNameRequestor.java,v
retrieving revision 1.10
diff -u -r1.10 TypeNameRequestor.java
--- search/org/eclipse/jdt/core/search/TypeNameRequestor.java	7 Mar 2009 01:08:10 -0000	1.10
+++ search/org/eclipse/jdt/core/search/TypeNameRequestor.java	20 May 2010 12:56:27 -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
@@ -29,12 +29,12 @@
 	 * 
    
 	 *
 	 * @param modifiers the modifier flags of the type. Note that for source type,
-	 *		these flags may slightly differ from thoses get after resolution.
+	 *		these flags may slightly differ from those get after resolution.
 	 *		For example an interface defined by interface A {},
 	 *		although obviously public, will be returned false by Flags.isPublic(modifiers)
-	 *		due to the fact that its declaration does not explicitely define public flag.
+	 *		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 (ie. a dot-separated name)
+	 * @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
Index: search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java,v
retrieving revision 1.331
diff -u -r1.331 MatchLocator.java
--- search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	5 May 2010 16:09:40 -0000	1.331
+++ search/org/eclipse/jdt/internal/core/search/matching/MatchLocator.java	20 May 2010 12:56:28 -0000
@@ -1149,7 +1149,7 @@
 			this.progressMonitor.beginTask("", searchDocuments.length); //$NON-NLS-1$
 		}
 
-		// initialize pattern for polymorphic search (ie. method reference pattern)
+		// initialize pattern for polymorphic search (i.e. method reference pattern)
 		this.patternLocator.initializePolymorphicSearch(this);
 
 		JavaProject previousJavaProject = null;
@@ -1833,7 +1833,7 @@
 	if (match.getRule() == 0) return;
 	if (!encloses((IJavaElement)match.getElement())) return;
 
-	// If there's type arguments, look for end (ie. char '>') of last one.
+	// 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();
@@ -1889,7 +1889,7 @@
 	if (match.getRule() == 0) return;
 	if (!encloses((IJavaElement)match.getElement())) return;
 
-	// If there's type arguments, look for end (ie. char '>') of last one.
+	// If there's type arguments, look for end (i.e. char '>') of last one.
 	int end = typeRef.sourceEnd;
 	if (typeArguments != null) {
 
@@ -2081,7 +2081,7 @@
 }
 /**
  * Visit the given method declaration and report the nodes that match exactly the
- * search pattern (ie. the ones in the matching nodes set)
+ * 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 {
@@ -2396,7 +2396,7 @@
 }
 /**
  * Visit the given field declaration and report the nodes that match exactly the
- * search pattern (ie. the ones in the matching nodes set)
+ * 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;
@@ -2524,7 +2524,7 @@
 }
 /**
  * Visit the given type declaration and report the nodes that match exactly the
- * search pattern (ie. the ones in the matching nodes set)
+ * 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
Index: search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java,v
retrieving revision 1.77
diff -u -r1.77 PatternLocator.java
--- search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java	7 Mar 2009 00:59:00 -0000	1.77
+++ search/org/eclipse/jdt/internal/core/search/matching/PatternLocator.java	20 May 2010 12:56:28 -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
@@ -264,7 +264,7 @@
  * 		
  • {@link #EXACT_FLAVOR}: Given name is equals to pattern
    • 
  * 		
  • {@link #PREFIX_FLAVOR}: Given name prefix equals to pattern
    • 
  * 		
  • {@link #CAMELCASE_FLAVOR}: Given name matches pattern as Camel Case
    • 
- * 		
  • {@link #PATTERN_FLAVOR}: Given name matches pattern as Pattern (ie. using '*' and '?' characters)
    • 
+ * 		
  • {@link #PATTERN_FLAVOR}: Given name matches pattern as Pattern (i.e. using '*' and '?' characters)
    • 
  * 		
  *
    • * @@ -426,9 +426,9 @@ /** * 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 (ie. + * 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 (ie. + * 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) { @@ -702,7 +702,7 @@ * 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 (ie. X.Member instead of p.X.Member). + * 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. @@ -822,7 +822,7 @@ return level; } - // Standard types (ie. neither generic nor parameterized nor raw types) + // 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()) { Index: search/org/eclipse/jdt/internal/core/search/matching/TypeParameterLocator.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/TypeParameterLocator.java,v retrieving revision 1.6 diff -u -r1.6 TypeParameterLocator.java --- search/org/eclipse/jdt/internal/core/search/matching/TypeParameterLocator.java 7 Mar 2009 01:08:09 -0000 1.6 +++ search/org/eclipse/jdt/internal/core/search/matching/TypeParameterLocator.java 20 May 2010 12:56:28 -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 @@ -31,7 +31,7 @@ /* * Verify whether a type reference matches name pattern. - * Type parameter references (ie. type arguments) are compiler type reference nodes + * Type parameter references (i.e. type arguments) are compiler type reference nodes */ public int match(TypeReference node, MatchingNodeSet nodeSet) { if (this.pattern.findReferences) {