RESOLVED - bug 230320: [api] extract context externalization from InteractionContextManager

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

4 files changed, 7 insertions, 7 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
index 2b26a3976..6ad103070 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataExportTest.java
@@ -79,7 +79,7 @@ public class TaskDataExportTest extends AbstractContextTest {
 
 		// Save the context file and check that it exists
 		assertTrue(ContextCorePlugin.getContextStore().getContextDirectory().exists());
-		ContextCore.getContextStore().saveContext(mockContext.getHandleIdentifier());
+		ContextCorePlugin.getContextStore().saveContext(mockContext.getHandleIdentifier());
 		File taskFile = ContextCorePlugin.getContextStore().getFileForContext(task1.getHandleIdentifier());
 		assertTrue(ContextCore.getContextManager().hasContext(task1.getHandleIdentifier()));
 		assertTrue(taskFile.exists());
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 81d385ed2..33e67729f 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
@@ -81,7 +81,7 @@ public class TaskExportImportTest extends AbstractContextTest {
 		ContextCore.getContextManager().deactivateContext(mockContext.getHandleIdentifier());
 
 		assertTrue(ContextCorePlugin.getContextStore().getContextDirectory().exists());
-		ContextCore.getContextStore().saveContext(mockContext.getHandleIdentifier());
+		ContextCorePlugin.getContextStore().saveContext(mockContext.getHandleIdentifier());
 		assertTrue(ContextCore.getContextManager().hasContext(task.getHandleIdentifier()));
 
 		File outFile = new File(dest + File.separator + "local-task.xml.zip");
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentUtil.java
index 18e9bd72f..c44638cc1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AttachmentUtil.java
@@ -78,7 +78,7 @@ public class AttachmentUtil {
 	@Deprecated
 	public static boolean attachContext(AbstractAttachmentHandler attachmentHandler, TaskRepository repository,
 			ITask task, String longComment, IProgressMonitor monitor) throws CoreException {
-		ContextCore.getContextStore().saveContext(task.getHandleIdentifier());
+		ContextCorePlugin.getContextStore().saveContext(task.getHandleIdentifier());
 		final File sourceContextFile = ContextCorePlugin.getContextStore()
 				.getFileForContext(task.getHandleIdentifier());
 
@@ -108,7 +108,7 @@ public class AttachmentUtil {
 	public static boolean postContext(AbstractRepositoryConnector connector, TaskRepository repository, ITask task,
 			String comment, IProgressMonitor monitor) throws CoreException {
 		AbstractTaskAttachmentHandler attachmentHandler = connector.getTaskAttachmentHandler();
-		ContextCore.getContextStore().saveContext(task.getHandleIdentifier());
+		ContextCorePlugin.getContextStore().saveContext(task.getHandleIdentifier());
 		File file = ContextCorePlugin.getContextStore().getFileForContext(task.getHandleIdentifier());
 		if (file != null && file.exists()) {
 			FileTaskAttachmentSource attachment = new FileTaskAttachmentSource(file);
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
index ad96bda33..80f005a1a 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java
@@ -23,10 +23,10 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.mylyn.commons.net.AuthenticationCredentials;
 import org.eclipse.mylyn.commons.net.AuthenticationType;
-import org.eclipse.mylyn.context.core.ContextCore;
 import org.eclipse.mylyn.context.tests.support.TestUtil;
 import org.eclipse.mylyn.context.tests.support.TestUtil.Credentials;
 import org.eclipse.mylyn.context.tests.support.TestUtil.PrivilegeLevel;
+import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
 import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
 import org.eclipse.mylyn.internal.tasks.core.deprecated.LegacyTaskDataCollector;
@@ -277,7 +277,7 @@ public class TracRepositoryConnectorTest extends TestCase {
 
 		//int size = task.getTaskData().getAttachments().size();
 
-		File sourceContextFile = ContextCore.getContextManager().getFileForContext(task.getHandleIdentifier());
+		File sourceContextFile = ContextCorePlugin.getContextStore().getFileForContext(task.getHandleIdentifier());
 		sourceContextFile.createNewFile();
 		sourceContextFile.deleteOnExit();
 
@@ -296,7 +296,7 @@ public class TracRepositoryConnectorTest extends TestCase {
 		init(TracTestConstants.TEST_TRAC_096_URL, Version.TRAC_0_9);
 		TracTask task = (TracTask) TasksUiInternal.createTask(repository, data.attachmentTicketId + "", null);
 
-		File sourceContextFile = ContextCore.getContextManager().getFileForContext(task.getHandleIdentifier());
+		File sourceContextFile = ContextCorePlugin.getContextStore().getFileForContext(task.getHandleIdentifier());
 		sourceContextFile.createNewFile();
 		sourceContextFile.deleteOnExit();