diff options
author | spingel | 2009-08-10 21:38:18 +0000 |
---|---|---|
committer | spingel | 2009-08-10 21:38:18 +0000 |
commit | 04b9eb40a92ba342b6752ab4977252a9a475faa1 (patch) | |
tree | c57d5593eb5a0a03fea9f5a870708bd34d4f975f | |
parent | 4d4fd6d4c87fb05379e85ee3df3e2b5849a24d55 (diff) | |
download | org.eclipse.mylyn.tasks-04b9eb40a92ba342b6752ab4977252a9a475faa1.tar.gz org.eclipse.mylyn.tasks-04b9eb40a92ba342b6752ab4977252a9a475faa1.tar.xz org.eclipse.mylyn.tasks-04b9eb40a92ba342b6752ab4977252a9a475faa1.zip |
NEW - bug 285796: [backport] due date is lost when time tracking is not enabled
https://bugs.eclipse.org/bugs/show_bug.cgi?id=285796
3 files changed, 12 insertions, 19 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java index aa03b6b04..00bad2ad0 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java @@ -509,8 +509,8 @@ public class BugzillaClient { 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.DEADLINE }; + BugzillaAttribute.NEW_COMMENT, BugzillaAttribute.QA_CONTACT, BugzillaAttribute.STATUS_WHITEBOARD + }; for (BugzillaAttribute element : reportElements) { BugzillaTaskDataHandler.createAttribute(existingReport, element); diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java index 9fafc3f86..5bf183fc5 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java @@ -169,22 +169,6 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { task.setAttribute(BugzillaAttribute.BUG_SEVERITY.getKey(), attrSeverity.getValue()); } - // Due Date - if (taskData.getRoot().getMappedAttribute(BugzillaAttribute.ESTIMATED_TIME.getKey()) != null) { - Date dueDate = null; - // HACK: if estimated_time field exists, time tracking is - // enabled - try { - TaskAttribute attributeDeadline = taskData.getRoot().getMappedAttribute( - BugzillaAttribute.DEADLINE.getKey()); - if (attributeDeadline != null) { - dueDate = new SimpleDateFormat(DEADLINE_FORMAT).parse(attributeDeadline.getValue()); - } - } catch (Exception e) { - // ignore - } - task.setDueDate(dueDate); - } } updateExtendedAttributes(task, taskData); 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 9d767496b..76c7532e7 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 @@ -407,7 +407,16 @@ public class SaxMultiBugReportContentHandler extends DefaultHandler { tokenAttribute.setValue(token); } - // Guard against empty data sets + // Work around (bug#285796) If planning enabled (ESTIMATE_TIME attr present) create DEADLINE attr since it should be present. + TaskAttribute estimatedTimeAttr = repositoryTaskData.getRoot().getMappedAttribute( + BugzillaAttribute.ESTIMATED_TIME.getKey()); + TaskAttribute deadlineAttr = repositoryTaskData.getRoot().getMappedAttribute( + BugzillaAttribute.DEADLINE.getKey()); + if (estimatedTimeAttr != null && deadlineAttr == null) { + BugzillaTaskDataHandler.createAttribute(repositoryTaskData, BugzillaAttribute.DEADLINE); + } + + // Save/Add to collector. Guard against empty data sets if (attrCreation != null && !attrCreation.equals("")) { //$NON-NLS-1$ collector.accept(repositoryTaskData); } |