diff options
| author | Steffen Pingel | 2012-02-10 00:22:03 +0000 |
|---|---|---|
| committer | Steffen Pingel | 2012-02-10 00:22:03 +0000 |
| commit | 9f99269112887b9003a6938eb5b59c1eb44f969b (patch) | |
| tree | d4c79d7b3802222c162697e1e53ce71caf811230 /org.eclipse.mylyn.bugzilla.core | |
| parent | 173c07207e39b2cbbe5af0077b5588be52b09c6c (diff) | |
| download | org.eclipse.mylyn.tasks-9f99269112887b9003a6938eb5b59c1eb44f969b.tar.gz org.eclipse.mylyn.tasks-9f99269112887b9003a6938eb5b59c1eb44f969b.tar.xz org.eclipse.mylyn.tasks-9f99269112887b9003a6938eb5b59c1eb44f969b.zip | |
ASSIGNED - bug 349620: improve UI for private comments
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349620
Change-Id: I00b570970980919ae15c6026db859cc1c4ea89fa
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.core')
3 files changed, 12 insertions, 24 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java index 7520244f7..315fc6a5d 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaAttributeMapper.java @@ -177,8 +177,6 @@ public class BugzillaAttributeMapper extends TaskAttributeMapper { return BugzillaAttribute.THETEXT.getKey(); } else if (key.equals(TaskAttribute.COMMENT_ISPRIVATE)) { return BugzillaAttribute.IS_PRIVATE.getKey(); - } else if (key.equals(TaskAttribute.COMMENT_ID)) { - return BugzillaAttribute.COMMENTID.getKey(); } else if (key.equals(TaskAttribute.DATE_CREATION)) { return BugzillaAttribute.CREATION_TS.getKey(); } else if (key.equals(TaskAttribute.DESCRIPTION)) { 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 e96d286e3..ecd1ac001 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 @@ -1548,23 +1548,19 @@ public class BugzillaClient { + flagnumber.getValue(), requestee.getValue() != null ? requestee.getValue() : "")); //$NON-NLS-1$ } } else if (id.startsWith(TaskAttribute.PREFIX_COMMENT)) { - TaskAttribute commentID = a.getAttribute(BugzillaAttribute.COMMENTID.getKey()); - if (commentID != null) { - String valueID = commentID.getValue(); - TaskAttribute definedIsPrivate = a.getAttribute(IBugzillaConstants.BUGZILLA_PREFIX_DEFINED_ISPRIVATE - + valueID); - if (definedIsPrivate != null) { - fields.put(definedIsPrivate.getId(), new NameValuePair(definedIsPrivate.getId(), - definedIsPrivate.getValue() != null ? definedIsPrivate.getValue() : "")); //$NON-NLS-1$ - } - TaskAttribute isPrivate = a.getAttribute(IBugzillaConstants.BUGZILLA_PREFIX_ISPRIVATE - + valueID); - if (isPrivate != null) { - fields.put(isPrivate.getId(), new NameValuePair(isPrivate.getId(), - isPrivate.getValue() != null ? isPrivate.getValue() : "")); //$NON-NLS-1$ - } - continue; + String valueID = a.getValue(); + TaskAttribute definedIsPrivate = a.getAttribute(IBugzillaConstants.BUGZILLA_PREFIX_DEFINED_ISPRIVATE + + valueID); + if (definedIsPrivate != null) { + fields.put(definedIsPrivate.getId(), new NameValuePair(definedIsPrivate.getId(), + definedIsPrivate.getValue() != null ? definedIsPrivate.getValue() : "")); //$NON-NLS-1$ } + TaskAttribute isPrivate = a.getAttribute(IBugzillaConstants.BUGZILLA_PREFIX_ISPRIVATE + valueID); + if (isPrivate != null) { + fields.put(isPrivate.getId(), new NameValuePair(isPrivate.getId(), + isPrivate.getValue() != null ? isPrivate.getValue() : "")); //$NON-NLS-1$ + } + continue; } else if (id.startsWith("task.common.")) { //$NON-NLS-1$ // Don't post any remaining non-bugzilla specific attributes continue; 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 da763ea94..a9b09617d 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 @@ -709,13 +709,7 @@ public class SaxMultiBugReportContentHandler extends DefaultHandler { workTime.setValue(comment.timeWorked); } - if (comment.id != 0) { - TaskAttribute commentID = BugzillaTaskDataHandler.createAttribute(attribute, BugzillaAttribute.COMMENTID); - commentID.setValue(Integer.toString(comment.id)); - } - parseAttachment(taskComment); - } /** determines attachment id from comment */ |