NEW - bug 225033: [api] ensure consistent naming of API classes and methods

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

19 files changed, 37 insertions, 59 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
index 37b712a3a..3931884ef 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java
@@ -26,11 +26,9 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.ITaskFactory;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState;
-import org.eclipse.mylyn.tasks.ui.TaskFactory;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 
@@ -51,8 +49,6 @@ public abstract class AbstractBugzillaTest extends TestCase {
 
 	protected TaskList taskList;
 
-	protected ITaskFactory taskFactory;
-
 	public AbstractBugzillaTest() {
 		super();
 	}
@@ -116,8 +112,6 @@ public abstract class AbstractBugzillaTest extends TestCase {
 		assertEquals(abstractRepositoryClient.getConnectorKind(), DEFAULT_KIND);
 
 		connector = (BugzillaRepositoryConnector) abstractRepositoryClient;
-
-		taskFactory = new TaskFactory(repository);
 	}
 
 	protected BugzillaTask generateLocalTaskAndDownload(String taskNumber) throws CoreException {
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
index e9df7a41c..6c432dea2 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java
@@ -447,7 +447,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest {
 		String queryUrl = "http://mylyn.eclipse.org/bugs218/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=search-match-test&product=TestProduct&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&deadlinefrom=&deadlineto=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=";
 		BugzillaRepositoryQuery bugzillaQuery = new BugzillaRepositoryQuery(repository.getRepositoryUrl(), queryUrl, "search");
 
-		SearchHitCollector collector = new SearchHitCollector(taskList, repository, bugzillaQuery, taskFactory);
+		SearchHitCollector collector = new SearchHitCollector(taskList, repository, bugzillaQuery);
 		RepositorySearchResult result = (RepositorySearchResult) collector.getSearchResult();
 
 		// operation.run(new NullProgressMonitor());
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/StackTraceDuplicateDetector.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/StackTraceDuplicateDetector.java
index b1f240a09..92e18a6db 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/StackTraceDuplicateDetector.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/StackTraceDuplicateDetector.java
@@ -18,7 +18,6 @@ import org.eclipse.mylyn.monitor.core.StatusHandler;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector;
-import org.eclipse.mylyn.tasks.ui.TaskFactory;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
 import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
@@ -58,7 +57,7 @@ public class StackTraceDuplicateDetector extends AbstractDuplicateDetector {
 		BugzillaRepositoryQuery bugzillaQuery = new BugzillaRepositoryQuery(repository.getRepositoryUrl(), queryUrl, "search");
 
 		SearchHitCollector collector = new SearchHitCollector(TasksUi.getTaskListManager().getTaskList(),
-				repository, bugzillaQuery, new TaskFactory(repository, false, false));
+				repository, bugzillaQuery);
 		return collector;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java
index b0f92a900..cf5ef06d6 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java
@@ -332,8 +332,6 @@ public abstract class AbstractTask extends AbstractTaskContainer {
 	}
 
 	/**
-	 * API 3.0
-	 * 
 	 * @deprecated use setCompletionDate()
 	 */
 	@Deprecated
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java
index a5db7ab45..a24609369 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AttributeContainer.java
@@ -24,7 +24,7 @@ import org.eclipse.mylyn.monitor.core.StatusHandler;
  * @author Rob Elves
  * @since 2.0
  */
-// API 3.0 convert all error logging to assertions
+//API 3.0 deprecate
 public class AttributeContainer implements Serializable {
 
 	public static final String ERROR_NO_ATTRIBUTE_FACTORY = "Attribute factory not available.";
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java
index 1243c4dcf..4c07a793f 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryAttachment.java
@@ -17,6 +17,7 @@ import java.io.Serializable;
  * @author Mik Kersten
  * @since 2.0
  */
+//API 3.0 deprecate
 public class RepositoryAttachment extends AttributeContainer implements Serializable {
 
 	private static final long serialVersionUID = 2663237137799050826L;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java
index 02871a2b6..ace7805e2 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryTaskData.java
@@ -24,6 +24,7 @@ import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil;
  * @author Rob Elves
  * @since 2.0
  */
+//API 3.0 deprecate
 public final class RepositoryTaskData extends AttributeContainer implements Serializable {
 
 	private static final long serialVersionUID = 2304501248225237699L;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java
index 0b50fcdb2..37966c658 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskComment.java
@@ -16,6 +16,7 @@ import java.io.Serializable;
  * @author Rob Elves
  * @since 2.0
  */
+//API 3.0 deprecate
 public class TaskComment extends AttributeContainer implements Serializable {
 
 	private static final long serialVersionUID = 1076016406335550318L;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index 31aaf032b..14f97edec 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -170,7 +170,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 
 	private static final boolean DEBUG_HTTPCLIENT = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.mylyn.tasks.ui/debug/httpclient"));
 
-	// API 3.0 reconsider if this is necessary - move to internal class either way
+	// XXX reconsider if this is necessary
 	public static class TasksUiStartup implements IStartup {
 
 		public void earlyStartup() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
index 130c1e8ad..b2c19d67f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
@@ -12,6 +12,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.preference.JFacePreferences;
 import org.eclipse.jface.resource.JFaceResources;
@@ -68,8 +69,7 @@ public class RepositoryTextViewerConfiguration extends TextSourceViewerConfigura
 
 	public RepositoryTextViewerConfiguration(TaskRepository taskRepository, boolean spellCheck) {
 		super(EditorsUI.getPreferenceStore());
-		// API 3.0 add this check
-		//Assert.isNotNull(taskRepository);
+		Assert.isNotNull(taskRepository);
 		this.taskRepository = taskRepository;
 		this.spellCheck = spellCheck;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
index c7ee9d338..adcfa84cd 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
@@ -73,10 +73,7 @@ public abstract class AbstractRepositoryConnectorUi {
 	/**
 	 * @since 2.2
 	 */
-	// API 3.0 remove default implementation
-	public IWizard getNewTaskWizard(TaskRepository taskRepository, TaskSelection selection) {
-		return null;
-	}
+	public abstract IWizard getNewTaskWizard(TaskRepository taskRepository, TaskSelection selection);
 
 	/**
 	 * @deprecated use {@link #getNewTaskWizard(TaskRepository, TaskSelection)} instead
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
index 4974ae5ad..e93deba9c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java
@@ -211,7 +211,7 @@ import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
  * @author Xiaoyang Guan (Wiki HTML preview)
  * @since 2.0
  */
-// API 3.0 deprecate this class
+// API 3.0 deprecate
 public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
 
 	private static final String PREF_SORT_ORDER_PREFIX = "org.eclipse.mylyn.editor.comments.sortDirectionUp.";
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java
index 9e8cd4594..e3f4acf8d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskFormPage.java
@@ -88,7 +88,7 @@ import org.eclipse.ui.themes.IThemeManager;
  * @ref: PDEFormPage.class ref:
  * @ref: http://dev.eclipse.org/newslists/news.eclipse.platform.swt/msg19676.html
  */
-// API 3.0 deprecate class
+// API 3.0 deprecate
 public class TaskFormPage extends FormPage {
 
 	protected boolean isDirty;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java
index 8b4e4bbcc..18ab34c36 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/AbstractRepositoryQueryPage.java
@@ -19,7 +19,6 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylyn.tasks.core.AbstractTaskCategory;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TaskFactory;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.mylyn.tasks.ui.wizards.AbstractEditQueryWizard;
 import org.eclipse.search.ui.ISearchPage;
@@ -166,7 +165,7 @@ public abstract class AbstractRepositoryQueryPage extends WizardPage implements
 				repository.getConnectorKind());
 		if (connector != null) {
 			SearchHitCollector collector = new SearchHitCollector(TasksUi.getTaskListManager().getTaskList(),
-					repository, getQuery(), new TaskFactory(repository, false, false));
+					repository, getQuery());
 			NewSearchUI.runQueryInBackground(collector);
 		}
 		return true;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java
index afd762f0e..6a5a9fd98 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java
@@ -10,19 +10,16 @@ package org.eclipse.mylyn.tasks.ui.search;
 import java.util.HashSet;
 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.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.monitor.core.StatusHandler;
 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.ITaskFactory;
 import org.eclipse.mylyn.tasks.core.ITaskList;
 import org.eclipse.mylyn.tasks.core.RepositoryStatus;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
@@ -57,24 +54,23 @@ public class SearchHitCollector extends AbstractTaskDataCollector implements ISe
 
 	private final ITaskList taskList;
 
-	private final ITaskFactory taskFactory;
-
 	private final TaskRepository repository;
 
 	private final AbstractRepositoryQuery repositoryQuery;
 
 	private final RepositorySearchResult searchResult;
 
+	private final AbstractRepositoryConnector connector;
+
 	/**
 	 * @since 3.0
 	 */
-	public SearchHitCollector(ITaskList tasklist, TaskRepository repository, AbstractRepositoryQuery repositoryQuery,
-			ITaskFactory taskFactory) {
+	public SearchHitCollector(ITaskList tasklist, TaskRepository repository, AbstractRepositoryQuery repositoryQuery) {
 		this.taskList = tasklist;
 		this.repository = repository;
 		this.repositoryQuery = repositoryQuery;
+		this.connector = TasksUi.getRepositoryManager().getRepositoryConnector(repository.getConnectorKind());
 		this.searchResult = new RepositorySearchResult(this);
-		this.taskFactory = taskFactory;
 	}
 
 	public void aboutToStart() {
@@ -104,21 +100,13 @@ public class SearchHitCollector extends AbstractTaskDataCollector implements ISe
 
 	@Override
 	public void accept(RepositoryTaskData taskData) {
-		if (taskData == null) {
-			throw new IllegalArgumentException();
-		}
-
-		AbstractTask task;
-		try {
-			task = taskFactory.createTask(taskData, new SubProgressMonitor(new NullProgressMonitor(), 1));
-			if (task != null) {
-				taskResults.add(task);
-				this.searchResult.addMatch(new Match(task, 0, 0));
-			}
-		} catch (CoreException e) {
-			// FIXME
-			e.printStackTrace();
+		AbstractTask task = taskList.getTask(repository.getRepositoryUrl(), taskData.getTaskId());
+		if (task == null) {
+			task = connector.createTask(taskData.getRepositoryUrl(), taskData.getTaskId(), "");
+			connector.updateTaskFromTaskData(repository, task, taskData);
 		}
+		taskResults.add(task);
+		this.searchResult.addMatch(new Match(task, 0, 0));
 	}
 
 	public String getLabel() {
@@ -135,8 +123,8 @@ public class SearchHitCollector extends AbstractTaskDataCollector implements ISe
 
 	public ISearchResult getSearchResult() {
 		if (searchResult.getMatchCount() >= AbstractTaskDataCollector.MAX_HITS) {
-			StatusHandler.displayStatus("Maximum hits reached", RepositoryStatus.createStatus(repository.getRepositoryUrl(),
-					IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, LABEL_MAX_HITS_REACHED));
+			StatusHandler.displayStatus("Maximum hits reached", RepositoryStatus.createStatus(
+					repository.getRepositoryUrl(), IStatus.WARNING, TasksUiPlugin.ID_PLUGIN, LABEL_MAX_HITS_REACHED));
 		}
 		return searchResult;
 	}
diff --git a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
index da815367a..41775499f 100644
--- a/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
+++ b/org.eclipse.mylyn.trac.core/src/org/eclipse/mylyn/internal/trac/core/TracRepositoryConnector.java
@@ -262,7 +262,11 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 
 		task.setSummary(taskData.getSummary());
 		task.setOwner(taskData.getAttributeValue(RepositoryTaskAttribute.USER_ASSIGNED));
-		task.setCompleted(TracTask.isCompleted(taskData.getStatus()));
+		if (TracTask.isCompleted(taskData.getStatus())) {
+			task.setCompletionDate(TracUtils.parseDate(Integer.valueOf(taskData.getLastModified())));
+		} else {
+			task.setCompletionDate(null);
+		}
 		task.setUrl(taskRepository.getRepositoryUrl() + ITracClient.TICKET_URL + taskData.getTaskId());
 
 		String priority = taskData.getAttributeValue(Attribute.PRIORITY.getTracKey());
@@ -273,7 +277,6 @@ public class TracRepositoryConnector extends AbstractRepositoryConnector {
 		task.setTaskKind((kind != null) ? kind.toString() : null);
 
 		tracTask.setSupportsSubtasks(taskDataHandler.canInitializeSubTaskData(null, taskData));
-		// TODO: Completion Date
 
 		// TODO check return value
 		return false;
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
index 55684b7a9..402c67cc5 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/RepositorySearchQueryTest.java
@@ -23,7 +23,6 @@ import org.eclipse.mylyn.internal.trac.core.ITracClient.Version;
 import org.eclipse.mylyn.internal.trac.core.model.TracSearch;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.TaskFactory;
 import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
 import org.eclipse.mylyn.trac.tests.support.TestFixture;
 import org.eclipse.mylyn.trac.tests.support.XmlRpcServer.TestData;
@@ -77,7 +76,7 @@ public class RepositorySearchQueryTest extends TestCase {
 		String queryUrl = repository.getRepositoryUrl() + ITracClient.QUERY_URL + search.toUrl();
 		TracRepositoryQuery query = new TracRepositoryQuery(repository.getRepositoryUrl(), queryUrl, "description");
 		SearchHitCollector collector = new SearchHitCollector(TasksUiPlugin.getTaskListManager().getTaskList(),
-				repository, query, new TaskFactory(repository, false, false));
+				repository, query);
 
 		collector.run(new NullProgressMonitor());
 		for (AbstractTask task : collector.getTasks()) {
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 c1f169593..8b75662ab 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
@@ -40,11 +40,10 @@ import org.eclipse.mylyn.internal.trac.core.model.TracVersion;
 import org.eclipse.mylyn.internal.trac.ui.wizard.TracRepositorySettingsPage;
 import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector;
 import org.eclipse.mylyn.tasks.core.AbstractTask;
-import org.eclipse.mylyn.tasks.core.QueryHitCollector;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.core.TaskRepositoryLocationFactory;
-import org.eclipse.mylyn.tasks.ui.TaskFactory;
+import org.eclipse.mylyn.tasks.core.data.AbstractTaskDataCollector;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.mylyn.trac.tests.support.TestFixture;
@@ -204,7 +203,6 @@ public class TracRepositoryConnectorTest extends TestCase {
 		performQuery(TracTestConstants.TEST_TRAC_096_URL, Version.TRAC_0_9);
 	}
 
-	@SuppressWarnings("deprecation")
 	protected void performQuery(String url, Version version) {
 		init(url, version);
 
@@ -218,7 +216,7 @@ public class TracRepositoryConnectorTest extends TestCase {
 
 		//MultiStatus queryStatus = new MultiStatus(TracUiPlugin.PLUGIN_ID, IStatus.OK, "Query result", null);
 		final List<RepositoryTaskData> result = new ArrayList<RepositoryTaskData>();
-		QueryHitCollector hitCollector = new QueryHitCollector(new TaskFactory(repository)) {
+		AbstractTaskDataCollector hitCollector = new AbstractTaskDataCollector() {
 			@Override
 			public void accept(RepositoryTaskData hit) {
 				result.add(hit);
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
index 52c92e9b8..2c3cad1c7 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
@@ -17,7 +17,6 @@ import org.eclipse.mylyn.internal.trac.core.model.TracSearch;
 import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter;
 import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter.CompareOperator;
 import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute;
-import org.eclipse.mylyn.tasks.ui.TaskFactory;
 import org.eclipse.mylyn.tasks.ui.TasksUi;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractNewRepositoryTaskEditor;
 import org.eclipse.mylyn.tasks.ui.search.SearchHitCollector;
@@ -58,10 +57,11 @@ public class NewTracTaskEditor extends AbstractNewRepositoryTaskEditor {
 		sb.append(ITracClient.QUERY_URL);
 		sb.append(search.toUrl());
 
-		TracRepositoryQuery query = new TracRepositoryQuery(repository.getRepositoryUrl(), sb.toString(), "<Duplicate Search>");
+		TracRepositoryQuery query = new TracRepositoryQuery(repository.getRepositoryUrl(), sb.toString(),
+				"<Duplicate Search>");
 
-		SearchHitCollector collector = new SearchHitCollector(TasksUi.getTaskListManager().getTaskList(),
-				repository, query, new TaskFactory(repository, false, false));
+		SearchHitCollector collector = new SearchHitCollector(TasksUi.getTaskListManager().getTaskList(), repository,
+				query);
 		return collector;
 	}