diff options
| author | spingel | 2008-05-31 00:09:36 +0000 |
|---|---|---|
| committer | spingel | 2008-05-31 00:09:36 +0000 |
| commit | b55c085296e15a08461ec568359090027ba6d28a (patch) | |
| tree | a080435a05d499a16c3d131ee0507d80683d18e0 /org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn | |
| parent | 21ab4b99350212b94a3f755f5483363942fec0da (diff) | |
| download | org.eclipse.mylyn.tasks-b55c085296e15a08461ec568359090027ba6d28a.tar.gz org.eclipse.mylyn.tasks-b55c085296e15a08461ec568359090027ba6d28a.tar.xz org.eclipse.mylyn.tasks-b55c085296e15a08461ec568359090027ba6d28a.zip | |
NEW - bug 234044: support having the notes and personal planning on the task editor page
https://bugs.eclipse.org/bugs/show_bug.cgi?id=234044
Diffstat (limited to 'org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn')
2 files changed, 12 insertions, 11 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/externalization/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/externalization/DelegatingTaskExternalizer.java index 27d0b8aee..ce4d11665 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/externalization/DelegatingTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/externalization/DelegatingTaskExternalizer.java @@ -280,9 +280,9 @@ public final class DelegatingTaskExternalizer { node.setAttribute(KEY_NOTIFIED_INCOMING, VAL_FALSE); } if (task.getSynchronizationState() != null) { - node.setAttribute(KEY_SYNC_STATE, task.getSynchronizationState().toString()); + node.setAttribute(KEY_SYNC_STATE, task.getSynchronizationState().name()); } else { - node.setAttribute(KEY_SYNC_STATE, SynchronizationState.SYNCHRONIZED.toString()); + node.setAttribute(KEY_SYNC_STATE, SynchronizationState.SYNCHRONIZED.name()); } if (task.getOwner() != null) { node.setAttribute(KEY_OWNER, task.getOwner()); @@ -584,15 +584,12 @@ public final class DelegatingTaskExternalizer { task.setNotified(false); } if (element.hasAttribute(KEY_SYNC_STATE)) { - String syncState = element.getAttribute(KEY_SYNC_STATE); - if (syncState.compareTo(SynchronizationState.SYNCHRONIZED.toString()) == 0) { - task.setSynchronizationState(SynchronizationState.SYNCHRONIZED); - } else if (syncState.compareTo(SynchronizationState.INCOMING.toString()) == 0) { - task.setSynchronizationState(SynchronizationState.INCOMING); - } else if (syncState.compareTo(SynchronizationState.OUTGOING.toString()) == 0) { - task.setSynchronizationState(SynchronizationState.OUTGOING); - } else if (syncState.compareTo(SynchronizationState.CONFLICT.toString()) == 0) { - task.setSynchronizationState(SynchronizationState.CONFLICT); + try { + SynchronizationState state = SynchronizationState.valueOf(element.getAttribute(KEY_SYNC_STATE)); + task.setSynchronizationState(state); + } catch (IllegalArgumentException e) { + // invalid sync state, ignore + // TODO log this to a multi-status } } if (element.hasAttribute(KEY_KEY)) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskDataModel.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskDataModel.java index 89cec416f..af33ead29 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskDataModel.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/data/TaskDataModel.java @@ -111,6 +111,10 @@ public class TaskDataModel { return taskRepository; } + public boolean hasBeenRead() { + return workingCopy.getLastReadData() != null; + } + public boolean hasIncomingChanges(TaskAttribute taskAttribute) { TaskData lastReadData = workingCopy.getLastReadData(); if (lastReadData == null) { |