Attachment 76605 Details for Bug 198027 – correted Patch

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

[patch] correted Patch

patch198027.txt (text/plain), 10.72 KB, created by Frank Becker

on 2007-08-21 23:19:09 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2007-08-21 23:19:09 EDT

Size: 10.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java,v
>retrieving revision 1.78
>diff -u -r1.78 BugzillaTaskEditor.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java	2 Aug 2007 17:22:33 -0000	1.78
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java	22 Aug 2007 03:15:10 -0000
>@@ -16,6 +16,7 @@
> import java.util.List;
> import java.util.Set;
> 
>+import org.eclipse.core.runtime.CoreException;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.MessageDialog;
> import org.eclipse.jface.layout.GridDataFactory;
>@@ -88,6 +89,8 @@
> 
> 	protected Text votesText;
> 
>+	protected Text assignedTo;
>+
> 	/**
> 	 * Creates a new <code>ExistingBugEditor</code>.
> 	 */
>@@ -634,4 +637,49 @@
> 		}
> 		return bugzillaDuplicateDetectors;
> 	}
>+
>+	/**
>+	 * @author Frank Becker (bug 198027)
>+	 */
>+	@Override
>+	protected void addAssignedTo(Composite peopleComposite) {
>+		RepositoryTaskAttribute assignedAttribute = taskData.getAttribute(RepositoryTaskAttribute.USER_ASSIGNED);
>+		if (assignedAttribute != null) {
>+			String bugzillaVersion;
>+			try {
>+				bugzillaVersion = BugzillaCorePlugin.getRepositoryConfiguration(repository, false).getInstallVersion();
>+			} catch (CoreException e1) {
>+				// ignore
>+				bugzillaVersion = "2.18";
>+			}
>+			if (bugzillaVersion.compareTo("3.1")<0) {
>+				// old bugzilla workflow is used
>+				super.addAssignedTo(peopleComposite);
>+				return;
>+			}
>+			Label label = createLabel(peopleComposite, assignedAttribute);
>+			GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label);
>+			assignedTo = createTextField(peopleComposite, assignedAttribute, SWT.FLAT);
>+			GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(assignedTo);
>+			assignedTo.addModifyListener(new ModifyListener() {
>+				public void modifyText(ModifyEvent e) {
>+					String sel = assignedTo.getText();
>+					RepositoryTaskAttribute a = taskData.getAttribute(RepositoryTaskAttribute.USER_ASSIGNED);
>+					if (!(a.getValue().equals(sel))) {
>+						a.setValue(sel);
>+						markDirty(true);
>+					}
>+				}
>+			});
>+			FormToolkit toolkit = getManagedForm().getToolkit();
>+			Label dummylabel = toolkit.createLabel(peopleComposite, "");
>+			GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(dummylabel);
>+			RepositoryTaskAttribute attribute = taskData.getAttribute(BugzillaReportElement.SET_DEFAULT_ASSIGNEE.getKeyString());
>+			if (attribute == null) {
>+				taskData.setAttributeValue(BugzillaReportElement.SET_DEFAULT_ASSIGNEE.getKeyString(), "0");
>+				attribute = taskData.getAttribute(BugzillaReportElement.SET_DEFAULT_ASSIGNEE.getKeyString());
>+			}
>+			addButtonField(peopleComposite, attribute, SWT.CHECK);
>+		}
>+	}
> }
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java,v
>retrieving revision 1.214
>diff -u -r1.214 AbstractRepositoryTaskEditor.java
>--- src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java	21 Aug 2007 23:44:37 -0000	1.214
>+++ src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java	22 Aug 2007 03:15:36 -0000
>@@ -1791,14 +1791,8 @@
> 		peopleComposite.setLayout(layout);
> 		GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(peopleComposite);
> 
>-		RepositoryTaskAttribute assignedAttribute = taskData.getAttribute(RepositoryTaskAttribute.USER_ASSIGNED);
>-		if (assignedAttribute != null) {
>-			Label label = createLabel(peopleComposite, assignedAttribute);
>-			GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label);
>-			Text textField = createTextField(peopleComposite, assignedAttribute, SWT.FLAT | SWT.READ_ONLY);
>-			GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(textField);
>-		}
>-
>+		addAssignedTo(peopleComposite);
>+		
> 		RepositoryTaskAttribute reporterAttribute = taskData.getAttribute(RepositoryTaskAttribute.USER_REPORTER);
> 		if (reporterAttribute != null) {
> 
>@@ -3474,4 +3468,19 @@
> 		controlBySelectableObject.remove(item);
> 	}
> 
>+	/**
>+	 * This method allow you to overwrite the generation of the form area for "assigned to" in the peopleLayout.<br><br>
>+	 * The overwrite is used for Bugzilla Versions > 3.0
>+	 * @since 2.1
>+	 * @author Frank Becker (bug 198027)
>+	 */
>+	protected void addAssignedTo(Composite peopleComposite) {
>+		RepositoryTaskAttribute assignedAttribute = taskData.getAttribute(RepositoryTaskAttribute.USER_ASSIGNED);
>+		if (assignedAttribute != null) {
>+			Label label = createLabel(peopleComposite, assignedAttribute);
>+			GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(label);
>+			Text textField = createTextField(peopleComposite, assignedAttribute, SWT.FLAT | SWT.READ_ONLY);
>+			GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).applyTo(textField);			
>+		}
>+	}
> }
>#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 03:15:52 -0000
>@@ -179,10 +179,11 @@
> 
> 	public void configureTaskData(TaskRepository repository, RepositoryTaskData taskData) throws CoreException {
> 		connector.updateAttributeOptions(repository, taskData);
>-		addValidOperations(taskData, repository.getUserName());
>+		addValidOperations(taskData, repository.getUserName(), repository);
> 	}
> 
>-	private void addValidOperations(RepositoryTaskData bugReport, String userName) throws CoreException {
>+	private void addValidOperations(RepositoryTaskData bugReport, String userName, TaskRepository repository)
>+			throws CoreException {
> 		BUGZILLA_REPORT_STATUS status;
> 		try {
> 			status = BUGZILLA_REPORT_STATUS.valueOf(bugReport.getStatus());
>@@ -198,15 +199,11 @@
> 			addOperation(bugReport, BUGZILLA_OPERATION.accept, userName);
> 			addOperation(bugReport, BUGZILLA_OPERATION.resolve, userName);
> 			addOperation(bugReport, BUGZILLA_OPERATION.duplicate, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reassign, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reassignbycomponent, userName);
> 			break;
> 		case ASSIGNED:
> 			addOperation(bugReport, BUGZILLA_OPERATION.none, userName);
> 			addOperation(bugReport, BUGZILLA_OPERATION.resolve, userName);
> 			addOperation(bugReport, BUGZILLA_OPERATION.duplicate, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reassign, userName);
>-			addOperation(bugReport, BUGZILLA_OPERATION.reassignbycomponent, userName);
> 			break;
> 		case RESOLVED:
> 			addOperation(bugReport, BUGZILLA_OPERATION.none, userName);
>@@ -223,6 +220,19 @@
> 			addOperation(bugReport, BUGZILLA_OPERATION.reopen, userName);
> 			addOperation(bugReport, BUGZILLA_OPERATION.close, userName);
> 		}
>+		String bugzillaVersion;
>+		try {
>+			bugzillaVersion = BugzillaCorePlugin.getRepositoryConfiguration(repository, false).getInstallVersion();
>+		} catch (CoreException e1) {
>+			// ignore
>+			bugzillaVersion = "2.18";
>+		}
>+		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);
>+		}
> 	}
> 
> 	private void addOperation(RepositoryTaskData bugReport, BUGZILLA_OPERATION opcode, String userName) {
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaReportElement.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaReportElement.java,v
>retrieving revision 1.26
>diff -u -r1.26 BugzillaReportElement.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaReportElement.java	26 Jun 2007 01:16:07 -0000	1.26
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaReportElement.java	22 Aug 2007 03:15:50 -0000
>@@ -35,7 +35,7 @@
> 			false), PRIORITY("Priority:", "priority", false, false), PRODUCT("Product:", "product", false), REP_PLATFORM(
> 			"Platform:", "rep_platform", false), REPORTER("Reporter:", "reporter", true, true), REPORTER_ACCESSIBLE(
> 			"Reporter", "reporter_accessible", true), RESOLUTION("Resolution:", "resolution", false, true), // Exiting bug field, new cc
>-	REMAINING_TIME("Hours Left:", "remaining_time", true), SHORT_DESC("Summary:", "short_desc", true), TARGET_MILESTONE(
>+	REMAINING_TIME("Hours Left:", "remaining_time", true), SET_DEFAULT_ASSIGNEE("Reassign to default assignee", "set_default_assignee", false), SHORT_DESC("Summary:", "short_desc", true), TARGET_MILESTONE(
> 			"Target milestone:", "target_milestone", false), THETEXT("thetext", "thetext", false, true), TYPE("type",
> 			"type"), UNKNOWN("UNKNOWN", "UNKNOWN"), VERSION("Version:", "version", false), INSTALL_VERSION(
> 			"version of bugzilla installed", "install_version", true), VOTES("Votes:", "votes", true, true), WORK_TIME(
>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.91
>diff -u -r1.91 BugzillaClient.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	10 Aug 2007 03:00:15 -0000	1.91
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	22 Aug 2007 03:15:48 -0000
>@@ -886,7 +886,7 @@
> 			} else if (a.getId().equals(BugzillaReportElement.CC.getKeyString())
> 					|| a.getId().equals(RepositoryTaskAttribute.REMOVE_CC)
> 					|| a.getId().equals(BugzillaReportElement.REPORTER.getKeyString())
>-					|| a.getId().equals(BugzillaReportElement.ASSIGNED_TO.getKeyString())
>+//					|| a.getId().equals(BugzillaReportElement.ASSIGNED_TO.getKeyString())
> 					|| a.getId().equals(BugzillaReportElement.CREATION_TS.getKeyString())) {
> 				continue;
> 			} else if (a.getId() != null && a.getId().compareTo("") != 0) {

Actions: View | Diff

Attachments on bug 198027: 76397 | 76485 | 76486 | 76605 | 76606