NEW - bug 238048: implementation of TaskMapper.hasChanges() does not match implementation of applyTo()

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

2 files changed, 12 insertions, 10 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java
index 26852aae9..e0506fd40 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITask.java
@@ -135,19 +135,19 @@ public interface ITask extends IRepositoryElement, IAttributeContainer {
 		 * @since 3.0
 		 */
 		public static PriorityLevel fromString(String string) {
-			if (string.equals("P1")) {
+			if ("P1".equals(string)) {
 				return P1;
 			}
-			if (string.equals("P2")) {
+			if ("P2".equals(string)) {
 				return P2;
 			}
-			if (string.equals("P3")) {
+			if ("P3".equals(string)) {
 				return P3;
 			}
-			if (string.equals("P4")) {
+			if ("P4".equals(string)) {
 				return P4;
 			}
-			if (string.equals("P5")) {
+			if ("P5".equals(string)) {
 				return P5;
 			}
 			return getDefault();
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java
index 25b47176e..0932ce50a 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskMapper.java
@@ -58,10 +58,8 @@ public class TaskMapper implements ITaskMapping {
 			task.setOwner(getOwner());
 			changed = true;
 		}
-		String priority = (getPriorityLevel() != null) ? getPriorityLevel().toString() : PriorityLevel.getDefault()
-				.toString();
-		if (hasChanges(task.getPriority(), priority, TaskAttribute.PRIORITY)) {
-			task.setPriority(priority);
+		if (hasChanges(task.getPriority(), getPriorityLevelString(), TaskAttribute.PRIORITY)) {
+			task.setPriority(getPriorityLevelString());
 			changed = true;
 		}
 		if (hasChanges(task.getSummary(), getSummary(), TaskAttribute.SUMMARY)) {
@@ -83,6 +81,10 @@ public class TaskMapper implements ITaskMapping {
 		return changed;
 	}
 
+	private String getPriorityLevelString() {
+		return (getPriorityLevel() != null) ? getPriorityLevel().toString() : PriorityLevel.getDefault().toString();
+	}
+
 	private boolean hasChanges(Object existingValue, Object newValue, String attributeId) {
 		TaskAttribute attribute = taskData.getRoot().getMappedAttribute(attributeId);
 		if (attribute != null) {
@@ -307,7 +309,7 @@ public class TaskMapper implements ITaskMapping {
 		changed |= hasChanges(task.getModificationDate(), getModificationDate(), TaskAttribute.DATE_MODIFICATION);
 		changed |= hasChanges(task.getDueDate(), getDueDate(), TaskAttribute.DATE_DUE);
 		changed |= hasChanges(task.getOwner(), getOwner(), TaskAttribute.USER_ASSIGNED);
-		changed |= hasChanges(task.getPriority(), getPriorityLevel(), TaskAttribute.PRIORITY);
+		changed |= hasChanges(task.getPriority(), getPriorityLevelString(), TaskAttribute.PRIORITY);
 		changed |= hasChanges(task.getSummary(), getSummary(), TaskAttribute.SUMMARY);
 		changed |= hasChanges(task.getTaskKey(), getTaskKey(), TaskAttribute.TASK_KEY);
 		changed |= hasChanges(task.getTaskKind(), getTaskKind(), TaskAttribute.TASK_KIND);