NEW - bug 193842: [api] review Mylyn 2.0 APIs

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

7 files changed, 80 insertions, 80 deletions

diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java
index 903a1a5e4..eff0c3627 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java
@@ -62,18 +62,18 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 
 	public void testHasIncoming() {
 		AbstractTask task = new MockRepositoryTask(MOCCK_ID);
-		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), connector.getRepositoryType(),
+		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), connector.getConnectorKind(),
 				MockRepositoryConnector.REPOSITORY_URL, MOCCK_ID);
-		task.setLastSyncDateStamp("never");
+		task.setLastReadTimeStamp("never");
 
 		assertTrue(TasksUiPlugin.getSynchronizationManager().checkHasIncoming(task, taskData));
 		taskData.setAttributeValue(RepositoryTaskAttribute.DATE_MODIFIED, "2006-06-21 15:29:39");
 		assertTrue(TasksUiPlugin.getSynchronizationManager().checkHasIncoming(task, taskData));
 		taskData.setAttributeValue(RepositoryTaskAttribute.DATE_MODIFIED, DATE_STAMP_1);
 		assertTrue(TasksUiPlugin.getSynchronizationManager().checkHasIncoming(task, taskData));
-		task.setLastSyncDateStamp("2006-06-21 15:29:39");
+		task.setLastReadTimeStamp("2006-06-21 15:29:39");
 		assertTrue(TasksUiPlugin.getSynchronizationManager().checkHasIncoming(task, taskData));
-		task.setLastSyncDateStamp(DATE_STAMP_1);
+		task.setLastReadTimeStamp(DATE_STAMP_1);
 		assertFalse(TasksUiPlugin.getSynchronizationManager().checkHasIncoming(task, taskData));
 	}
 
@@ -90,32 +90,32 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 				RepositoryTaskSyncState.INCOMING);
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(
 				task.getRepositoryUrl(), task.getTaskId());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
 		assertEquals(DATE_STAMP_2, newData.getLastModified());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
 		// TasksUiPlugin.getSynchronizationManager().setTaskRead(task, true);
 		// assertEquals(DATE_STAMP_2, task.getLastSyncDateStamp());
 		// and again...
 
 		RepositoryTaskData taskData3 = new RepositoryTaskData(new MockAttributeFactory(),
-				connector.getRepositoryType(), MockRepositoryConnector.REPOSITORY_URL, "1");
+				connector.getConnectorKind(), MockRepositoryConnector.REPOSITORY_URL, "1");
 		taskData3.setAttributeValue(RepositoryTaskAttribute.DATE_MODIFIED, DATE_STAMP_3);
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, taskData3, false);
 		// last modified stamp not updated until user synchronizes (newdata ==
 		// olddata)
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId());
 		assertEquals(DATE_STAMP_3, taskData.getLastModified());
 
 		// Should keep INCOMING state state since new data has same date samp
 		// and sych is not forced.
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, taskData3, false);
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId());
 		assertEquals(DATE_STAMP_3, taskData.getLastModified());
 	}
@@ -127,26 +127,26 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 		// if new data has same date stamp as old data.
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 
 		task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING, RepositoryTaskSyncState.SYNCHRONIZED);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true);
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
 		// assertEquals(RepositoryTaskSyncState.SYNCHRONIZED,
 		// task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 
 		// Test forced with remote incoming
 		// Update: bug#163850 - synchronize gets new data but doesn't mark
 		// synchronized
 		task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING, RepositoryTaskSyncState.INCOMING);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true);
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
 
 	}
 
@@ -185,9 +185,9 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	public void testSynchronizedToIncoming() {
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.INCOMING);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId());
 		assertEquals(DATE_STAMP_2, taskData.getLastModified());
 		// assertEquals(DATE_STAMP_2, task.getLastModifiedDateStamp());
