### Eclipse Workspace Patch 1.0 #P org.eclipse.mylyn.bugzilla.core Index: src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java,v retrieving revision 1.54 diff -u -r1.54 SaxMultiBugReportContentHandler.java --- src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java 13 Feb 2010 22:32:34 -0000 1.54 +++ src/org/eclipse/mylyn/internal/bugzilla/core/SaxMultiBugReportContentHandler.java 31 Mar 2010 10:17:58 -0000 @@ -455,6 +455,16 @@ } } 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; Index: src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties,v retrieving revision 1.17 diff -u -r1.17 messages.properties --- src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties 14 Feb 2010 22:22:15 -0000 1.17 +++ src/org/eclipse/mylyn/internal/bugzilla/core/messages.properties 31 Mar 2010 10:17:58 -0000 @@ -33,6 +33,7 @@ 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 Index: src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java,v retrieving revision 1.21 diff -u -r1.21 BugzillaAttribute.java --- src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java 13 Feb 2010 22:32:33 -0000 1.21 +++ src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttribute.java 31 Mar 2010 10:17:57 -0000 @@ -83,6 +83,8 @@ 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, Index: src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java,v retrieving revision 1.50 diff -u -r1.50 RepositoryConfiguration.java --- src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java 28 Jan 2010 23:06:19 -0000 1.50 +++ src/org/eclipse/mylyn/internal/bugzilla/core/RepositoryConfiguration.java 31 Mar 2010 10:17:57 -0000 @@ -703,6 +703,18 @@ 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()); Index: src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java =================================================================== RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java,v retrieving revision 1.12 diff -u -r1.12 Messages.java --- src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java 13 Feb 2010 22:32:33 -0000 1.12 +++ src/org/eclipse/mylyn/internal/bugzilla/core/Messages.java 31 Mar 2010 10:17:57 -0000 @@ -75,6 +75,8 @@ public static String BugzillaAttribute_Due; + public static String BugzillaAttribute_Duplicate_of; + public static String BugzillaAttribute_Estimated_Time; public static String BugzillaAttribute_everconfirmed;