Attachment 124505 Details for Bug 259434 – updated patch

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

[patch] updated patch

clipboard.txt (text/plain), 4.41 KB, created by Robert Elves

on 2009-02-02 23:49:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Elves

Created: 2009-02-02 23:49:23 EST

Size: 4.41 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties,v
>retrieving revision 1.6
>diff -u -r1.6 messages.properties
>--- src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties	3 Feb 2009 03:03:28 -0000	1.6
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties	3 Feb 2009 04:47:38 -0000
>@@ -109,7 +109,6 @@
> IBugzillaConstants_requested_operation_not_permitted=The requested operation is not permitted.
> 
> SaxMultiBugReportContentHandler_Bug_id_from_server_did_not_match_requested_id=Bug id from server did not match requested id.
>-SaxMultiBugReportContentHandler_CREATED_AN_ATTACHEMENT_ID=Created an attachment (id=
> SaxMultiBugReportContentHandler_id_not_found=\ id not found.
> 
> BugzillaStatus_errorRepository = Repository error from {0}:\n\n{1}
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java,v
>retrieving revision 1.42
>diff -u -r1.42 SaxMultiBugReportContentHandler.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java	18 Dec 2008 00:45:36 -0000	1.42
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java	3 Feb 2009 04:47:38 -0000
>@@ -32,12 +32,15 @@
>  * Parser for xml bugzilla reports.
>  * 
>  * @author Rob Elves
>+ * @author Hiroyuki Inaba (internationalization)
>  */
> public class SaxMultiBugReportContentHandler extends DefaultHandler {
> 
> 	private static final String ATTRIBUTE_NAME = "name"; //$NON-NLS-1$
> 
>-	private static final String COMMENT_ATTACHMENT_STRING = Messages.SaxMultiBugReportContentHandler_CREATED_AN_ATTACHEMENT_ID;
>+	private static final String ID_STRING_BEGIN = " (id="; //$NON-NLS-1$
>+
>+	private static final String ID_STRING_END = ")"; //$NON-NLS-1$
> 
> 	private StringBuffer characters;
> 
>@@ -574,15 +577,30 @@
> 
> 	/** determines attachment id from comment */
> 	private void parseAttachment(TaskCommentMapper comment) {
>-
> 		String attachmentID = ""; //$NON-NLS-1$
> 		String commentText = comment.getText();
>-		if (commentText.startsWith(COMMENT_ATTACHMENT_STRING)) {
>-			int endIndex = commentText.indexOf(")"); //$NON-NLS-1$
>-			if (endIndex > 0 && endIndex < commentText.length()) {
>-				attachmentID = commentText.substring(COMMENT_ATTACHMENT_STRING.length(), endIndex);
>-				if (!attachmentID.equals("")) { //$NON-NLS-1$
>-					attachIdToComment.put(attachmentID, comment);
>+		int firstDelimiter = commentText.indexOf("\n"); //$NON-NLS-1$
>+		if (firstDelimiter < 0) {
>+			firstDelimiter = commentText.length();
>+		}
>+		int startIndex = commentText.indexOf(ID_STRING_BEGIN);
>+		if (startIndex > 0 && startIndex < firstDelimiter) {
>+			int endIndex = commentText.indexOf(ID_STRING_END, startIndex);
>+			if (endIndex > 0 && endIndex < firstDelimiter) {
>+				startIndex += ID_STRING_BEGIN.length();
>+				int p = startIndex;
>+				while (p < endIndex) {
>+					char c = commentText.charAt(p);
>+					if (c < '0' || c > '9') {
>+						break;
>+					}
>+					p++;
>+				}
>+				if (p == endIndex) {
>+					attachmentID = commentText.substring(startIndex, endIndex);
>+					if (!attachmentID.equals("")) { //$NON-NLS-1$
>+						attachIdToComment.put(attachmentID, comment);
>+					}
> 				}
> 			}
> 		}
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java,v
>retrieving revision 1.4
>diff -u -r1.4 Messages.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java	10 Jan 2009 04:15:16 -0000	1.4
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java	3 Feb 2009 04:47:38 -0000
>@@ -235,8 +235,6 @@
> 
> 	public static String SaxMultiBugReportContentHandler_Bug_id_from_server_did_not_match_requested_id;
> 
>-	public static String SaxMultiBugReportContentHandler_CREATED_AN_ATTACHEMENT_ID;
>-
> 	public static String SaxMultiBugReportContentHandler_id_not_found;
> 
> 	public static String BugzillaStatus_repositoryLoginFailure;

Actions: View | Diff

Attachments on bug 259434: 122679 | 124505