RESOLVED - bug 237552: [api] remove deprecated classes

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

8 files changed, 38 insertions, 42 deletions

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();