NEW - bug 230099: [api] merge IInteractionContextListener and IInteractionContextListener2

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

4 files changed, 33 insertions, 34 deletions

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 461a5ee8a..1b19ba941 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
@@ -15,6 +15,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.mylyn.context.core.ContextCore;
 import org.eclipse.mylyn.context.core.IInteractionContextManager;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.context.ui.TaskListInterestFilter;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
 import org.eclipse.mylyn.internal.tasks.core.DateRange;
@@ -30,7 +31,7 @@ public class ScheduledPresentationTest extends TestCase {
 
 	@Override
 	protected void setUp() throws Exception {
-		ContextCore.getContextManager().getActivityMetaContext().reset();
+		ContextCorePlugin.getContextManager().getActivityMetaContext().reset();
 		ContextCore.getContextManager().saveActivityContext();
 		TasksUiPlugin.getTaskListManager().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 8638fde85..3bb3f5175 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
@@ -48,14 +48,14 @@ public class TaskActivityTimingTest extends TestCase {
 		super.setUp();
 		activityManager = TasksUi.getTaskActivityManager();
 		taskList = TasksUiInternal.getTaskList();
-		ContextCore.getContextManager().getActivityMetaContext().reset();
+		ContextCorePlugin.getContextManager().getActivityMetaContext().reset();
 		ContextCore.getContextManager().saveActivityContext();
 		TasksUiPlugin.getTaskActivityMonitor().reloadActivityTime();
 	}
 
 	@Override
 	protected void tearDown() throws Exception {
-		ContextCore.getContextManager().getActivityMetaContext().reset();
+		ContextCorePlugin.getContextManager().getActivityMetaContext().reset();
 		TasksUiPlugin.getTaskListManager().resetTaskList();
 		TasksUiPlugin.getTaskListManager().saveTaskList();
 		super.tearDown();
@@ -123,9 +123,9 @@ public class TaskActivityTimingTest extends TestCase {
 				task1.getHandleIdentifier(), "originId", "navigatedRelation",
 				IInteractionContextManager.ACTIVITY_DELTA_ADDED, 2f, start2.getTime(), end2.getTime());
 
-		ContextCore.getContextManager().getActivityMetaContext().parseEvent(event1);
+		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
 		TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event1, false);
-		ContextCore.getContextManager().getActivityMetaContext().parseEvent(event2);
+		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
 		TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event2, false);
 
 		long expectedTotalTime = end.getTime().getTime() - start.getTime().getTime();
@@ -286,8 +286,7 @@ public class TaskActivityTimingTest extends TestCase {
 	}
 
 	public void testActivityNotLoggedTwice() {
-
-		InteractionContext metaContext = ContextCore.getContextManager().getActivityMetaContext();
+		InteractionContext metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		metaContext.reset();
 		assertEquals(0, metaContext.getInteractionHistory().size());
 
@@ -362,20 +361,20 @@ public class TaskActivityTimingTest extends TestCase {
 					IInteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
 					IInteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, startTime.getTime(), endTime.getTime());
 
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(event1);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event1, false);
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(activityEvent1, false);
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(event2);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event2, false);
 
 			long elapsed = TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1);
 			assertEquals(10000, elapsed);
 
 			// 2nd activation - no activity
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(event1);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event1, false);
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(event2);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event2, false);
 
 			elapsed = TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1);
@@ -409,18 +408,18 @@ public class TaskActivityTimingTest extends TestCase {
 					IInteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
 					IInteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, startTime2.getTime(), endTime2.getTime());
 
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(event1);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event1, false);
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(activityEvent1, false);
-			ContextCore.getContextManager().getActivityMetaContext().parseEvent(event2);
+			ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
 			TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event2, false);
 		}
 
 		assertEquals(26000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 
-		ContextCore.getContextManager().saveActivityContext();
-		ContextCore.getContextManager().loadActivityMetaContext();
+		ContextCorePlugin.getContextManager().saveActivityContext();
+		ContextCorePlugin.getContextManager().loadActivityMetaContext();
 		TasksUiPlugin.getTaskActivityMonitor().reloadActivityTime();
 
 		assertEquals(26000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
@@ -447,11 +446,11 @@ public class TaskActivityTimingTest extends TestCase {
 				IInteractionContextManager.ACTIVITY_ORIGINID_WORKBENCH, null,
 				IInteractionContextManager.ACTIVITY_DELTA_ADDED, 1f, startTime.getTime(), endTime.getTime());
 
-		ContextCore.getContextManager().getActivityMetaContext().parseEvent(event1);
+		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event1);
 		TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event1, false);
-		ContextCore.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
+		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(activityEvent1);
 		TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(activityEvent1, false);
