Attachment 169337 Details for Bug 313706 – Proposed fix + 3 additional corrections

Proposed fix + 3 additional corrections

patch1.txt (text/plain), 43.81 KB, created by Frederic Fusier

on 2010-05-20 08:58:55 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2010-05-20 08:58:55 EDT

Size: 43.81 KB

patch

obsolete

>### 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 @@
> <h2>What's new in this drop</h2>
> <ul>
> <li>
>-Added a new formatter preferences to align annotation arguments (ie. element-value pairs).
>+Added a new formatter preferences to align annotation arguments (i.e. element-value pairs).
> 
> This new preference is controlled with the option:
> <code>DefaultCodeFormatterConstants.FORMATTER_ALIGNMENT_FOR_ARGUMENTS_IN_ANNOTATION</code>
>Index: codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java,v
>retrieving revision 1.214
>diff -u -r1.214 CompletionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	22 Apr 2010 12:56:48 -0000	1.214
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	20 May 2010 12:56:12 -0000
>@@ -47,7 +47,7 @@
> 	protected static final int K_NEXT_TYPEREF_IS_CLASS = COMPLETION_PARSER + 5; // whether the next type reference is a class
> 	protected static final int K_NEXT_TYPEREF_IS_INTERFACE = COMPLETION_PARSER + 6; // whether the next type reference is an interface
> 	protected static final int K_NEXT_TYPEREF_IS_EXCEPTION = COMPLETION_PARSER + 7; // whether the next type reference is an exception
>-	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 '{'
>+	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 '{'
> 	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
> 	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
> 	protected static final int K_CAST_STATEMENT = COMPLETION_PARSER + 11; // whether we are between ')' and the end of a cast statement
>@@ -1630,7 +1630,7 @@
> 	return false;
> }
> /**
>- * Checks if the completion is on a member access (ie. in an identifier following a dot).
>+ * Checks if the completion is on a member access (i.e. in an identifier following a dot).
> * Returns whether we found a completion node.
> */
> private boolean checkMemberAccess() {
>Index: codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java,v
>retrieving revision 1.91
>diff -u -r1.91 AssistParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java	30 Mar 2010 06:36:00 -0000	1.91
>+++ codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java	20 May 2010 12:56:12 -0000
>@@ -359,7 +359,7 @@
> }
> protected void consumeForceNoDiet() {
> 	super.consumeForceNoDiet();
>-	// if we are not in a method (ie. we are not in a local variable initializer)
>+	// if we are not in a method (i.e. we are not in a local variable initializer)
> 	// then we are entering a field initializer
> 	if (!isInsideMethod()) {
> 		if(topKnownElementKind(ASSIST_PARSER) != K_ENUM_CONSTANT_DELIMITER) {
>@@ -580,7 +580,7 @@
> }
> protected void consumeRestoreDiet() {
> 	super.consumeRestoreDiet();
>-	// if we are not in a method (ie. we were not in a local variable initializer)
>+	// if we are not in a method (i.e. we were not in a local variable initializer)
> 	// then we are exiting a field initializer
> 	if (!isInsideMethod()) {
> 		popElement(K_FIELD_INITIALIZER_DELIMITER);
>Index: compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java,v
>retrieving revision 1.17
>diff -u -r1.17 IBinaryMethod.java
>--- compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java	7 Mar 2009 01:08:09 -0000	1.17
>+++ compiler/org/eclipse/jdt/internal/compiler/env/IBinaryMethod.java	20 May 2010 12:56:12 -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
>@@ -12,7 +12,7 @@
> 
> // clinit methods (synthetics too?) can be returned from IBinaryType>>getMethods()
> // BUT do not have to be... the compiler will ignore them when building the binding.
>-// The synthetic argument of a member type's constructor (ie. the first arg of a non-static
>+// The synthetic argument of a member type's constructor (i.e. the first arg of a non-static
> // member type) is also ignored by the compiler, BUT in this case it must be included
> // in the constructor's signature.
> 
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java,v
>retrieving revision 1.176
>diff -u -r1.176 ClassScope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	5 Feb 2010 09:06:32 -0000	1.176
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/ClassScope.java	20 May 2010 12:56:13 -0000
>@@ -984,7 +984,7 @@
> 			}
> 
> 			// check for simple interface collisions
>-			// Check for a duplicate interface once the name is resolved, otherwise we may be confused (ie : a.b.I and c.d.I)
>+			// Check for a duplicate interface once the name is resolved, otherwise we may be confused (i.e. a.b.I and c.d.I)
> 			for (int j = 0; j < i; j++) {
> 				if (interfaceBindings[j] == superInterface) {
> 					problemReporter().duplicateSuperinterface(sourceType, superInterfaceRef, superInterface);
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java,v
>retrieving revision 1.73
>diff -u -r1.73 MethodScope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java	3 Nov 2009 15:37:47 -0000	1.73
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java	20 May 2010 12:56:13 -0000
>@@ -295,7 +295,7 @@
> * Error management:
> * 		keep null for all the errors that prevent the method to be created
> * 		otherwise return a correct method binding (but without the element
>- *		that caused the problem) : ie : Incorrect thrown exception
>+ *		that caused the problem) : i.e. Incorrect thrown exception
> */
> MethodBinding createMethod(AbstractMethodDeclaration method) {
> 	// is necessary to ensure error reporting
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java,v
>retrieving revision 1.111
>diff -u -r1.111 MethodVerifier.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java	19 Feb 2010 10:14:13 -0000	1.111
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/MethodVerifier.java	20 May 2010 12:56:13 -0000
>@@ -35,7 +35,7 @@
> 		- extending a final class
> 		- extending an interface instead of a class
> 		- implementing a class instead of an interface
>-		- implementing the same interface more than once (ie. duplicate interfaces)
>+		- implementing the same interface more than once (i.e. duplicate interfaces)
> 	- with nested types:
> 		- shadowing an enclosing type's source name
> 		- defining a static class or interface inside a non-static nested class
>Index: compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java,v
>retrieving revision 1.367
>diff -u -r1.367 Scope.java
>--- compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	8 Mar 2010 16:08:50 -0000	1.367
>+++ compiler/org/eclipse/jdt/internal/compiler/lookup/Scope.java	20 May 2010 12:56:15 -0000
>@@ -1653,7 +1653,7 @@
> 											}
> 										}
> 										if (receiverType == fieldBinding.declaringClass || compilerOptions().complianceLevel >= ClassFileConstants.JDK1_4) {
>-											// found a valid field in the 'immediate' scope (ie. not inherited)
>+											// 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){
>@@ -1666,7 +1666,7 @@
> 											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)
>-													// ie. have we found the same field - do not trust field identity yet
>+													// i.e. have we found the same field - do not trust field identity yet
> 													return new ProblemFieldBinding(
> 														foundField, // closest match
> 														foundField.declaringClass,
>@@ -1988,7 +1988,7 @@
> 									if (inheritedHasPrecedence
> 											|| receiverType == methodBinding.declaringClass
> 											|| (receiverType.getMethods(selector)) != Binding.NO_METHODS) {
>-										// found a valid method in the 'immediate' scope (ie. not inherited)
>+										// 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)
>@@ -2520,11 +2520,11 @@
> 									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 (ie. not inherited)
>+										// 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 (ie. not inherited)
>+										// 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);
> 									}
>Index: compiler/org/eclipse/jdt/internal/compiler/util/Util.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/util/Util.java,v
>retrieving revision 1.77
>diff -u -r1.77 Util.java
>--- compiler/org/eclipse/jdt/internal/compiler/util/Util.java	21 Feb 2010 03:35:51 -0000	1.77
>+++ compiler/org/eclipse/jdt/internal/compiler/util/Util.java	20 May 2010 12:56:15 -0000
>@@ -294,7 +294,7 @@
> 	*/
> 	/**
> 	 * Returns the given input stream's contents as a byte array.
>-	 * If a length is specified (ie. if length != -1), only length bytes
>+	 * If a length is specified (i.e. if length != -1), only length bytes
> 	 * are returned. Otherwise all bytes in the stream are returned.
> 	 * Note this doesn't close the stream.
> 	 * @throws IOException if a problem occured reading the stream.
>@@ -377,7 +377,7 @@
> 	*/
> 	/**
> 	 * Returns the given input stream's contents as a character array.
>-	 * If a length is specified (ie. if length != -1), this represents the number of bytes in the stream.
>+	 * If a length is specified (i.e. if length != -1), this represents the number of bytes in the stream.
> 	 * Note this doesn't close the stream.
> 	 * @throws IOException if a problem occured reading the stream.
> 	 */
>Index: eval/org/eclipse/jdt/internal/eval/EvaluationContext.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationContext.java,v
>retrieving revision 1.64
>diff -u -r1.64 EvaluationContext.java
>--- eval/org/eclipse/jdt/internal/eval/EvaluationContext.java	26 Nov 2008 12:36:41 -0000	1.64
>+++ eval/org/eclipse/jdt/internal/eval/EvaluationContext.java	20 May 2010 12:56:15 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 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
>@@ -512,7 +512,7 @@
> 	return this.packageName;
> }
> /**
>- * Return the binary for the root code snippet class (ie. org.eclipse.jdt.internal.eval.target.CodeSnippet).
>+ * Return the binary for the root code snippet class (i.e. org.eclipse.jdt.internal.eval.target.CodeSnippet).
> */
> IBinaryType getRootCodeSnippetBinary() {
> 	if (this.codeSnippetBinary == null) {
>Index: eval/org/eclipse/jdt/internal/eval/GlobalVariable.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/GlobalVariable.java,v
>retrieving revision 1.23
>diff -u -r1.23 GlobalVariable.java
>--- eval/org/eclipse/jdt/internal/eval/GlobalVariable.java	7 Mar 2009 01:08:09 -0000	1.23
>+++ eval/org/eclipse/jdt/internal/eval/GlobalVariable.java	20 May 2010 12:56:15 -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 @@
> }
> /**
> * Returns the initializer of this global variable. The initializer is a
>- * variable initializer (ie. an expression or an array initializer) as defined
>+ * variable initializer (i.e. an expression or an array initializer) as defined
> * in the Java Language Specifications.
> */
> public char[] getInitializer() {
>Index: formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java,v
>retrieving revision 1.114
>diff -u -r1.114 DefaultCodeFormatterConstants.java
>--- formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	20 May 2010 11:45:27 -0000	1.114
>+++ formatter/org/eclipse/jdt/core/formatter/DefaultCodeFormatterConstants.java	20 May 2010 12:56:17 -0000
>@@ -3532,8 +3532,8 @@
> 	 * 
> 	 * Important notes:
> 	 * <ol>
>-	 * <li>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,
>+	 * <li>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.</li>
> 	 * <li>The new strategy currently only applies to nested method calls, but might be extended to other nested expressions in future versions</li>
> 	 * </ol>
>Index: model/org/eclipse/jdt/internal/core/DeltaProcessor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeltaProcessor.java,v
>retrieving revision 1.337
>diff -u -r1.337 DeltaProcessor.java
>--- model/org/eclipse/jdt/internal/core/DeltaProcessor.java	11 May 2010 18:47:09 -0000	1.337
>+++ model/org/eclipse/jdt/internal/core/DeltaProcessor.java	20 May 2010 12:56:18 -0000
>@@ -2336,7 +2336,7 @@
> 	}
> 
> 	/*
>-	 * Update the current delta (ie. add/remove/change the given element) and update the correponding index.
>+	 * Update the current delta (i.e. add/remove/change the given element) and update the correponding index.
> 	 * Returns whether the children of the given delta must be processed.
> 	 * @throws a JavaModelException if the delta doesn't correspond to a java element of the given type.
> 	 */
>Index: model/org/eclipse/jdt/internal/core/JavaModel.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModel.java,v
>retrieving revision 1.97
>diff -u -r1.97 JavaModel.java
>--- model/org/eclipse/jdt/internal/core/JavaModel.java	5 Nov 2008 12:48:20 -0000	1.97
>+++ model/org/eclipse/jdt/internal/core/JavaModel.java	20 May 2010 12:56:18 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 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
>@@ -49,7 +49,7 @@
> 
> 	/**
> 	 * A set of external files ({@link #existingExternalFiles}) which have
>-	 * been confirmed as file (ie. which returns true to {@link java.io.File#isFile()}.
>+	 * 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();
>@@ -366,14 +366,14 @@
> }
> 
> /**
>- * Helper method - returns whether an object is afile (ie. which returns true to {@link java.io.File#isFile()}.
>+ * 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 (ie. which returns true to {@link java.io.File#isFile()},
>+ * 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) {
>Index: model/org/eclipse/jdt/internal/core/JavaModelManager.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelManager.java,v
>retrieving revision 1.450
>diff -u -r1.450 JavaModelManager.java
>--- model/org/eclipse/jdt/internal/core/JavaModelManager.java	11 May 2010 16:28:28 -0000	1.450
>+++ model/org/eclipse/jdt/internal/core/JavaModelManager.java	20 May 2010 12:56:20 -0000
>@@ -1670,7 +1670,7 @@
> 	/*
> 	 * Return a new Java 6 annotation processor manager. The manager will need to
> 	 * be configured before it can be used. Returns null if a manager cannot be
>-	 * created, ie if the current VM does not support Java 6 annotation processing.
>+	 * created, i.e. if the current VM does not support Java 6 annotation processing.
> 	 */
> 	public AbstractAnnotationProcessorManager createAnnotationProcessorManager() {
> 		synchronized(this) {
>Index: model/org/eclipse/jdt/internal/core/builder/AdditionalTypeCollection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/AdditionalTypeCollection.java,v
>retrieving revision 1.11
>diff -u -r1.11 AdditionalTypeCollection.java
>--- model/org/eclipse/jdt/internal/core/builder/AdditionalTypeCollection.java	7 Mar 2009 01:08:10 -0000	1.11
>+++ model/org/eclipse/jdt/internal/core/builder/AdditionalTypeCollection.java	20 May 2010 12:56:20 -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
>@@ -16,7 +16,7 @@
> 
> protected AdditionalTypeCollection(char[][] definedTypeNames, char[][][] qualifiedReferences, char[][] simpleNameReferences, char[][] rootReferences) {
> 	super(qualifiedReferences, simpleNameReferences, rootReferences);
>-	this.definedTypeNames = definedTypeNames; // do not bother interning member type names (ie. 'A$M')
>+	this.definedTypeNames = definedTypeNames; // do not bother interning member type names (i.e. 'A$M')
> }
> }
> 
>Index: model/org/eclipse/jdt/internal/core/builder/State.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/builder/State.java,v
>retrieving revision 1.70
>diff -u -r1.70 State.java
>--- model/org/eclipse/jdt/internal/core/builder/State.java	7 Oct 2009 14:46:27 -0000	1.70
>+++ model/org/eclipse/jdt/internal/core/builder/State.java	20 May 2010 12:56:20 -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,7 +29,7 @@
> String javaProjectName;
> ClasspathMultiDirectory[] sourceLocations;
> ClasspathLocation[] binaryLocations;
>-// keyed by the project relative path of the type (ie. "src1/p1/p2/A.java"), value is a ReferenceCollection or an AdditionalTypeCollection
>+// keyed by the project relative path of the type (i.e. "src1/p1/p2/A.java"), value is a ReferenceCollection or an AdditionalTypeCollection
> SimpleLookupTable references;
> // keyed by qualified type name "p1/p2/A", value is the project relative path which defines this type "src1/p1/p2/A.java"
> public SimpleLookupTable typeLocators;
>Index: model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java,v
>retrieving revision 1.93
>diff -u -r1.93 HierarchyResolver.java
>--- model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java	5 May 2010 16:09:41 -0000	1.93
>+++ model/org/eclipse/jdt/internal/core/hierarchy/HierarchyResolver.java	20 May 2010 12:56:21 -0000
>@@ -755,7 +755,7 @@
> 			}
> 		}
> 
>-		// complete type bindings (ie. connect super types)
>+		// complete type bindings (i.e. connect super types)
> 		for (int i = 0; i < unitsIndex; i++) {
> 			CompilationUnitDeclaration parsedUnit = parsedUnits[i];
> 			if (parsedUnit != null) {
>@@ -826,7 +826,7 @@
> }
> 
> /*
>- * Set the focus type (ie. the type that this resolver is computing the hierarch for.
>+ * Set the focus type (i.e. the type that this resolver is computing the hierarch for.
> * Returns the binding of this focus type or null if it could not be found.
> */
> public ReferenceBinding setFocusType(char[][] compoundName) {
>Index: notes/R31_buildnotes_jdt-core.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/notes/R31_buildnotes_jdt-core.html,v
>retrieving revision 1.6
>diff -u -r1.6 R31_buildnotes_jdt-core.html
>--- notes/R31_buildnotes_jdt-core.html	26 May 2009 16:55:43 -0000	1.6
>+++ notes/R31_buildnotes_jdt-core.html	20 May 2010 12:56:23 -0000
>@@ -1704,7 +1704,7 @@
> </ul>
> </li>
> <li>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 <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=54968">54968</a>). 
> For example, hit F3 with cursor located in <code>MyClass</code>, in following Javadoc comment:
> <pre>
>@@ -1898,7 +1898,7 @@
> */
> int IGNORE_RETURN_TYPE = 0x20;
> </pre>
>-Note that these flags are active only for search of declarations (ie. <code>IJavaSearchConstants.DECLARATIONS</code> and <code>IJavaSearchConstants.ALL_OCCURRENCES</code>)
>+Note that these flags are active only for search of declarations (i.e. <code>IJavaSearchConstants.DECLARATIONS</code> and <code>IJavaSearchConstants.ALL_OCCURRENCES</code>)
> and while searching for IJavaElement (see doc of <code>SearchPattern.createPattern(IJavaElement, int)</code> API method).
> </li>
> <li>Improved API for type name requestor. Abstract class <code>TypeNameRequestor</code> replaces interface <code>ITypeNameRequestor</code> 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)
> </pre>
> Early performance tests using added <code>searchAllTypeNames</code> method with <code>TypeNameMatchRequestor</code>
>-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...
> </li>
> <li>Added new <code>SearchEngine</code> API method for search all type names with multiple qualifications and type names
>@@ -2605,7 +2605,7 @@
> and <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=156491">bug 156491</a>).
> 
> When a search requestor (<code>SearchRequestor</code>) 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:
> <pre>
>@@ -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 @@
> 	 *		<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 (ie. classes, interfaces, enum and annotation types)</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
>@@ -709,7 +709,7 @@
> 	 *		<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 (ie. classes, interfaces, enum and annotation types)</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
>@@ -810,7 +810,7 @@
> 	 *		<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 (ie. classes, interfaces, enum and annotation types)</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
>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 <code> null</code>
>- * @return the existing java model package fragment root (ie. cannot be <code>null</code>
>+ * @return the existing java model package fragment root (i.e. cannot be <code>null</code>
> * 	and will return <code>true</code> to <code>exists()</code> 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 <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 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 @@
> * 		<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 (ie. using '*' and '?' characters)</li>
>+ * 		<li>{@link #PATTERN_FLAVOR}: Given name matches pattern as Pattern (i.e. using '*' and '?' characters)</li>
> * 		</ul>
> * 	</li>
> * </ul>
>@@ -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) {

Actions: View

Attachments on bug 313706: 169322 | 169337 | 169393