Attachment 33354 Details for Bug 124611 – Proposed patch

[patch] Proposed patch

patch_for_124611.txt (text/plain), 2.55 KB, created by Olivier Thomann

on 2006-01-20 10:56:29 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-01-20 10:56:29 EST

Size: 2.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/SourceMapper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMapper.java,v
>retrieving revision 1.116
>diff -u -r1.116 SourceMapper.java
>--- model/org/eclipse/jdt/internal/core/SourceMapper.java	6 Jan 2006 11:20:55 -0000	1.116
>+++ model/org/eclipse/jdt/internal/core/SourceMapper.java	20 Jan 2006 15:55:05 -0000
>@@ -34,6 +34,7 @@
> import org.eclipse.core.runtime.IPath;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Path;
>+import org.eclipse.jdt.core.IClassFile;
> import org.eclipse.jdt.core.IField;
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.IMember;
>@@ -690,11 +691,28 @@
> 			IType currentType = this.types[typeDepth];
> 			char[][] parameterTypes = methodInfo.parameterTypes;
> 			if (parameterTypes != null && methodInfo.isConstructor && currentType.getDeclaringType() != null) {
>-				int length = parameterTypes.length;
>-				char[][] newParameterTypes = new char[length+1][];
>-				newParameterTypes[0] = currentType.getDeclaringType().getElementName().toCharArray();
>-				System.arraycopy(parameterTypes, 0, newParameterTypes, 1, length);
>-				this.methodParameterTypes[typeDepth] = newParameterTypes;
>+				IType declaringType = currentType.getDeclaringType();
>+				String declaringTypeName = declaringType.getElementName();
>+				if (declaringTypeName.length() == 0) {
>+					IClassFile classFile = declaringType.getClassFile();
>+					if (classFile != null) {
>+						int length = parameterTypes.length;
>+						char[][] newParameterTypes = new char[length+1][];
>+						declaringTypeName = classFile.getElementName();
>+						declaringTypeName = declaringTypeName.substring(0, declaringTypeName.indexOf('.'));
>+						newParameterTypes[0] = declaringTypeName.toCharArray();
>+						System.arraycopy(parameterTypes, 0, newParameterTypes, 1, length);
>+						this.methodParameterTypes[typeDepth] = newParameterTypes;
>+					} else {
>+						this.methodParameterTypes[typeDepth] = parameterTypes;
>+					}
>+				} else {
>+					int length = parameterTypes.length;
>+					char[][] newParameterTypes = new char[length+1][];
>+					newParameterTypes[0] = declaringTypeName.toCharArray();
>+					System.arraycopy(parameterTypes, 0, newParameterTypes, 1, length);
>+					this.methodParameterTypes[typeDepth] = newParameterTypes;
>+				}
> 			} else {
> 				this.methodParameterTypes[typeDepth] = parameterTypes;
> 			}

Actions: View | Diff

Attachments on bug 124611: 33354