diff options
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui/src/org/eclipse')
15 files changed, 33 insertions, 44 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskJobFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskJobFactory.java index 5794ef439..432861540 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskJobFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskJobFactory.java @@ -108,7 +108,7 @@ public class TaskJobFactory implements ITaskJobFactory { } catch (CoreException e) { StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Unexpected error", e)); } - taskList.notifyTaskChanged(task, false); + taskList.notifyElementChanged(task); return job; } @@ -161,7 +161,7 @@ public class TaskJobFactory implements ITaskJobFactory { } catch (CoreException e) { StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Unexpected error", e)); } - taskList.notifyTaskChanged(task, false); + taskList.notifyElementChanged(task); job.setUser(true); return job; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java index c52f7b9dd..7c914bcda 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskCompleteAction.java @@ -72,7 +72,7 @@ public class MarkTaskCompleteAction extends AbstractChangeCompletionAction { ITaskList taskList = TasksUiInternal.getTaskList(); for (AbstractTask task : toComplete) { task.setCompletionDate(new Date()); - taskList.notifyTaskChanged(task, false); + taskList.notifyElementChanged(task); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java index 95b8b374a..caa7fb10e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/MarkTaskIncompleteAction.java @@ -70,7 +70,7 @@ public class MarkTaskIncompleteAction extends AbstractChangeCompletionAction { ITaskList taskList = TasksUiInternal.getTaskList(); for (AbstractTask task : toComplete) { task.setCompletionDate(null); - taskList.notifyTaskChanged(task, false); + taskList.notifyElementChanged(task); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java index e3eb17425..8c9a9efe0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/MarkTaskHandler.java @@ -30,7 +30,7 @@ public abstract class MarkTaskHandler extends AbstractTaskHandler { protected void execute(ExecutionEvent event, ITask task) throws ExecutionException { if (task instanceof LocalTask || (task instanceof AbstractTask && ((AbstractTask) task).isLocal())) { task.setCompletionDate(new Date()); - TasksUiPlugin.getTaskList().notifyTaskChanged(task, false); + TasksUiPlugin.getTaskList().notifyElementChanged(task); } } } @@ -40,7 +40,7 @@ public abstract class MarkTaskHandler extends AbstractTaskHandler { protected void execute(ExecutionEvent event, ITask task) throws ExecutionException { if (task instanceof LocalTask || (task instanceof AbstractTask && ((AbstractTask) task).isLocal())) { task.setCompletionDate(null); - TasksUiPlugin.getTaskList().notifyTaskChanged(task, false); + TasksUiPlugin.getTaskList().notifyElementChanged(task); } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractRepositoryTaskEditor.java index 8d1dd3628..2df6b66f2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractRepositoryTaskEditor.java @@ -422,9 +422,9 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { public void containersChanged(Set<TaskContainerDelta> containers) { ITask taskToRefresh = null; for (TaskContainerDelta taskContainerDelta : containers) { - if (repositoryTask != null && repositoryTask.equals(taskContainerDelta.getContainer())) { + if (repositoryTask != null && repositoryTask.equals(taskContainerDelta.getTarget())) { if (taskContainerDelta.getKind().equals(TaskContainerDelta.Kind.CONTENT)) { - taskToRefresh = (ITask) taskContainerDelta.getContainer(); + taskToRefresh = (ITask) taskContainerDelta.getTarget(); break; } } @@ -2833,7 +2833,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { TasksUiPlugin.getTaskDataManager().saveOutgoing(repositoryTask, changedAttributes); } if (repositoryTask != null) { - TasksUiInternal.getTaskList().notifyTaskChanged(repositoryTask, false); + TasksUiInternal.getTaskList().notifyElementChanged(repositoryTask); } markDirty(false); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java index 626a12dee..eeba99ee1 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/CategoryEditorInput.java @@ -8,11 +8,7 @@ package org.eclipse.mylyn.internal.tasks.ui.editors; -import java.util.HashSet; -import java.util.Set; - import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.internal.tasks.core.TaskCategory; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IEditorInput; @@ -69,10 +65,7 @@ public class CategoryEditorInput implements IEditorInput { public void setUrl(String url) { category.setUrl(url); - Set<AbstractTaskContainer> updated = new HashSet<AbstractTaskContainer>(); - updated.add(category); - TasksUiPlugin.getTaskList().notifyContainersUpdated(updated); -// .notifyContainerUpdated(category); + TasksUiPlugin.getTaskList().notifyElementChanged(category); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java index 6036ec2fe..bb2e7337b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskPlanningEditor.java @@ -154,8 +154,8 @@ public class TaskPlanningEditor extends TaskFormPage { @Override public void containersChanged(Set<TaskContainerDelta> containers) { for (TaskContainerDelta taskContainerDelta : containers) { - if (taskContainerDelta.getContainer() instanceof ITask) { - final AbstractTask updateTask = (AbstractTask) taskContainerDelta.getContainer(); + if (taskContainerDelta.getTarget() instanceof ITask) { + final AbstractTask updateTask = (AbstractTask) taskContainerDelta.getTarget(); if (updateTask != null && task != null && updateTask.getHandleIdentifier().equals(task.getHandleIdentifier())) { if (PlatformUI.getWorkbench() != null && !PlatformUI.getWorkbench().isClosing()) { @@ -248,7 +248,7 @@ public class TaskPlanningEditor extends TaskFormPage { } else { task.setCompletionDate(null); } - TasksUiInternal.getTaskList().notifyTaskChanged(task, false); + TasksUiInternal.getTaskList().notifyElementChanged(task); } String note = noteEditor.getTextWidget().getText();// notes.getText(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java index c238c4034..03d07c17a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java @@ -266,7 +266,7 @@ public class TasksUiInternal { for (RepositoryQuery query : queries) { query.setSynchronizing(true); } - taskList.notifyContainersUpdated(queries); + taskList.notifySyncStateChanged(queries); SynchronizationJob job = TasksUiPlugin.getTasksJobFactory().createSynchronizeQueriesJob(connector, repository, queries); @@ -340,7 +340,7 @@ public class TasksUiInternal { ITaskList taskList = TasksUiInternal.getTaskList(); for (ITask task : tasks) { ((AbstractTask) task).setSynchronizing(true); - taskList.notifyTaskChanged(task, false); + taskList.notifyElementChanged(task); } // TODO notify task list? @@ -356,8 +356,7 @@ public class TasksUiInternal { @Override public void done(IJobChangeEvent event) { if (task.getErrorStatus() != null) { - TasksUiInternal.asyncDisplayStatus("Task Synchronization Failed", - task.getErrorStatus()); + TasksUiInternal.asyncDisplayStatus("Task Synchronization Failed", task.getErrorStatus()); } } }); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java index f02a24c47..738369f5a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListCellModifier.java @@ -81,7 +81,7 @@ class TaskListCellModifier implements ICellModifier { case 0: if (task != null) { task.setSummary(((String) value).trim()); - TasksUiPlugin.getTaskList().notifyTaskChanged(task, false); + TasksUiPlugin.getTaskList().notifyElementChanged(task); } break; case 1: diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java index 908838272..7479d5fd0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java @@ -398,7 +398,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter { @Override protected void titleRetrieved(final String pageTitle) { newTask.setSummary(pageTitle); - TasksUiInternal.getTaskList().notifyTaskChanged(newTask, false); + TasksUiInternal.getTaskList().notifyElementChanged(newTask); } }; job.schedule(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java index bd134a810..03c32099f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java @@ -164,7 +164,7 @@ public class TaskListFilteredTree extends AbstractFilteredTree { @Override public void containersChanged(Set<TaskContainerDelta> containers) { for (TaskContainerDelta taskContainerDelta : containers) { - if (taskContainerDelta.getContainer() instanceof ITask) { + if (taskContainerDelta.getTarget() instanceof ITask) { updateTaskProgressBar(); break; } @@ -328,8 +328,8 @@ public class TaskListFilteredTree extends AbstractFilteredTree { @Override public void containersChanged(Set<TaskContainerDelta> containers) { for (TaskContainerDelta taskContainerDelta : containers) { - if (taskContainerDelta.getContainer() instanceof ITask) { - final AbstractTask changedTask = (AbstractTask) (taskContainerDelta.getContainer()); + if (taskContainerDelta.getTarget() instanceof ITask) { + final AbstractTask changedTask = (AbstractTask) (taskContainerDelta.getTarget()); if (Platform.isRunning() && PlatformUI.getWorkbench() != null && Display.getCurrent() == null) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java index d888a2646..4d57ae43f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java @@ -465,7 +465,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { public void taskDeactivated(final ITask task) { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { - refreshJob.refreshTask(task); + refreshJob.refreshElement(task); updateDescription(); filteredTree.indicateNoActiveTask(); } @@ -505,10 +505,10 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { refreshJob.refresh(); break; default: - if (taskContainerDelta.getContainer() == null) { + if (taskContainerDelta.getTarget() == null) { refreshJob.refresh(); } else { - refreshJob.refreshTask(taskContainerDelta.getContainer()); + refreshJob.refreshElement(taskContainerDelta.getTarget()); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java index 35656191d..6d6039c28 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java @@ -130,8 +130,8 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang public void containersChanged(Set<TaskContainerDelta> delta) { for (TaskContainerDelta taskContainerDelta : delta) { - if (taskContainerDelta.getContainer() instanceof TaskCategory - || taskContainerDelta.getContainer() instanceof IRepositoryQuery) { + if (taskContainerDelta.getTarget() instanceof TaskCategory + || taskContainerDelta.getTarget() instanceof IRepositoryQuery) { synchronized (workingSets) { switch (taskContainerDelta.getKind()) { case REMOVED: @@ -139,7 +139,7 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang for (IWorkingSet workingSet : workingSets) { ArrayList<IAdaptable> elements = new ArrayList<IAdaptable>( Arrays.asList(workingSet.getElements())); - elements.remove(taskContainerDelta.getContainer()); + elements.remove(taskContainerDelta.getTarget()); workingSet.setElements(elements.toArray(new IAdaptable[elements.size()])); } break; @@ -148,13 +148,10 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang for (IWorkingSet workingSet : TaskWorkingSetUpdater.getEnabledSets()) { ArrayList<IAdaptable> elements = new ArrayList<IAdaptable>( Arrays.asList(workingSet.getElements())); - elements.add(taskContainerDelta.getContainer()); + elements.add(taskContainerDelta.getTarget()); workingSet.setElements(elements.toArray(new IAdaptable[elements.size()])); } break; - case CHANGED: - // Ignore since containers change during synch with server - break; } } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java index d36243519..e8098974b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java @@ -192,9 +192,9 @@ public abstract class AbstractTaskEditorPage extends FormPage implements ISelect public void containersChanged(Set<TaskContainerDelta> containers) { ITask taskToRefresh = null; for (TaskContainerDelta taskContainerDelta : containers) { - if (task.equals(taskContainerDelta.getContainer())) { + if (task.equals(taskContainerDelta.getTarget())) { if (taskContainerDelta.getKind().equals(TaskContainerDelta.Kind.CONTENT)) { - taskToRefresh = (ITask) taskContainerDelta.getContainer(); + taskToRefresh = (ITask) taskContainerDelta.getTarget(); break; } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/RepositoryQueryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/RepositoryQueryWizard.java index 312b2fbc8..e8fb8a00c 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/RepositoryQueryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/RepositoryQueryWizard.java @@ -8,8 +8,6 @@ package org.eclipse.mylyn.tasks.ui.wizards; -import java.util.Collections; - import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -63,7 +61,9 @@ public class RepositoryQueryWizard extends Wizard { IRepositoryQuery query = page.getQuery(); if (query != null) { page.applyTo(query); - TasksUiPlugin.getTaskList().notifyContainersUpdated(Collections.singleton((RepositoryQuery) query)); + if (query instanceof RepositoryQuery) { + TasksUiPlugin.getTaskList().notifyElementChanged((RepositoryQuery) query); + } } else { query = page.createQuery(); TasksUi.getTasksModel().addQuery(query); |