Attachment 201749 Details for Bug 354766 – Proposed fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed fix

patch_354766.txt (text/plain), 7.08 KB, created by Olivier Thomann

on 2011-08-18 17:23:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2011-08-18 17:23:35 EDT

Size: 7.08 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/JavadocContents.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java,v
>retrieving revision 1.5
>diff -u -r1.5 JavadocContents.java
>--- model/org/eclipse/jdt/internal/core/JavadocContents.java	20 Jan 2011 02:28:43 -0000	1.5
>+++ model/org/eclipse/jdt/internal/core/JavadocContents.java	18 Aug 2011 21:20:02 -0000
>@@ -128,7 +128,9 @@
> 		}
> 		
> 		if (range != null) {
>-			if (range == UNKNOWN_FORMAT) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, child));
>+			if (range == UNKNOWN_FORMAT) {
>+				throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, child));
>+			}
> 			return String.valueOf(CharOperation.subarray(this.content, range[0], range[1]));
> 		}
> 		return null;
>@@ -377,21 +379,24 @@
> 		IType declaringType = this.type;
> 		if (declaringType.isMember()) {
> 			int depth = 0;
>-			// might need to remove a part of the signature corresponding to the synthetic argument
>-			if (!Flags.isStatic(declaringType.getFlags())) {
>+			// might need to remove a part of the signature corresponding to the synthetic argument (only for constructor)
>+			if (method.isConstructor() && !Flags.isStatic(declaringType.getFlags())) {
> 				depth++;
> 			}
> 			if (depth != 0) {
> 				// depth is 1
> 				int indexOfOpeningParen = anchor.indexOf('(');
>-				if (indexOfOpeningParen == -1) return null;
>+				if (indexOfOpeningParen == -1) {
>+					// should not happen as this is a method signature
>+					return null;
>+				}
> 				int index = indexOfOpeningParen;
> 				indexOfOpeningParen++;
> 				int indexOfComma = anchor.indexOf(',', index);
> 				if (indexOfComma != -1) {
> 					index = indexOfComma + 2;
>+					anchor = anchor.substring(0, indexOfOpeningParen) + anchor.substring(index);
> 				}
>-				anchor = anchor.substring(0, indexOfOpeningParen) + anchor.substring(index);
> 			}
> 		}
> 		return anchor + JavadocConstants.ANCHOR_PREFIX_END;
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/internal/ui/text/java/MethodProposalInfo.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/java/MethodProposalInfo.java,v
>retrieving revision 1.14
>diff -u -r1.14 MethodProposalInfo.java
>--- ui/org/eclipse/jdt/internal/ui/text/java/MethodProposalInfo.java	1 Mar 2011 11:50:36 -0000	1.14
>+++ ui/org/eclipse/jdt/internal/ui/text/java/MethodProposalInfo.java	18 Aug 2011 21:20:02 -0000
>@@ -14,6 +14,7 @@
> import java.util.Map;
> 
> import org.eclipse.jdt.core.CompletionProposal;
>+import org.eclipse.jdt.core.Flags;
> import org.eclipse.jdt.core.IJavaProject;
> import org.eclipse.jdt.core.IMember;
> import org.eclipse.jdt.core.IMethod;
>@@ -90,7 +91,7 @@
> 	 */
> 	private IMethod findMethod(String name, String[] paramTypes, boolean isConstructor, IType type) throws JavaModelException {
> 		Map<String, char[]> typeVariables= computeTypeVariables(type);
>-		return findMethod(name, paramTypes, isConstructor, type.getMethods(), typeVariables);
>+		return findMethod(name, paramTypes, isConstructor, type, typeVariables);
> 	}
> 
> 	/**
>@@ -142,14 +143,15 @@
> 	 * @param paramTypes The type signatures of the parameters e.g.
> 	 *        <code>{"QString;","I"}</code>
> 	 * @param isConstructor If the method is a constructor
>-	 * @param methods The methods to search in
>+	 * @param type the given type in which to search for methods
> 	 * @param typeVariables a map from type variables to concretely used types
> 	 * @return The found method or <code>null</code>, if nothing found
> 	 * @throws JavaModelException if the method does not exist or if an exception occurs while accessing its corresponding resource
> 	 */
>-	private IMethod findMethod(String name, String[] paramTypes, boolean isConstructor, IMethod[] methods, Map<String, char[]> typeVariables) throws JavaModelException {
>+	private IMethod findMethod(String name, String[] paramTypes, boolean isConstructor, IType type, Map<String, char[]> typeVariables) throws JavaModelException {
>+		IMethod[] methods = type.getMethods();
> 		for (int i= methods.length - 1; i >= 0; i--) {
>-			if (isSameMethodSignature(name, paramTypes, isConstructor, methods[i], typeVariables)) {
>+			if (isSameMethodSignature(name, paramTypes, isConstructor, methods[i], typeVariables, type)) {
> 				return methods[i];
> 			}
> 		}
>@@ -167,25 +169,36 @@
> 	 * @param isConstructor Specifies if the method is a constructor
> 	 * @param method the method to be compared with this info's method
> 	 * @param typeVariables a map from type variables to types
>+	 * @param type the given type that declares the method
> 	 * @return Returns <code>true</code> if the method has the given name and
> 	 *         parameter types and constructor state.
> 	 * @throws JavaModelException if the method does not exist or if an exception occurs while accessing its corresponding resource
> 	 */
>-	private boolean isSameMethodSignature(String name, String[] paramTypes, boolean isConstructor, IMethod method, Map<String, char[]> typeVariables) throws JavaModelException {
>+	private boolean isSameMethodSignature(String name, String[] paramTypes, boolean isConstructor, IMethod method, Map<String, char[]> typeVariables, IType type) throws JavaModelException {
> 		if (isConstructor || name.equals(method.getElementName())) {
> 			if (isConstructor == method.isConstructor()) {
> 				String[] otherParams= method.getParameterTypes(); // types may be type variables
>-				if (paramTypes.length == otherParams.length) {
>+				String[] paramTypesTemp= paramTypes;
>+				boolean isConstructorForNonStaticMemberClass= isConstructor && type.isMember() && !Flags.isStatic(type.getFlags());
>+				if (isConstructorForNonStaticMemberClass) {
>+					paramTypesTemp= new String[paramTypes.length + 1];
>+					System.arraycopy(paramTypes, 0, paramTypesTemp, 1, paramTypes.length);
>+				}
>+				if (paramTypesTemp.length == otherParams.length) {
> 					fFallbackMatch= method;
> 					String signature= method.getSignature();
> 					String[] otherParamsFromSignature= Signature.getParameterTypes(signature); // types are resolved / upper-bounded
> 					// no need to check method type variables since these are
> 					// not yet bound when proposing a method
>-					for (int i= 0; i < paramTypes.length; i++) {
>-						String ourParamName= computeSimpleTypeName(paramTypes[i], typeVariables);
>+					for (int i= 0; i < paramTypesTemp.length; i++) {
>+						if (isConstructorForNonStaticMemberClass && i == 0) {
>+							// skip this one
>+							continue;
>+						}
>+						String ourParamName= computeSimpleTypeName(paramTypesTemp[i], typeVariables);
> 						String otherParamName1= computeSimpleTypeName(otherParams[i], typeVariables);
> 						String otherParamName2= computeSimpleTypeName(otherParamsFromSignature[i], typeVariables);
>-
>+	
> 						if (!ourParamName.equals(otherParamName1) && !ourParamName.equals(otherParamName2)) {
> 							return false;
> 						}

Actions: View | Diff

Attachments on bug 354766: 201749 | 201750 | 201751 | 201752 | 201753 | 201974 | 202006 | 202008 | 202020 | 206108 | 206119