Attachment 177775 Details for Bug 324007 – commited patch

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

[patch] commited patch

patch324007V1.txt (text/plain), 4.92 KB, created by Frank Becker

on 2010-08-30 16:09:41 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2010-08-30 16:09:41 EDT

Size: 4.92 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.bugzilla.core
>Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaUtil.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaUtil.java,v
>retrieving revision 1.2
>diff -u -r1.2 BugzillaUtil.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaUtil.java	21 Aug 2010 19:46:13 -0000	1.2
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaUtil.java	30 Aug 2010 20:00:48 -0000
>@@ -41,20 +41,23 @@
> 		} else {
> 			attribute.addValue(parsedText);
> 		}
>-		String useParam = repositoryTaskData.getAttributeMapper().getTaskRepository().getProperty(propertyName);
>-		if (defaultWhenNull) {
>-			if (useParam == null || (useParam != null && useParam.equals("true"))) { //$NON-NLS-1$
>-				attribute.getMetaData().setKind(TaskAttribute.KIND_DEFAULT);
>-			} else {
>-				attribute.getMetaData().setKind(null);
>-			}
>+		if (BugzillaAttribute.QA_CONTACT.equals(tag)) {
>+			attribute.getMetaData().setKind(null);
> 		} else {
>-			if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>-				attribute.getMetaData().setKind(TaskAttribute.KIND_DEFAULT);
>+			String useParam = repositoryTaskData.getAttributeMapper().getTaskRepository().getProperty(propertyName);
>+			if (defaultWhenNull) {
>+				if (useParam == null || (useParam != null && useParam.equals("true"))) { //$NON-NLS-1$
>+					attribute.getMetaData().setKind(TaskAttribute.KIND_DEFAULT);
>+				} else {
>+					attribute.getMetaData().setKind(null);
>+				}
> 			} else {
>-				attribute.getMetaData().setKind(null);
>+				if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+					attribute.getMetaData().setKind(TaskAttribute.KIND_DEFAULT);
>+				} else {
>+					attribute.getMetaData().setKind(null);
>+				}
> 			}
> 		}
>-
> 	}
> }
>#P org.eclipse.mylyn.bugzilla.ui
>Index: src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java,v
>retrieving revision 1.10
>diff -u -r1.10 BugzillaPeoplePart.java
>--- src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java	16 Dec 2008 00:21:39 -0000	1.10
>+++ src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaPeoplePart.java	30 Aug 2010 20:00:51 -0000
>@@ -14,6 +14,7 @@
> import org.eclipse.jface.layout.GridDataFactory;
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaAttribute;
> import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTaskDataHandler;
>+import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants;
> import org.eclipse.mylyn.tasks.core.TaskRepository;
> import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
> import org.eclipse.mylyn.tasks.ui.editors.AbstractAttributeEditor;
>@@ -40,13 +41,17 @@
> 		AbstractAttributeEditor editor = createAttributeEditor(attribute);
> 		if (editor != null) {
> 			editor.createLabelControl(composite, toolkit);
>-			GridDataFactory.defaultsFor(editor.getLabelControl()).indent(COLUMN_MARGIN, 0).applyTo(
>-					editor.getLabelControl());
>+			GridDataFactory.defaultsFor(editor.getLabelControl())
>+					.indent(COLUMN_MARGIN, 0)
>+					.applyTo(editor.getLabelControl());
> 			editor.createControl(composite, toolkit);
> 			getTaskEditorPage().getAttributeEditorToolkit().adapt(editor);
> 			if (attribute.getId().equals(BugzillaAttribute.CC.getKey())) {
>-				GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).hint(130, 95).applyTo(
>-						editor.getControl());
>+				GridDataFactory.fillDefaults()
>+						.grab(true, true)
>+						.align(SWT.FILL, SWT.FILL)
>+						.hint(130, 95)
>+						.applyTo(editor.getControl());
> 			} else {
> 				GridDataFactory.fillDefaults()
> 						.grab(true, false)
>@@ -71,10 +76,15 @@
> 			addAttribute(peopleComposite, toolkit, assignee);
> 		}
> 		addAttribute(peopleComposite, toolkit, getTaskData().getRoot().getMappedAttribute(TaskAttribute.USER_REPORTER));
>-		addAttribute(peopleComposite, toolkit, getTaskData().getRoot().getMappedAttribute(
>-				BugzillaAttribute.QA_CONTACT.getKey()));
>-		addAttribute(peopleComposite, toolkit, getTaskData().getRoot().getMappedAttribute(
>-				BugzillaAttribute.NEWCC.getKey()));
>+		String useParam = getTaskData().getAttributeMapper()
>+				.getTaskRepository()
>+				.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT);
>+		if (useParam == null || (useParam != null && useParam.equals("true"))) { //$NON-NLS-1$
>+			addAttribute(peopleComposite, toolkit,
>+					getTaskData().getRoot().getMappedAttribute(BugzillaAttribute.QA_CONTACT.getKey()));
>+		}
>+		addAttribute(peopleComposite, toolkit,
>+				getTaskData().getRoot().getMappedAttribute(BugzillaAttribute.NEWCC.getKey()));
> 		addSelfToCC(peopleComposite);
> 		TaskAttribute cc = getTaskData().getRoot().getMappedAttribute(BugzillaAttribute.CC.getKey());
> 		if (cc != null) {

Actions: View | Diff

Attachments on bug 324007: 177775 | 177776