@@ -196,10 +196,10 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	public void testSynchronizedToSynchronized() {
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.SYNCHRONIZED);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
-		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 	}
 
 	/*
@@ -209,7 +209,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 	public void testSynchronizedToOutgoing() {
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.SYNCHRONIZED);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId());
 
@@ -218,22 +218,22 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 		HashSet<RepositoryTaskAttribute> changed = new HashSet<RepositoryTaskAttribute>();
 		changed.add(taskData.getAttribute(RepositoryTaskAttribute.COMMENT_NEW));
 		TasksUiPlugin.getSynchronizationManager().saveOutgoing(task, changed);
-		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSynchronizationState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 	}
 
 	public void testConflictToConflict() {
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.CONFLICT,
 				RepositoryTaskSyncState.INCOMING);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true);
-		assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSyncState());
+		assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSynchronizationState());
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(
 				task.getRepositoryUrl(), task.getTaskId());
 
 		assertEquals(DATE_STAMP_2, taskData.getLastModified());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true);
-		assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSyncState());
+		assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSynchronizationState());
 		taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId());
 		assertEquals(DATE_STAMP_2, taskData.getLastModified());
 	}
@@ -258,10 +258,10 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 				RepositoryTaskSyncState.INCOMING);
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId());
 
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
-		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSyncState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
+		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSynchronizationState());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true);
-		assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSyncState());
+		assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSynchronizationState());
 		taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId());
 
 		assertEquals(DATE_STAMP_2, taskData.getLastModified());
@@ -273,39 +273,39 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true);
-		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSynchronizationState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 	}
 
 	public void testOutgoingToOutgoing() {
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 		TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false);
-		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSyncState());
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
+		assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSynchronizationState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
 	}
 
 	public void testMarkRead() {
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING,
 				RepositoryTaskSyncState.SYNCHRONIZED);
-		task.setLastSyncDateStamp(null);
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
+		task.setLastReadTimeStamp(null);
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
 		TasksUiPlugin.getSynchronizationManager().setTaskRead(task, true);
-		assertEquals(DATE_STAMP_1, task.getLastSyncDateStamp());
-		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSyncState());
+		assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp());
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState());
 	}
 
 	public void testMarkUnread() {
 		AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.SYNCHRONIZED,
 				RepositoryTaskSyncState.SYNCHRONIZED);
-		task.setLastSyncDateStamp(null);
-		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSyncState());
+		task.setLastReadTimeStamp(null);
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState());
 		TasksUiPlugin.getSynchronizationManager().setTaskRead(task, false);
-		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSyncState());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState());
 	}
 
 	public void testClearOutgoing() {
@@ -326,7 +326,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 
 		TasksUiPlugin.getSynchronizationManager().discardOutgoing(task);
 
-		assertTrue(task.getSyncState().equals(RepositoryTaskSyncState.SYNCHRONIZED));
+		assertTrue(task.getSynchronizationState().equals(RepositoryTaskSyncState.SYNCHRONIZED));
 		RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId());
 		assertEquals("", taskData.getNewComment());
 
@@ -417,12 +417,12 @@ public class RepositoryTaskSynchronizationTest extends TestCase {
 		RepositoryTaskData taskData = null;
 		AbstractTask task = new MockRepositoryTask(MOCCK_ID);
 
-		taskData = new RepositoryTaskData(new MockAttributeFactory(), connector.getRepositoryType(), MockRepositoryConnector.REPOSITORY_URL, MOCCK_ID);
+		taskData = new RepositoryTaskData(new MockAttributeFactory(), connector.getConnectorKind(), MockRepositoryConnector.REPOSITORY_URL, MOCCK_ID);
 		taskData.setAttributeValue(RepositoryTaskAttribute.DATE_MODIFIED, DATE_STAMP_1);
-		task.setLastSyncDateStamp(DATE_STAMP_1);
-		task.setSyncState(localState);
+		task.setLastReadTimeStamp(DATE_STAMP_1);
+		task.setSynchronizationState(localState);
 		TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData);
-		newData = new RepositoryTaskData(new MockAttributeFactory(), connector.getRepositoryType(), MockRepositoryConnector.REPOSITORY_URL, MOCCK_ID);
+		newData = new RepositoryTaskData(new MockAttributeFactory(), connector.getConnectorKind(), MockRepositoryConnector.REPOSITORY_URL, MOCCK_ID);
 
 		switch (remoteState) {
 		case CONFLICT:
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 91df4171a..15d4c43ba 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
@@ -188,13 +188,13 @@ public class TaskListManagerTest extends TestCase {
 		manager.getTaskList().addTask(task);
 		manager.getTaskList().addTask(task2);
 
-		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), task.getRepositoryKind(),
+		RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), task.getConnectorKind(),
 				task.getRepositoryUrl(), task.getTaskId(), task.getTaskKind());
 		TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData);
 		assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(),
 				task.getTaskId()));
 
-		RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), task2.getRepositoryKind(),
+		RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), task2.getConnectorKind(),
 				task2.getRepositoryUrl(), task2.getTaskId(), task2.getTaskKind());
 		taskData2.setNewComment("TEST");
 		TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData2);
@@ -479,7 +479,7 @@ public class TaskListManagerTest extends TestCase {
 	
 	public void testCreateAndMove() {
 		MockRepositoryTask repositoryTask = new MockRepositoryTask("1");
-		repositoryTask.setKind("kind");
+		repositoryTask.setTaskKind("kind");
 		manager.getTaskList().addTask(repositoryTask, manager.getTaskList().getDefaultCategory());
 		assertEquals(0, manager.getTaskList().getArchiveContainer().getChildren().size());
 		assertEquals(1, manager.getTaskList().getDefaultCategory().getChildren().size());
@@ -493,7 +493,7 @@ public class TaskListManagerTest extends TestCase {
 
 	public void testArchiveRepositoryTaskExternalization() {
 		MockRepositoryTask repositoryTask = new MockRepositoryTask("1");
-		repositoryTask.setKind("kind");
+		repositoryTask.setTaskKind("kind");
 		manager.getTaskList().addTask(repositoryTask);
 		assertEquals(1, manager.getTaskList().getArchiveContainer().getChildren().size());
 		assertEquals(0, manager.getTaskList().getDefaultCategory().getChildren().size());
@@ -821,15 +821,15 @@ public class TaskListManagerTest extends TestCase {
 		String repositoryUrl = "http://mylar.eclipse.org/bugs222";
 		MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl, "1");
 		MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl, "2");
-		task1.setSyncState(RepositoryTaskSyncState.INCOMING);
-		task2.setSyncState(RepositoryTaskSyncState.INCOMING);
+		task1.setSynchronizationState(RepositoryTaskSyncState.INCOMING);
+		task2.setSynchronizationState(RepositoryTaskSyncState.INCOMING);
 		List<AbstractTaskContainer> elements = new ArrayList<AbstractTaskContainer>();
 		elements.add(task1);
 		elements.add(task2);
 		MarkTaskReadAction readAction = new MarkTaskReadAction(elements);
 		readAction.run();
-		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task1.getSyncState());
-		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task2.getSyncState());
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task1.getSynchronizationState());
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task2.getSynchronizationState());
 
 		manager.getTaskList().reset();
 		MockRepositoryTask hit1 = new MockRepositoryTask("1");
@@ -847,7 +847,7 @@ public class TaskListManagerTest extends TestCase {
 		for (AbstractTaskContainer element : query.getChildren()) {
 			if (element instanceof MockRepositoryTask) {
 				MockRepositoryTask mockTask = (MockRepositoryTask) element;
-				assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, mockTask.getSyncState());
+				assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, mockTask.getSynchronizationState());
 			}
 		}
 
@@ -857,15 +857,15 @@ public class TaskListManagerTest extends TestCase {
 		String repositoryUrl = "http://mylar.eclipse.org/bugs222";
 		MockRepositoryTask task1 = new MockRepositoryTask(repositoryUrl, "1");
 		MockRepositoryTask task2 = new MockRepositoryTask(repositoryUrl, "2");
-		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task1.getSyncState());
-		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task2.getSyncState());
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task1.getSynchronizationState());
+		assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task2.getSynchronizationState());
 		List<AbstractTaskContainer> elements = new ArrayList<AbstractTaskContainer>();
 		elements.add(task1);
 		elements.add(task2);
 		MarkTaskUnreadAction unreadAction = new MarkTaskUnreadAction(elements);
 		unreadAction.run();
-		assertEquals(RepositoryTaskSyncState.INCOMING, task1.getSyncState());
-		assertEquals(RepositoryTaskSyncState.INCOMING, task2.getSyncState());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task1.getSynchronizationState());
+		assertEquals(RepositoryTaskSyncState.INCOMING, task2.getSynchronizationState());
 
 		manager.getTaskList().reset();
 		MockRepositoryTask hit1 = new MockRepositoryTask("1");
@@ -883,7 +883,7 @@ public class TaskListManagerTest extends TestCase {
 		for (AbstractTaskContainer element : query.getChildren()) {
 			if (element instanceof MockRepositoryTask) {
 				MockRepositoryTask mockTask = (MockRepositoryTask) element;
-				assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, mockTask.getSyncState());
+				assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, mockTask.getSynchronizationState());
 			} else {
 				fail();
 			}
@@ -895,7 +895,7 @@ public class TaskListManagerTest extends TestCase {
 		for (AbstractTaskContainer element : query.getChildren()) {
 			if (element instanceof MockRepositoryTask) {
 				MockRepositoryTask mockTask = (MockRepositoryTask) element;
-				assertEquals(RepositoryTaskSyncState.INCOMING, mockTask.getSyncState());
+				assertEquals(RepositoryTaskSyncState.INCOMING, mockTask.getSynchronizationState());
 			} else {
 				fail();
 			}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
index 4b7e50e5d..df7b172ca 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
@@ -85,7 +85,7 @@ public class TaskRepositoryManagerTest extends TestCase {
 	public void testConnectorAddition() {
 		AbstractRepositoryConnector connector = new MockRepositoryConnector();
 		manager.addRepositoryConnector(connector);
-		assertNotNull(manager.getRepositoryConnector(connector.getRepositoryType()));
+		assertNotNull(manager.getRepositoryConnector(connector.getConnectorKind()));
 	}
 
 	public void testRepositoryPersistance() throws MalformedURLException {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java
index bc58b8bde..3834f381a 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttachmentHandler.java
@@ -15,8 +15,8 @@ import java.io.OutputStream;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.mylyn.tasks.core.AbstractAttachmentHandler;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
 import org.eclipse.mylyn.tasks.core.ITaskAttachment;
 import org.eclipse.mylyn.tasks.core.RepositoryAttachment;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
@@ -24,7 +24,7 @@ import org.eclipse.mylyn.tasks.core.TaskRepository;
 /**
  * @author Steffen Pingel
  */
