Attachment 65783 Details for Bug 184862 – improved patch

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

[patch] improved patch

type-params-deux.patch (text/plain), 2.03 KB, created by Darin Wright

on 2007-05-03 11:10:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2007-05-03 11:10:11 EDT

Size: 2.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.debug
>Index: eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.debug/eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java,v
>retrieving revision 1.40
>diff -u -r1.40 SourceBasedSourceGenerator.java
>--- eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java	27 Apr 2007 21:18:15 -0000	1.40
>+++ eval/org/eclipse/jdt/internal/debug/eval/ast/engine/SourceBasedSourceGenerator.java	3 May 2007 15:10:35 -0000
>@@ -237,19 +237,17 @@
> 			buffer.append("static "); //$NON-NLS-1$
> 			// add type parameters as required
> 			if (isSourceLevelGreaterOrEqual(1, 5)) {
>-				for (int i = 0; i < fLocalVariableTypeNames.length; i++) {
>-					String typeName = fLocalVariableTypeNames[i];
>-					if (fTypeParameters.contains(typeName)) {
>-						buffer.append(Signature.C_GENERIC_START);
>-						buffer.append(typeName);
>-						buffer.append(Signature.C_GENERIC_END);
>-					}
>-					int index = typeName.indexOf(Signature.C_GENERIC_START);
>-					if (index > 0) {
>-						String sig = typeName.substring(index);
>-						buffer.append(sig);
>-						buffer.append(' ');
>+				if (!fTypeParameters.isEmpty()) {
>+					Iterator iterator = fTypeParameters.iterator();
>+					buffer.append(Signature.C_GENERIC_START);
>+					while (iterator.hasNext()) {
>+						String name = (String) iterator.next();
>+						buffer.append(name);
>+						if (iterator.hasNext()) {
>+							buffer.append(", "); //$NON-NLS-1$
>+						}
> 					}
>+					buffer.append(Signature.C_GENERIC_END);
> 				}
> 			}			
> 		}
>@@ -1390,7 +1388,7 @@
> 			Iterator iterator = typeParameters.iterator();
> 			while (iterator.hasNext()) {
> 				TypeParameter typeParameter= (TypeParameter) iterator.next();
>-				fTypeParameters.add(typeParameter.getName().getIdentifier());
>+				fTypeParameters.add(typeParameter.toString());
> 			}
> 		}
> 		if (rightTypeFound()) {

Actions: View | Diff

Attachments on bug 184862: 65770 | 65783