Attachment 164085 Details for Bug 289015 – commited patch

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

[patch] commited patch

289015.txt (text/plain), 3.81 KB, created by Frank Becker

on 2010-04-07 12:21:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2010-04-07 12:21:57 EDT

Size: 3.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java,v
>retrieving revision 1.230
>diff -u -r1.230 BugzillaClient.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	2 Apr 2010 08:15:55 -0000	1.230
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	7 Apr 2010 16:19:01 -0000
>@@ -1164,6 +1164,12 @@
> 		Iterator<TaskAttribute> itr = attributes.iterator();
> 		boolean tokenFound = false;
> 		boolean tokenRequired = false;
>+		BugzillaVersion bugzillaVersion = null;
>+		if (repositoryConfiguration != null) {
>+			bugzillaVersion = repositoryConfiguration.getInstallVersion();
>+		} else {
>+			bugzillaVersion = BugzillaVersion.MIN_VERSION;
>+		}
> 		while (itr.hasNext()) {
> 			TaskAttribute a = itr.next();
> 
>@@ -1183,12 +1189,6 @@
> 						|| id.equals(BugzillaAttribute.VOTES.getKey())) {
> 					continue;
> 				} else if (id.equals(BugzillaAttribute.NEW_COMMENT.getKey())) {
>-					BugzillaVersion bugzillaVersion = null;
>-					if (repositoryConfiguration != null) {
>-						bugzillaVersion = repositoryConfiguration.getInstallVersion();
>-					} else {
>-						bugzillaVersion = BugzillaVersion.MIN_VERSION;
>-					}
> 					if (bugzillaVersion.compareMajorMinorOnly(BugzillaVersion.BUGZILLA_2_18) == 0) {
> 						a.setValue(formatTextToLineWrap(a.getValue(), true));
> 					}
>@@ -1206,7 +1206,11 @@
> 				} else if (id != null && id.compareTo("") != 0) { //$NON-NLS-1$
> 					String value = a.getValue();
> 					if (id.equals(BugzillaAttribute.DELTA_TS.getKey())) {
>-						value = stripTimeZone(value);
>+						if (bugzillaVersion.compareTo(BugzillaVersion.BUGZILLA_3_4_7) < 0
>+								|| (bugzillaVersion.compareTo(BugzillaVersion.BUGZILLA_3_5) >= 0)
>+								&& bugzillaVersion.compareTo(BugzillaVersion.BUGZILLA_3_6) < 0) {
>+							value = stripTimeZone(value);
>+						}
> 					}
> 					if (id.startsWith("task.common.kind.flag_type") && repositoryConfiguration != null) { //$NON-NLS-1$
> 						List<BugzillaFlag> flags = repositoryConfiguration.getFlags();
>@@ -1262,12 +1266,6 @@
> 		}
> 
> 		// add the operation to the bug post
>-		BugzillaVersion bugzillaVersion = null;
>-		if (repositoryConfiguration != null) {
>-			bugzillaVersion = repositoryConfiguration.getInstallVersion();
>-		} else {
>-			bugzillaVersion = BugzillaVersion.MIN_VERSION;
>-		}
> 		if (bugzillaVersion.compareTo(BugzillaVersion.BUGZILLA_3_2) < 0) {
> 
> 			TaskAttribute attributeOperation = model.getRoot().getMappedAttribute(TaskAttribute.OPERATION);
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java,v
>retrieving revision 1.8
>diff -u -r1.8 BugzillaVersion.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java	9 Sep 2009 18:57:33 -0000	1.8
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaVersion.java	7 Apr 2010 16:19:01 -0000
>@@ -32,7 +32,13 @@
> 
> 	public final static BugzillaVersion BUGZILLA_3_4 = new BugzillaVersion("3.4"); //$NON-NLS-1$
> 
>-	public final static BugzillaVersion MAX_VERSION = new BugzillaVersion("3.4"); //$NON-NLS-1$
>+	public final static BugzillaVersion BUGZILLA_3_4_7 = new BugzillaVersion("3.4.7"); //$NON-NLS-1$
>+
>+	public final static BugzillaVersion BUGZILLA_3_5 = new BugzillaVersion("3.5"); //$NON-NLS-1$
>+
>+	public final static BugzillaVersion BUGZILLA_3_6 = new BugzillaVersion("3.6"); //$NON-NLS-1$
>+
>+	public final static BugzillaVersion MAX_VERSION = new BugzillaVersion("3.6"); //$NON-NLS-1$
> 
> 	private final int major;
>

Actions: View | Diff

Attachments on bug 289015: 164085 | 164086