Attachment 169393 Details for Bug 313706 – Proposed fix for eg. => e.g.

[patch] Proposed fix for eg. => e.g.

patch_eg.txt (text/plain), 27.65 KB, created by Olivier Thomann

on 2010-05-20 14:11:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-05-20 14:11:23 EDT

Size: 27.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>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.215
>diff -u -r1.215 CompletionParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	20 May 2010 14:12:02 -0000	1.215
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionParser.java	20 May 2010 18:02:58 -0000
>@@ -1459,8 +1459,8 @@
> 	boolean isEmptyNameCompletion = false;
> 	boolean isEmptyAssistIdentifier = false;
> 	if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SELECTOR_QUALIFIER
>-		&& ((isEmptyNameCompletion = topExpression == this.assistNode && isEmptyNameCompletion()) // eg. it is something like "this.fred([cursor]" but it is not something like "this.fred(1 + [cursor]"
>-			|| (isEmptyAssistIdentifier = this.indexOfAssistIdentifier() >= 0 && this.identifierStack[this.identifierPtr].length == 0))) { // eg. it is something like "this.fred(1 [cursor]"
>+		&& ((isEmptyNameCompletion = topExpression == this.assistNode && isEmptyNameCompletion()) // e.g. it is something like "this.fred([cursor]" but it is not something like "this.fred(1 + [cursor]"
>+			|| (isEmptyAssistIdentifier = this.indexOfAssistIdentifier() >= 0 && this.identifierStack[this.identifierPtr].length == 0))) { // e.g. it is something like "this.fred(1 [cursor]"
> 
> 		// pop empty name completion
> 		if (isEmptyNameCompletion) {
>@@ -1654,7 +1654,7 @@
> 	/*
> 		We didn't find any other completion, but the completion identifier is on the identifier stack,
> 		so it can only be a completion on name.
>-		Note that we allow the completion on a name even if nothing is expected (eg. foo() b[cursor] would
>+		Note that we allow the completion on a name even if nothing is expected (e.g. foo() b[cursor] would
> 		be a completion on 'b'). This policy gives more to the user than he/she would expect, but this
> 		simplifies the problem. To fix this, the recovery must be changed to work at a 'statement' granularity
> 		instead of at the 'expression' granularity as it does right now.
>@@ -1977,7 +1977,7 @@
> 	if (checkClassLiteralAccess()) return;
> 	if (checkInstanceofKeyword()) return;
> 
>-	// if the completion was not on an empty name, it can still be inside an invocation (eg. this.fred("abc"[cursor])
>+	// if the completion was not on an empty name, it can still be inside an invocation (e.g. this.fred("abc"[cursor])
> 	// (NB: Put this check before checkNameCompletion() because the selector of the invocation can be on the identifier stack)
> 	if (checkInvocation()) return;
> 
>@@ -3262,15 +3262,15 @@
> 		switch (token) {
> 			case TokenNameDOT:
> 				switch (previous) {
>-					case TokenNamethis: // eg. this[.]fred()
>+					case TokenNamethis: // e.g. this[.]fred()
> 						this.invocationType = EXPLICIT_RECEIVER;
> 						break;
>-					case TokenNamesuper: // eg. super[.]fred()
>+					case TokenNamesuper: // e.g. super[.]fred()
> 						this.invocationType = SUPER_RECEIVER;
> 						break;
>-					case TokenNameIdentifier: // eg. bar[.]fred()
>+					case TokenNameIdentifier: // e.g. bar[.]fred()
> 						if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) != K_BETWEEN_NEW_AND_LEFT_BRACKET) {
>-							if (this.identifierPtr != prevIdentifierPtr) { // if identifier has been consumed, eg. this.x[.]fred()
>+							if (this.identifierPtr != prevIdentifierPtr) { // if identifier has been consumed, e.g. this.x[.]fred()
> 								this.invocationType = EXPLICIT_RECEIVER;
> 							} else {
> 								this.invocationType = NAME_RECEIVER;
>@@ -3280,21 +3280,21 @@
> 				}
> 				break;
> 			case TokenNameIdentifier:
>-				if (previous == TokenNameDOT) { // eg. foo().[fred]()
>-					if (this.invocationType != SUPER_RECEIVER // eg. not super.[fred]()
>-						&& this.invocationType != NAME_RECEIVER // eg. not bar.[fred]()
>-						&& this.invocationType != ALLOCATION // eg. not new foo.[Bar]()
>-						&& this.invocationType != QUALIFIED_ALLOCATION) { // eg. not fred().new foo.[Bar]()
>+				if (previous == TokenNameDOT) { // e.g. foo().[fred]()
>+					if (this.invocationType != SUPER_RECEIVER // e.g. not super.[fred]()
>+						&& this.invocationType != NAME_RECEIVER // e.g. not bar.[fred]()
>+						&& this.invocationType != ALLOCATION // e.g. not new foo.[Bar]()
>+						&& this.invocationType != QUALIFIED_ALLOCATION) { // e.g. not fred().new foo.[Bar]()
> 
> 						this.invocationType = EXPLICIT_RECEIVER;
> 						this.qualifier = this.expressionPtr;
> 					}
> 				}
>-				if (previous == TokenNameGREATER) { // eg. foo().<X>[fred]()
>-					if (this.invocationType != SUPER_RECEIVER // eg. not super.<X>[fred]()
>-						&& this.invocationType != NAME_RECEIVER // eg. not bar.<X>[fred]()
>-						&& this.invocationType != ALLOCATION // eg. not new foo.<X>[Bar]()
>-						&& this.invocationType != QUALIFIED_ALLOCATION) { // eg. not fred().new foo.<X>[Bar]()
>+				if (previous == TokenNameGREATER) { // e.g. foo().<X>[fred]()
>+					if (this.invocationType != SUPER_RECEIVER // e.g. not super.<X>[fred]()
>+						&& this.invocationType != NAME_RECEIVER // e.g. not bar.<X>[fred]()
>+						&& this.invocationType != ALLOCATION // e.g. not new foo.<X>[Bar]()
>+						&& this.invocationType != QUALIFIED_ALLOCATION) { // e.g. not fred().new foo.<X>[Bar]()
> 
> 						if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_PARAMETERIZED_METHOD_INVOCATION) {
> 							this.invocationType = EXPLICIT_RECEIVER;
>@@ -3306,20 +3306,20 @@
> 			case TokenNamenew:
> 				pushOnElementStack(K_BETWEEN_NEW_AND_LEFT_BRACKET);
> 				this.qualifier = this.expressionPtr; // NB: even if there is no qualification, set it to the expression ptr so that the number of arguments are correctly computed
>-				if (previous == TokenNameDOT) { // eg. fred().[new] X()
>+				if (previous == TokenNameDOT) { // e.g. fred().[new] X()
> 					this.invocationType = QUALIFIED_ALLOCATION;
>-				} else { // eg. [new] X()
>+				} else { // e.g. [new] X()
> 					this.invocationType = ALLOCATION;
> 				}
> 				break;
> 			case TokenNamethis:
>-				if (previous == TokenNameDOT) { // eg. fred().[this]()
>+				if (previous == TokenNameDOT) { // e.g. fred().[this]()
> 					this.invocationType = QUALIFIED_ALLOCATION;
> 					this.qualifier = this.expressionPtr;
> 				}
> 				break;
> 			case TokenNamesuper:
>-				if (previous == TokenNameDOT) { // eg. fred().[super]()
>+				if (previous == TokenNameDOT) { // e.g. fred().[super]()
> 					this.invocationType = QUALIFIED_ALLOCATION;
> 					this.qualifier = this.expressionPtr;
> 				}
>@@ -3332,7 +3332,7 @@
> 					this.qualifier = this.expressionPtr; // remenber the last expression so that arguments are correctly computed
> 				}
> 				switch (previous) {
>-					case TokenNameIdentifier: // eg. fred[(]) or foo.fred[(])
>+					case TokenNameIdentifier: // e.g. fred[(]) or foo.fred[(])
> 						if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SELECTOR) {
> 							int info = 0;
> 							if(topKnownElementKind(COMPLETION_OR_ASSIST_PARSER,1) == K_BETWEEN_ANNOTATION_NAME_AND_RPAREN &&
>@@ -3352,7 +3352,7 @@
> 						this.qualifier = -1;
> 						this.invocationType = NO_RECEIVER;
> 						break;
>-					case TokenNamethis: // explicit constructor invocation, eg. this[(]1, 2)
>+					case TokenNamethis: // explicit constructor invocation, e.g. this[(]1, 2)
> 						if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SELECTOR) {
> 							this.pushOnElementStack(K_SELECTOR_INVOCATION_TYPE, (this.invocationType == QUALIFIED_ALLOCATION) ? QUALIFIED_ALLOCATION : ALLOCATION);
> 							this.pushOnElementStack(K_SELECTOR_QUALIFIER, this.qualifier);
>@@ -3360,7 +3360,7 @@
> 						this.qualifier = -1;
> 						this.invocationType = NO_RECEIVER;
> 						break;
>-					case TokenNamesuper: // explicit constructor invocation, eg. super[(]1, 2)
>+					case TokenNamesuper: // explicit constructor invocation, e.g. super[(]1, 2)
> 						if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SELECTOR) {
> 							this.pushOnElementStack(K_SELECTOR_INVOCATION_TYPE, (this.invocationType == QUALIFIED_ALLOCATION) ? QUALIFIED_ALLOCATION : ALLOCATION);
> 							this.pushOnElementStack(K_SELECTOR_QUALIFIER, this.qualifier);
>@@ -3368,7 +3368,7 @@
> 						this.qualifier = -1;
> 						this.invocationType = NO_RECEIVER;
> 						break;
>-					case TokenNameGREATER: // explicit constructor invocation, eg. Fred<X>[(]1, 2)
>+					case TokenNameGREATER: // explicit constructor invocation, e.g. Fred<X>[(]1, 2)
> 					case TokenNameRIGHT_SHIFT: // or fred<X<X>>[(]1, 2)
> 					case TokenNameUNSIGNED_RIGHT_SHIFT: //or Fred<X<X<X>>>[(]1, 2)
> 						if (topKnownElementKind(COMPLETION_OR_ASSIST_PARSER) == K_SELECTOR) {
>@@ -4359,7 +4359,7 @@
> }
> /**
> * Returns whether the completion is just after an array type
>- * eg. String[].[cursor]
>+ * e.g. String[].[cursor]
> */
> private boolean isAfterArrayType() {
> 	// TBD: The following relies on the fact that array dimensions are small: it says that if the
>Index: codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java,v
>retrieving revision 1.71
>diff -u -r1.71 CompletionScanner.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java	7 Apr 2010 19:44:03 -0000	1.71
>+++ codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionScanner.java	20 May 2010 18:02:58 -0000
>@@ -185,7 +185,7 @@
> 					this.startPosition == this.cursorLocation + 1){
> 					// compute end of empty identifier.
> 					// if the empty identifier is at the start of a next token the end of
>-					// empty identifier is the end of the next token (eg. "<empty token>next").
>+					// empty identifier is the end of the next token (e.g. "<empty token>next").
> 					int temp = this.eofPosition;
> 					this.eofPosition = this.source.length;
> 				 	while(getNextCharAsJavaIdentifierPart()){/*empty*/}
>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.92
>diff -u -r1.92 AssistParser.java
>--- codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java	20 May 2010 14:12:03 -0000	1.92
>+++ codeassist/org/eclipse/jdt/internal/codeassist/impl/AssistParser.java	20 May 2010 18:02:58 -0000
>@@ -765,13 +765,13 @@
> 					case TokenNameIdentifier:
> 						this.pushOnElementStack(K_SELECTOR, this.identifierPtr);
> 						break;
>-					case TokenNamethis: // explicit constructor invocation, eg. this(1, 2)
>+					case TokenNamethis: // explicit constructor invocation, e.g. this(1, 2)
> 						this.pushOnElementStack(K_SELECTOR, THIS_CONSTRUCTOR);
> 						break;
>-					case TokenNamesuper: // explicit constructor invocation, eg. super(1, 2)
>+					case TokenNamesuper: // explicit constructor invocation, e.g. super(1, 2)
> 						this.pushOnElementStack(K_SELECTOR, SUPER_CONSTRUCTOR);
> 						break;
>-					case TokenNameGREATER: // explicit constructor invocation, eg. Fred<X>[(]1, 2)
>+					case TokenNameGREATER: // explicit constructor invocation, e.g. Fred<X>[(]1, 2)
> 					case TokenNameRIGHT_SHIFT: // or fred<X<X>>[(]1, 2)
> 					case TokenNameUNSIGNED_RIGHT_SHIFT: //or Fred<X<X<X>>>[(]1, 2)
> 						if(this.identifierPtr > -1) {
>@@ -1120,10 +1120,10 @@
> 	return this.indexOfAssistIdentifier(false);
> }
> /*
>- * Iterate the most recent group of awaiting identifiers (grouped for qualified name reference (eg. aa.bb.cc)
>+ * Iterate the most recent group of awaiting identifiers (grouped for qualified name reference (e.g. aa.bb.cc)
> * so as to check whether one of them is the assist identifier.
> * If so, then answer the index of the assist identifier (0 being the first identifier of the set).
>- *	eg. aa(0).bb(1).cc(2)
>+ *	e.g. aa(0).bb(1).cc(2)
> * If no assist identifier was found, answers -1.
> */
> protected int indexOfAssistIdentifier(boolean useGenericsStack){
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java,v
>retrieving revision 1.89
>diff -u -r1.89 CompilationUnitDeclaration.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java	18 May 2010 18:12:12 -0000	1.89
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/CompilationUnitDeclaration.java	20 May 2010 18:02:58 -0000
>@@ -194,7 +194,7 @@
> * Finds the matching type amoung this compilation unit types.
> * Returns null if no type with this name is found.
> * The type name is a compound name
>- * eg. if we're looking for X.A.B then a type name would be {X, A, B}
>+ * e.g. if we're looking for X.A.B then a type name would be {X, A, B}
> */
> public TypeDeclaration declarationOfType(char[][] typeName) {
> 	for (int i = 0; i < this.types.length; i++) {
>Index: compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java,v
>retrieving revision 1.162
>diff -u -r1.162 TypeDeclaration.java
>--- compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	25 Nov 2009 04:56:02 -0000	1.162
>+++ compiler/org/eclipse/jdt/internal/compiler/ast/TypeDeclaration.java	20 May 2010 18:02:58 -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
>@@ -470,7 +470,7 @@
> * Finds the matching type amoung this type's member types.
> * Returns null if no type with this name is found.
> * The type name is a compound name relative to this type
>- * eg. if this type is X and we're looking for Y.X.A.B
>+ * e.g. if this type is X and we're looking for Y.X.A.B
> * then a type name would be {X, A, B}
> */
> public TypeDeclaration declarationOfType(char[][] typeName) {
>Index: compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java,v
>retrieving revision 1.42
>diff -u -r1.42 RecoveredField.java
>--- compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java	22 Apr 2010 04:38:52 -0000	1.42
>+++ compiler/org/eclipse/jdt/internal/compiler/parser/RecoveredField.java	20 May 2010 18:02:58 -0000
>@@ -274,7 +274,7 @@
> 			}
> 		} else { // https://bugs.eclipse.org/bugs/show_bug.cgi?id=308980
> 			// in case an initializer bracket is opened in a non-array field
>-			// eg. int field = {..
>+			// e.g. int field = {..
> 			this.bracketBalance++;
> 			return null; // no update is necessary	(array initializer)
> 		}
>Index: eval/org/eclipse/jdt/internal/eval/EvaluationResult.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/eval/org/eclipse/jdt/internal/eval/EvaluationResult.java,v
>retrieving revision 1.26
>diff -u -r1.26 EvaluationResult.java
>--- eval/org/eclipse/jdt/internal/eval/EvaluationResult.java	7 Mar 2009 01:08:09 -0000	1.26
>+++ eval/org/eclipse/jdt/internal/eval/EvaluationResult.java	20 May 2010 18:02:58 -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 @@
> * An EvaluationResult is the result of a code snippet evaluation, a global
> * variable evaluation or it is used to report problems against imports and
> * package declaration.
>- * It primarily contains the representation of the resulting value (eg. its
>+ * It primarily contains the representation of the resulting value (e.g. its
> * toString() representation). However if the code snippet, a global variable
> * definition, an import or the package declaration could not be compiled, it
> * contains the corresponding compilation problems.
>@@ -129,7 +129,7 @@
> * Returns the displayable representation of this result's value.
> * This is obtained by sending toString() to the result object on the target side
> * if it is not a primitive value. If it is a primitive value, the corresponding
>- * static toString(...) is used, eg. Integer.toString(int n) if it is an int.
>+ * static toString(...) is used, e.g. Integer.toString(int n) if it is an int.
> * Returns null if there is no value.
> */
> public char[] getValueDisplayString() {
>@@ -138,7 +138,7 @@
> /**
> * Returns the dot-separated fully qualified name of this result's value type.
> * If the value is a primitive value, returns the toString() representation of its type
>- * (eg. "int", "boolean", etc.)
>+ * (e.g. "int", "boolean", etc.)
> * Returns null if there is no value.
> */
> public char[] getValueTypeName() {
>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.24
>diff -u -r1.24 GlobalVariable.java
>--- eval/org/eclipse/jdt/internal/eval/GlobalVariable.java	20 May 2010 14:12:00 -0000	1.24
>+++ eval/org/eclipse/jdt/internal/eval/GlobalVariable.java	20 May 2010 18:02:58 -0000
>@@ -45,7 +45,7 @@
> }
> /**
> * Returns the dot separated fully qualified name of the type of this global variable,
>- * or its simple representation if it is a primitive type (eg. int, boolean, etc.)
>+ * or its simple representation if it is a primitive type (e.g. int, boolean, etc.)
> */
> public char[] getTypeName() {
> 	return this.typeName;
>Index: model/org/eclipse/jdt/core/CompletionProposal.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/CompletionProposal.java,v
>retrieving revision 1.48
>diff -u -r1.48 CompletionProposal.java
>--- model/org/eclipse/jdt/core/CompletionProposal.java	19 Jan 2009 16:31:45 -0000	1.48
>+++ model/org/eclipse/jdt/core/CompletionProposal.java	20 May 2010 18:02:58 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2009 IBM Corporation and others.
>+ * Copyright (c) 2004, 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
>@@ -818,7 +818,7 @@
> 	 * 
> 	 * 
> 	 * This kind of proposal could require a long computation, so they are computed only if completion operation is called with a {@link IProgressMonitor}
>-	 * (eg. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)}). 
>+	 * (e.g. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)}). 
> 	 * This kind of proposal is always is only proposals with a {@link #TYPE_REF} required proposal, so this kind of required proposal must be allowed:
> 	 * <code>requestor.setAllowsRequiredProposals(CONSTRUCTOR_INVOCATION, TYPE_REF, true)</code>.
> 	 * 
>@@ -859,7 +859,7 @@
> 	 * 
> 	 * 
> 	 * This kind of proposal could require a long computation, so they are computed only if completion operation is called with a {@link IProgressMonitor}
>-	 * (eg. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)}) 
>+	 * (e.g. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)}) 
> 	 * This kind of proposal is always is only proposals with a {@link #TYPE_REF} required proposal, so this kind of required proposal must be allowed:
> 	 * <code>requestor.setAllowsRequiredProposals(CONSTRUCTOR_INVOCATION, TYPE_REF, true)</code>.
> 	 * 
>Index: model/org/eclipse/jdt/internal/core/JavaModelOperation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaModelOperation.java,v
>retrieving revision 1.79
>diff -u -r1.79 JavaModelOperation.java
>--- model/org/eclipse/jdt/internal/core/JavaModelOperation.java	28 Jan 2009 12:34:50 -0000	1.79
>+++ model/org/eclipse/jdt/internal/core/JavaModelOperation.java	20 May 2010 18:02:58 -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
>@@ -309,7 +309,7 @@
> 				getSubProgressMonitor(1));
> 			setAttribute(HAS_MODIFIED_RESOURCE_ATTR, TRUE);
> 			while (resource instanceof IFolder) {
>-				// deleting a package: delete the parent if it is empty (eg. deleting x.y where folder x doesn't have resources but y)
>+				// deleting a package: delete the parent if it is empty (e.g. deleting x.y where folder x doesn't have resources but y)
> 				// without deleting the package fragment root
> 				resource = resource.getParent();
> 				if (!resource.equals(rootResource) && resource.members().length == 0) {
>Index: model/org/eclipse/jdt/internal/core/util/HandleFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/HandleFactory.java,v
>retrieving revision 1.50
>diff -u -r1.50 HandleFactory.java
>--- model/org/eclipse/jdt/internal/core/util/HandleFactory.java	22 Oct 2009 12:29:08 -0000	1.50
>+++ model/org/eclipse/jdt/internal/core/util/HandleFactory.java	20 May 2010 18:02:58 -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
>@@ -65,9 +65,9 @@
> 
> 	/**
> 	 * Creates an Openable handle from the given resource path.
>-	 * The resource path can be a path to a file in the workbench (eg. /Proj/com/ibm/jdt/core/HandleFactory.java)
>+	 * The resource path can be a path to a file in the workbench (e.g. /Proj/com/ibm/jdt/core/HandleFactory.java)
> 	 * or a path to a file in a jar file - it then contains the path to the jar file and the path to the file in the jar
>-	 * (eg. c:/jdk1.2.2/jre/lib/rt.jar|java/lang/Object.class or /Proj/rt.jar|java/lang/Object.class)
>+	 * (e.g. c:/jdk1.2.2/jre/lib/rt.jar|java/lang/Object.class or /Proj/rt.jar|java/lang/Object.class)
> 	 * NOTE: This assumes that the resource path is the toString() of an IPath,
> 	 * in other words, it uses the IPath.SEPARATOR for file path
> 	 * and it uses '/' for entries in a zip file.
>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.5
>diff -u -r1.5 R32_buildnotes_jdt-core.html
>--- notes/R32_buildnotes_jdt-core.html	20 May 2010 14:12:01 -0000	1.5
>+++ notes/R32_buildnotes_jdt-core.html	20 May 2010 18:02:59 -0000
>@@ -2355,7 +2355,7 @@
> <li>Added Camel Case support in completion.
> When you perform code complete, the proposals list contains proposals whose name match with the camel case pattern.
> 
>-eg. a possible proposal for TT| is ToTo.
>+e.g. a possible proposal for TT| is ToTo.
> </li>
> <li>Added option to control Camel Case completion.
> <pre>
>Index: notes/R35_buildnotes_jdt-core.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/notes/R35_buildnotes_jdt-core.html,v
>retrieving revision 1.2
>diff -u -r1.2 R35_buildnotes_jdt-core.html
>--- notes/R35_buildnotes_jdt-core.html	25 Jun 2009 14:05:34 -0000	1.2
>+++ notes/R35_buildnotes_jdt-core.html	20 May 2010 18:02:59 -0000
>@@ -799,7 +799,7 @@
> 	 * &lt;/p&gt;
> 	 * &lt;p&gt;
> 	 * This kind of proposal could require a long computation, so they are computed only if completion operation is called with a {@link IProgressMonitor}
>-	 * (eg. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)}).&lt;br&gt;
>+	 * (e.g. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)}).&lt;br&gt;
> 	 * This kind of proposal is always is only proposals with a {@link #TYPE_REF} required proposal, so this kind of required proposal must be allowed:
> 	 * &lt;code&gt;requestor.setAllowsRequiredProposals(CONSTRUCTOR_INVOCATION, TYPE_REF, true)&lt;/code&gt;.
> 	 * &lt;/p&gt;
>@@ -840,7 +840,7 @@
> 	 * &lt;/p&gt;
> 	 * &lt;p&gt;
> 	 * This kind of proposal could require a long computation, so they are computed only if completion operation is called with a {@link IProgressMonitor}
>-	 * (eg. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)})&lt;br&gt;
>+	 * (e.g. {@link ICodeAssist#codeComplete(int, CompletionRequestor, IProgressMonitor)})&lt;br&gt;
> 	 * This kind of proposal is always is only proposals with a {@link #TYPE_REF} required proposal, so this kind of required proposal must be allowed:
> 	 * &lt;code&gt;requestor.setAllowsRequiredProposals(CONSTRUCTOR_INVOCATION, TYPE_REF, true)&lt;/code&gt;.
> 	 * &lt;/p&gt;
>Index: search/org/eclipse/jdt/internal/core/search/matching/PackageReferencePattern.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/PackageReferencePattern.java,v
>retrieving revision 1.64
>diff -u -r1.64 PackageReferencePattern.java
>--- search/org/eclipse/jdt/internal/core/search/matching/PackageReferencePattern.java	18 Sep 2008 15:24:56 -0000	1.64
>+++ search/org/eclipse/jdt/internal/core/search/matching/PackageReferencePattern.java	20 May 2010 18:02:59 -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
>@@ -56,7 +56,7 @@
> }
> protected boolean hasNextQuery() {
> 	// if package has at least 4 segments, don't look at the first 2 since they are mostly
>-	// redundant (eg. in 'org.eclipse.jdt.core.*' 'org.eclipse' is used all the time)
>+	// redundant (e.g. in 'org.eclipse.jdt.core.*' 'org.eclipse' is used all the time)
> 	return --this.currentSegment >= (this.segments.length >= 4 ? 2 : 0);
> }
> public boolean matchesDecodedKey(SearchPattern decodedPattern) {

Actions: View | Diff

Attachments on bug 313706: 169322 | 169337 | 169393