Attachment 40016 Details for Bug 139160 – Better patch

[patch] Better patch

patch_139160.txt (text/plain), 2.15 KB, created by Olivier Thomann

on 2006-05-01 22:01:23 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2006-05-01 22:01:23 EDT

Size: 2.15 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.89
>diff -u -r1.89 BinaryMethod.java
>--- model/org/eclipse/jdt/internal/core/BinaryMethod.java	27 Apr 2006 15:45:02 -0000	1.89
>+++ model/org/eclipse/jdt/internal/core/BinaryMethod.java	2 May 2006 01:59:35 -0000
>@@ -227,7 +227,11 @@
> 			javadocContents = nameCollector.getJavadoc();
>  		} else if (javadocContents != BinaryType.EMPTY_JAVADOC){
>  			// need to extract the part relative to the binary method since javadoc contains the javadoc for the declaring type
>- 			javadocContents = extractJavadoc(declaringType, javadocContents);
>+ 			try {
>+ 				javadocContents = extractJavadoc(declaringType, javadocContents);
>+ 			} catch(JavaModelException e) {
>+ 				// ignore
>+ 			}
>  		} else {
>  			// we don't want to set the parameter names
>  			return getRawParameterNames(paramCount);
>@@ -561,7 +565,6 @@
> 		anchor = Signature.toString(this.getSignature().replace('/', '.'), methodName, null, true, false, Flags.isVarargs(this.getFlags()));
> 	}
> 	if (declaringTypeIsMember) {
>-
> 		int depth = 0;
> 		final String packageFragmentName = declaringType.getPackageFragment().getElementName();
> 		// might need to remove a part of the signature corresponding to the synthetic argument
>@@ -593,7 +596,9 @@
> 		}
> 	}
> 	int indexAnchor = contents.indexOf(JavadocConstants.ANCHOR_PREFIX_START + anchor + JavadocConstants.ANCHOR_PREFIX_END);
>-	if (indexAnchor == -1) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this));
>+	if (indexAnchor == -1) {
>+		return null; // method without javadoc
>+	}
> 	int indexOfEndLink = contents.indexOf(JavadocConstants.ANCHOR_SUFFIX, indexAnchor);
> 	if (indexOfEndLink == -1) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this));
> 	int indexOfNextMethod = contents.indexOf(JavadocConstants.ANCHOR_PREFIX_START, indexOfEndLink);

Actions: View | Diff

Attachments on bug 139160: 39858 | 40016