diff options
25 files changed, 85 insertions, 213 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java index 5f2389c6e..02ac96e5c 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java @@ -39,6 +39,7 @@ import org.eclipse.mylyn.tasks.core.data.TaskAttribute; import org.eclipse.mylyn.tasks.core.data.TaskData; import org.eclipse.mylyn.tasks.core.data.TaskDataModel; import org.eclipse.mylyn.tasks.core.sync.SubmitJob; +import org.eclipse.mylyn.tasks.tests.TaskTestUtil; import org.eclipse.mylyn.tasks.ui.TasksUi; /** @@ -75,7 +76,7 @@ public abstract class AbstractBugzillaTest extends TestCase { @Override protected void tearDown() throws Exception { super.tearDown(); - TasksUiPlugin.getTaskListManager().resetTaskList(); + TaskTestUtil.resetTaskList(); manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath()); } diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java index 1d122aede..03fbb00ca 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java @@ -23,6 +23,7 @@ import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataHandler; import org.eclipse.mylyn.tasks.core.data.TaskAttributeMapper; import org.eclipse.mylyn.tasks.core.data.TaskData; +import org.eclipse.mylyn.tasks.tests.TaskTestUtil; import org.eclipse.mylyn.tasks.ui.TasksUi; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.ui.IWorkbenchPage; @@ -42,7 +43,7 @@ public class TaskEditorTest extends TestCase { protected void tearDown() throws Exception { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); TasksUiPlugin.getRepositoryManager().clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath()); - TasksUiPlugin.getTaskListManager().resetTaskList(); + TaskTestUtil.resetTaskList(); TasksUiPlugin.getExternalizationManager().requestSave(); super.tearDown(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/QueryExportImportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/QueryExportImportTest.java index 5d92d4e3e..71a2f0635 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/QueryExportImportTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/QueryExportImportTest.java @@ -56,8 +56,7 @@ public class QueryExportImportTest extends TestCase { dest.mkdir(); } assertTrue(dest.exists()); - - taskListWriter = TasksUiPlugin.getTaskListManager().getTaskListWriter(); + taskListWriter = TasksUiPlugin.getTaskListWriter(); TaskTestUtil.resetTaskListAndRepositories(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ScheduledPresentationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ScheduledPresentationTest.java index 90ee70549..c64bc7a5b 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ScheduledPresentationTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ScheduledPresentationTest.java @@ -35,13 +35,13 @@ public class ScheduledPresentationTest extends TestCase { protected void setUp() throws Exception { ContextCorePlugin.getContextManager().getActivityMetaContext().reset(); ContextCorePlugin.getContextManager().saveActivityMetaContext(); - TasksUiPlugin.getTaskListManager().resetTaskList(); + TaskTestUtil.resetTaskList(); TasksUiPlugin.getExternalizationManager().requestSave(); } @Override protected void tearDown() throws Exception { - TasksUiPlugin.getTaskListManager().resetTaskList(); + TaskTestUtil.resetTaskList(); TasksUiPlugin.getExternalizationManager().requestSave(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java index 0cd17ce98..f20a66028 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityTimingTest.java @@ -710,7 +710,7 @@ public class TaskActivityTimingTest extends TestCase { TasksUiPlugin.getTaskActivityManager().deactivateActiveTask(); assertEquals(4, ContextCorePlugin.getContextManager().getActivityMetaContext().getInteractionHistory().size()); - TasksUiPlugin.getTaskListManager().saveTaskList(); + TaskTestUtil.saveTaskList(); ContextCorePlugin.getContextManager().saveActivityMetaContext(); ContextCorePlugin.getContextManager().getActivityMetaContext().reset(); assertEquals(0, ContextCorePlugin.getContextManager().getActivityMetaContext().getInteractionHistory().size()); @@ -888,7 +888,7 @@ public class TaskActivityTimingTest extends TestCase { AbstractTask task1 = new LocalTask("task 1", "Task 1"); TasksUiPlugin.getTaskList().addTask(task1); - TasksUiPlugin.getTaskListManager().activateTask(task1); + TasksUiPlugin.getTaskActivityManager().activateTask(task1); InteractionContext metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext(); metaContext.reset(); assertEquals(0, metaContext.getInteractionHistory().size()); @@ -919,9 +919,9 @@ public class TaskActivityTimingTest extends TestCase { assertEquals(1000 * 60 * 2, activityManager.getElapsedTime(task1, startTime1, endTime1)); assertEquals(1000 * 60 * 8, activityManager.getElapsedTime(task1, startTime2, endTime2)); - TasksUiPlugin.getTaskListManager().deactivateAllTasks(); + TasksUi.getTaskActivityManager().deactivateActiveTask(); assertEquals(4, ContextCorePlugin.getContextManager().getActivityMetaContext().getInteractionHistory().size()); - TasksUiPlugin.getTaskListManager().saveTaskList(); + TaskTestUtil.saveTaskList(); ContextCorePlugin.getContextManager().saveActivityMetaContext(); ContextCorePlugin.getContextManager().getActivityMetaContext().reset(); assertEquals(0, ContextCorePlugin.getContextManager().getActivityMetaContext().getInteractionHistory().size()); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java index ab750fbdc..48819d6a3 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java @@ -58,7 +58,7 @@ public class TaskDataImportTest extends AbstractContextTest { protected void tearDown() throws Exception { ContextCorePlugin.getContextManager().resetActivityMetaContext(); TasksUiPlugin.getRepositoryManager().clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath()); - TasksUiPlugin.getTaskListManager().resetTaskList(); + TaskTestUtil.resetTaskList(); super.tearDown(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskExportImportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskExportImportTest.java index b00924bb7..fe992efdd 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskExportImportTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskExportImportTest.java @@ -13,14 +13,12 @@ package org.eclipse.mylyn.tasks.tests; import java.io.File; import java.io.FileInputStream; -import java.io.IOException; import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.eclipse.core.runtime.CoreException; import org.eclipse.mylyn.context.core.ContextCore; import org.eclipse.mylyn.context.core.IInteractionContext; import org.eclipse.mylyn.context.tests.AbstractContextTest; @@ -71,7 +69,7 @@ public class TaskExportImportTest extends AbstractContextTest { super.tearDown(); } - public void testTaskContextExport() throws IOException, CoreException { + public void testTaskContextExport() throws Exception { LocalTask task = TasksUiInternal.createNewLocalTask("Test local task"); TaskList taskList = TasksUiPlugin.getTaskList(); @@ -91,7 +89,7 @@ public class TaskExportImportTest extends AbstractContextTest { assertTrue(ContextCore.getContextManager().hasContext(task.getHandleIdentifier())); File outFile = new File(dest + File.separator + "local-task.xml.zip"); - TasksUiPlugin.getTaskListManager().getTaskListWriter().writeTask(task, outFile); + TasksUiPlugin.getTaskListWriter().writeTask(task, outFile); assertTrue(outFile.exists()); // check the content of the archive @@ -111,14 +109,14 @@ public class TaskExportImportTest extends AbstractContextTest { assertTrue("exported file contains a file with context", files.contains(contextName)); // reset all data - TasksUiPlugin.getTaskListManager().resetTaskList(); + TaskTestUtil.resetTaskList(); assertTrue(taskList.getAllTasks().size() == 0); ContextCore.getContextManager().deleteContext(handleIdentifier); assertFalse(ContextCore.getContextManager().hasContext(task.getHandleIdentifier())); // load data back - List<AbstractTask> tasks = TasksUiPlugin.getTaskListManager().getTaskListWriter().readTasks(outFile); + List<AbstractTask> tasks = TasksUiPlugin.getTaskListWriter().readTasks(outFile); IInteractionContext loadedContext = ContextCore.getContextStore().importContext(task.getHandleIdentifier(), outFile); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java index 30a4ba3fc..d899abf08 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -42,9 +42,7 @@ public class TaskPlanningEditorTest extends TestCase { protected void tearDown() throws Exception { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false); TasksUiPlugin.getRepositoryManager().clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath()); - TasksUiPlugin.getTaskListManager().resetTaskList(); - TasksUiPlugin.getTaskListManager().saveTaskList(); - super.tearDown(); + TaskTestUtil.resetTaskList(); } public void testDirtyOnEdit() { diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java index a38d7b831..daefb805a 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java @@ -64,19 +64,22 @@ public class TaskTestUtil { } } - /** - * Adaptred from Java Developers' almanac - */ public static void copy(File source, File dest) throws IOException { InputStream in = new FileInputStream(source); - OutputStream out = new FileOutputStream(dest); - byte[] buf = new byte[1024]; - int len; - while ((len = in.read(buf)) > 0) { - out.write(buf, 0, len); + try { + OutputStream out = new FileOutputStream(dest); + try { + byte[] buf = new byte[1024]; + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + } finally { + out.close(); + } + } finally { + in.close(); } - in.close(); - out.close(); } /** @@ -92,23 +95,25 @@ public class TaskTestUtil { /** * Clears all tasks. */ - @SuppressWarnings("deprecation") public static void resetTaskList() throws Exception { TasksUi.getTaskActivityManager().deactivateActiveTask(); - TasksUiPlugin.getTaskListManager().resetTaskList(); + TaskTestUtil.resetTaskList(); } /** * @see #resetTaskList() */ - @SuppressWarnings("deprecation") public static void saveAndReadTasklist() throws Exception { TasksUiPlugin.getTaskList().notifyElementsChanged(null); - TasksUiPlugin.getTaskListManager().saveTaskList(); - TasksUiPlugin.getTaskListManager().resetTaskList(); + saveTaskList(); + TaskTestUtil.resetTaskList(); TasksUiPlugin.getDefault().reloadDataDirectory(); } + public static void saveTaskList() { + TasksUiPlugin.getExternalizationManager().requestSave(); + } + public static TaskRepository createMockRepository() { return new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/performance/TaskListPerformanceTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/performance/TaskListPerformanceTest.java index ea1d87219..2b0ffebbb 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/performance/TaskListPerformanceTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/performance/TaskListPerformanceTest.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -14,7 +14,6 @@ package org.eclipse.mylyn.tasks.tests.performance; import java.io.File; import org.eclipse.mylyn.internal.tasks.core.TaskList; -import org.eclipse.mylyn.internal.tasks.ui.TaskListManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.internal.tasks.ui.util.TaskListElementImporter; import org.eclipse.mylyn.tasks.tests.TaskTestUtil; @@ -26,14 +25,11 @@ public class TaskListPerformanceTest extends PerformanceTestCase { private TaskList taskList; - private TaskListManager taskListManager; - @Override protected void setUp() throws Exception { super.setUp(); - taskListManager = TasksUiPlugin.getTaskListManager(); - taskList = taskListManager.getTaskList(); + taskList = TasksUiPlugin.getTaskList(); taskList.reset(); } @@ -46,7 +42,7 @@ public class TaskListPerformanceTest extends PerformanceTestCase { public void testReadTasksWith4000Tasks() { final File file = TaskTestUtil.getLocalFile(TASK_LIST_4000); - final TaskListElementImporter taskListWriter = taskListManager.getTaskListWriter(); + final TaskListElementImporter taskListWriter = TasksUiPlugin.getTaskListWriter(); for (int i = 0; i < 10; i++) { startMeasuring(); @@ -61,7 +57,7 @@ public class TaskListPerformanceTest extends PerformanceTestCase { public void testReadTaskListWith4000Tasks() { final File file = TaskTestUtil.getLocalFile(TASK_LIST_4000); - final TaskListElementImporter taskListWriter = taskListManager.getTaskListWriter(); + final TaskListElementImporter taskListWriter = TasksUiPlugin.getTaskListWriter(); for (int i = 0; i < 10; i++) { startMeasuring(); 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 682040db5..586980c26 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 @@ -12,15 +12,7 @@ package org.eclipse.mylyn.internal.tasks.ui; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.mylyn.commons.core.StatusHandler; -import org.eclipse.mylyn.internal.tasks.core.AbstractTask; -import org.eclipse.mylyn.internal.tasks.core.ITaskList; -import org.eclipse.mylyn.internal.tasks.core.TaskList; -import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizationParticipant; import org.eclipse.mylyn.internal.tasks.ui.util.TaskListElementImporter; -import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.ui.TasksUi; /** * Provides facilities for using and managing the Task List and task activity information. @@ -34,100 +26,8 @@ public class TaskListManager { private final TaskListElementImporter importer; - private final TaskList taskList; - - private final TaskListExternalizationParticipant participant; - - public TaskListManager(TaskList taskList, TaskListExternalizationParticipant participant, - TaskListElementImporter importer) { - this.taskList = taskList; + public TaskListManager(TaskListElementImporter importer) { this.importer = importer; - this.participant = participant; - } - - @Deprecated - public TaskListElementImporter getTaskListWriter() { - return importer; - } - - /** - * @deprecated - */ - @Deprecated - public ITaskList resetTaskList() { - participant.resetTaskList(); - return taskList; - } - - /** - * @deprecated use TasksUiPlugin.reloadDataDirectory() - */ - @Deprecated - public boolean readExistingOrCreateNewList() { - try { - TasksUiPlugin.getDefault().reloadDataDirectory(); - } catch (CoreException e) { - StatusHandler.fail(e.getStatus()); - } - return true; - } - - /** - * @deprecated use {@link TasksUiPlugin#getTaskList()} instead - */ - @Deprecated - public TaskList getTaskList() { - return taskList; - } - - /** - * use <code>TasksUi.getTaskActivityManager().getActiveTask()</code> - * - * @deprecated - */ - @Deprecated - public ITask getActiveTask() { - return TasksUi.getTaskActivityManager().getActiveTask(); - } - - /** - * Will not save an empty task list to avoid losing data on bad startup. - * - * @deprecated use <code>TasksUiPlugin.getExternalizationManager().requestSave()</code> - */ - @Deprecated - public synchronized void saveTaskList() { - TasksUiPlugin.getExternalizationManager().requestSave(); - } - - /** - * use <code>TasksUi.getTaskActivityManager().activateTask(task)</code> - * - * @deprecated - */ - @Deprecated - public void activateTask(AbstractTask task) { - TasksUi.getTaskActivityManager().activateTask(task); - } - - /** - * use <code>TasksUi.getTaskActivityManager().activateTask(task)</code> - * - * @deprecated - */ - @Deprecated - public void activateTask(AbstractTask task, boolean addToHistory) { - TasksUi.getTaskActivityManager().activateTask(task); - } - - /** - * use <code>TasksUi.getTaskActivityManager().deactivateAllTasks()</code> - * - * @deprecated - */ - @Deprecated - public void deactivateAllTasks() { - TasksUi.getTaskActivityManager().deactivateActiveTask(); } } 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 4e28b8287..fc5548039 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 @@ -133,8 +133,6 @@ public class TasksUiPlugin extends AbstractUIPlugin { private static ExternalizationManager externalizationManager; - private static TaskListManager taskListManager; - private static TaskActivityManager taskActivityManager; private static TaskRepositoryManager repositoryManager; @@ -375,6 +373,8 @@ public class TasksUiPlugin extends AbstractUIPlugin { private boolean settingDataDirectory = false; + private static TaskListElementImporter taskListImporter; + private static TaskList taskList; private static RepositoryModel repositoryModel; @@ -521,7 +521,7 @@ public class TasksUiPlugin extends AbstractUIPlugin { taskList = new TaskList(); repositoryModel = new RepositoryModel(taskList, repositoryManager); taskListExternalizer = new TaskListExternalizer(repositoryModel, repositoryManager); - TaskListElementImporter taskListImporter = new TaskListElementImporter(repositoryManager, repositoryModel); + taskListImporter = new TaskListElementImporter(repositoryManager, repositoryModel); taskListSaveParticipant = new TaskListExternalizationParticipant(repositoryModel, taskList, taskListExternalizer, externalizationManager, repositoryManager); @@ -532,8 +532,6 @@ public class TasksUiPlugin extends AbstractUIPlugin { taskActivityManager = new TaskActivityManager(repositoryManager, taskList); taskActivityManager.addActivationListener(taskListSaveParticipant); - taskListManager = new TaskListManager(taskList, taskListSaveParticipant, taskListImporter); - // initialize updateTaskActivityManager(); @@ -563,12 +561,10 @@ public class TasksUiPlugin extends AbstractUIPlugin { // instantiate taskDataManager TaskDataStore taskDataStore = new TaskDataStore(repositoryManager); - taskDataManager = new TaskDataManager(taskDataStore, repositoryManager, taskListManager.getTaskList(), - taskActivityManager); + taskDataManager = new TaskDataManager(taskDataStore, repositoryManager, taskList, taskActivityManager); taskDataManager.setDataPath(getDataDirectory()); - taskJobFactory = new TaskJobFactory(taskListManager.getTaskList(), taskDataManager, repositoryManager, - repositoryModel); + taskJobFactory = new TaskJobFactory(taskList, taskDataManager, repositoryManager, repositoryModel); taskActivityManager.addActivationListener(CONTEXT_TASK_ACTIVATION_LISTENER); @@ -885,11 +881,6 @@ public class TasksUiPlugin extends AbstractUIPlugin { store.setDefault(ITasksUiPreferenceConstants.PLANNING_ENDHOUR, 18); } - @Deprecated - public static TaskListManager getTaskListManager() { - return taskListManager; - } - public static TaskActivityManager getTaskActivityManager() { return taskActivityManager; } @@ -1228,4 +1219,8 @@ public class TasksUiPlugin extends AbstractUIPlugin { repositoryLinkProviders.remove(provider); } + public static TaskListElementImporter getTaskListWriter() { + return taskListImporter; + } + } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskHistoryDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskHistoryDropDownAction.java index f927f2ffc..11abf32b2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskHistoryDropDownAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/ActivateTaskHistoryDropDownAction.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -85,7 +85,8 @@ public class ActivateTaskHistoryDropDownAction extends Action implements IWorkbe if (taskHistory.hasPrevious()) { AbstractTask previousTask = taskHistory.getPreviousTask(); if (previousTask != null && !previousTask.isActive()) { - TasksUiPlugin.getTaskListManager().activateTask(previousTask, false); + // FIXME do not readd to history? + TasksUiPlugin.getTaskActivityManager().activateTask(previousTask); if (TaskListView.getFromActivePerspective() != null) { TaskListView.getFromActivePerspective().refresh(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java index f7f8d1aaf..69d6eb3c5 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryCloneAction.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -81,10 +81,8 @@ public class QueryCloneAction extends Action implements IViewActionDelegate { List<RepositoryQuery> queries = new ArrayList<RepositoryQuery>(); queries.add(selectedQuery); - - Document queryDoc = TasksUiPlugin.getTaskListManager().getTaskListWriter().createQueryDocument(queries); - List<RepositoryQuery> clonedQueries = TasksUiPlugin.getTaskListManager().getTaskListWriter().readQueryDocument( - queryDoc); + Document queryDoc = TasksUiPlugin.getTaskListWriter().createQueryDocument(queries); + List<RepositoryQuery> clonedQueries = TasksUiPlugin.getTaskListWriter().readQueryDocument(queryDoc); if (clonedQueries.size() > 0) { for (RepositoryQuery query : clonedQueries) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryExportAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryExportAction.java index 65fd5427d..c4d1ab788 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryExportAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryExportAction.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -105,8 +105,7 @@ public class QueryExportAction extends Action implements IViewActionDelegate { return; } } - - TasksUiPlugin.getTaskListManager().getTaskListWriter().writeQueries(queries, file); + TasksUiPlugin.getTaskListWriter().writeQueries(queries, file); } return; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryImportAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryImportAction.java index aa668b711..1c8b4396b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryImportAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/QueryImportAction.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -70,11 +70,8 @@ public class QueryImportAction extends Action implements IViewActionDelegate { File file = new File(path); if (file.isFile()) { try { - List<RepositoryQuery> queries = TasksUiPlugin.getTaskListManager().getTaskListWriter().readQueries( - file); - Set<TaskRepository> repositories = TasksUiPlugin.getTaskListManager() - .getTaskListWriter() - .readRepositories(file); + List<RepositoryQuery> queries = TasksUiPlugin.getTaskListWriter().readQueries(file); + Set<TaskRepository> repositories = TasksUiPlugin.getTaskListWriter().readRepositories(file); if (queries.size() > 0) { importQueries(queries, repositories, shell); } else { @@ -168,7 +165,7 @@ public class QueryImportAction extends Action implements IViewActionDelegate { Pattern pattern = Pattern.compile(patternStr); // resolve name conflict - Set<RepositoryQuery> existingQueries = TasksUiPlugin.getTaskListManager().getTaskList().getQueries(); + Set<RepositoryQuery> existingQueries = TasksUiPlugin.getTaskList().getQueries(); Map<String, RepositoryQuery> queryMap = new HashMap<String, RepositoryQuery>(); for (RepositoryQuery existingQuery : existingQueries) { queryMap.put(existingQuery.getHandleIdentifier(), existingQuery); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskExportAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskExportAction.java index 59a80291f..cb984600f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskExportAction.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskExportAction.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -121,8 +121,7 @@ public class TaskExportAction extends Action implements IViewActionDelegate { continue; } } - - TasksUiPlugin.getTaskListManager().getTaskListWriter().writeTask(task, file); + TasksUiPlugin.getTaskListWriter().writeTask(task, file); } return; } 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 c32c71e55..e6bad3c89 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 @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -61,11 +61,8 @@ public class TaskImportAction extends Action implements IViewActionDelegate { if (path != null) { File file = new File(path); if (file.isFile()) { - Set<TaskRepository> repositories = TasksUiPlugin.getTaskListManager() - .getTaskListWriter() - .readRepositories(file); - Collection<AbstractTask> readTasks = TasksUiPlugin.getTaskListManager().getTaskListWriter().readTasks( - file); + Set<TaskRepository> repositories = TasksUiPlugin.getTaskListWriter().readRepositories(file); + Collection<AbstractTask> readTasks = TasksUiPlugin.getTaskListWriter().readTasks(file); if (readTasks.size() > 0) { TasksUiInternal.importTasks(readTasks, repositories, file, shell); // refreshTaskListView(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDragSourceListener.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDragSourceListener.java index 5aee548cb..c049ae00a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDragSourceListener.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskDragSourceListener.java @@ -109,9 +109,7 @@ public class TaskDragSourceListener extends DragSourceAdapter { ITasksCoreConstants.FILENAME_ENCODING); File file = File.createTempFile(encodedName, ITasksCoreConstants.FILE_EXTENSION, tempDir); file.deleteOnExit(); - - TasksUiPlugin.getTaskListManager().getTaskListWriter().writeQueries(Collections.singletonList(query), - file); + TasksUiPlugin.getTaskListWriter().writeQueries(Collections.singletonList(query), file); taskFiles.add(file); } @@ -120,8 +118,7 @@ public class TaskDragSourceListener extends DragSourceAdapter { ITasksCoreConstants.FILENAME_ENCODING); File file = File.createTempFile(encodedName, ITasksCoreConstants.FILE_EXTENSION, tempDir); file.deleteOnExit(); - - TasksUiPlugin.getTaskListManager().getTaskListWriter().writeTask(task, file); + TasksUiPlugin.getTaskListWriter().writeTask(task, file); taskFiles.add(file); } 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 b9ad8d8df..af64651bd 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 @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -96,9 +96,7 @@ class TaskListCellModifier implements ICellModifier { AbstractTaskContainer container = (AbstractTaskContainer) data; switch (columnIndex) { case 0: - TasksUiPlugin.getTaskListManager() - .getTaskList() - .renameContainer(container, ((String) value).trim()); + TasksUiPlugin.getTaskList().renameContainer(container, ((String) value).trim()); case 1: break; case 2: 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 8cfe94e25..7b3063d7e 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 @@ -125,21 +125,16 @@ public class TaskListDropAdapter extends ViewerDropAdapter { final File file = new File(path); final List<RepositoryQuery> queries = new ArrayList<RepositoryQuery>(); final Set<TaskRepository> repositories = new HashSet<TaskRepository>(); - final List<AbstractTask> readTasks = TasksUiPlugin.getTaskListManager().getTaskListWriter().readTasks( - file); + final List<AbstractTask> readTasks = TasksUiPlugin.getTaskListWriter().readTasks(file); if (file.isFile()) { List<RepositoryQuery> readQueries; try { - readQueries = TasksUiPlugin.getTaskListManager().getTaskListWriter().readQueries(file); + readQueries = TasksUiPlugin.getTaskListWriter().readQueries(file); if (readQueries.size() > 0) { queries.addAll(readQueries); - repositories.addAll(TasksUiPlugin.getTaskListManager() - .getTaskListWriter() - .readRepositories(file)); + repositories.addAll(TasksUiPlugin.getTaskListWriter().readRepositories(file)); } else { - repositories.addAll(TasksUiPlugin.getTaskListManager() - .getTaskListWriter() - .readRepositories(file)); + repositories.addAll(TasksUiPlugin.getTaskListWriter().readRepositories(file)); } } catch (IOException e) { StatusHandler.log(new Status(IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, "The specified file \"" diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java index 808ddbf3d..0ef7a41cc 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2004, 2008 Tasktop Technologies and others. + * Copyright (c) 2004, 2008 Tasktop Technologies and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,6 +22,7 @@ import org.eclipse.mylyn.internal.tasks.ui.RefactorRepositoryUrlOperation; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; +import org.eclipse.mylyn.tasks.ui.TasksUi; import org.eclipse.mylyn.tasks.ui.TasksUiImages; import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage; import org.eclipse.mylyn.tasks.ui.wizards.ITaskRepositoryPage; @@ -55,7 +56,7 @@ public class EditRepositoryWizard extends Wizard implements INewWizard { String oldUrl = repository.getRepositoryUrl(); String newUrl = settingsPage.getRepositoryUrl(); if (oldUrl != null && newUrl != null && !oldUrl.equals(newUrl)) { - TasksUiPlugin.getTaskListManager().deactivateAllTasks(); + TasksUi.getTaskActivityManager().deactivateActiveTask(); RefactorRepositoryUrlOperation operation = new RefactorRepositoryUrlOperation(oldUrl, newUrl); try { diff --git a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF index 58a79c872..682781a67 100644 --- a/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.mylyn.trac.tests/META-INF/MANIFEST.MF @@ -9,13 +9,14 @@ Require-Bundle: org.apache.xmlrpc;bundle-version="3.0.0", org.eclipse.jface.text, org.eclipse.ui, org.eclipse.ui.workbench.texteditor, + org.eclipse.mylyn.commons.net, org.eclipse.mylyn.context.core, org.eclipse.mylyn.context.tests, org.eclipse.mylyn.tasks.ui, org.eclipse.mylyn.tasks.core, + org.eclipse.mylyn.tasks.tests, org.eclipse.mylyn.trac.ui, - org.eclipse.mylyn.trac.core, - org.eclipse.mylyn.commons.net + org.eclipse.mylyn.trac.core Export-Package: org.eclipse.mylyn.internal.trac.ui;x-internal:=true, org.eclipse.mylyn.trac.tests;x-internal:=true, org.eclipse.mylyn.trac.tests.client;x-internal:=true, diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java index 7b9c20fe7..20ccea286 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskEditorTest.java @@ -19,6 +19,7 @@ import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.internal.trac.core.client.ITracClient.Version; import org.eclipse.mylyn.tasks.core.ITask; import org.eclipse.mylyn.tasks.core.TaskRepository; +import org.eclipse.mylyn.tasks.tests.TaskTestUtil; import org.eclipse.mylyn.tasks.ui.TasksUiUtil; import org.eclipse.mylyn.trac.tests.support.TracTestConstants; import org.eclipse.mylyn.trac.tests.support.TracTestUtil; @@ -30,7 +31,7 @@ public class TracTaskEditorTest extends TestCase { @Override protected void setUp() throws Exception { - TracTestUtil.resetTaskList(); + TaskTestUtil.resetTaskList(); } public void testGetSelectedRepository() throws Exception { diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestUtil.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestUtil.java index f0caf085e..57532b13c 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestUtil.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/support/TracTestUtil.java @@ -90,9 +90,4 @@ public class TracTestUtil { return attachments; } - @SuppressWarnings("deprecation") - public static void resetTaskList() { - TasksUiPlugin.getTaskListManager().resetTaskList(); - } - } |