Attachment 175227 Details for Bug 317682 – commited patch

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

[patch] commited patch

patch317682V1.txt (text/plain), 5.83 KB, created by Frank Becker

on 2010-07-26 11:23:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2010-07-26 11:23:52 EDT

Size: 5.83 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.248
>diff -u -r1.248 BugzillaClient.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	12 Jul 2010 20:34:43 -0000	1.248
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java	26 Jul 2010 15:20:53 -0000
>@@ -584,18 +584,36 @@
> 		// and additional elements that may not appear in the incoming xml
> 		// stream but need to be present for bug submission / not always dirty
> 		// state handling
>-		BugzillaAttribute[] reportElements = { BugzillaAttribute.SHORT_DESC, BugzillaAttribute.BUG_STATUS,
>+		BugzillaAttribute[] reportElements1 = { BugzillaAttribute.SHORT_DESC, BugzillaAttribute.BUG_STATUS,
> 				BugzillaAttribute.RESOLUTION, BugzillaAttribute.BUG_ID, BugzillaAttribute.REP_PLATFORM,
> 				BugzillaAttribute.PRODUCT, BugzillaAttribute.OP_SYS, BugzillaAttribute.COMPONENT,
> 				BugzillaAttribute.VERSION, BugzillaAttribute.PRIORITY, BugzillaAttribute.BUG_SEVERITY,
>-				BugzillaAttribute.ASSIGNED_TO, BugzillaAttribute.TARGET_MILESTONE, BugzillaAttribute.REPORTER,
>-				BugzillaAttribute.DEPENDSON, BugzillaAttribute.BLOCKED, BugzillaAttribute.BUG_FILE_LOC,
>-				BugzillaAttribute.NEWCC, BugzillaAttribute.KEYWORDS, BugzillaAttribute.CC,
>-				BugzillaAttribute.NEW_COMMENT, BugzillaAttribute.QA_CONTACT, BugzillaAttribute.STATUS_WHITEBOARD };
>+				BugzillaAttribute.ASSIGNED_TO };
>+		BugzillaAttribute[] reportElements2 = { BugzillaAttribute.REPORTER, BugzillaAttribute.DEPENDSON,
>+				BugzillaAttribute.BLOCKED, BugzillaAttribute.BUG_FILE_LOC, BugzillaAttribute.NEWCC,
>+				BugzillaAttribute.KEYWORDS, BugzillaAttribute.CC, BugzillaAttribute.NEW_COMMENT };
> 
>-		for (BugzillaAttribute element : reportElements) {
>+		TaskRepository taskRepository = existingReport.getAttributeMapper().getTaskRepository();
>+
>+		for (BugzillaAttribute element : reportElements1) {
>+			BugzillaTaskDataHandler.createAttribute(existingReport, element);
>+		}
>+		String useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE);
>+		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+			BugzillaTaskDataHandler.createAttribute(existingReport, BugzillaAttribute.TARGET_MILESTONE);
>+		}
>+		for (BugzillaAttribute element : reportElements2) {
> 			BugzillaTaskDataHandler.createAttribute(existingReport, element);
> 		}
>+		useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT);
>+		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+			BugzillaTaskDataHandler.createAttribute(existingReport, BugzillaAttribute.QA_CONTACT);
>+		}
>+		useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USESTATUSWHITEBOARD);
>+		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+			BugzillaTaskDataHandler.createAttribute(existingReport, BugzillaAttribute.STATUS_WHITEBOARD);
>+		}
>+
> 	}
> 
> 	public static String getBugUrlWithoutLogin(String repositoryUrl, String id) {
>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.103
>diff -u -r1.103 BugzillaTaskDataHandler.java
>--- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java	27 Jun 2010 06:38:58 -0000	1.103
>+++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java	26 Jul 2010 15:20:53 -0000
>@@ -498,15 +498,18 @@
> 			attributeComponent.setValue(component);
> 		}
> 
>-		optionValues = repositoryConfiguration.getTargetMilestones(productAttribute.getValue());
>-		if (optionValues.size() > 0) {
>-			TaskAttribute attributeTargetMilestone = createAttribute(taskData, BugzillaAttribute.TARGET_MILESTONE);
>-			for (String option : optionValues) {
>-				attributeTargetMilestone.putOption(option, option);
>+		TaskRepository taskRepository = taskData.getAttributeMapper().getTaskRepository();
>+		String useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USETARGETMILESTONE);
>+		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+			optionValues = repositoryConfiguration.getTargetMilestones(productAttribute.getValue());
>+			if (optionValues.size() > 0) {
>+				TaskAttribute attributeTargetMilestone = createAttribute(taskData, BugzillaAttribute.TARGET_MILESTONE);
>+				for (String option : optionValues) {
>+					attributeTargetMilestone.putOption(option, option);
>+				}
>+				attributeTargetMilestone.setValue(optionValues.get(0));
> 			}
>-			attributeTargetMilestone.setValue(optionValues.get(0));
> 		}
>-
> 		TaskAttribute attributePlatform = createAttribute(taskData, BugzillaAttribute.REP_PLATFORM);
> 		optionValues = repositoryConfiguration.getPlatforms();
> 		for (String option : optionValues) {
>@@ -550,9 +553,11 @@
> 		TaskAttribute attributeAssignedTo = createAttribute(taskData, BugzillaAttribute.ASSIGNED_TO);
> 		attributeAssignedTo.setValue(""); //$NON-NLS-1$
> 
>-		TaskAttribute attributeQAContact = createAttribute(taskData, BugzillaAttribute.QA_CONTACT);
>-		attributeQAContact.setValue(""); //$NON-NLS-1$
>-
>+		useParam = taskRepository.getProperty(IBugzillaConstants.BUGZILLA_PARAM_USEQACONTACT);
>+		if (useParam != null && useParam.equals("true")) { //$NON-NLS-1$
>+			TaskAttribute attributeQAContact = createAttribute(taskData, BugzillaAttribute.QA_CONTACT);
>+			attributeQAContact.setValue(""); //$NON-NLS-1$
>+		}
> 		TaskAttribute attributeBugFileLoc = createAttribute(taskData, BugzillaAttribute.BUG_FILE_LOC);
> 		attributeBugFileLoc.setValue("http://"); //$NON-NLS-1$
>

Actions: View | Diff

Attachments on bug 317682: 175227 | 175228