NEW - bug 224780: [api] decouple tasks.core from context.core

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

11 files changed, 130 insertions, 463 deletions

diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java
index 293a07231..211d1bb06 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityManager.java
@@ -89,9 +89,9 @@ public class TaskActivityManager {
 
 	private int endHour = 17;
 
-	private TaskList taskList;
+	private final TaskList taskList;
 
-	private TaskRepositoryManager repositoryManager;
+	private final TaskRepositoryManager repositoryManager;
 
 	private int startDay = Calendar.MONDAY;
 
@@ -99,29 +99,11 @@ public class TaskActivityManager {
 
 	private Date startTime = new Date();
 
-	private boolean initialized;
+	public static TaskActivityManager INSTANCE;
 
-	private static TaskActivityManager INSTANCE;
-
-	private TaskActivityManager() {
-		// SINGLETON
-	}
-
-	public static synchronized TaskActivityManager getInstance() {
-		if (INSTANCE == null) {
-			INSTANCE = new TaskActivityManager();
-		}
-		return INSTANCE;
-	}
-
-	public void init(TaskRepositoryManager repositoryManager, TaskList taskList) {
+	public TaskActivityManager(TaskRepositoryManager repositoryManager, TaskList taskList) {
 		this.taskList = taskList;
 		this.repositoryManager = repositoryManager;
-		initialized = true;
-	}
-
-	@Deprecated
-	public void dispose() {
 	}
 
 	public int getStartDay() {
@@ -428,10 +410,6 @@ public class TaskActivityManager {
 		taskList.notifyTaskChanged(task, false);
 	}
 
-	public boolean isInitialized() {
-		return initialized;
-	}
-
 	/**
 	 * @return if a repository task, will only return true if the user is a
 	 */
@@ -586,7 +564,7 @@ public class TaskActivityManager {
 		scheduleContainers.clear();
 		scheduleWeekDays.clear();
 
-		int startDay = TaskActivityManager.getInstance().getStartDay();
+		int startDay = getStartDay();
 		//int endDay = TaskActivityManager.getInstance().getEndDay();
 		// scheduledStartHour =
 		// TasksUiPlugin.getDefault().getPreferenceStore().getInt(
@@ -812,4 +790,10 @@ public class TaskActivityManager {
 		return false;
 	}
 
+	public Set<AbstractTask> getScheduledForThisWeek() {
+		Calendar startWeek = TaskActivityUtil.getStartOfCurrentWeek();
+		Calendar endWeek = TaskActivityUtil.getEndOfCurrentWeek();
+		return getScheduledTasks(startWeek, endWeek);
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityUtil.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityUtil.java
index 305e0a6ae..56c3c8391 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityUtil.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/TaskActivityUtil.java
@@ -15,6 +15,10 @@ import java.util.Calendar;
  */
 public class TaskActivityUtil {
 
+	private static int startDay = Calendar.MONDAY;
+
+	private static int endHour = 17;
+
 	public static Calendar snapStartOfDay(Calendar cal) {
 		cal.set(Calendar.HOUR_OF_DAY, 0);
 		cal.set(Calendar.MINUTE, 0);
@@ -56,7 +60,7 @@ public class TaskActivityUtil {
 	}
 
 	public static Calendar snapStartOfWorkWeek(Calendar cal) {
-		cal.set(Calendar.DAY_OF_WEEK, TaskActivityManager.getInstance().getStartDay());
+		cal.set(Calendar.DAY_OF_WEEK, startDay);
 		snapStartOfDay(cal);
 		return cal;
 	}
@@ -84,7 +88,7 @@ public class TaskActivityUtil {
 
 	public static Calendar snapForwardNumDays(Calendar calendar, int days) {
 		calendar.add(Calendar.DAY_OF_MONTH, days);
-		calendar.set(Calendar.HOUR_OF_DAY, TaskActivityManager.getInstance().getEndHour());
+		calendar.set(Calendar.HOUR_OF_DAY, endHour);
 		calendar.set(Calendar.MINUTE, 0);
 		calendar.set(Calendar.SECOND, 0);
 		calendar.set(Calendar.MILLISECOND, 0);
@@ -92,7 +96,7 @@ public class TaskActivityUtil {
 	}
 
 	public static Calendar snapEndOfWorkDay(Calendar calendar) {
-		calendar.set(Calendar.HOUR_OF_DAY, TaskActivityManager.getInstance().getEndHour());
+		calendar.set(Calendar.HOUR_OF_DAY, endHour);
 		calendar.set(Calendar.MINUTE, 0);
 		calendar.set(Calendar.SECOND, 0);
 		calendar.set(Calendar.MILLISECOND, 0);
@@ -163,7 +167,7 @@ public class TaskActivityUtil {
 
 	public static Calendar getCalendar() {
 		Calendar cal = Calendar.getInstance();
-		cal.setFirstDayOfWeek(TaskActivityManager.getInstance().getStartDay());
+		cal.setFirstDayOfWeek(startDay);
 		cal.getTime();
 		return cal;
 	}
@@ -182,4 +186,12 @@ public class TaskActivityUtil {
 		return (time.compareTo(start) >= 0 && time.compareTo(end) <= 0);
 	}
 
+	public static void setStartDay(int startDay) {
+		TaskActivityUtil.startDay = startDay;
+	}
+
+	public static void setEndHour(int endHour) {
+		TaskActivityUtil.endHour = endHour;
+	}
+
 }
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 3aa7ed400..b9b125315 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
@@ -18,7 +18,6 @@ import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer;
-import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
 import org.eclipse.mylyn.monitor.core.InteractionEvent;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -88,14 +87,14 @@ public class ScheduledPresentationTest extends TestCase {
 		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1);
 
-		assertEquals(0, TaskActivityManager.getInstance()
+		assertEquals(0, TasksUiPlugin.getTaskActivityManager()
 				.getScheduledTasks(thisWeek.getStart(), thisWeek.getEnd())
 				.size());
 
-		TaskActivityManager.getInstance().setScheduledFor(task1, thisWeek.getStart().getTime());
+		TasksUiPlugin.getTaskActivityManager().setScheduledFor(task1, thisWeek.getStart().getTime());
 
 //		TasksUiPlugin.getTaskListManager().parseInteractionEvent(event2);
-		assertEquals(1, TaskActivityManager.getInstance()
+		assertEquals(1, TasksUiPlugin.getTaskActivityManager()
 				.getScheduledTasks(thisWeek.getStart(), thisWeek.getEnd())
 				.size());
 		// assertEquals(thisWeekTaskStop.getTime().getTime() -
@@ -126,9 +125,9 @@ public class ScheduledPresentationTest extends TestCase {
 		assertFalse(newThisWeek.isPresent());
 		assertTrue(newThisWeek.isFuture());
 
-		assertEquals(0, TaskActivityManager.getInstance().getScheduledTasks(newThisWeek.getStart(),
+		assertEquals(0, TasksUiPlugin.getTaskActivityManager().getScheduledTasks(newThisWeek.getStart(),
 				newThisWeek.getEnd()).size());
-		assertEquals(1, TaskActivityManager.getInstance().getScheduledTasks(newPreviousWeek.getStart(),
+		assertEquals(1, TasksUiPlugin.getTaskActivityManager().getScheduledTasks(newPreviousWeek.getStart(),
 				newPreviousWeek.getEnd()).size());
 
 		TasksUiPlugin.getTaskListManager().resetAndRollOver(oldStart);
@@ -156,8 +155,8 @@ public class ScheduledPresentationTest extends TestCase {
 				InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
 				InteractionContextManager.ACTIVITY_DELTA_ADDED, 2f, startDate.getTime(), endDate.getTime());
 
-		TaskActivityManager.getInstance().parseInteractionEvent(event1);
-		TaskActivityManager.getInstance().parseInteractionEvent(event2);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
 
 		ScheduledTaskContainer container = TasksUiPlugin.getTaskActivityManager().getActivityPast();
 		assertEquals(2, container.getChildren().size());
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 04099c8fb..88660f89e 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
@@ -76,8 +76,8 @@ public class TaskActivityTimingTest extends TestCase {
 				task1.getHandleIdentifier(), "originId", "navigatedRelation",
 				InteractionContextManager.ACTIVITY_DELTA_ADDED, 2f, start2.getTime(), end2.getTime());
 
-		TaskActivityManager.getInstance().parseInteractionEvent(event1);
-		TaskActivityManager.getInstance().parseInteractionEvent(event2);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
 
 		long expectedTotalTime = end.getTime().getTime() - start.getTime().getTime();
 		assertEquals(2 * expectedTotalTime, activityManager.getElapsedTime(task1));
@@ -114,10 +114,10 @@ public class TaskActivityTimingTest extends TestCase {
 				task1.getHandleIdentifier(), "originId", "navigatedRelation",
 				InteractionContextManager.ACTIVITY_DELTA_ADDED, 2f, end2.getTime(), start2.getTime());
 
-		TaskActivityManager.getInstance().parseInteractionEvent(event1);
-		TaskActivityManager.getInstance().parseInteractionEvent(event2);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
 
-		assertEquals(0, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(0, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 		assertEquals(0, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1, start, end));
 		assertEquals(0, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1, start2, end2));
 		assertEquals(0, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1, start, end2));
@@ -140,9 +140,9 @@ public class TaskActivityTimingTest extends TestCase {
 				"originId", "navigatedRelation", InteractionContextManager.ACTIVITY_DELTA_ADDED, 2f, start.getTime(),
 				end.getTime());
 
-		TaskActivityManager.getInstance().parseInteractionEvent(event1);
-		TaskActivityManager.getInstance().parseInteractionEvent(event2);
-		assertEquals(0, TaskActivityManager.getInstance().getElapsedTime(task1));
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
+		assertEquals(0, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 	}
 
 	public void testActivityNotLoggedTwice() {
@@ -223,27 +223,27 @@ public class TaskActivityTimingTest extends TestCase {
 					InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, startTime.getTime(), endTime.getTime());
 
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
-			TaskActivityManager.getInstance().parseInteractionEvent(event1);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
-			TaskActivityManager.getInstance().parseInteractionEvent(activityEvent1);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(activityEvent1);
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
-			TaskActivityManager.getInstance().parseInteractionEvent(event2);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
 
-			long elapsed = TaskActivityManager.getInstance().getElapsedTime(task1);
+			long elapsed = TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1);
 			assertEquals(10000, elapsed);
 
 			// 2nd activation - no activity
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
-			TaskActivityManager.getInstance().parseInteractionEvent(event1);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
-			TaskActivityManager.getInstance().parseInteractionEvent(event2);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
 
-			elapsed = TaskActivityManager.getInstance().getElapsedTime(task1);
+			elapsed = TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1);
 			assertEquals(10000, elapsed);
-			assertTrue(TaskActivityManager.getInstance().isActiveThisWeek(task1));
+			assertTrue(TasksUiPlugin.getTaskActivityManager().isActiveThisWeek(task1));
 		}
 
-		assertEquals(10000, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(10000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 		///--- 2nd activity on same task
 		{
 			Calendar startActiveTime2 = Calendar.getInstance();
@@ -270,20 +270,20 @@ public class TaskActivityTimingTest extends TestCase {
 					InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, startTime2.getTime(), endTime2.getTime());
 
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
-			TaskActivityManager.getInstance().parseInteractionEvent(event1);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
-			TaskActivityManager.getInstance().parseInteractionEvent(activityEvent1);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(activityEvent1);
 			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
-			TaskActivityManager.getInstance().parseInteractionEvent(event2);
+			TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
 		}
 
-		assertEquals(26000, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(26000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 
 		ContextCorePlugin.getContextManager().saveActivityContext();
 		ContextCorePlugin.getContextManager().loadActivityMetaContext();
 		TasksUiPlugin.getTaskListManager().resetAndRollOver();
 
-		assertEquals(26000, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(26000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 
 	}
 
@@ -308,18 +308,18 @@ public class TaskActivityTimingTest extends TestCase {
 				InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, startTime.getTime(), endTime.getTime());
 
 		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
-		TaskActivityManager.getInstance().parseInteractionEvent(event1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
 		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
-		TaskActivityManager.getInstance().parseInteractionEvent(activityEvent1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(activityEvent1);
 		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
-		TaskActivityManager.getInstance().parseInteractionEvent(event2);
-		assertEquals(20000, TaskActivityManager.getInstance().getElapsedTime(task1));
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
+		assertEquals(20000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 
 		ContextCorePlugin.getContextManager().saveActivityContext();
 		ContextCorePlugin.getContextManager().loadActivityMetaContext();
 		TasksUiPlugin.getTaskListManager().resetAndRollOver();
 
-		assertEquals(20000, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(20000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 
 	}
 
@@ -445,11 +445,11 @@ public class TaskActivityTimingTest extends TestCase {
 		ContextCorePlugin.getContextManager().loadActivityMetaContext();
 
 		assertEquals(4, ContextCorePlugin.getContextManager().getActivityMetaContext().getInteractionHistory().size());
-		assertEquals(0, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(0, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 
 		TasksUiPlugin.getTaskListManager().resetAndRollOver();
 		assertEquals((endTime1.getTimeInMillis() - startTime1.getTimeInMillis())
-				+ (endTime2.getTimeInMillis() - startTime2.getTimeInMillis()), TaskActivityManager.getInstance()
+				+ (endTime2.getTimeInMillis() - startTime2.getTimeInMillis()), TasksUiPlugin.getTaskActivityManager()
 				.getElapsedTime(task1));
 	}
 
@@ -573,12 +573,12 @@ public class TaskActivityTimingTest extends TestCase {
 				InteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
 				InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, activityStart.getTime(), activityEnd.getTime());
 
-		TaskActivityManager.getInstance().parseInteractionEvent(event1);
-		TaskActivityManager.getInstance().parseInteractionEvent(activityEvent);
-		TaskActivityManager.getInstance().parseInteractionEvent(event2);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(activityEvent);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event2);
 
 		long expectedTotalTime = (activityEnd.getTime().getTime() - activityStart.getTime().getTime());
-		assertEquals(expectedTotalTime, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(expectedTotalTime, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 	}
 
 	public void testElapsedSameAfterRead() {
@@ -637,13 +637,13 @@ public class TaskActivityTimingTest extends TestCase {
 				InteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, startTime3.getTime(), endTime3.getTime());
 
 		metaContext.parseEvent(activityEvent1);
-		TaskActivityManager.getInstance().parseInteractionEvent(activityEvent1);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(activityEvent1);
 		metaContext.parseEvent(activityEvent2);
-		TaskActivityManager.getInstance().parseInteractionEvent(activityEvent2);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(activityEvent2);
 		metaContext.parseEvent(activityEvent3);
-		TaskActivityManager.getInstance().parseInteractionEvent(activityEvent3);
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(activityEvent3);
 
-		assertEquals(1000 * 60 * 10, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(1000 * 60 * 10, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 		assertEquals(1000 * 60 * 2, activityManager.getElapsedTime(task1, startTime1, endTime1));
 		assertEquals(1000 * 60 * 8, activityManager.getElapsedTime(task1, startTime2, endTime2));
 
@@ -729,16 +729,16 @@ public class TaskActivityTimingTest extends TestCase {
 				"originId", "navigatedRelation", InteractionContextManager.ACTIVITY_DELTA_DEACTIVATED, 2f, time7, time7);
 
 		LegacyActivityAdaptor legacyAdaptor = new LegacyActivityAdaptor();
-		TaskActivityManager.getInstance().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event1));
-		TaskActivityManager.getInstance().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event2));
-		TaskActivityManager.getInstance().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event3));
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event1));
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event2));
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event3));
 		// TasksUiPlugin.getTaskListManager().parseInteractionEvent(event4);
-		TaskActivityManager.getInstance().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event5));
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event5));
 		// TaskActivityManager.getInstance().parseInteractionEvent(event6);
-		TaskActivityManager.getInstance().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event7));
+		TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(legacyAdaptor.parseInteractionEvent(event7));
 		long expectedTotalTime = time6.getTime() - time5.getTime() + time4.getTime() - time3.getTime()
 				+ time2.getTime() - time1.getTime();
-		assertEquals(expectedTotalTime, TaskActivityManager.getInstance().getElapsedTime(task1));
+		assertEquals(expectedTotalTime, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 	}
 
 // DND: OLD ACTIVITY TESTS - Will be using to test activity report/view 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
index 607c5c6b4..2ce79c327 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java
@@ -28,6 +28,7 @@ import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
 import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
+import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
 import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
 import org.eclipse.mylyn.internal.tasks.ui.ScheduledTaskListSynchJob;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListSynchronizationScheduler;
@@ -261,7 +262,6 @@ public class TaskListManagerTest extends TestCase {
 		assertEquals("http://b/task/123", task.getUrl());
 	}
 
-	@SuppressWarnings("deprecation")
 	public void testRefactorMetaContextHandles() {
 		String firstUrl = "http://repository1.com/bugs";
 		String secondUrl = "http://repository2.com/bugs";
@@ -295,26 +295,27 @@ public class TaskListManagerTest extends TestCase {
 						endDate2.getTime()));
 
 		assertEquals(2, metaContext.getInteractionHistory().size());
-		assertEquals(60 * 1000 * 5, manager.getElapsedTime(task1));
-		assertEquals(2 * 60 * 1000 * 5, manager.getElapsedTime(task2));
+		assertEquals(60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
+		assertEquals(2 * 60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task2));
 		manager.refactorRepositoryUrl(firstUrl, secondUrl);
 		metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		assertEquals(2, metaContext.getInteractionHistory().size());
-		assertEquals(60 * 1000 * 5, manager.getElapsedTime(new MockRepositoryTask(secondUrl, "1")));
-		assertEquals(2 * 60 * 1000 * 5, manager.getElapsedTime(new MockRepositoryTask(secondUrl, "2")));
+		assertEquals(60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(
+				new MockRepositoryTask(secondUrl, "1")));
+		assertEquals(2 * 60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(
+				new MockRepositoryTask(secondUrl, "2")));
 		assertEquals(secondUrl + "-1", metaContext.getInteractionHistory().get(0).getStructureHandle());
 	}
 
-	@SuppressWarnings("deprecation")
 	public void testIsActiveToday() {
 		AbstractTask task = new LocalTask("1", "task-1");
-		assertFalse(manager.isScheduledForToday(task));
+		assertFalse(TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task));
 
 		task.setScheduledForDate(new Date());
-		assertTrue(manager.isScheduledForToday(task));
+		assertTrue(TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task));
 
 		task.setReminded(true);
-		assertTrue(manager.isScheduledForToday(task));
+		assertTrue(TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task));
 		task.setReminded(true);
 
 		Calendar inAnHour = Calendar.getInstance();
@@ -322,50 +323,48 @@ public class TaskListManagerTest extends TestCase {
 		inAnHour.getTime();
 		task.setScheduledForDate(inAnHour.getTime());
 		Calendar tomorrow = Calendar.getInstance();
-		manager.snapToNextDay(tomorrow);
+		TasksUiPlugin.getTaskActivityManager().snapToNextDay(tomorrow);
 		assertEquals(-1, inAnHour.compareTo(tomorrow));
 
-		assertTrue(manager.isScheduledForToday(task));
+		assertTrue(TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task));
 	}
 
-	@SuppressWarnings("deprecation")
 	public void testScheduledForToday() {
 		AbstractTask task = new LocalTask("1", "task-1");
 		Calendar cal = Calendar.getInstance();
 		cal.add(Calendar.MINUTE, 2);
 		task.setScheduledForDate(cal.getTime());
-		assertTrue(manager.isScheduledForToday(task));
-		manager.setSecheduledIn(cal, 1);
+		assertTrue(TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task));
+		TaskActivityUtil.snapForwardNumDays(cal, 1);
 		task.setScheduledForDate(cal.getTime());
-		assertFalse(manager.isScheduledForToday(task));
+		assertFalse(TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task));
 		cal = Calendar.getInstance();
-		manager.setScheduledEndOfDay(cal);
+		TaskActivityUtil.snapEndOfWorkDay(cal);
 		task.setScheduledForDate(cal.getTime());
-		assertTrue(manager.isScheduledForToday(task));
+		assertTrue(TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task));
 	}
 
-	@SuppressWarnings("deprecation")
 	public void testSchedulePastEndOfMonth() {
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(Calendar.MONTH, Calendar.SEPTEMBER);
 		calendar.set(Calendar.DAY_OF_MONTH, 30);
-		manager.setSecheduledIn(calendar, 1);
+		TaskActivityUtil.snapForwardNumDays(calendar, 1);
 		assertEquals("Should be October", Calendar.OCTOBER, calendar.get(Calendar.MONTH));
 	}
 
-	@SuppressWarnings("deprecation")
 	public void testIsCompletedToday() {
 		AbstractTask task = new LocalTask("1", "task 1");
 		task.setCompleted(true);
 		task.setCompletionDate(new Date());
-		assertTrue(manager.isCompletedToday(task));
+		assertTrue(TasksUiPlugin.getTaskActivityManager().isCompletedToday(task));
 
 		MockRepositoryTask mockTask = new MockRepositoryTask("1");
 		mockTask.setOwner("unknown");
 		manager.getTaskList().addTask(mockTask);
 		mockTask.setCompleted(true);
 		mockTask.setCompletionDate(new Date());
-		assertFalse("completed: " + mockTask.getCompletionDate(), manager.isCompletedToday(mockTask));
+		assertFalse("completed: " + mockTask.getCompletionDate(), TasksUiPlugin.getTaskActivityManager()
+				.isCompletedToday(mockTask));
 
 		mockTask = new MockRepositoryTask("2");
 		manager.getTaskList().addTask(mockTask);
@@ -373,7 +372,7 @@ public class TaskListManagerTest extends TestCase {
 		mockTask.setCompletionDate(new Date());
 		repository.setAuthenticationCredentials("testUser", "testPassword");
 		mockTask.setOwner("testUser");
-		assertTrue(manager.isCompletedToday(mockTask));
+		assertTrue(TasksUiPlugin.getTaskActivityManager().isCompletedToday(mockTask));
 
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
index 4bf5a5672..cdb55a933 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduleTaskMenuContributor.java
@@ -50,7 +50,6 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 
 	private static final String LABEL_NOT_SCHEDULED = "Not Scheduled";
 
-	@SuppressWarnings("deprecation")
 	public MenuManager getSubMenuManager(final List<AbstractTaskContainer> selectedElements) {
 
 		final TaskListManager tasklistManager = TasksUiPlugin.getTaskListManager();
@@ -106,7 +105,7 @@ public class ScheduleTaskMenuContributor implements IDynamicSubMenuContributor {
 				public void run() {
 					Calendar reminderCalendar = TaskActivityUtil.getCalendar();
 					int dueIn = day - today;
-					TasksUiPlugin.getTaskListManager().setSecheduledIn(reminderCalendar, dueIn);
+					TaskActivityUtil.snapForwardNumDays(reminderCalendar, dueIn);
 					for (AbstractTaskContainer element : taskListElementsToSchedule) {
 						AbstractTask task = tasklistManager.getTaskForElement(element, true);
 						setScheduledDate(task, reminderCalendar, false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
index f154c69d5..9d091fdf6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskLabelDecorator.java
@@ -15,7 +15,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
-import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
 import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
@@ -52,7 +51,7 @@ public class TaskLabelDecorator implements ILightweightLabelDecorator {
 			}
 		} else if (element instanceof AbstractTask) {
 			AbstractTask task = (AbstractTask) element;
-			if (!task.isCompleted() && TaskActivityManager.getInstance().isOverdue(task)) {
+			if (!task.isCompleted() && TasksUiPlugin.getTaskActivityManager().isOverdue(task)) {
 				decoration.addOverlay(TasksUiImages.OVERLAY_OVER_DUE, IDecoration.TOP_RIGHT);
 			} else if (!task.isCompleted() && task.getDueDate() != null) {
 				decoration.addOverlay(TasksUiImages.OVERLAY_HAS_DUE, IDecoration.TOP_RIGHT);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
index 352268347..7cc802b2d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java
@@ -16,7 +16,6 @@ import org.eclipse.jface.viewers.IFontProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.mylyn.internal.tasks.core.Person;
 import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer;
-import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
 import org.eclipse.mylyn.internal.tasks.core.TaskArchive;
 import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
 import org.eclipse.mylyn.internal.tasks.core.TaskGroup;
@@ -252,7 +251,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 		if (object instanceof AbstractTaskContainer && object instanceof AbstractTask) {
 			AbstractTask task = getCorrespondingTask((AbstractTaskContainer) object);
 			if (task != null) {
-				if (TaskActivityManager.getInstance().isCompletedToday(task)) {
+				if (TasksUiPlugin.getTaskActivityManager().isCompletedToday(task)) {
 					return themeManager.getCurrentTheme().getColorRegistry().get(
 							TaskListColorsAndFonts.THEME_COLOR_TASK_TODAY_COMPLETED);
 				} else if (task.isCompleted()) {
@@ -260,16 +259,16 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 							TaskListColorsAndFonts.THEME_COLOR_COMPLETED);
 				} else if (task.isActive()) {
 					return TaskListColorsAndFonts.COLOR_TASK_ACTIVE;
-				} else if (TaskActivityManager.getInstance().isOverdue(task)) {
+				} else if (TasksUiPlugin.getTaskActivityManager().isOverdue(task)) {
 					return themeManager.getCurrentTheme().getColorRegistry().get(
 							TaskListColorsAndFonts.THEME_COLOR_TASK_PAST_DUE);
 				} else if (!task.internalIsFloatingScheduledDate() && task.isPastReminder()) {
 					return themeManager.getCurrentTheme().getColorRegistry().get(
 							TaskListColorsAndFonts.THEME_COLOR_TASK_PAST_SCHEDULED);
-				} else if (TaskActivityManager.getInstance().isScheduledForToday(task)) {
+				} else if (TasksUiPlugin.getTaskActivityManager().isScheduledForToday(task)) {
 					return themeManager.getCurrentTheme().getColorRegistry().get(
 							TaskListColorsAndFonts.THEME_COLOR_TASK_TODAY_SCHEDULED);
-				} else if (TaskActivityManager.getInstance().isScheduledForThisWeek(task)) {
+				} else if (TasksUiPlugin.getTaskActivityManager().isScheduledForThisWeek(task)) {
 					return themeManager.getCurrentTheme().getColorRegistry().get(
 							TaskListColorsAndFonts.THEME_COLOR_TASK_THISWEEK_SCHEDULED);
 				}
@@ -278,7 +277,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
 			for (AbstractTask child : ((AbstractTaskContainer) object).getChildren()) {
 				if (child.isActive() || showHasActiveChild(child)) {
 					return TaskListColorsAndFonts.COLOR_TASK_ACTIVE;
-				} else if (TaskActivityManager.getInstance().isOverdue(child)) {
+				} else if (TasksUiPlugin.getTaskActivityManager().isOverdue(child)) {
 //				} else if ((child.isPastReminder() && !child.isCompleted()) || showHasChildrenPastDue(child)) {
 					return themeManager.getCurrentTheme().getColorRegistry().get(
 							TaskListColorsAndFonts.THEME_COLOR_TASK_PAST_DUE);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
index d2ca66180..41aece70b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListFilteredTree.java
@@ -220,13 +220,12 @@ public class TaskListFilteredTree extends AbstractFilteredTree {
 		return searchComposite;
 	}
 
-	@SuppressWarnings("deprecation")
 	private void updateTaskProgressBar() {
 		if (taskProgressBar.isDisposed()) {
 			return;
 		}
 
-		Set<AbstractTask> tasksThisWeek = TasksUiPlugin.getTaskListManager().getScheduledForThisWeek();
+		Set<AbstractTask> tasksThisWeek = TasksUiPlugin.getTaskActivityManager().getScheduledForThisWeek();
 
 		totalTasks = tasksThisWeek.size();
 		completeTime = 0;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
index 9f94dc4fa..5b3748b29 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java
@@ -26,8 +26,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylyn.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.context.core.InteractionContext;
@@ -36,13 +34,10 @@ import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
 import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
 import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer;
-import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
-import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
 import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
 import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
 import org.eclipse.mylyn.internal.tasks.core.UnmatchedTaskContainer;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants;
-import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
 import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore;
 import org.eclipse.mylyn.internal.tasks.ui.util.TaskListSaveManager;
 import org.eclipse.mylyn.internal.tasks.ui.util.TaskListWriter;
@@ -76,7 +71,7 @@ import org.eclipse.swt.widgets.Display;
  * @author Jevgeni Holodkov (insertQueries)
  * @since 2.0
  */
-public class TaskListManager implements IPropertyChangeListener {
+public class TaskListManager {
 
 	private static final long SECOND = 1000;
 
@@ -87,24 +82,6 @@ public class TaskListManager implements IPropertyChangeListener {
 	// TODO: Remove
 	public static final String ARCHIVE_CATEGORY_DESCRIPTION = "Archive";
 
-	@Deprecated
-	public static final String[] ESTIMATE_TIMES = new String[] { "0 Hours", "1 Hours", "2 Hours", "3 Hours", "4 Hours",
-			"5 Hours", "6 Hours", "7 Hours", "8 Hours", "9 Hours", "10 Hours" };
-
-	//private ScheduledTaskContainer scheduledThisWeek;
-
-	//private List<ScheduledTaskContainer> scheduleWeekDays = new ArrayList<ScheduledTaskContainer>();
-//
-//	private ScheduledTaskContainer scheduledNextWeek;
-//
-//	private ScheduledTaskContainer scheduledFuture;
-//
-//	private ScheduledTaskContainer scheduledPast;
-//
-//	private ScheduledTaskContainer scheduledPrevious;
-
-	//private ArrayList<ScheduledTaskContainer> scheduleContainers = new ArrayList<ScheduledTaskContainer>();
-
 	private final List<ITaskActivityListener> activityListeners = new ArrayList<ITaskActivityListener>();
 
 	private final TaskListWriter taskListWriter;
@@ -287,7 +264,8 @@ public class TaskListManager implements IPropertyChangeListener {
 				resetTaskList();
 			}
 			taskListInitialized = true;
-			resetAndRollOver();
+			// invoked from initActivityHistory()
+			//resetAndRollOver();
 			for (ITaskActivityListener listener : new ArrayList<ITaskActivityListener>(activityListeners)) {
 				listener.taskListRead();
 			}
@@ -444,20 +422,6 @@ public class TaskListManager implements IPropertyChangeListener {
 		return taskListFile;
 	}
 
-	public void propertyChange(PropertyChangeEvent event) {
-		if (event.getProperty().equals(TasksUiPreferenceConstants.PLANNING_STARTHOUR)
-				|| event.getProperty().equals(TasksUiPreferenceConstants.PLANNING_ENDHOUR)) {
-			// event.getProperty().equals(TaskListPreferenceConstants.PLANNING_STARTDAY)
-			// scheduledStartHour =
-			// TasksUiPlugin.getDefault().getPreferenceStore().getInt(
-			// TaskListPreferenceConstants.PLANNING_STARTHOUR);
-			TaskActivityManager.getInstance()
-					.setEndHour(
-							TasksUiPlugin.getDefault().getPreferenceStore().getInt(
-									TasksUiPreferenceConstants.PLANNING_ENDHOUR));
-		}
-	}
-
 	/**
 	 * public for testing TODO: Move to TaskActivityManager
 	 */
@@ -469,16 +433,14 @@ public class TaskListManager implements IPropertyChangeListener {
 	 * public for testing TODO: Move to TaskActivityManager
 	 */
 	public void resetAndRollOver(Date startDate) {
-		TasksUiPlugin.getDefault().initTaskActivityManager();
-
 		startTime = startDate;
 		if (isTaskListInitialized()) {
-			TaskActivityManager.getInstance().reloadTimingData(startDate);
+			TasksUiPlugin.getTaskActivityManager().reloadTimingData(startDate);
 			List<InteractionEvent> events = ContextCorePlugin.getContextManager()
 					.getActivityMetaContext()
 					.getInteractionHistory();
 			for (InteractionEvent event : events) {
-				TaskActivityManager.getInstance().parseInteractionEvent(event);
+				TasksUiPlugin.getTaskActivityManager().parseInteractionEvent(event);
 			}
 		}
 		for (ITaskActivityListener listener : activityListeners) {
@@ -648,295 +610,4 @@ public class TaskListManager implements IPropertyChangeListener {
 		return handle;
 	}
 
-	/** deprecated post 2.0 *********************************************** */
-
-	/**
-	 * @deprecated use TaskActivityManager.getScheduledTasks
-	 */
-	@Deprecated
-	public Set<AbstractTask> getScheduledForThisWeek() {
-		Calendar startWeek = TaskActivityUtil.getStartOfCurrentWeek();
-		Calendar endWeek = TaskActivityUtil.getEndOfCurrentWeek();
-		return TaskActivityManager.getInstance().getScheduledTasks(startWeek, endWeek);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.isScheduledAfterThisWeek
-	 */
-	@Deprecated
-	public boolean isScheduledAfterThisWeek(AbstractTask task) {
-		return TaskActivityManager.getInstance().isScheduledAfterThisWeek(task);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.isScheduledForFuture
-	 */
-	@Deprecated
-	public boolean isScheduledForLater(AbstractTask task) {
-		return TaskActivityManager.getInstance().isScheduledForFuture(task);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.isScheduledForThisWeek
-	 */
-	@Deprecated
-	public boolean isScheduledForThisWeek(AbstractTask task) {
-		return TaskActivityManager.getInstance().isScheduledForThisWeek(task);
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager.isScheduledForToday
-	 */
-	@Deprecated
-	public boolean isScheduledForToday(AbstractTask task) {
-		return TaskActivityManager.getInstance().isScheduledForToday(task);
-	}
-
-	/**
-	 * @deprecated use TaskRepositoryManager.isOwnedBuyUser
-	 */
-	@Deprecated
-	public boolean isOwnedByUser(AbstractTask task) {
-		return TasksUiPlugin.getRepositoryManager().isOwnedByUser(task);
-	}
-
-	/**
-	 * @deprecated use ActivityManager
-	 */
-	@Deprecated
-	public void setScheduledFor(AbstractTask task, Date reminderDate) {
-		TaskActivityManager.getInstance().setScheduledFor(task, reminderDate);
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager.setDueDate
-	 */
-	@Deprecated
-	public void setDueDate(AbstractTask task, Date dueDate) {
-		TaskActivityManager.getInstance().setDueDate(task, dueDate);
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager
-	 * @return true if task due date != null and has past
-	 */
-	@Deprecated
-	public boolean isOverdue(AbstractTask task) {
-		return TaskActivityManager.getInstance().isOverdue(task);
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager.isActiveThisWeek
-	 */
-	@Deprecated
-	public boolean isActiveThisWeek(AbstractTask task) {
-		return TaskActivityManager.getInstance().isActiveThisWeek(task);
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager.isCompletedToday
-	 * @return if a repository task, will only return true if the user is a
-	 */
-	@Deprecated
-	public boolean isCompletedToday(AbstractTask task) {
-		return TaskActivityManager.getInstance().isCompletedToday(task);
-	}
-
-	@Deprecated
-	public void parseFutureReminders() {
-		// no longer required
-	}
-
-	/**
-	 * @deprecated use same method on TaskActivityManager
-	 */
-	@Deprecated
-	public long getElapsedTime(AbstractTask task) {
-		return TasksUiPlugin.getTaskActivityManager().getElapsedTime(task);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapStartOfDay
-	 */
-	@Deprecated
-	public void snapToStartOfDay(Calendar cal) {
-		TaskActivityUtil.snapStartOfDay(cal);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapStartOfHour
-	 */
-	@Deprecated
-	public void snapToStartOfHour(Calendar cal) {
-		TaskActivityUtil.snapStartOfHour(cal);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapEndOfHour
-	 */
-	@Deprecated
-	public void snapToEndOfHour(Calendar cal) {
-		TaskActivityUtil.snapEndOfHour(cal);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapEndOfDay
-	 */
-	@Deprecated
-	public void snapToEndOfDay(Calendar cal) {
-		TaskActivityUtil.snapEndOfDay(cal);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapNextDay
-	 */
-	@Deprecated
-	public void snapToNextDay(Calendar cal) {
-		TaskActivityUtil.snapNextDay(cal);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapStartOfWorkWeek
-	 */
-	@Deprecated
-	public void snapToStartOfWeek(Calendar cal) {
-		TaskActivityUtil.snapStartOfWorkWeek(cal);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapEndOfWeek
-	 */
-	@Deprecated
-	public void snapToEndOfWeek(Calendar cal) {
-		TaskActivityUtil.snapEndOfWeek(cal);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapForwardNumDays
-	 */
-	@Deprecated
-	public Calendar setSecheduledIn(Calendar calendar, int days) {
-		return TaskActivityUtil.snapForwardNumDays(calendar, days);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapEndOfWorkDay
-	 */
-	@Deprecated
-	public Calendar setScheduledEndOfDay(Calendar calendar) {
-		return TaskActivityUtil.snapEndOfWorkDay(calendar);
-	}
-
-	/**
-	 * @deprecated use TaskActivityUtil.snapNextWorkWeek
-	 */
-	@Deprecated
-	public void setScheduledNextWeek(Calendar calendar) {
-		TaskActivityUtil.snapNextWorkWeek(calendar);
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager.getDateRanges()
-	 */
-	@Deprecated
-	public List<ScheduledTaskContainer> getDateRanges() {
-		return TasksUiPlugin.getTaskActivityManager().getDateRanges();
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager.getActivityWeekDays()
-	 */
-	@Deprecated
-	public List<ScheduledTaskContainer> getActivityWeekDays() {
-		return TasksUiPlugin.getTaskActivityManager().getActivityWeekDays();
-	}
-
-	/**
-	 * @deprecated use TaskActivityManager.isWeekDay()
-	 */
-	@Deprecated
-	public boolean isWeekDay(ScheduledTaskContainer dateRangeTaskContainer) {
-		return TasksUiPlugin.getTaskActivityManager().isWeekDay(dateRangeTaskContainer);
-	}
-
-	/**
-	 * public for testing
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	public ScheduledTaskContainer getActivityThisWeek() {
-		return TasksUiPlugin.getTaskActivityManager().getActivityThisWeek();
-	}
-
-	/**
-	 * public for testing
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	public ScheduledTaskContainer getActivityPast() {
-		return TasksUiPlugin.getTaskActivityManager().getActivityPast();
-	}
-
-	/**
-	 * public for testing
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	public ScheduledTaskContainer getActivityFuture() {
-		return TasksUiPlugin.getTaskActivityManager().getActivityFuture();
-	}
-
-	/**
-	 * public for testing
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	public ScheduledTaskContainer getActivityNextWeek() {
-		return TasksUiPlugin.getTaskActivityManager().getActivityNextWeek();
-	}
-
-	/**
-	 * public for testing
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	public ScheduledTaskContainer getActivityPrevious() {
-		return TasksUiPlugin.getTaskActivityManager().getActivityPrevious();
-	}
-
-	/**
-	 * Use TaskActivityManager.getStartHour()
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	public int getStartHour() {
-		return TasksUiPlugin.getDefault().getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR);
-	}
-
-	/**
-	 * Use TaskActivityManager.scheduleNewTask()
-	 * 
-	 * @deprecated
-	 */
-	@Deprecated
-	public static void scheduleNewTask(AbstractTask newTask) {
-		newTask.setCreationDate(new Date());
-
-		Calendar newTaskSchedule = Calendar.getInstance();
-		int scheduledEndHour = TasksUiPlugin.getDefault().getPreferenceStore().getInt(
-				TasksUiPreferenceConstants.PLANNING_ENDHOUR);
-		// If past scheduledEndHour set for following day
-		if (newTaskSchedule.get(Calendar.HOUR_OF_DAY) >= scheduledEndHour) {
-			TasksUiPlugin.getTaskListManager().setSecheduledIn(newTaskSchedule, 1);
-		} else {
-			TasksUiPlugin.getTaskListManager().setScheduledEndOfDay(newTaskSchedule);
-		}
-		TasksUiPlugin.getTaskActivityManager().setScheduledFor(newTask, newTaskSchedule.getTime());
-	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
index 5f0d4cb9f..cd6f6f08f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
@@ -43,6 +43,7 @@ import org.eclipse.mylyn.internal.context.core.ContextPreferenceContstants;
 import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
 import org.eclipse.mylyn.internal.tasks.core.ScheduledTaskContainer;
 import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager;
+import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
 import org.eclipse.mylyn.internal.tasks.core.TaskDataManager;
 import org.eclipse.mylyn.internal.tasks.ui.IDynamicSubMenuContributor;
 import org.eclipse.mylyn.internal.tasks.ui.ITaskHighlighter;
@@ -326,6 +327,11 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 					reloadDataDirectory(true);
 				}
 			}
+
+			if (event.getProperty().equals(TasksUiPreferenceConstants.PLANNING_STARTHOUR)
+					|| event.getProperty().equals(TasksUiPreferenceConstants.PLANNING_ENDHOUR)) {
+				updateTaskActivityManager();
+			}
 		}
 	};
 
@@ -391,7 +397,6 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 
 				getPreferenceStore().addPropertyChangeListener(PROPERTY_LISTENER);
 				getPreferenceStore().addPropertyChangeListener(synchronizationScheduler);
-				getPreferenceStore().addPropertyChangeListener(taskListManager);
 
 				// TODO: get rid of this, hack to make decorators show
 				// up on startup
@@ -433,8 +438,9 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 
 			File taskListFile = new File(path);
 			taskListManager = new TaskListManager(taskListWriter, taskListFile);
-			taskActivityManager = TaskActivityManager.getInstance();
 			taskRepositoryManager = new TaskRepositoryManager(taskListManager.getTaskList());
+			taskActivityManager = new TaskActivityManager(taskRepositoryManager, taskListManager.getTaskList());
+			updateTaskActivityManager();
 
 			IProxyService proxyService = ProxyManager.getProxyManager();
 			IProxyChangeListener proxyChangeListener = new TasksUiProxyChangeListener(taskRepositoryManager);
@@ -461,8 +467,8 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 			taskListManager.readExistingOrCreateNewList();
 			initialized = true;
 
-			// if the taskListManager didn't initialize do it here
-			initTaskActivityManager();
+			taskActivityMonitor = new TaskActivityMonitor(taskActivityManager, ContextCorePlugin.getContextManager());
+			taskActivityMonitor.start();
 
 			saveParticipant = new ISaveParticipant() {
 
@@ -490,14 +496,15 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 		}
 	}
 
-	void initTaskActivityManager() {
-		if (!taskActivityManager.isInitialized()) {
-			taskActivityManager.init(taskRepositoryManager, taskListManager.getTaskList());
-			taskActivityManager.setEndHour(getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR));
+	private void updateTaskActivityManager() {
+		int endHour = getPreferenceStore().getInt(TasksUiPreferenceConstants.PLANNING_ENDHOUR);
+		taskActivityManager.setEndHour(endHour);
+		TaskActivityUtil.setEndHour(endHour);
 
-			taskActivityMonitor = new TaskActivityMonitor(taskActivityManager, ContextCorePlugin.getContextManager());
-			taskActivityMonitor.start();
-		}
+		// event.getProperty().equals(TaskListPreferenceConstants.PLANNING_STARTDAY)
+		// scheduledStartHour =
+		// TasksUiPlugin.getDefault().getPreferenceStore().getInt(
+		// TaskListPreferenceConstants.PLANNING_STARTHOUR);
 	}
 
 	private void loadTemplateRepositories() {
@@ -566,7 +573,6 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 			if (PlatformUI.isWorkbenchRunning()) {
 				getPreferenceStore().removePropertyChangeListener(taskListNotificationManager);
 				getPreferenceStore().removePropertyChangeListener(taskListBackupManager);
-				getPreferenceStore().removePropertyChangeListener(taskListManager);
 				getPreferenceStore().removePropertyChangeListener(synchronizationScheduler);
 				getPreferenceStore().removePropertyChangeListener(PROPERTY_LISTENER);
 				taskListManager.getTaskList().removeChangeListener(taskListSaveManager);