-		ContextCore.getContextManager().getActivityMetaContext().parseEvent(event2);
+		ContextCorePlugin.getContextManager().getActivityMetaContext().parseEvent(event2);
 		TasksUiPlugin.getTaskActivityMonitor().parseInteractionEvent(event2, false);
 		assertEquals(20000, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 
@@ -558,7 +557,7 @@ public class TaskActivityTimingTest extends TestCase {
 
 		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskList().addTask(task1);
-		InteractionContext metaContext = ContextCore.getContextManager().getActivityMetaContext();
+		InteractionContext metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		metaContext.reset();
 		assertEquals(0, metaContext.getInteractionHistory().size());
 
@@ -582,8 +581,8 @@ public class TaskActivityTimingTest extends TestCase {
 		assertEquals(4, ContextCore.getContextManager().getActivityMetaContext().getInteractionHistory().size());
 
 		TasksUiPlugin.getTaskListManager().saveTaskList();
-		ContextCore.getContextManager().saveActivityContext();
-		ContextCore.getContextManager().getActivityMetaContext().reset();
+		ContextCorePlugin.getContextManager().saveActivityContext();
+		ContextCorePlugin.getContextManager().getActivityMetaContext().reset();
 		assertEquals(0, ContextCore.getContextManager().getActivityMetaContext().getInteractionHistory().size());
 		ContextCore.getContextManager().loadActivityMetaContext();
 
@@ -760,7 +759,7 @@ public class TaskActivityTimingTest extends TestCase {
 		AbstractTask task1 = new LocalTask("task 1", "Task 1");
 		TasksUiPlugin.getTaskList().addTask(task1);
 		TasksUiPlugin.getTaskListManager().activateTask(task1);
-		InteractionContext metaContext = ContextCore.getContextManager().getActivityMetaContext();
+		InteractionContext metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		metaContext.reset();
 		assertEquals(0, metaContext.getInteractionHistory().size());
 
@@ -794,7 +793,7 @@ public class TaskActivityTimingTest extends TestCase {
 		assertEquals(4, ContextCore.getContextManager().getActivityMetaContext().getInteractionHistory().size());
 		TasksUiPlugin.getTaskListManager().saveTaskList();
 		ContextCore.getContextManager().saveActivityContext();
-		ContextCore.getContextManager().getActivityMetaContext().reset();
+		ContextCorePlugin.getContextManager().getActivityMetaContext().reset();
 		assertEquals(0, ContextCore.getContextManager().getActivityMetaContext().getInteractionHistory().size());
 		TasksUiPlugin.getTaskActivityMonitor().reloadActivityTime();
 		assertEquals(0, activityManager.getElapsedTime(task1));
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 9c9086c20..ae1d51be9 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
@@ -11,6 +11,7 @@ import java.io.File;
 
 import org.eclipse.mylyn.context.core.ContextCore;
 import org.eclipse.mylyn.context.tests.AbstractContextTest;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.tasks.ui.TaskListManager;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizard;
@@ -53,7 +54,7 @@ public class TaskDataImportTest extends AbstractContextTest {
 
 		// make correct number of categories exist prior to import tests
 		assertEquals(1, manager.getTaskList().getTaskContainers().size());
-		ContextCore.getContextManager().getActivityMetaContext().reset();
+		ContextCorePlugin.getContextManager().getActivityMetaContext().reset();
 	}
 
 	@Override
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 2771a6571..42ad18480 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
@@ -25,14 +25,15 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.mylyn.context.core.ContextCore;
 import org.eclipse.mylyn.context.core.IInteractionContextManager;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.context.core.InteractionContext;
-import org.eclipse.mylyn.internal.tasks.core.ITaskList;
-import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTaskCategory;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.internal.tasks.core.ITaskList;
 import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector;
 import org.eclipse.mylyn.internal.tasks.core.LocalTask;
+import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
 import org.eclipse.mylyn.internal.tasks.core.TaskActivityUtil;
 import org.eclipse.mylyn.internal.tasks.core.TaskCategory;
 import org.eclipse.mylyn.internal.tasks.core.TaskList;
@@ -210,10 +211,7 @@ public class TaskListManagerTest extends TestCase {
 		runRepositoryUrlOperation("http://foo.bar", "http://bar.baz");
 		assertTrue(manager.getTaskList().getRepositoryQueries("http://foo.bar").size() == 0);
 		assertTrue(manager.getTaskList().getRepositoryQueries("http://bar.baz").size() > 0);
-		IRepositoryQuery changedQuery = manager.getTaskList()
-				.getRepositoryQueries("http://bar.baz")
-				.iterator()
-				.next();
+		IRepositoryQuery changedQuery = manager.getTaskList().getRepositoryQueries("http://bar.baz").iterator().next();
 		assertEquals("http://bar.baz/b", changedQuery.getUrl());
 	}
 
@@ -297,7 +295,7 @@ public class TaskListManagerTest extends TestCase {
 		endDate2.add(Calendar.MINUTE, 25);
 
 		ContextCore.getContextManager().resetActivityHistory();
-		InteractionContext metaContext = ContextCore.getContextManager().getActivityMetaContext();
+		InteractionContext metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		assertEquals(0, metaContext.getInteractionHistory().size());
 
 		ContextCore.getContextManager().processActivityMetaContextEvent(
@@ -316,7 +314,7 @@ public class TaskListManagerTest extends TestCase {
 		assertEquals(60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task1));
 		assertEquals(2 * 60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(task2));
 		runRepositoryUrlOperation(firstUrl, secondUrl);
-		metaContext = ContextCore.getContextManager().getActivityMetaContext();
+		metaContext = ContextCorePlugin.getContextManager().getActivityMetaContext();
 		assertEquals(2, metaContext.getInteractionHistory().size());
 		assertEquals(60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(new MockTask(secondUrl, "1")));
 		assertEquals(2 * 60 * 1000 * 5, TasksUiPlugin.getTaskActivityManager().getElapsedTime(