Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrandon Dong2016-02-18 17:13:41 -0500
committerBrandon Dong2016-02-18 17:13:41 -0500
commitdacac85a258520a69fef851ba8b62499b6744b0d (patch)
tree48e8313c651aae44e7be48da8b86b932734f0f46 /org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal
parentcb1dbebb836a1dbb36f8fc83ead775f38cef60c7 (diff)
downloadorg.eclipse.mylyn.tasks-dacac85a258520a69fef851ba8b62499b6744b0d.tar.gz
org.eclipse.mylyn.tasks-dacac85a258520a69fef851ba8b62499b6744b0d.tar.xz
org.eclipse.mylyn.tasks-dacac85a258520a69fef851ba8b62499b6744b0d.zip
486145: tasks should not receive incoming notifications for attributes
that aren't visible Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=486145 Change-Id: I7a05e6e280b4e13423cd1490c5ff21c0b1e75c7b Signed-off-by: Brandon Dong <brandon.dong@tasktop.com>
Diffstat (limited to 'org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal')
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataManager.java35
1 files changed, 18 insertions, 17 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataManager.java
index 0e16ced2f..7bec7af89 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataManager.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/data/TaskDataManager.java
@@ -46,7 +46,7 @@ import org.eclipse.mylyn.tasks.core.data.TaskData;
/**
* Encapsulates synchronization policy.
- *
+ *
* @author Mik Kersten
* @author Rob Elves
* @author Steffen Pingel
@@ -175,7 +175,8 @@ public class TaskDataManager implements ITaskDataManager {
}
}
- public void putUpdatedTaskData(final ITask itask, final TaskData taskData, final boolean user) throws CoreException {
+ public void putUpdatedTaskData(final ITask itask, final TaskData taskData, final boolean user)
+ throws CoreException {
putUpdatedTaskData(itask, taskData, user, null);
}
@@ -217,16 +218,14 @@ public class TaskDataManager implements ITaskDataManager {
if (taskDataChanged) {
String suppressIncoming = null;
- if (synchronizationManger.hasParticipants(task.getConnectorKind())) {
- // determine whether to show an incoming
- if (state == null) {
- File file = getMigratedFile(task, task.getConnectorKind());
- state = taskDataStore.getTaskDataState(ensurePathExists(file));
- }
- TaskData lastReadData = (state != null) ? state.getLastReadData() : null;
- TaskDataDiff diff = synchronizationManger.createDiff(taskData, lastReadData, monitor);
- suppressIncoming = Boolean.toString(!diff.hasChanged());
+ // determine whether to show an incoming
+ if (state == null) {
+ File file = getMigratedFile(task, task.getConnectorKind());
+ state = taskDataStore.getTaskDataState(ensurePathExists(file));
}
+ TaskData lastReadData = (state != null) ? state.getLastReadData() : null;
+ TaskDataDiff diff = synchronizationManger.createDiff(taskData, lastReadData, monitor);
+ suppressIncoming = Boolean.toString(!diff.hasChanged());
switch (task.getSynchronizationState()) {
case OUTGOING:
@@ -274,7 +273,7 @@ public class TaskDataManager implements ITaskDataManager {
task.setChanged(false);
Date oldDueDate = task.getDueDate();
connector.updateTaskFromTaskData(repository, task, taskData);
- // XXX move this to AbstractTask or use model listener to notify task activity
+ // XXX move this to AbstractTask or use model listener to notify task activity
// manager of due date changes
Date newDueDate = task.getDueDate();
if (oldDueDate != null && !oldDueDate.equals(newDueDate) || newDueDate != oldDueDate) {
@@ -356,8 +355,8 @@ public class TaskDataManager implements ITaskDataManager {
// String fileName = kind + "-" + URLEncoder.encode(task.getTaskId(), ENCODING_UTF_8) + EXTENSION;
String repositoryPath = task.getConnectorKind() + "-" + CoreUtil.asFileName(repositoryUrl); //$NON-NLS-1$
String fileName = CoreUtil.asFileName(task.getTaskId()) + EXTENSION;
- File path = new File(dataPath + File.separator + FOLDER_TASKS + File.separator + repositoryPath
- + File.separator + FOLDER_DATA);
+ File path = new File(dataPath + File.separator + FOLDER_TASKS + File.separator + repositoryPath + File.separator
+ + FOLDER_DATA);
return new File(path, fileName);
}
@@ -393,8 +392,9 @@ public class TaskDataManager implements ITaskDataManager {
public TaskData getTaskData(TaskRepository taskRepository, String taskId) throws CoreException {
Assert.isNotNull(taskRepository);
Assert.isNotNull(taskId);
- TaskDataState state = taskDataStore.getTaskDataState(findFile(new TaskTask(taskRepository.getConnectorKind(),
- taskRepository.getRepositoryUrl(), taskId), taskRepository.getConnectorKind()));
+ TaskDataState state = taskDataStore.getTaskDataState(
+ findFile(new TaskTask(taskRepository.getConnectorKind(), taskRepository.getRepositoryUrl(), taskId),
+ taskRepository.getConnectorKind()));
if (state == null) {
return null;
}
@@ -487,7 +487,8 @@ public class TaskDataManager implements ITaskDataManager {
}
} else {
// if an incoming was previously suppressed it need to show now
- task.setAttribute(ITasksCoreConstants.ATTRIBUTE_TASK_SUPPRESS_INCOMING, Boolean.toString(false));
+ task.setAttribute(ITasksCoreConstants.ATTRIBUTE_TASK_SUPPRESS_INCOMING,
+ Boolean.toString(false));
switch (task.getSynchronizationState()) {
case SYNCHRONIZED:
task.setSynchronizationState(SynchronizationState.INCOMING);

Back to the top