View | Details | Raw Unified | Return to bug 139160 | Differences between
and this patch

Collapse All | Expand All

(-)model/org/eclipse/jdt/internal/core/BinaryMethod.java (-3 / +8 lines)
Lines 227-233 Link Here
227
			javadocContents = nameCollector.getJavadoc();
227
			javadocContents = nameCollector.getJavadoc();
228
 		} else if (javadocContents != BinaryType.EMPTY_JAVADOC){
228
 		} else if (javadocContents != BinaryType.EMPTY_JAVADOC){
229
 			// need to extract the part relative to the binary method since javadoc contains the javadoc for the declaring type
229
 			// need to extract the part relative to the binary method since javadoc contains the javadoc for the declaring type
230
 			javadocContents = extractJavadoc(declaringType, javadocContents);
230
 			try {
231
 				javadocContents = extractJavadoc(declaringType, javadocContents);
232
 			} catch(JavaModelException e) {
233
 				// ignore
234
 			}
231
 		} else {
235
 		} else {
232
 			// we don't want to set the parameter names
236
 			// we don't want to set the parameter names
233
 			return getRawParameterNames(paramCount);
237
 			return getRawParameterNames(paramCount);
Lines 561-567 Link Here
561
		anchor = Signature.toString(this.getSignature().replace('/', '.'), methodName, null, true, false, Flags.isVarargs(this.getFlags()));
565
		anchor = Signature.toString(this.getSignature().replace('/', '.'), methodName, null, true, false, Flags.isVarargs(this.getFlags()));
562
	}
566
	}
563
	if (declaringTypeIsMember) {
567
	if (declaringTypeIsMember) {
564
565
		int depth = 0;
568
		int depth = 0;
566
		final String packageFragmentName = declaringType.getPackageFragment().getElementName();
569
		final String packageFragmentName = declaringType.getPackageFragment().getElementName();
567
		// might need to remove a part of the signature corresponding to the synthetic argument
570
		// might need to remove a part of the signature corresponding to the synthetic argument
Lines 593-599 Link Here
593
		}
596
		}
594
	}
597
	}
595
	int indexAnchor = contents.indexOf(JavadocConstants.ANCHOR_PREFIX_START + anchor + JavadocConstants.ANCHOR_PREFIX_END);
598
	int indexAnchor = contents.indexOf(JavadocConstants.ANCHOR_PREFIX_START + anchor + JavadocConstants.ANCHOR_PREFIX_END);
596
	if (indexAnchor == -1) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this));
599
	if (indexAnchor == -1) {
600
		return null; // method without javadoc
601
	}
597
	int indexOfEndLink = contents.indexOf(JavadocConstants.ANCHOR_SUFFIX, indexAnchor);
602
	int indexOfEndLink = contents.indexOf(JavadocConstants.ANCHOR_SUFFIX, indexAnchor);
598
	if (indexOfEndLink == -1) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this));
603
	if (indexOfEndLink == -1) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this));
599
	int indexOfNextMethod = contents.indexOf(JavadocConstants.ANCHOR_PREFIX_START, indexOfEndLink);
604
	int indexOfNextMethod = contents.indexOf(JavadocConstants.ANCHOR_PREFIX_START, indexOfEndLink);

Return to bug 139160