Attachment 151859 Details for Bug 293955 – Proposed fix

[patch] Proposed fix

patch_293955.txt (text/plain), 15.65 KB, created by Olivier Thomann

on 2009-11-10 13:14:37 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2009-11-10 13:14:37 EST

Size: 15.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: model/org/eclipse/jdt/internal/core/JavadocConstants.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocConstants.java,v
>retrieving revision 1.9
>diff -u -r1.9 JavadocConstants.java
>--- model/org/eclipse/jdt/internal/core/JavadocConstants.java	7 Mar 2009 00:58:57 -0000	1.9
>+++ model/org/eclipse/jdt/internal/core/JavadocConstants.java	10 Nov 2009 18:17:00 -0000
>@@ -13,25 +13,25 @@
> public interface JavadocConstants {
> 
> 	String ANCHOR_PREFIX_END = "\""; //$NON-NLS-1$
>-	String ANCHOR_PREFIX_START = "<A NAME=\""; //$NON-NLS-1$
>-	int ANCHOR_PREFIX_START_LENGHT = ANCHOR_PREFIX_START.length();
>-	String ANCHOR_SUFFIX = "</A>"; //$NON-NLS-1$
>-	int ANCHOR_SUFFIX_LENGTH = JavadocConstants.ANCHOR_SUFFIX.length();
>-	String CONSTRUCTOR_DETAIL = ""; //$NON-NLS-1$
>-	String CONSTRUCTOR_SUMMARY = ""; //$NON-NLS-1$
>-	String FIELD_DETAIL= ""; //$NON-NLS-1$
>-	String FIELD_SUMMARY = ""; //$NON-NLS-1$
>-	String ENUM_CONSTANT_SUMMARY = ""; //$NON-NLS-1$
>-	String ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY = ""; //$NON-NLS-1$
>-	String ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY = ""; //$NON-NLS-1$
>-	String END_OF_CLASS_DATA = ""; //$NON-NLS-1$
>+	char[] ANCHOR_PREFIX_START = "<A NAME=\"".toCharArray(); //$NON-NLS-1$
>+	int ANCHOR_PREFIX_START_LENGHT = ANCHOR_PREFIX_START.length;
>+	char[] ANCHOR_SUFFIX = "</A>".toCharArray(); //$NON-NLS-1$
>+	int ANCHOR_SUFFIX_LENGTH = JavadocConstants.ANCHOR_SUFFIX.length;
>+	char[] CONSTRUCTOR_DETAIL = "".toCharArray(); //$NON-NLS-1$
>+	char[] CONSTRUCTOR_SUMMARY = "".toCharArray(); //$NON-NLS-1$
>+	char[] FIELD_DETAIL= "".toCharArray(); //$NON-NLS-1$
>+	char[] FIELD_SUMMARY = "".toCharArray(); //$NON-NLS-1$
>+	char[] ENUM_CONSTANT_SUMMARY = "".toCharArray(); //$NON-NLS-1$
>+	char[] ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY = "".toCharArray(); //$NON-NLS-1$
>+	char[] ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY = "".toCharArray(); //$NON-NLS-1$
>+	char[] END_OF_CLASS_DATA = "".toCharArray(); //$NON-NLS-1$
> 	String HTML_EXTENSION = ".html"; //$NON-NLS-1$
> 	String INDEX_FILE_NAME = "index.html"; //$NON-NLS-1$
>-	String METHOD_DETAIL = ""; //$NON-NLS-1$
>-	String METHOD_SUMMARY = ""; //$NON-NLS-1$
>-	String NESTED_CLASS_SUMMARY = ""; //$NON-NLS-1$
>+	char[] METHOD_DETAIL = "".toCharArray(); //$NON-NLS-1$
>+	char[] METHOD_SUMMARY = "".toCharArray(); //$NON-NLS-1$
>+	char[] NESTED_CLASS_SUMMARY = "".toCharArray(); //$NON-NLS-1$
> 	String PACKAGE_FILE_NAME = "package-summary.html"; //$NON-NLS-1$
>-	String SEPARATOR_START = ""; //$NON-NLS-1$
>-	int START_OF_CLASS_DATA_LENGTH = JavadocConstants.START_OF_CLASS_DATA.length();
>+	char[] SEPARATOR_START = "".toCharArray(); //$NON-NLS-1$
>+	int START_OF_CLASS_DATA_LENGTH = JavadocConstants.START_OF_CLASS_DATA.length;
> }
>Index: model/org/eclipse/jdt/internal/core/JavadocContents.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavadocContents.java,v
>retrieving revision 1.1
>diff -u -r1.1 JavadocContents.java
>--- model/org/eclipse/jdt/internal/core/JavadocContents.java	5 Mar 2009 13:30:06 -0000	1.1
>+++ model/org/eclipse/jdt/internal/core/JavadocContents.java	10 Nov 2009 18:17:00 -0000
>@@ -27,7 +27,7 @@
> 	private static final int[] UNKNOWN_FORMAT = new int[0]; 
> 	
> 	private BinaryType type;
>-	private String content;
>+	private char[] content;
> 	
> 	private int childrenStart;
> 	
>@@ -60,16 +60,8 @@
> 	
> 	public JavadocContents(BinaryType type, String content) {
> 		this.type = type;
>-		this.content = content;
>+		this.content = content != null ? content.toCharArray() : null;
> 	}
>-	
>-	/*
>-	 * Return the full content of the javadoc
>-	 */
>-	public String getContent() {
>-		return this.content;
>-	}
>-	
> 	/*
> 	 * Returns the part of the javadoc that describe the type
> 	 */
>@@ -84,7 +76,7 @@
> 		
> 		if (this.typeDocRange != null) {
> 			if (this.typeDocRange == UNKNOWN_FORMAT) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, this.type));
>-			return this.content.substring(this.typeDocRange[0], this.typeDocRange[1]);
>+			return String.valueOf(CharOperation.subarray(this.content, this.typeDocRange[0], this.typeDocRange[1]));
> 		}
> 		return null;
> 	}
>@@ -111,7 +103,7 @@
> 		
> 		if (range != null) {
> 			if (range == UNKNOWN_FORMAT) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, child));
>-			return this.content.substring(range[0], range[1]);
>+			return String.valueOf(CharOperation.subarray(this.content, range[0], range[1]));
> 		}
> 		return null;
> 	}
>@@ -138,7 +130,7 @@
> 		
> 		if (range != null) {
> 			if (range == UNKNOWN_FORMAT) throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.UNKNOWN_JAVADOC_FORMAT, child));
>-			return this.content.substring(range[0], range[1]);
>+			return String.valueOf(CharOperation.subarray(this.content, range[0], range[1]));
> 		}
> 		return null;
> 	}
>@@ -146,14 +138,14 @@
> 	/*
> 	 * Compute the ranges of the parts of the javadoc that describe each method of the type
> 	 */
>-	private int[] computeChildRange(String anchor, int indexOfSectionBottom) throws JavaModelException {
>+	private int[] computeChildRange(char[] anchor, int indexOfSectionBottom) throws JavaModelException {
> 		
> 		// checks each known anchor locations
> 		if (this.tempAnchorIndexesCount > 0) {
> 			for (int i = 0; i < this.tempAnchorIndexesCount; i++) {
> 				int anchorEndStart = this.tempAnchorIndexes[i];
> 				
>-				if (anchorEndStart != -1 && this.content.startsWith(anchor, anchorEndStart)) {
>+				if (anchorEndStart != -1 && CharOperation.indexOf(anchor, this.content, false, anchorEndStart) == anchorEndStart) {
> 					
> 					this.tempAnchorIndexes[i] = -1;
> 					
>@@ -166,15 +158,14 @@
> 		int index;
> 		
> 		// check each next unknown anchor locations
>-		while ((index = this.content.indexOf(JavadocConstants.ANCHOR_PREFIX_START, fromIndex)) != -1 && (index < indexOfSectionBottom || indexOfSectionBottom == -1)) {
>+		while ((index = CharOperation.indexOf(JavadocConstants.ANCHOR_PREFIX_START, this.content, false, fromIndex)) != -1 && (index < indexOfSectionBottom || indexOfSectionBottom == -1)) {
> 			fromIndex = index + 1;
> 			
> 			int anchorEndStart = index + JavadocConstants.ANCHOR_PREFIX_START_LENGHT;
> 			
> 			this.tempLastAnchorFoundIndex = anchorEndStart;
> 			
>-			if (this.content.startsWith(anchor, anchorEndStart)) {
>-				
>+			if (CharOperation.indexOf(anchor, this.content, false, anchorEndStart) == anchorEndStart) {
> 				return computeChildRange(anchorEndStart, anchor, indexOfSectionBottom);
> 			} else {
> 				if (this.tempAnchorIndexes.length == this.tempAnchorIndexesCount) {
>@@ -188,16 +179,16 @@
> 		return null;
> 	}
> 	
>-	private int[] computeChildRange(int anchorEndStart, String anchor, int indexOfBottom) {
>+	private int[] computeChildRange(int anchorEndStart, char[] anchor, int indexOfBottom) {
> 		int[] range = null;
> 				
> 		// try to find the bottom of the section
> 		if (indexOfBottom != -1) {
> 			// try to find the end of the anchor
>-			int indexOfEndLink = this.content.indexOf(JavadocConstants.ANCHOR_SUFFIX, anchorEndStart + anchor.length());
>+			int indexOfEndLink = CharOperation.indexOf(JavadocConstants.ANCHOR_SUFFIX, this.content, false, anchorEndStart + anchor.length);
> 			if (indexOfEndLink != -1) {
> 				// try to find the next anchor
>-				int indexOfNextElement = this.content.indexOf(JavadocConstants.ANCHOR_PREFIX_START, indexOfEndLink);
>+				int indexOfNextElement = CharOperation.indexOf(JavadocConstants.ANCHOR_PREFIX_START, this.content, false, indexOfEndLink);
> 				
> 				int javadocStart = indexOfEndLink + JavadocConstants.ANCHOR_SUFFIX_LENGTH;
> 				int javadocEnd = indexOfNextElement == -1 ? indexOfBottom : Math.min(indexOfNextElement, indexOfBottom);
>@@ -216,22 +207,22 @@
> 
> 	private void computeChildrenSections() {
> 		// try to find the next separator part
>-		int lastIndex = this.content.indexOf(JavadocConstants.SEPARATOR_START, this.childrenStart);
>+		int lastIndex = CharOperation.indexOf(JavadocConstants.SEPARATOR_START, this.content, false, this.childrenStart);
> 		
> 		// try to find field detail start
>-		this.indexOfFieldDetails = this.content.indexOf(JavadocConstants.FIELD_DETAIL, lastIndex);
>+		this.indexOfFieldDetails = CharOperation.indexOf(JavadocConstants.FIELD_DETAIL, this.content, false, lastIndex);
> 		lastIndex = this.indexOfFieldDetails == -1 ? lastIndex : this.indexOfFieldDetails;
> 		
> 		// try to find constructor detail start
>-		this.indexOfConstructorDetails = this.content.indexOf(JavadocConstants.CONSTRUCTOR_DETAIL, lastIndex);
>+		this.indexOfConstructorDetails = CharOperation.indexOf(JavadocConstants.CONSTRUCTOR_DETAIL, this.content, false, lastIndex);
> 		lastIndex = this.indexOfConstructorDetails == -1 ? lastIndex : this.indexOfConstructorDetails;
> 		
> 		// try to find method detail start
>-		this.indexOfMethodDetails = this.content.indexOf(JavadocConstants.METHOD_DETAIL, lastIndex);
>+		this.indexOfMethodDetails = CharOperation.indexOf(JavadocConstants.METHOD_DETAIL, this.content, false, lastIndex);
> 		lastIndex = this.indexOfMethodDetails == -1 ? lastIndex : this.indexOfMethodDetails;
> 		
> 		// we take the end of class data
>-		this.indexOfEndOfClassData = this.content.indexOf(JavadocConstants.END_OF_CLASS_DATA, lastIndex);
>+		this.indexOfEndOfClassData = CharOperation.indexOf(JavadocConstants.END_OF_CLASS_DATA, this.content, false, lastIndex);
> 		
> 		// try to find the field detail end
> 		this.indexOfFieldsBottom =
>@@ -257,7 +248,9 @@
> 			computeChildrenSections();
> 		}
> 		
>-		String anchor = field.getElementName() + JavadocConstants.ANCHOR_PREFIX_END;
>+		StringBuffer buffer = new StringBuffer(field.getElementName());
>+		buffer.append(JavadocConstants.ANCHOR_PREFIX_END);
>+		char[] anchor = String.valueOf(buffer).toCharArray();
> 		
> 		int[] range = null;
> 		
>@@ -307,7 +300,7 @@
> 			computeChildrenSections();
> 		}
> 		
>-		String anchor = computeMethodAnchorPrefixEnd((BinaryMethod)method);
>+		char[] anchor = computeMethodAnchorPrefixEnd((BinaryMethod)method).toCharArray();
> 		
> 		int[] range = null;
> 		
>@@ -420,45 +413,45 @@
> 	 * Compute the range of the part of the javadoc that describe the type
> 	 */
> 	private void computeTypeRange() throws JavaModelException {
>-		final int indexOfStartOfClassData = this.content.indexOf(JavadocConstants.START_OF_CLASS_DATA);
>+		final int indexOfStartOfClassData = CharOperation.indexOf(JavadocConstants.START_OF_CLASS_DATA, this.content, false);
> 		if (indexOfStartOfClassData == -1) {
> 			this.typeDocRange = UNKNOWN_FORMAT;
> 			return;
> 		}
>-		int indexOfNextSeparator = this.content.indexOf(JavadocConstants.SEPARATOR_START, indexOfStartOfClassData);
>+		int indexOfNextSeparator = CharOperation.indexOf(JavadocConstants.SEPARATOR_START, this.content, false, indexOfStartOfClassData);
> 		if (indexOfNextSeparator == -1) {
> 			this.typeDocRange = UNKNOWN_FORMAT;
> 			return;
> 		}
>-		int indexOfNextSummary = this.content.indexOf(JavadocConstants.NESTED_CLASS_SUMMARY, indexOfNextSeparator);
>+		int indexOfNextSummary = CharOperation.indexOf(JavadocConstants.NESTED_CLASS_SUMMARY, this.content, false, indexOfNextSeparator);
> 		if (indexOfNextSummary == -1 && this.type.isEnum()) {
> 			// try to find enum constant summary start
>-			indexOfNextSummary = this.content.indexOf(JavadocConstants.ENUM_CONSTANT_SUMMARY, indexOfNextSeparator);
>+			indexOfNextSummary = CharOperation.indexOf(JavadocConstants.ENUM_CONSTANT_SUMMARY, this.content, false, indexOfNextSeparator);
> 		}
> 		if (indexOfNextSummary == -1 && this.type.isAnnotation()) {
> 			// try to find required enum constant summary start
>-			indexOfNextSummary = this.content.indexOf(JavadocConstants.ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY, indexOfNextSeparator);
>+			indexOfNextSummary = CharOperation.indexOf(JavadocConstants.ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY, this.content, false, indexOfNextSeparator);
> 			if (indexOfNextSummary == -1) {
> 				// try to find optional enum constant summary start
>-				indexOfNextSummary = this.content.indexOf(JavadocConstants.ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY, indexOfNextSeparator);
>+				indexOfNextSummary = CharOperation.indexOf(JavadocConstants.ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY, this.content, false, indexOfNextSeparator);
> 			}
> 		}
> 		if (indexOfNextSummary == -1) {
> 			// try to find field summary start
>-			indexOfNextSummary = this.content.indexOf(JavadocConstants.FIELD_SUMMARY, indexOfNextSeparator);
>+			indexOfNextSummary = CharOperation.indexOf(JavadocConstants.FIELD_SUMMARY, this.content, false, indexOfNextSeparator);
> 		}
> 		if (indexOfNextSummary == -1) {
> 			// try to find constructor summary start
>-			indexOfNextSummary = this.content.indexOf(JavadocConstants.CONSTRUCTOR_SUMMARY, indexOfNextSeparator);
>+			indexOfNextSummary = CharOperation.indexOf(JavadocConstants.CONSTRUCTOR_SUMMARY, this.content, false, indexOfNextSeparator);
> 		}
> 		if (indexOfNextSummary == -1) {
> 			// try to find method summary start
>-			indexOfNextSummary = this.content.indexOf(JavadocConstants.METHOD_SUMMARY, indexOfNextSeparator);
>+			indexOfNextSummary = CharOperation.indexOf(JavadocConstants.METHOD_SUMMARY, this.content, false, indexOfNextSeparator);
> 		}
> 		
> 		if (indexOfNextSummary == -1) {
> 			// we take the end of class data
>-			indexOfNextSummary = this.content.indexOf(JavadocConstants.END_OF_CLASS_DATA, indexOfNextSeparator);
>+			indexOfNextSummary = CharOperation.indexOf(JavadocConstants.END_OF_CLASS_DATA, this.content, false, indexOfNextSeparator);
> 		} else {
> 			// improve performance of computation of children ranges
> 			this.childrenStart = indexOfNextSummary + 1;
>@@ -473,10 +466,7 @@
> 		 * We remove what the contents between the start of class data and the first <P>
> 		 */
> 		int start = indexOfStartOfClassData + JavadocConstants.START_OF_CLASS_DATA_LENGTH;
>-		int indexOfFirstParagraph = this.content.indexOf("<P>", start); //$NON-NLS-1$
>-		if (indexOfFirstParagraph == -1) {
>-			indexOfFirstParagraph = this.content.indexOf("<p>", start); //$NON-NLS-1$
>-		}
>+		int indexOfFirstParagraph = CharOperation.indexOf("<P>".toCharArray(), this.content, false, start); //$NON-NLS-1$
> 		if (indexOfFirstParagraph != -1 && indexOfFirstParagraph < indexOfNextSummary) {
> 			start = indexOfFirstParagraph;
> 		}

Actions: View | Diff

Attachments on bug 293955: 151097 | 151517 | 151859