-public class MockAttachmentHandler implements IAttachmentHandler {
+public class MockAttachmentHandler extends AbstractAttachmentHandler {
 
 	private byte[] data;
 
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java
index 1183b35a8..38ae94fe2 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockAttributeFactory.java
@@ -22,7 +22,7 @@ public class MockAttributeFactory extends AbstractAttributeFactory {
 	private static final long serialVersionUID = 7713746838934802731L;
 
 	@Override
-	public boolean getIsHidden(String key) {
+	public boolean isHidden(String key) {
 		// ignore
 		return false;
 	}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
index 381eb8e83..9a42de18d 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
@@ -17,13 +17,13 @@ import java.util.Set;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.mylyn.tasks.core.AbstractAttachmentHandler;
 import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.IAttachmentHandler;
-import org.eclipse.mylyn.tasks.core.ITaskCollector;
 import org.eclipse.mylyn.tasks.core.AbstractTaskDataHandler;
+import org.eclipse.mylyn.tasks.core.ITaskCollector;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 
@@ -37,7 +37,7 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector {
 
 	public static final String REPOSITORY_URL = "http://mockrepository.test";
 
-	private IAttachmentHandler attachmentHandler;
+	private AbstractAttachmentHandler attachmentHandler;
 
 	@Override
 	public boolean canCreateNewTask(TaskRepository repository) {
@@ -52,7 +52,7 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector {
 	}
 
 	@Override
-	public IAttachmentHandler getAttachmentHandler() {
+	public AbstractAttachmentHandler getAttachmentHandler() {
 		return attachmentHandler;
 	}
 
@@ -101,7 +101,7 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector {
 	}
 
 	@Override
-	public String getRepositoryType() {
+	public String getConnectorKind() {
 		return REPOSITORY_KIND;
 	}
 
@@ -118,7 +118,7 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector {
 	}
 
 	@Override
-	public String getTaskWebUrl(String repositoryUrl, String taskId) {
+	public String getTaskUrl(String repositoryUrl, String taskId) {
 		return null;
 	}
 
@@ -159,7 +159,7 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector {
 		return null;
 	}
 
-	public void setAttachmentHandler(IAttachmentHandler attachmentHandler) {
+	public void setAttachmentHandler(AbstractAttachmentHandler attachmentHandler) {
 		this.attachmentHandler = attachmentHandler;
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
index 4a87c9823..7f5b2ff71 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryTask.java
@@ -33,7 +33,7 @@ public class MockRepositoryTask extends AbstractTask {
 	}
 	
 	@Override
-	public String getRepositoryKind() {
+	public String getConnectorKind() {
 		return "mock";
 	}