Attachment 76709 Details for Bug 161457 – Patch

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

[patch] Patch

clipboard.txt (text/plain), 6.54 KB, created by Frank Becker

on 2007-08-22 17:02:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2007-08-22 17:02:11 EDT

Size: 6.54 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.28
>diff -u -r1.28 BugzillaTaskDataHandler.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java	10 Jul 2007 00:30:23 -0000	1.28
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java	22 Aug 2007 21:01:45 -0000
>@@ -10,6 +10,8 @@
> 
> import java.io.IOException;
> import java.util.HashSet;
>+import java.util.Iterator;
>+import java.util.List;
> import java.util.Map;
> import java.util.Set;
> 
>@@ -18,7 +20,6 @@
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPERATION;
> import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_REPORT_STATUS;
>-import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_RESOLUTION;
> import org.eclipse.mylyn.monitor.core.StatusHandler;
> import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
> import org.eclipse.mylyn.tasks.core.AbstractTaskDataHandler;
>@@ -239,8 +240,13 @@
> 		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());
>+			String repositoryUrl = bugReport.getRepositoryUrl();
>+			RepositoryConfiguration repositoryConfiguration= BugzillaCorePlugin.getRepositoryConfiguration(repositoryUrl);
>+			List<String> resolutionList = repositoryConfiguration.getResolutions();
>+			for (Iterator<String> lIter = resolutionList.iterator();lIter.hasNext();) {
>+				String resolutionString =lIter.next();
>+				if (resolutionString.compareTo("DUPLICATE")!= 0)
>+					newOperation.addOption(resolutionString,resolutionString);
> 			}
> 			break;
> 		case duplicate:
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java,v
>retrieving revision 1.46
>diff -u -r1.46 IBugzillaConstants.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java	31 Jul 2007 20:08:51 -0000	1.46
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java	22 Aug 2007 21:01:45 -0000
>@@ -227,10 +227,6 @@
> 		UNCONFIRMED, NEW, ASSIGNED, REOPENED, RESOLVED, VERIFIED, CLOSED, SCHEDULED;
> 	}
> 
>-	public static enum BUGZILLA_RESOLUTION {
>-		FIXED, INVALID, WONTFIX, LATER, REMIND, WORKSFORME;
>-	}
>-
> 	public static final String ERROR_MSG_OP_NOT_PERMITTED = "The requested operation is not permitted.";
> 
> 	public static final String ERROR_MSG_INVALID_BUG_ID = "Invalid bug id. The requested bug id does not exist.";
>Index: .refactorings/2007/8/34/refactorings.index
>===================================================================
>RCS file: .refactorings/2007/8/34/refactorings.index
>diff -N .refactorings/2007/8/34/refactorings.index
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ .refactorings/2007/8/34/refactorings.index	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,3 @@
>+1187815634230	Rename local variable 'repURL'
>+1187815708926	Rename local variable 'resList'
>+1187816102320	Rename local variable 'vv'
>Index: .refactorings/2007/8/34/refactorings.history
>===================================================================
>RCS file: .refactorings/2007/8/34/refactorings.history
>diff -N .refactorings/2007/8/34/refactorings.history
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ .refactorings/2007/8/34/refactorings.history	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,6 @@
>+<?xml version="1.0" encoding="utf-8"?>
>+<session version="1.0">
>+<refactoring comment="Rename local variable 'repURL' in 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(...)' to 'repositoryUrl'&#10;- Original project: 'org.eclipse.mylyn.bugzilla.core'&#10;- Original element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(RepositoryTaskData, BUGZILLA_OPERATION, String).repURL'&#10;- Renamed element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(RepositoryTaskData, BUGZILLA_OPERATION, String).repositoryUrl'&#10;- Update references to refactored element" description="Rename local variable 'repURL'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src&lt;org.eclipse.mylyn.internal.bugzilla.core{BugzillaTaskDataHandler.java" name="repositoryUrl" references="true" selection="9163 6" stamp="1187815634230" version="1.0"/>
>+<refactoring comment="Rename local variable 'resList' in 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(...)' to 'resolutionList'&#10;- Original project: 'org.eclipse.mylyn.bugzilla.core'&#10;- Original element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(RepositoryTaskData, BUGZILLA_OPERATION, String).resList'&#10;- Renamed element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(RepositoryTaskData, BUGZILLA_OPERATION, String).resolutionList'&#10;- Update references to refactored element" description="Rename local variable 'resList'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src&lt;org.eclipse.mylyn.internal.bugzilla.core{BugzillaTaskDataHandler.java" name="resolutionList" references="true" selection="9339 7" stamp="1187815708926" version="1.0"/>
>+<refactoring comment="Rename local variable 'vv' in 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(...)' to 'resolutionString'&#10;- Original project: 'org.eclipse.mylyn.bugzilla.core'&#10;- Original element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(RepositoryTaskData, BUGZILLA_OPERATION, String).vv'&#10;- Renamed element: 'org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler.addOperation(RepositoryTaskData, BUGZILLA_OPERATION, String).resolutionString'&#10;- Update references to refactored element" description="Rename local variable 'vv'" id="org.eclipse.jdt.ui.rename.local.variable" input="/src&lt;org.eclipse.mylyn.internal.bugzilla.core{BugzillaTaskDataHandler.java" name="resolutionString" references="true" selection="9488 2" stamp="1187816102320" version="1.0"/>
>+</session>

Actions: View | Diff

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