Attachment 92443 Details for Bug 221723 – Proposed patch

[patch] Proposed patch

bug221723_001.txt (text/plain), 1.96 KB, created by David Audel

on 2008-03-13 10:49:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Audel

Created: 2008-03-13 10:49:06 EDT

Size: 1.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/BinaryMethod.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/BinaryMethod.java,v
>retrieving revision 1.97
>diff -u -r1.97 BinaryMethod.java
>--- model/org/eclipse/jdt/internal/core/BinaryMethod.java	22 Nov 2007 11:51:58 -0000	1.97
>+++ model/org/eclipse/jdt/internal/core/BinaryMethod.java	13 Mar 2008 14:48:15 -0000
>@@ -251,19 +251,8 @@
> 			try {
> 				javadocContents = extractJavadoc(declaringType, javadocContents);
> 			} catch(JavaModelException e) {
>-				// ignore
>+				javadocContents = null;
> 			}
>-		} else {
>-			// let's see if we can retrieve them from the debug infos
>-			char[][] argumentNames = info.getArgumentNames();
>-			if (argumentNames != null && argumentNames.length == paramCount) {
>-				String[] names = new String[paramCount];
>-				for (int i = 0; i < paramCount; i++) {
>-					names[i] = new String(argumentNames[i]);
>-				}
>-				return this.parameterNames = names;
>-			}
>-			return getRawParameterNames(paramCount);
> 		}
> 		if (javadocContents != null && javadocContents != BinaryType.EMPTY_JAVADOC) {
> 			final int indexOfOpenParen = javadocContents.indexOf('(');
>@@ -651,8 +640,7 @@
> 		indexOfBottom = contents.indexOf(JavadocConstants.END_OF_CLASS_DATA, indexOfEndLink);
> 	}
> 	if (indexOfBottom == -1) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this));
>-	indexOfNextMethod = Math.min(indexOfNextMethod, indexOfBottom);
>-	if (indexOfNextMethod == -1) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this));
>+	indexOfNextMethod = indexOfNextMethod == -1 ? indexOfBottom : Math.min(indexOfNextMethod, indexOfBottom);
> 	return contents.substring(indexOfEndLink + JavadocConstants.ANCHOR_SUFFIX_LENGTH, indexOfNextMethod);
> }
> }

Actions: View | Diff

Attachments on bug 221723: 91791 | 92443 | 92552