RESOLVED - bug 307655: add an attribute for the the duplicated bug id in a duplicate bug

https://bugs.eclipse.org/bugs/show_bug.cgi?id=307655

5 files changed, 27 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java
index 64a7ac743..815a26c9b 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java
@@ -83,6 +83,8 @@ public enum BugzillaAttribute {
 
 	DESC(Messages.BugzillaAttribute_desc, "desc", TaskAttribute.TYPE_LONG_TEXT, true, true), //$NON-NLS-1$
 
+	DUP_ID(Messages.BugzillaAttribute_Duplicate_of, "dup_id", TaskAttribute.TYPE_TASK_DEPENDENCY, false, false), //$NON-NLS-1$
+
 	EVERCONFIRMED(Messages.BugzillaAttribute_everconfirmed, "everconfirmed", TaskAttribute.TYPE_BOOLEAN, true, false), //$NON-NLS-1$
 
 	ESTIMATED_TIME(Messages.BugzillaAttribute_Estimated_Time,
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java
index 5902d326f..98a55330a 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java
@@ -75,6 +75,8 @@ public class Messages extends NLS {
 
 	public static String BugzillaAttribute_Due;
 
+	public static String BugzillaAttribute_Duplicate_of;
+
 	public static String BugzillaAttribute_Estimated_Time;
 
 	public static String BugzillaAttribute_everconfirmed;
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java
index 1542e6ac2..71d9663b6 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java
@@ -703,6 +703,18 @@ public class RepositoryConfiguration implements Serializable {
 				attrResolvedInput.setValue(getResolutions().get(0));
 			}
 			break;
+		case duplicate:
+			attribute = bugReport.getRoot().createAttribute(TaskAttribute.PREFIX_OPERATION + opcode.toString());
+			TaskOperation.applyTo(attribute, opcode.toString(), opcode.getLabel());
+			if (opcode.getInputId() != null) {
+				TaskAttribute attrInput = bugReport.getRoot().getAttribute(opcode.getInputId());
+				if (attrInput == null) {
+					attrInput = bugReport.getRoot().createAttribute(opcode.getInputId());
+				}
+				attrInput.getMetaData().defaults().setReadOnly(false).setType(opcode.getInputType());
+				attribute.getMetaData().putValue(TaskAttribute.META_ASSOCIATED_ATTRIBUTE_ID, opcode.getInputId());
+			}
+			break;
 		default:
 			attribute = bugReport.getRoot().createAttribute(TaskAttribute.PREFIX_OPERATION + opcode.toString());
 			TaskOperation.applyTo(attribute, opcode.toString(), opcode.getLabel());
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
index 33762fa15..f1217c63c 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java
@@ -455,6 +455,16 @@ public class SaxMultiBugReportContentHandler extends DefaultHandler {
 				}
 			}
 			break;
+		case DUP_ID:
+			TaskAttribute duplicateOf = repositoryTaskData.getRoot().getMappedAttribute(tag.getKey());
+			if (duplicateOf == null) {
+				BugzillaTaskDataHandler.createAttribute(repositoryTaskData, tag).setValue(parsedText);
+			} else {
+				if (duplicateOf.getValue().equals("")) { //$NON-NLS-1$
+					duplicateOf.setValue(parsedText);
+				}
+			}
+			break;
 		case UNKNOWN:
 			//ignore
 			break;
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties
index c467f0ea3..e6a2c13b1 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties
@@ -33,6 +33,7 @@ BugzillaAttribute_Depends_on__Subtasks_=Depends on (Subtasks):
 BugzillaAttribute_desc=desc
 BugzillaAttribute_Description=Description:
 BugzillaAttribute_Due=Due:
+BugzillaAttribute_Duplicate_of=Duplicate of:
 BugzillaAttribute_Estimated_Time=Estimated Time:
 BugzillaAttribute_everconfirmed=everconfirmed
 BugzillaAttribute_filename=filename