NEW - bug 220433: provide source bundles

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

35 files changed, 67 insertions, 66 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
index cb51c9406..f7a2f76d5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
@@ -144,8 +144,7 @@ public class PersonProposalProvider implements IContentProposalProvider {
 				tasks.add(currentTask);
 			}
 
-			TaskRepository repository = TasksUi.getRepositoryManager()
-					.getRepository(connectorKind, repositoryUrl);
+			TaskRepository repository = TasksUi.getRepositoryManager().getRepository(connectorKind, repositoryUrl);
 
 			if (repository != null) {
 				AuthenticationCredentials credentials = repository.getCredentials(AuthenticationType.REPOSITORY);
@@ -154,7 +153,7 @@ public class PersonProposalProvider implements IContentProposalProvider {
 				}
 			}
 
-			Collection<AbstractTask> allTasks = TasksUi.getTaskList().getAllTasks();
+			Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskList().getAllTasks();
 			for (AbstractTask task : allTasks) {
 				if (repositoryUrl.equals(task.getRepositoryUrl())) {
 					tasks.add(task);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java
index e5e09ec7b..b22c4cad5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskActivityMonitor.java
@@ -84,7 +84,7 @@ public class TaskActivityMonitor {
 	public TaskActivityMonitor(TaskActivityManager taskActivityManager, IInteractionContextManager contextManager) {
 		this.taskActivityManager = taskActivityManager;
 		this.contextManager = contextManager;
-		this.taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		this.taskList = TasksUiPlugin.getTaskList();
 	}
 
 	public void start() {
@@ -156,7 +156,7 @@ public class TaskActivityMonitor {
 		InteractionEvent event = ContextCore.getContextManager().getActivityMetaContext().getInteractionHistory().get(
 				pos);
 		if (event.getDelta().equals(IInteractionContextManager.ACTIVITY_DELTA_ACTIVATED)) {
-			return TasksUiPlugin.getTaskListManager().getTaskList().getTask(event.getStructureHandle());
+			return TasksUiPlugin.getTaskList().getTask(event.getStructureHandle());
 		} else {
 			return null;
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListManager.java
index a8597cd34..39011e040 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListManager.java
@@ -315,7 +315,7 @@ public class TaskListManager {
 //		} else if (view != null && view.getDrilledIntoCategory() instanceof TaskCategory) {
 //			taskList.addTask(newTask, view.getDrilledIntoCategory());
 //		} else {
-//			taskList.addTask(newTask, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
+//			taskList.addTask(newTask, TasksUiPlugin.getTaskList().getDefaultCategory());
 //		}
 //	} else if (view != null && view.getDrilledIntoCategory() instanceof TaskCategory) {
 //		taskList.addTask(newTask, view.getDrilledIntoCategory());
@@ -324,7 +324,7 @@ public class TaskListManager {
 //			MessageDialog.openInformation(Display.getCurrent().getActiveShell(), ITasksUiConstants.TITLE_DIALOG,
 //					"The new task has been added to the root of the list, since tasks can not be added to a query.");
 //		}
-//		taskList.addTask(newTask, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
+//		taskList.addTask(newTask, TasksUiPlugin.getTaskList().getDefaultCategory());
 //	}
 //	return newTask;
 //}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListModifyOperation.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListModifyOperation.java
index e5a22dcc1..f6cf7f75e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListModifyOperation.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListModifyOperation.java
@@ -70,6 +70,6 @@ public abstract class TaskListModifyOperation implements IRunnableWithProgress {
 	}
 
 	protected TaskList getTaskList() {
-		return TasksUiPlugin.getTaskListManager().getTaskList();
+		return TasksUiPlugin.getTaskList();
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java
index c564ddfc1..9a06b3927 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskTransfer.java
@@ -100,7 +100,7 @@ public class TaskTransfer extends ByteArrayTransfer {
 
 	private ITask readTask(DataInputStream dataIn) throws IOException {
 		String handle = dataIn.readUTF();
-		return TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
+		return TasksUiPlugin.getTaskList().getTask(handle);
 	}
 
 	private void writeTask(DataOutputStream dataOut, ITask task) throws IOException {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index 6cd0bdd79..836a1fcc2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -61,6 +61,7 @@ import org.eclipse.mylyn.internal.tasks.core.RepositoryTemplateManager;
 import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
 import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
 import org.eclipse.mylyn.internal.tasks.core.TaskDataStorageManager;
+import org.eclipse.mylyn.internal.tasks.core.TaskList;
 import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
 import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManager;
 import org.eclipse.mylyn.internal.tasks.core.data.TaskDataStore;
@@ -266,7 +267,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 	private static ITaskListNotificationProvider REMINDER_NOTIFICATION_PROVIDER = new ITaskListNotificationProvider() {
 
 		public Set<AbstractNotification> getNotifications() {
-			Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks();
+			Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskList().getAllTasks();
 			Set<AbstractNotification> reminders = new HashSet<AbstractNotification>();
 			for (AbstractTask task : allTasks) {
 				if (task.isPastReminder() && !task.isReminded()) {
@@ -288,7 +289,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 						repository.getConnectorKind());
 				AbstractRepositoryConnectorUi connectorUi = getConnectorUi(repository.getConnectorKind());
 				if (connectorUi != null && !connectorUi.isCustomNotificationHandling()) {
-					for (ITask repositoryTask : TasksUiPlugin.getTaskListManager().getTaskList().getTasks(
+					for (ITask repositoryTask : TasksUiPlugin.getTaskList().getTasks(
 							repository.getRepositoryUrl())) {
 						if ((repositoryTask.getLastReadTimeStamp() == null || repositoryTask.getSynchronizationState() == SynchronizationState.INCOMING)
 								&& ((AbstractTask) repositoryTask).isNotified() == false) {
@@ -301,7 +302,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 				}
 			}
 			// New query hits
-			for (AbstractRepositoryQuery query : TasksUiPlugin.getTaskListManager().getTaskList().getQueries()) {
+			for (AbstractRepositoryQuery query : TasksUiPlugin.getTaskList().getQueries()) {
 				AbstractRepositoryConnectorUi connectorUi = getConnectorUi(query.getConnectorKind());
 				if (!connectorUi.isCustomNotificationHandling()) {
 					for (ITask hit : query.getChildren()) {
@@ -1355,4 +1356,8 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 	public static TaskActivityMonitor getTaskActivityMonitor() {
 		return INSTANCE.taskActivityMonitor;
 	}
+
+	public static TaskList getTaskList() {
+		return getTaskListManager().getTaskList();
+	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java
index cdb5ae738..f740574b1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/AbstractTaskAction.java
@@ -50,7 +50,7 @@ public abstract class AbstractTaskAction extends Action {
 	protected abstract void performActionOnTask(ITask repositoryTask);
 
 	protected boolean containsArchiveContainer(List<AbstractTaskContainer> selectedElements) {
-		return false;//selectedElements.contains(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer());
+		return false;//selectedElements.contains(TasksUiPlugin.getTaskList().getArchiveContainer());
 	}
 
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java
index 02b7d2d7b..da044a8d8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewCategoryAction.java
@@ -77,7 +77,7 @@ public class NewCategoryAction extends Action implements IViewActionDelegate {
 			}
 
 			this.cat = new TaskCategory(name);
-			TasksUiPlugin.getTaskListManager().getTaskList().addCategory(cat);
+			TasksUiPlugin.getTaskList().addCategory(cat);
 //			this.view.getViewer().refresh();
 		}
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewSubTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewSubTaskAction.java
index 9350d64b7..48cecb90f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewSubTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewSubTaskAction.java
@@ -75,7 +75,7 @@ public class NewSubTaskAction extends Action implements IViewActionDelegate, IEx
 
 		if (selectedTask instanceof LocalTask) {
 			// XXX code copied from NewLocalTaskWizard.performFinish() and TaskListManager.createNewLocalTask()
-			TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+			TaskList taskList = TasksUiPlugin.getTaskList();
 			LocalTask newTask = new LocalTask("" + taskList.getNextLocalTaskId(),
 					LocalRepositoryConnector.DEFAULT_SUMMARY);
 			newTask.setPriority(PriorityLevel.P3.toString());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RefreshRepositoryTasksAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RefreshRepositoryTasksAction.java
index 13eb87a4b..ca5ad0de3 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RefreshRepositoryTasksAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/RefreshRepositoryTasksAction.java
@@ -52,7 +52,7 @@ public class RefreshRepositoryTasksAction extends AbstractTaskRepositoryAction i
 		AbstractRepositoryConnector connector = TasksUi.getRepositoryManager().getRepositoryConnector(
 				repository.getConnectorKind());
 		if (connector != null) {
-			Set<ITask> repositoryTasks = TasksUiPlugin.getTaskListManager().getTaskList().getTasks(
+			Set<ITask> repositoryTasks = TasksUiPlugin.getTaskList().getTasks(
 					repository.getRepositoryUrl());
 			TasksUiInternal.synchronizeTasks(connector, repositoryTasks, true, null);
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java
index de70df4bc..27fc3cbb8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/SynchronizeSelectedAction.java
@@ -125,7 +125,7 @@ public class SynchronizeSelectedAction extends ActionDelegate implements IViewAc
 		queriesToSyncMap.clear();
 		tasksToSyncMap.clear();
 
-//		TasksUiPlugin.getTaskListManager().getTaskList().notifyContainerUpdated(null);
+//		TasksUiPlugin.getTaskList().notifyContainerUpdated(null);
 
 //		if (TaskListView.getFromActivePerspective() != null) {
 //			TaskListView.getFromActivePerspective().getViewer().refresh();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskImportAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskImportAction.java
index a953df590..18aa2b042 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskImportAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskImportAction.java
@@ -110,7 +110,7 @@ public class TaskImportAction extends Action implements IViewActionDelegate {
 				TasksUiPlugin.getDefault().getRepositoriesFilePath());
 
 		for (AbstractTask loadedTask : taskContexts.keySet()) {
-			TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+			TaskList taskList = TasksUiPlugin.getTaskList();
 			if (taskList.getTask(loadedTask.getHandleIdentifier()) != null) {
 				boolean confirmed = MessageDialog.openConfirm(shell, ITasksUiConstants.TITLE_DIALOG, "Task '"
 						+ loadedTask.getSummary()
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
index 9ae0a7371..7361c1643 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java
@@ -550,7 +550,7 @@ public class TaskSelectionDialog extends FilteredItemsSelectionDialog {
 
 		if (allTasks == null) {
 			allTasks = new HashSet<AbstractTask>();
-			TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+			TaskList taskList = TasksUiPlugin.getTaskList();
 			allTasks.addAll(taskList.getAllTasks());
 		}
 		progressMonitor.worked(10);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
index f186c65b5..93b0b4769 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
@@ -47,7 +47,6 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.ITask;
 import org.eclipse.mylyn.tasks.core.ITaskElement;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
@@ -143,7 +142,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 			}
 
 		});
-		tasksViewer.setInput(TasksUi.getTaskList().getAllTasks());
+		tasksViewer.setInput(TasksUiPlugin.getTaskList().getAllTasks());
 		idText.addModifyListener(new ModifyListener() {
 
 			public void modifyText(ModifyEvent e) {
@@ -221,7 +220,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 
 		categoryViewer = new ComboViewer(addToTaskListComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		categoryViewer.setContentProvider(new ArrayContentProvider());
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		TaskList taskList = TasksUiPlugin.getTaskList();
 		LinkedList<AbstractTaskContainer> categories = new LinkedList<AbstractTaskContainer>(taskList.getCategories());
 		categories.addFirst(taskList.getDefaultCategory());
 		categoryViewer.setInput(categories);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractNewRepositoryTaskEditor.java
index 41b7b5188..37fd9c4e8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractNewRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/deprecated/AbstractNewRepositoryTaskEditor.java
@@ -368,9 +368,9 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository
 		Collections.sort(categories, new Comparator<AbstractTaskContainer>() {
 
 			public int compare(AbstractTaskContainer c1, AbstractTaskContainer c2) {
-				if (c1.equals(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory())) {
+				if (c1.equals(TasksUiPlugin.getTaskList().getDefaultCategory())) {
 					return -1;
-				} else if (c2.equals(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory())) {
+				} else if (c2.equals(TasksUiPlugin.getTaskList().getDefaultCategory())) {
 					return 1;
 				} else {
 					return c1.getSummary().compareToIgnoreCase(c2.getSummary());
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 63ee5a67f..626a12dee 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
@@ -63,7 +63,7 @@ public class CategoryEditorInput implements IEditorInput {
 	}
 
 	public void setCategoryName(String description) {
-		TasksUiPlugin.getTaskListManager().getTaskList().renameContainer(category, description);
+		TasksUiPlugin.getTaskList().renameContainer(category, description);
 //		category.setDescription(summary);
 	}
 
@@ -71,7 +71,7 @@ public class CategoryEditorInput implements IEditorInput {
 		category.setUrl(url);
 		Set<AbstractTaskContainer> updated = new HashSet<AbstractTaskContainer>();
 		updated.add(category);
-		TasksUiPlugin.getTaskListManager().getTaskList().notifyContainersUpdated(updated);
+		TasksUiPlugin.getTaskList().notifyContainersUpdated(updated);
 //		.notifyContainerUpdated(category);
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
index 6b410692f..92b67f9f0 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryCompletionProcessor.java
@@ -263,7 +263,7 @@ public class RepositoryCompletionProcessor implements IContentAssistProcessor {
 		if (taskRepository != null) {
 			proposalComputer.addSeparator();
 
-			TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+			TaskList taskList = TasksUiPlugin.getTaskList();
 			tasks = new ArrayList<AbstractTask>(taskList.getAllTasks());
 			proposalComputer.filterTasks(tasks);
 			Collections.sort(tasks, new Comparator<AbstractTask>() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
index 09ea239ab..d922f30ee 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
@@ -171,7 +171,7 @@ public class RepositoryTextViewerConfiguration extends TextSourceViewerConfigura
 			if (hyperlinks != null && hyperlinks.length > 0 && hyperlinks[0] instanceof TaskHyperlink) {
 				TaskHyperlink hyperlink = (TaskHyperlink) hyperlinks[0];
 
-				TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+				TaskList taskList = TasksUiPlugin.getTaskList();
 				String repositoryUrl = hyperlink.getRepository().getRepositoryUrl();
 
 				ITask task = taskList.getTask(repositoryUrl, hyperlink.getTaskId());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
index 8839fde49..f988428b2 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java
@@ -194,7 +194,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib
 
 			Collections.sort(categories);
 			for (final AbstractTaskCategory category : categories) {
-				if (!(category instanceof UnmatchedTaskContainer)) {//.equals(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer())) {
+				if (!(category instanceof UnmatchedTaskContainer)) {//.equals(TasksUiPlugin.getTaskList().getArchiveContainer())) {
 					Action action = new Action() {
 						@Override
 						public void run() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
index 209537d6c..7d8ca2d5f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionPart.java
@@ -152,9 +152,9 @@ public class TaskEditorActionPart extends AbstractTaskEditorPart {
 		Collections.sort(categories, new Comparator<AbstractTaskContainer>() {
 
 			public int compare(AbstractTaskContainer c1, AbstractTaskContainer c2) {
-				if (c1.equals(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory())) {
+				if (c1.equals(TasksUiPlugin.getTaskList().getDefaultCategory())) {
 					return -1;
-				} else if (c2.equals(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory())) {
+				} else if (c2.equals(TasksUiPlugin.getTaskList().getDefaultCategory())) {
 					return 1;
 				} else {
 					return c1.getSummary().compareToIgnoreCase(c2.getSummary());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
index 13c8d50a0..40e8601b8 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorInputFactory.java
@@ -31,7 +31,7 @@ public class TaskEditorInputFactory implements IElementFactory {
 
 	public IAdaptable createElement(IMemento memento) {
 		String handle = memento.getString(TAG_TASK_HANDLE);
-		AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(handle);
+		AbstractTask task = TasksUiPlugin.getTaskList().getTask(handle);
 		if (task != null) {
 			TaskRepository taskRepository = TasksUi.getRepositoryManager().getRepository(task.getConnectorKind(),
 					task.getRepositoryUrl());
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
index 5089fa1f9..3f0b75ada 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
@@ -382,7 +382,7 @@ public class RepositorySearchResultView extends AbstractTextSearchViewPage imple
 
 		Collections.sort(categories);
 		for (final AbstractTaskCategory category : categories) {
-			if (!(category instanceof UnmatchedTaskContainer)) {//.equals(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer())) {
+			if (!(category instanceof UnmatchedTaskContainer)) {//.equals(TasksUiPlugin.getTaskList().getArchiveContainer())) {
 				Action action = new Action() {
 					@Override
 					public void run() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportOperation.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportOperation.java
index f436f9bbb..7504b603a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportOperation.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDataExportOperation.java
@@ -35,7 +35,6 @@ import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
 import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
 
 /**
  * Job that performs exporting (copying or zipping) of the Task List data Assumes that check with user for overwrite
@@ -69,7 +68,7 @@ public class TaskDataExportOperation implements IRunnableWithProgress {
 
 	/** export all data */
 	public TaskDataExportOperation(String destinationDirectory, boolean zipIt, String zipFileName) {
-		this(destinationDirectory, true, true, true, zipIt, zipFileName, TasksUi.getTaskList().getAllTasks());
+		this(destinationDirectory, true, true, true, zipIt, zipFileName, TasksUiPlugin.getTaskList().getAllTasks());
 	}
 
 	/** export specified data */
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 01ef015ef..cb7060220 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
@@ -262,7 +262,7 @@ public class TasksUiInternal {
 			Set<AbstractRepositoryQuery> queries, IJobChangeListener listener, boolean force) {
 		Assert.isTrue(queries.size() > 0);
 
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		TaskList taskList = TasksUiPlugin.getTaskList();
 		for (AbstractRepositoryQuery query : queries) {
 			query.setSynchronizing(true);
 		}
@@ -436,7 +436,7 @@ public class TasksUiInternal {
 		if (summary == null) {
 			summary = LocalRepositoryConnector.DEFAULT_SUMMARY;
 		}
-		TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+		TaskList taskList = TasksUiPlugin.getTaskList();
 		LocalTask newTask = new LocalTask("" + taskList.getNextLocalTaskId(), summary);
 		newTask.setPriority(PriorityLevel.P3.toString());
 		TasksUi.getTaskList().addTask(newTask);
@@ -459,7 +459,7 @@ public class TasksUiInternal {
 			} else if (view != null && view.getDrilledIntoCategory() instanceof TaskCategory) {
 				taskList.addTask(newTask, view.getDrilledIntoCategory());
 			} else {
-				taskList.addTask(newTask, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
+				taskList.addTask(newTask, TasksUiPlugin.getTaskList().getDefaultCategory());
 			}
 		} else if (view != null && view.getDrilledIntoCategory() instanceof TaskCategory) {
 			taskList.addTask(newTask, view.getDrilledIntoCategory());
@@ -468,7 +468,7 @@ public class TasksUiInternal {
 				MessageDialog.openInformation(Display.getCurrent().getActiveShell(), ITasksUiConstants.TITLE_DIALOG,
 						"The new task has been added to the root of the list, since tasks can not be added to a query.");
 			}
-			taskList.addTask(newTask, TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
+			taskList.addTask(newTask, TasksUiPlugin.getTaskList().getDefaultCategory());
 		}
 		return newTask;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CopyOfTaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CopyOfTaskListView.java
index 01aeb08a3..4f5aa7dda 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CopyOfTaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CopyOfTaskListView.java
@@ -499,7 +499,7 @@
 //									break;
 //								default:
 //									if (taskContainerDelta.getContainer().equals(
-//											TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory())) {
+//											TasksUiPlugin.getTaskList().getDefaultCategory())) {
 //										refresh(null);
 //									} else {
 //										refresh(taskContainerDelta.getContainer());
@@ -606,13 +606,13 @@
 //		PlatformUI.getWorkbench().getWorkingSetManager().addPropertyChangeListener(this);
 //		createRefreshJob();
 //		TasksUiPlugin.getTaskListManager().addActivityListener(TASK_ACTIVITY_LISTENER);
-//		TasksUiPlugin.getTaskListManager().getTaskList().addChangeListener(TASK_REFERESH_LISTENER);
+//		TasksUiPlugin.getTaskList().addChangeListener(TASK_REFERESH_LISTENER);
 //	}
 //
 //	@Override
 //	public void dispose() {
 //		super.dispose();
-//		TasksUiPlugin.getTaskListManager().getTaskList().removeChangeListener(TASK_REFERESH_LISTENER);
+//		TasksUiPlugin.getTaskList().removeChangeListener(TASK_REFERESH_LISTENER);
 //		TasksUiPlugin.getTaskListManager().removeActivityListener(TASK_ACTIVITY_LISTENER);
 //
 //		PlatformUI.getWorkbench().getWorkingSetManager().removePropertyChangeListener(this);
@@ -635,7 +635,7 @@
 //	}
 //
 //	private void updateDescription() {
-//		List<AbstractTask> activeTasks = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTasks();
+//		List<AbstractTask> activeTasks = TasksUiPlugin.getTaskList().getActiveTasks();
 //		if (activeTasks.size() > 0) {
 //			updateDescription(activeTasks.get(0));
 //		} else {
@@ -731,7 +731,7 @@
 //			applyPresentation(taskListMemento.getString(MEMENTO_PRESENTATION));
 //		}
 //
-//		filterWorkingSet = new TaskWorkingSetFilter(TasksUiPlugin.getTaskListManager().getTaskList());
+//		filterWorkingSet = new TaskWorkingSetFilter(TasksUiPlugin.getTaskList());
 //		filterWorkingSet.setCurrentWorkingSet(getSite().getPage().getAggregateWorkingSet());
 //		addFilter(filterWorkingSet);
 //		addFilter(filterPriority);
@@ -1046,7 +1046,7 @@
 //		final IWorkbench workbench = PlatformUI.getWorkbench();
 //		workbench.getDisplay().asyncExec(new Runnable() {
 //			public void run() {
-//				List<AbstractTask> activeTasks = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTasks();
+//				List<AbstractTask> activeTasks = TasksUiPlugin.getTaskList().getActiveTasks();
 //				for (AbstractTask t : activeTasks) {
 //					getViewer().expandToLevel(t, 0);
 //				}
@@ -1316,7 +1316,7 @@
 //	 * @return <code>true</code> if the taskId was found in the node or any of its children
 //	 */
 //	protected boolean lookForId(String taskId) {
-//		return (TasksUiPlugin.getTaskListManager().getTaskList().getTask(taskId) == null);
+//		return (TasksUiPlugin.getTaskList().getTask(taskId) == null);
 //	}
 //
 //	private void hookOpenAction() {
@@ -1369,7 +1369,7 @@
 //			getViewer().expandAll();
 //		}
 //		refresh(null);
-//		selectedAndFocusTask(TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask());
+//		selectedAndFocusTask(TasksUiPlugin.getTaskList().getActiveTask());
 //	}
 //
 //	public TreeViewer getViewer() {
@@ -1668,10 +1668,10 @@
 //			// TODO: move logic into deltas
 //			refresh(task);
 //			Set<AbstractTaskContainer> containers = new HashSet<AbstractTaskContainer>(
-//					TasksUiPlugin.getTaskListManager().getTaskList().getQueriesForHandle(task.getHandleIdentifier()));
+//					TasksUiPlugin.getTaskList().getQueriesForHandle(task.getHandleIdentifier()));
 //			containers.addAll(task.getParentContainers());
-//			containers.add(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer());
-//			containers.add(TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
+//			containers.add(TasksUiPlugin.getTaskList().getArchiveContainer());
+//			containers.add(TasksUiPlugin.getTaskList().getDefaultCategory());
 //			for (AbstractTaskContainer container : containers) {
 //				refresh(container);
 //			}
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 71d3c49ed..52f5636b0 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.getTaskListManager().getTaskList().notifyTaskChanged(task, false);
+						TasksUiPlugin.getTaskList().notifyTaskChanged(task, false);
 					}
 					break;
 				case 1:
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
index 033b0d3b8..7ca265593 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java
@@ -50,7 +50,7 @@ public class TaskListContentProvider extends AbstractTaskListContentProvider {
 
 	public Object[] getElements(Object parent) {
 		if (parent.equals(this.taskListView.getViewSite())) {
-			return applyFilter(TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()).toArray();
+			return applyFilter(TasksUiPlugin.getTaskList().getRootElements()).toArray();
 		}
 		return getChildren(parent);
 	}
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 337ecef24..73596b344 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
@@ -231,7 +231,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 									container.isCaptureFloating());
 						} else if (currentTarget == null) {
 							TasksUi.getTaskList().addTask(newTask,
-									TasksUiPlugin.getTaskListManager().getTaskList().getDefaultCategory());
+									TasksUiPlugin.getTaskList().getDefaultCategory());
 						}
 					}
 				}
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 2fb75dc50..768e95426 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
@@ -1383,7 +1383,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener {
 //		}
 //		getViewer().refresh();
 //		refresh(null);
-//		selectedAndFocusTask(TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask());
+//		selectedAndFocusTask(TasksUiPlugin.getTaskList().getActiveTask());
 	}
 
 	public TaskListToolTip getToolTip() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java
index 90ed8f602..4a56deade 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataExportWizard.java
@@ -28,7 +28,6 @@ import org.eclipse.mylyn.internal.tasks.core.ITasksCoreConstants;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.util.TaskDataExportOperation;
 import org.eclipse.mylyn.tasks.core.ITask;
-import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.ui.IExportWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
@@ -106,7 +105,7 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard {
 		boolean overwrite = exportPage.overwrite();
 		boolean zip = exportPage.zip();
 
-		Collection<AbstractTask> taskContextsToExport = TasksUi.getTaskList().getAllTasks();
+		Collection<AbstractTask> taskContextsToExport = TasksUiPlugin.getTaskList().getAllTasks();
 
 		// Get file paths to check for existence
 		String destDir = exportPage.getDestinationDirectory();
@@ -154,8 +153,8 @@ public class TaskDataExportWizard extends Wizard implements IExportWizard {
 
 				if (exportPage.exportTaskContexts()) {
 					for (ITask task : taskContextsToExport) {
-						File contextFile = ContextCore.getContextManager().getFileForContext(
-								task.getHandleIdentifier());
+						File contextFile = ContextCore.getContextManager()
+								.getFileForContext(task.getHandleIdentifier());
 						File destTaskFile = new File(destDir + File.separator + contextFile.getName());
 						if (destTaskFile.exists()) {
 							if (!MessageDialog.openConfirm(getShell(), "Confirm File Replace",
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java
index 7b25fc3df..44633a9a7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetElementFactory.java
@@ -37,7 +37,7 @@ public class TaskWorkingSetElementFactory implements IElementFactory {
 		String taskHandle = memento.getString(HANDLE_TASK);
 		if (taskHandle != null) {
 			// TOOD: this does not support projects and categories/queries have the same name
-			TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList();
+			TaskList taskList = TasksUiPlugin.getTaskList();
 			for (AbstractTaskContainer element : taskList.getRootElements()) {
 				if (element.getHandleIdentifier().equals(taskHandle)) {
 					return element;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
index e12159eee..08c5907ee 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetPage.java
@@ -393,7 +393,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage {
 			containers.add(repository);
 		}
 
-//		for (AbstractTaskContainer element : TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
+//		for (AbstractTaskContainer element : TasksUiPlugin.getTaskList().getRootElements()) {
 //			if (!(element instanceof TaskArchive)) {
 //				containers.add(element);
 //			}
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 3a130847e..4c425d1e9 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
@@ -99,7 +99,7 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang
 		for (IAdaptable adaptable : workingSet.getElements()) {
 			if (adaptable instanceof ITaskElement) {
 				String handle = ((ITaskElement) adaptable).getHandleIdentifier();
-				for (ITaskElement element : TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) {
+				for (ITaskElement element : TasksUiPlugin.getTaskList().getRootElements()) {
 					if (element != null && element.getHandleIdentifier().equals(handle)) {
 						list.add(adaptable);
 					}
@@ -164,7 +164,7 @@ public class TaskWorkingSetUpdater implements IWorkingSetUpdater, ITaskListChang
 	// TODO: consider putting back, but evaluate policy and note bug 197257
 //	public void taskActivated(AbstractTask task) {
 //		Set<AbstractTaskContainer> taskContainers = new HashSet<AbstractTaskContainer>(
-//				TasksUiPlugin.getTaskListManager().getTaskList().getQueriesForHandle(task.getHandleIdentifier()));
+//				TasksUiPlugin.getTaskList().getQueriesForHandle(task.getHandleIdentifier()));
 //		taskContainers.addAll(task.getParentContainers());
 //
 //		Set<AbstractTaskContainer> allActiveWorkingSetContainers = new HashSet<AbstractTaskContainer>();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUi.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUi.java
index 3a37e256e..9dc6d9962 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUi.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUi.java
@@ -35,7 +35,7 @@ public class TasksUi {
 	}
 
 	public static ITaskList getTaskList() {
-		return TasksUiPlugin.getTaskListManager().getTaskList();
+		return TasksUiPlugin.getTaskList();
 	}
 
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
index 622d0b37d..bc0407631 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
@@ -591,7 +591,7 @@ public class TasksUiUtil {
 			task = TasksUiUtil.getTaskByUrl(fullUrl);
 		}
 		if (task == null && repositoryUrl != null && taskId != null) {
-			task = TasksUiPlugin.getTaskListManager().getTaskList().getTaskByKey(repositoryUrl, taskId);
+			task = TasksUiPlugin.getTaskList().getTaskByKey(repositoryUrl, taskId);
 		}
 
 		if (task != null) {
@@ -629,7 +629,7 @@ public class TasksUiUtil {
 	 * @since 2.0
 	 */
 	private static AbstractTask getTaskByUrl(String taskUrl) {
-		Collection<AbstractTask> tasks = TasksUi.getTaskList().getAllTasks();
+		Collection<AbstractTask> tasks = TasksUiPlugin.getTaskList().getAllTasks();
 		for (AbstractTask task : tasks) {
 			String currUrl = task.getUrl();
 			if (currUrl != null && !currUrl.equals("") && currUrl.equals(taskUrl)) {
@@ -648,7 +648,7 @@ public class TasksUiUtil {
 
 		AbstractTask task = (AbstractTask) TasksUi.getTaskList().getTask(repository.getRepositoryUrl(), taskId);
 		if (task == null) {
-			task = TasksUiPlugin.getTaskListManager().getTaskList().getTaskByKey(repository.getRepositoryUrl(), taskId);
+			task = TasksUiPlugin.getTaskList().getTaskByKey(repository.getRepositoryUrl(), taskId);
 		}
 		if (task != null) {
 			return TasksUiUtil.openTaskAndRefresh(task);