Attachment 76715 Details for Bug 161457 – Custom Resolution

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

Custom Resolution

CustomResolution.patch (text/plain), 4.87 KB, created by Robert Elves

on 2007-08-22 17:16:13 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Elves

Created: 2007-08-22 17:16:13 EDT

Size: 4.87 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java,v
>retrieving revision 1.29
>diff -u -r1.29 BugzillaTaskDataHandler.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java	22 Aug 2007 20:50:00 -0000	1.29
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java	22 Aug 2007 21:07:08 -0000
>@@ -195,30 +195,30 @@
> 		case UNCONFIRMED:
> 		case REOPENED:
> 		case NEW:
>-			addOperation(bugReport, BUGZILLA_OPERATION.none, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.accept, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.resolve, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.duplicate, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.none, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.accept, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.resolve, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.duplicate, userName);
> 			break;
> 		case ASSIGNED:
>-			addOperation(bugReport, BUGZILLA_OPERATION.none, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.resolve, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.duplicate, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.none, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.resolve, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.duplicate, userName);
> 			break;
> 		case RESOLVED:
>-			addOperation(bugReport, BUGZILLA_OPERATION.none, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reopen, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.verify, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.close, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.none, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.reopen, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.verify, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.close, userName);
> 			break;
> 		case CLOSED:
>-			addOperation(bugReport, BUGZILLA_OPERATION.none, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reopen, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.none, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.reopen, userName);
> 			break;
> 		case VERIFIED:
>-			addOperation(bugReport, BUGZILLA_OPERATION.none, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reopen, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.close, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.none, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.reopen, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.close, userName);
> 		}
> 		String bugzillaVersion;
> 		try {
>@@ -230,12 +230,13 @@
> 		if (bugzillaVersion.compareTo("3.1") < 0
> 				&& (status == BUGZILLA_REPORT_STATUS.NEW || status == BUGZILLA_REPORT_STATUS.ASSIGNED)) {
> 			// old bugzilla workflow is used
>-			addOperation(bugReport, BUGZILLA_OPERATION.reassign, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reassignbycomponent, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.reassign, userName);
>+			addOperation(repository, bugReport, BUGZILLA_OPERATION.reassignbycomponent, userName);
> 		}
> 	}
> 
>-	private void addOperation(RepositoryTaskData bugReport, BUGZILLA_OPERATION opcode, String userName) {
>+	private void addOperation(TaskRepository repository, RepositoryTaskData bugReport, BUGZILLA_OPERATION opcode,
>+			String userName) {
> 		RepositoryOperation newOperation = null;
> 		switch (opcode) {
> 		case none:
>@@ -249,8 +250,20 @@
> 		case resolve:
> 			newOperation = new RepositoryOperation(opcode.toString(), OPERATION_LABEL_RESOLVE);
> 			newOperation.setUpOptions(OPERATION_OPTION_RESOLUTION);
>-			for (BUGZILLA_RESOLUTION resolution : BUGZILLA_RESOLUTION.values()) {
>-				newOperation.addOption(resolution.toString(), resolution.toString());
>+			RepositoryConfiguration config;
>+			try {
>+				config = BugzillaCorePlugin.getRepositoryConfiguration(repository, false);
>+			} catch (CoreException e) {
>+				config = null;
>+			}
>+			if (config != null) {
>+				for (String resolution : config.getResolutions()) {
>+					newOperation.addOption(resolution, resolution);
>+				}
>+			} else {
>+				for (BUGZILLA_RESOLUTION resolution : BUGZILLA_RESOLUTION.values()) {
>+					newOperation.addOption(resolution.toString(), resolution.toString());
>+				}
> 			}
> 			break;
> 		case duplicate:

Actions: View

Attachments on bug 161457: 76709 | 76710 | 76715 | 76716 | 76736 | 76809 | 76810 | 76819 | 76820