NEW - bug 371323: [regression] all comments are shown as incoming

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

Change-Id: I20bd34a248dbfbd2e157ffdfda183aaa0fd30b00

1 files changed, 19 insertions, 0 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMapper.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMapper.java
index 2c7687848..2b7d17f6d 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMapper.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskAttributeMapper.java
@@ -47,6 +47,25 @@ public class TaskAttributeMapper {
 	}
 
 	public boolean equals(TaskAttribute newAttribute, TaskAttribute oldAttribute) {
+		if (TaskAttribute.TYPE_COMMENT.equals(newAttribute.getMetaData().getType())) {
+			if (newAttribute.getValues().equals(oldAttribute.getValues())) {
+				return true;
+			}
+			// the comment mapping accidentally changed throughout the Mylyn 3.7 cycle therefore some 
+			// cases need to be considered equal even though attribute values differ
+			if (oldAttribute != null) {
+				TaskAttribute commentIdAttribute = oldAttribute.getAttribute("task.common.comment.id"); //$NON-NLS-1$
+				// ID not present 
+				if ((commentIdAttribute == null || commentIdAttribute.getValue().equals("")) //$NON-NLS-1$
+						&& newAttribute.getValue().equals("")) { //$NON-NLS-1$
+					return true;
+				}
+				// ID previously stored in a sub attribute
+				if (commentIdAttribute != null && commentIdAttribute.getValue().equals(newAttribute.getValue())) {
+					return true;
+				}
+			}
+		}
 		return newAttribute.getValues().equals(oldAttribute.getValues());
 	}