Attachment 51149 Details for Bug 153133 – New proposed patch

[patch] New proposed patch

v01.txt (text/plain), 2.56 KB, created by Frederic Fusier

on 2006-09-29 04:37:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2006-09-29 04:37:58 EDT

Size: 2.56 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.126
>diff -u -r1.126 SourceMapper.java
>--- model/org/eclipse/jdt/internal/core/SourceMapper.java	18 Jul 2006 10:20:48 -0000	1.126
>+++ model/org/eclipse/jdt/internal/core/SourceMapper.java	27 Sep 2006 11:27:17 -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.Flags;
> import org.eclipse.jdt.core.IClassFile;
> import org.eclipse.jdt.core.IField;
> import org.eclipse.jdt.core.IJavaElement;
>@@ -170,6 +171,7 @@
> 	IType[] types;
> 	int[] typeDeclarationStarts;
> 	SourceRange[] typeNameRanges;
>+	int[] typeModifiers;
> 	int typeDepth;
> 	
> 	/**
>@@ -626,6 +628,12 @@
> 				this.methodParameterNames = new char[this.typeDepth * 2][][],
> 				0,
> 				this.typeDepth);					
>+			System.arraycopy(
>+				this.typeModifiers,
>+				0,
>+				this.typeModifiers = new int[this.typeDepth * 2],
>+				0,
>+				this.typeDepth);
> 		}
> 		if (typeInfo.name.length == 0) {
> 			this.anonymousCounter++;
>@@ -659,6 +667,9 @@
> 			}
> 		}
> 		
>+		// type modifiers
>+		this.typeModifiers[typeDepth] = typeInfo.modifiers;
>+
> 		// categories
> 		addCategories(currentType, typeInfo.categories);
> 	}
>@@ -717,8 +728,9 @@
> 				new SourceRange(methodInfo.nameSourceStart, methodInfo.nameSourceEnd - methodInfo.nameSourceStart + 1);
> 			this.memberDeclarationStart[typeDepth] = methodInfo.declarationStart;
> 			IType currentType = this.types[typeDepth];
>+			int currenTypeModifiers = this.typeModifiers[typeDepth];
> 			char[][] parameterTypes = methodInfo.parameterTypes;
>-			if (parameterTypes != null && methodInfo.isConstructor && currentType.getDeclaringType() != null) {
>+			if (parameterTypes != null && methodInfo.isConstructor && currentType.getDeclaringType() != null && !Flags.isStatic(currenTypeModifiers)) {
> 				IType declaringType = currentType.getDeclaringType();
> 				String declaringTypeName = declaringType.getElementName();
> 				if (declaringTypeName.length() == 0) {
>@@ -1220,6 +1232,7 @@
> 		this.types = new IType[1];
> 		this.typeDeclarationStarts = new int[1];
> 		this.typeNameRanges = new SourceRange[1];
>+		this.typeModifiers = new int[1];
> 		this.typeDepth = -1;
> 		this.memberDeclarationStart = new int[1];
> 		this.memberName = new String[1];

Actions: View | Diff

Attachments on bug 153133: 47702 | 51149