Attachment 54656 Details for Bug 99137 – Proposed patch for JDT/UI

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

[patch] Proposed patch for JDT/UI

v00-v20061128-0800.txt (text/plain), 1.96 KB, created by Frederic Fusier

on 2006-11-28 13:40:35 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frederic Fusier

Created: 2006-11-28 13:40:35 EST

Size: 1.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.ui
>Index: ui/org/eclipse/jdt/ui/JavaElementLabels.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/JavaElementLabels.java,v
>retrieving revision 1.41
>diff -u -r1.41 JavaElementLabels.java
>--- ui/org/eclipse/jdt/ui/JavaElementLabels.java	7 Nov 2006 10:45:30 -0000	1.41
>+++ ui/org/eclipse/jdt/ui/JavaElementLabels.java	28 Nov 2006 18:36:42 -0000
>@@ -535,18 +535,28 @@
> 				String[] names= null;
> 				if (getFlag(flags, M_PARAMETER_NAMES) && method.exists()) {
> 					names= method.getParameterNames();
>+					int namesLength = names.length;
> 					if (types == null) {
>-						nParams= names.length;
>-					} else {
>-						if (nParams != names.length) {
>-							// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=99137 and
>-							// https://bugs.eclipse.org/bugs/show_bug.cgi?id=101029
>-							// JavaPlugin.logErrorMessage("JavaElementLabels: Number of param types(" + nParams + ") != number of names(" + names.length + "): " + method.getElementName());   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
>-							names= null; // no names rendered
>+						nParams= namesLength;
>+					} else if (nParams < namesLength) {
>+						// unexpected number of parameter names
>+						names = null;
>+					} else if (nParams > namesLength) {
>+						// assume that extra parameter types are synthetic
>+						if (namesLength == 0) {
>+							// no param to display
>+							nParams = 0;
>+						} else if (resolvedSig == null) {
>+							// unexpected number of parameter types/names
>+							names = null;
>+						} else {
>+							// reduce get types to number of names
>+							int size = nParams - namesLength;
>+							nParams -= size;
>+							System.arraycopy(types, size, types = new String[namesLength], 0, namesLength);
> 						}
> 					}
> 				}
>-				
> 				for (int i= 0; i < nParams; i++) {
> 					if (i > 0) {
> 						buf.append(COMMA_STRING);

Actions: View | Diff

Attachments on bug 99137: 54656