NEW - bug 165581: Improve Open Correspond Task action

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

47 files changed, 223 insertions, 273 deletions

diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
index f3d51b8ce..de65dcc6e 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java
@@ -18,7 +18,7 @@ import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylar.internal.bugzilla.core.NewBugzillaReport;
 import org.eclipse.mylar.internal.bugzilla.ui.editor.NewBugzillaTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.editors.NewTaskEditorInput;
 import org.eclipse.mylar.tasks.core.TaskRepository;
@@ -50,7 +50,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -68,7 +68,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -89,7 +89,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -118,7 +118,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -146,7 +146,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -170,7 +170,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -193,7 +193,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -218,7 +218,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
@@ -242,7 +242,7 @@ public class DuplicateDetetionTest extends TestCase {
 		model.setHasLocalChanges(true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		NewTaskEditorInput input = new NewTaskEditorInput(repository, model);
-		TaskUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(input, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		NewBugzillaTaskEditor editor = (NewBugzillaTaskEditor) taskEditor.getActivePageInstance();
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
index df5fe70d1..866b2d434 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java
@@ -15,7 +15,7 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaCorePlugin;
 import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylar.internal.bugzilla.core.NewBugzillaReport;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.editors.AbstractRepositoryTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.editors.NewTaskEditorInput;
@@ -59,7 +59,7 @@ public class TaskEditorTest extends TestCase {
 				.getTaskDataManager().getNewRepositoryTaskId());
 		NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, model);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		TaskUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 		assertTrue(page.getActiveEditor() instanceof MylarTaskEditor);
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
 		assertTrue(taskEditor.getActivePageInstance() instanceof AbstractRepositoryTaskEditor);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java
index 769ccd685..d64a24ffe 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/BugzillaHyperLink.java
@@ -14,7 +14,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 
 /**
  * @author Mik Kersten
@@ -54,7 +54,7 @@ public class BugzillaHyperLink implements IHyperlink {
 		// MylarTaskListPlugin.getRepositoryManager().getDefaultRepository(
 		// BugzillaPlugin.REPOSITORY_KIND);
 		if (repositoryUrl != null) {
-			TaskUiUtil.openRepositoryTask(repositoryUrl, id, repositoryUrl + IBugzillaConstants.URL_GET_SHOW_BUG
+			TasksUiUtil.openRepositoryTask(repositoryUrl, id, repositoryUrl + IBugzillaConstants.URL_GET_SHOW_BUG
 					+ id);
 			// OpenBugzillaReportJob job = new
 			// OpenBugzillaReportJob(repository.getUrl(), id);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
index fa9099512..661810b07 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java
@@ -39,7 +39,7 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaReportSubmitForm;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryConnector;
 import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
 import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.editors.AbstractRepositoryTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.editors.AbstractTaskEditorInput;
 import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor;
@@ -246,7 +246,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
 											@Override
 											public void done(IJobChangeEvent event) {
 												close();
-												TaskUiUtil.openEditor(modifiedTask, false);
+												TasksUiUtil.openEditor(modifiedTask, false);
 											}
 										});
 
@@ -266,7 +266,7 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
 								// TasksUiPlugin.getSynchronizationManager().synchronizeChanged(connector,
 								// repository);
 							} else {
-								TaskUiUtil.openRepositoryTask(repository.getUrl(), BugzillaTaskEditor.this
+								TasksUiUtil.openRepositoryTask(repository.getUrl(), BugzillaTaskEditor.this
 										.getRepositoryTaskData().getId(), repository.getUrl()
 										+ IBugzillaConstants.URL_GET_SHOW_BUG
 										+ BugzillaTaskEditor.this.getRepositoryTaskData().getId());
@@ -551,9 +551,9 @@ public class BugzillaTaskEditor extends AbstractRepositoryTaskEditor {
 					@Override
 					public void linkActivated(HyperlinkEvent e) {
 						if (task != null) {
-							TaskUiUtil.refreshAndOpenTaskListElement(task);
+							TasksUiUtil.refreshAndOpenTaskListElement(task);
 						} else {
-							TaskUiUtil.openRepositoryTask(repository.getUrl(), bugId, repository.getUrl()
+							TasksUiUtil.openRepositoryTask(repository.getUrl(), bugId, repository.getUrl()
 									+ IBugzillaConstants.URL_GET_SHOW_BUG + bugId);
 						}
 					}
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
index 596b9b528..e07a9baf2 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
@@ -18,7 +18,7 @@ import org.eclipse.mylar.internal.bugzilla.core.BugzillaRepositoryQuery;
 import org.eclipse.mylar.internal.bugzilla.core.BugzillaClient;
 import org.eclipse.mylar.internal.bugzilla.ui.search.BugzillaSearchPage;
 import org.eclipse.mylar.internal.bugzilla.ui.wizard.NewBugzillaTaskWizard;
-import org.eclipse.mylar.internal.tasks.ui.OpenRemoteTaskJob;
+import org.eclipse.mylar.internal.tasks.ui.OpenRepositoryTaskJob;
 import org.eclipse.mylar.internal.tasks.ui.search.AbstractRepositoryQueryPage;
 import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
@@ -81,7 +81,7 @@ public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi {
 		}
 		String bugUrl = BugzillaClient.getBugUrlWithoutLogin(repositoryUrl, id);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		OpenRemoteTaskJob job = new OpenRemoteTaskJob(BugzillaCorePlugin.REPOSITORY_KIND, repositoryUrl, idString,
+		OpenRepositoryTaskJob job = new OpenRepositoryTaskJob(BugzillaCorePlugin.REPOSITORY_KIND, repositoryUrl, idString,
 				bugUrl, page);
 		job.schedule();
 		return true;
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java
index 36b44d493..b72c1f92f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/wizard/NewBugzillaTaskWizard.java
@@ -17,7 +17,7 @@ import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.mylar.internal.bugzilla.core.NewBugzillaReport;
 import org.eclipse.mylar.internal.bugzilla.ui.BugzillaUiPlugin;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.editors.NewTaskEditorInput;
 import org.eclipse.mylar.tasks.core.TaskRepository;
 import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
@@ -89,7 +89,7 @@ public class NewBugzillaTaskWizard extends Wizard implements INewWizard {
 			productPage.saveDataToModel();
 			NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, model);
 			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			TaskUiUtil.openEditor(editorInput,  TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+			TasksUiUtil.openEditor(editorInput,  TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 			return true;
 		} catch (Exception e) {
 			productPage.applyToStatusLine(new Status(IStatus.ERROR, "not_used", 0,
@@ -156,7 +156,7 @@ public class NewBugzillaTaskWizard extends Wizard implements INewWizard {
 // MylarTaskListPlugin.getTaskListManager().getTaskList().getRootCategory());
 // }
 //
-// TaskUiUtil.refreshAndOpenTaskListElement(newTask);
+// TasksUiUtil.refreshAndOpenTaskListElement(newTask);
 // MylarTaskListPlugin.getSynchronizationManager().synchNow(0);
 //
 // return true;
diff --git a/org.eclipse.mylyn.help.ui/doc/new.html b/org.eclipse.mylyn.help.ui/doc/new.html
index 745d1d300..89ece8389 100644
--- a/org.eclipse.mylyn.help.ui/doc/new.html
+++ b/org.eclipse.mylyn.help.ui/doc/new.html
@@ -121,9 +121,10 @@
 	<li>Inline highlighting of changes since last read of bug</li>
 	<li>Transfer context</li>
 	<li>Offline data will get cleared</li>
-	<li>Open Remote Task dialog</li>
+	<li>Open Remote Task dialog, replaces Add Existing Task</li>
 	<li>Proxy configuration [clean up page, hostname format must start with 
 	https://</li>
+	<li>[update keyboard shortcuts in docs]</li>
 </ul>
 
 <hr>
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
index 972fc8f6c..efb276431 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.mylar.internal.tasks.core.WebTask;
 import org.eclipse.mylar.internal.tasks.ui.MoveToCategoryMenuContributor;
 import org.eclipse.mylar.internal.tasks.ui.TaskPriorityFilter;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.actions.MarkTaskCompleteAction;
 import org.eclipse.mylar.internal.tasks.ui.actions.NewCategoryAction;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListView;
@@ -230,11 +230,11 @@ public class TaskListUiTest extends TestCase {
 
 		// open a task in editor
 		// cat1task1.setForceSyncOpen(true);
-		TaskUiUtil.openEditor(cat1task1, false, true);
+		TasksUiUtil.openEditor(cat1task1, false, true);
 		// cat1task1.openTaskInEditor(false);
 		// cat1task2.setForceSyncOpen(true);
 		// cat1task2.openTaskInEditor(false);
-		TaskUiUtil.openEditor(cat1task2, false, true);
+		TasksUiUtil.openEditor(cat1task2, false, true);
 
 		listeners = manager.getTaskList().getChangeListeners();
 		numListenersDuring = listeners.size();
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
index 508394485..6c84b1f6b 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskPlanningEditorTest.java
@@ -12,7 +12,7 @@
 package org.eclipse.mylar.tasks.tests;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.editors.TaskPlanningEditor;
 import org.eclipse.mylar.tasks.core.Task;
@@ -54,7 +54,7 @@ public class TaskPlanningEditorTest extends TestCase {
 		Task task = new Task(MOCK_HANDLE, MOCK_LABEL, true);
 		task.setDescription(DESCRIPTION);
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task);
-		TaskUiUtil.openEditor(task, false, true);
+		TasksUiUtil.openEditor(task, false, true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		assertTrue(page.getActiveEditor() instanceof MylarTaskEditor);
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
@@ -76,7 +76,7 @@ public class TaskPlanningEditorTest extends TestCase {
 		Task task = new Task(MOCK_HANDLE, MOCK_LABEL, true);
 		task.setDescription(DESCRIPTION);
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task);
-		TaskUiUtil.openEditor(task, false, true);
+		TasksUiUtil.openEditor(task, false, true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		assertTrue(page.getActiveEditor() instanceof MylarTaskEditor);
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
@@ -100,7 +100,7 @@ public class TaskPlanningEditorTest extends TestCase {
 		Task task = new Task(MOCK_HANDLE, MOCK_LABEL, true);
 		task.setDescription(DESCRIPTION);
 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(task);
-		TaskUiUtil.openEditor(task, false, true);
+		TasksUiUtil.openEditor(task, false, true);
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		assertTrue(page.getActiveEditor() instanceof MylarTaskEditor);
 		MylarTaskEditor taskEditor = (MylarTaskEditor) page.getActiveEditor();
diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool16/open-repository-task.gif b/org.eclipse.mylyn.tasks.ui/icons/etool16/open-repository-task.gif
new file mode 100644
index 000000000..79b22b7f9
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool16/open-repository-task.gif
diff --git a/org.eclipse.mylyn.tasks.ui/icons/etool16/task-inactive-centered.gif b/org.eclipse.mylyn.tasks.ui/icons/etool16/task-inactive-centered.gif
new file mode 100644
index 000000000..979ec18d4
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/icons/etool16/task-inactive-centered.gif
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index 0ef0c791c..c15e33911 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -339,6 +339,7 @@
             </enablement>
          </action>
          
+        <!--
 		<action
               class="org.eclipse.mylar.internal.tasks.ui.actions.AddRepositoryTaskAction"
               enablesFor="*"
@@ -349,6 +350,7 @@
               style="push"
               tooltip="Add Existing Task"> 
   		</action>
+  		-->
   		
   		<action
 	        class="org.eclipse.mylar.internal.tasks.ui.actions.NewRepositoryTaskAction"
@@ -565,21 +567,32 @@
             id="org.eclipse.mylar.tasks.navigation"
             label="Task Navigation"
             visible="true">
-         <action
+		<action
                class="org.eclipse.mylar.internal.tasks.ui.actions.DeactivateAllTasksAction"
                definitionId="org.eclipse.mylar.tasks.command.deactivateAllTasks"
+               icon="icons/etool16/task-inactive-centered.gif"
                id="org.eclipse.mylar.tasks.ui.deactivateAllTasks"
                label="&amp;Deactivate Task"
                menubarPath="navigate/open.ext3"
                style="push"/>
 		<action
-               class="org.eclipse.mylar.internal.tasks.ui.actions.ActivateTaskDialogAction"
-               definitionId="org.eclipse.mylar.tasks.command.activateTask"
-               id="org.eclipse.mylar.tasks.ui.switchTask"
-               label="&amp;Activate Task..."
+        	class="org.eclipse.mylar.internal.tasks.ui.actions.ActivateTaskDialogAction"
+        	definitionId="org.eclipse.mylar.tasks.command.activateTask"
+        	icon="icons/etool16/task-active-centered.gif"
+        	id="org.eclipse.mylar.tasks.ui.switchTask"
+        	label="&amp;Activate Task..."
+        	menubarPath="navigate/open.ext3"
+        	style="push"/>
+		<action
+               class="org.eclipse.mylar.internal.tasks.ui.actions.OpenRepositoryTask"
+               definitionId="org.eclipse.mylar.tasks.command.openRemoteTask"
+               icon="icons/etool16/open-repository-task.gif"
+               id="org.eclipse.mylar.tasks.ui.open.task.remote"
+               label="Open &amp;Repository Task..."
                menubarPath="navigate/open.ext3"
-               style="push"/>
-         <action
+               style="push"
+               tooltip="Open Repository Task"/>
+        <action
                class="org.eclipse.mylar.internal.tasks.ui.actions.OpenTaskAction"
                definitionId="org.eclipse.mylar.tasks.command.openTask"
                icon="icons/etool16/open-task.gif"
@@ -599,7 +612,6 @@
             name="Open Task"/>
       <command
             categoryId="org.eclipse.ui.category.navigate"
-            defaultHandler="org.eclipse.mylar.internal.tasks.ui.commands.OpenRemoteTaskHandler"
             id="org.eclipse.mylar.tasks.command.openRemoteTask"
             name="Open Remote Task"/>
       <command
@@ -616,15 +628,15 @@
       <key
             commandId="org.eclipse.mylar.tasks.command.openTask"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M1+M2+F11"/>
+            sequence="M1+F12"/>
       <key
             commandId="org.eclipse.mylar.tasks.command.openRemoteTask"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M1+F12"/>
+            sequence="M1+M2+F12"/>
       <key
             commandId="org.eclipse.mylar.tasks.command.activateTask"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="M1+M2+F12"/>
+            sequence="M1+F9"/>
       <key
             commandId="org.eclipse.mylar.tasks.command.deactivateAllTasks"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java
index f4c2861cf..7c9533c0f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java
@@ -86,7 +86,7 @@ public class AddExistingTaskJob extends Job {
 						}
 						TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(category, newTask);
 						taskListView.getViewer().setSelection(new StructuredSelection(newTask));
-						TaskUiUtil.openEditor(newTask, false, false);
+						TasksUiUtil.openEditor(newTask, false, false);
 					}
 
 				});
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRemoteTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java
index 6cfed1b90..28578e526 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRemoteTaskJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java
@@ -36,7 +36,7 @@ import org.eclipse.ui.PlatformUI;
  * @author Mik Kersten
  * @author Steffen Pingel
  */
-public class OpenRemoteTaskJob extends Job {
+public class OpenRepositoryTaskJob extends Job {
 
 	private String serverUrl;
 
@@ -48,7 +48,7 @@ public class OpenRemoteTaskJob extends Job {
 
 	private String taskUrl;
 
-	public OpenRemoteTaskJob(String repositoryKind, String serverUrl, String taskId, String taskUrl, IWorkbenchPage page) {
+	public OpenRepositoryTaskJob(String repositoryKind, String serverUrl, String taskId, String taskUrl, IWorkbenchPage page) {
 		super("Opening remote task: " + taskId);
 		
 		this.repositoryKind = repositoryKind;
@@ -69,7 +69,7 @@ public class OpenRemoteTaskJob extends Job {
 						MessageDialog.openError(null, "Repository Not Found",
 								"Could not find repository configuration for " + serverUrl
 								+ ". \nPlease set up repository via " + TaskRepositoriesView.NAME + ".");
-						TaskUiUtil.openUrl(taskUrl);
+						TasksUiUtil.openUrl(taskUrl);
 					}
 
 				});
@@ -109,7 +109,7 @@ public class OpenRemoteTaskJob extends Job {
 				} else {
 					PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 						public void run() {
-							TaskUiUtil.openUrl(taskUrl);
+							TasksUiUtil.openUrl(taskUrl);
 						}
 					});
 				}
@@ -123,11 +123,11 @@ public class OpenRemoteTaskJob extends Job {
 		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 			public void run() {
 				if (taskData == null) {
-					TaskUiUtil.openUrl(taskUrl);
+					TasksUiUtil.openUrl(taskUrl);
 				} else {
 					//AbstractTaskEditorInput editorInput = new RepositoryTaskEditorInput(taskUrl, repository, taskData, null);
 					AbstractTaskEditorInput editorInput = new RepositoryTaskEditorInput(repository, handle, taskUrl);
-					TaskUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+					TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 				}
 			}
 		});
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java
index aaa3025c7..3a0610df7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationIncoming.java
@@ -54,7 +54,7 @@ public class TaskListNotificationIncoming implements ITaskListNotification {
 
 		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
 			public void run() {
-				TaskUiUtil.refreshAndOpenTaskListElement(task);
+				TasksUiUtil.refreshAndOpenTaskListElement(task);
 			}
 		});
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java
index 653350574..0ade17342 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationQueryIncoming.java
@@ -51,7 +51,7 @@ public class TaskListNotificationQueryIncoming implements ITaskListNotification
 
 		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
 			public void run() {
-				TaskUiUtil.refreshAndOpenTaskListElement(hit);
+				TasksUiUtil.refreshAndOpenTaskListElement(hit);
 			}
 		});
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java
index c014a86ca..4bd7d5cc9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskListNotificationReminder.java
@@ -51,7 +51,7 @@ public class TaskListNotificationReminder implements ITaskListNotification {
 
 		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
 			public void run() {
-				TaskUiUtil.refreshAndOpenTaskListElement(task);
+				TasksUiUtil.refreshAndOpenTaskListElement(task);
 			}
 		});
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java
index c5b5c0151..6f9c32d9e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskSearchPage.java
@@ -136,7 +136,7 @@ public class TaskSearchPage extends DialogPage implements ISearchPage {
 									@Override
 									public void linkActivated(HyperlinkEvent e) {
 										TaskSearchPage.this.getControl().getShell().close();
-										TaskUiUtil.openEditRepositoryWizard(getRepository());
+										TasksUiUtil.openEditRepositoryWizard(getRepository());
 										// TODO: Re-construct this page with new
 										// repository data
 									}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiUtil.java
index be0040326..1620c88ef 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskUiUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiUtil.java
@@ -16,11 +16,16 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.tasks.ui.editors.CategoryEditorInput;
@@ -59,7 +64,7 @@ import org.eclipse.ui.internal.browser.WorkbenchBrowserSupport;
 /**
  * @author Mik Kersten
  */
-public class TaskUiUtil {
+public class TasksUiUtil {
 
 	/**
 	 * TODO: move
@@ -105,7 +110,7 @@ public class TaskUiUtil {
 		ITask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(
 				AbstractRepositoryTask.getHandle(repository.getUrl(), taskId));
 		if (task != null) {
-			TaskUiUtil.refreshAndOpenTaskListElement(task);
+			TasksUiUtil.refreshAndOpenTaskListElement(task);
 			opened = true;
 		} else {
 			AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(repository.getKind());
@@ -141,7 +146,7 @@ public class TaskUiUtil {
 		}
 
 		if (task != null) {
-			TaskUiUtil.refreshAndOpenTaskListElement(task);
+			TasksUiUtil.refreshAndOpenTaskListElement(task);
 			opened = true;
 		} else {
 			AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
@@ -153,7 +158,7 @@ public class TaskUiUtil {
 			}
 		}
 		if (!opened) {
-			TaskUiUtil.openUrl(fullUrl);
+			TasksUiUtil.openUrl(fullUrl);
 			opened = true;
 		}
 		return opened;
@@ -192,7 +197,7 @@ public class TaskUiUtil {
 
 				if (connector != null)
 					if (repositoryTask.getTaskData() != null) {
-						TaskUiUtil.openEditor(task, false, false);
+						TasksUiUtil.openEditor(task, false, false);
 						TasksUiPlugin.getSynchronizationManager().setTaskRead(repositoryTask, true);
 						TasksUiPlugin.getSynchronizationManager().synchronize(connector, repositoryTask, false, null);
 					} else {
@@ -205,18 +210,18 @@ public class TaskUiUtil {
 										// TODO: if synch job failed, don't mark
 										// read
 										TasksUiPlugin.getSynchronizationManager().setTaskRead(repositoryTask, true);
-										TaskUiUtil.openEditor(task, false);
+										TasksUiUtil.openEditor(task, false);
 									}
 								});
 						if (refreshJob == null) {
-							TaskUiUtil.openEditor(task, false);
+							TasksUiUtil.openEditor(task, false);
 						}
 					}
 			} else {
-				TaskUiUtil.openEditor(task, false);
+				TasksUiUtil.openEditor(task, false);
 			}
 		} else if (element instanceof TaskCategory) {
-			TaskUiUtil.openEditor((AbstractTaskContainer) element);
+			TasksUiUtil.openEditor((AbstractTaskContainer) element);
 		} else if (element instanceof AbstractRepositoryQuery) {
 			AbstractRepositoryQuery query = (AbstractRepositoryQuery) element;
 			AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryUi(query.getRepositoryKind());
@@ -343,4 +348,55 @@ public class TaskUiUtil {
 		}
 		return repositoryTaskEditors;
 	}
+	
+	/**
+	 * Will use the workbench window's selection if viewer's selection is null
+	 */
+	public static TaskRepository getSelectedRepository(StructuredViewer viewer) {
+		IStructuredSelection selection = (IStructuredSelection)viewer.getSelection();
+		if (selection == null) {
+			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+			ISelection windowSelection = window.getSelectionService().getSelection();
+			if (windowSelection instanceof IStructuredSelection) {
+				selection = (IStructuredSelection)windowSelection;
+			}
+		}
+
+		Object element = selection.getFirstElement();
+		if (element instanceof TaskRepository) {
+			return (TaskRepository)selection.getFirstElement();
+		} else if (element instanceof AbstractRepositoryQuery) {
+			AbstractRepositoryQuery query = (AbstractRepositoryQuery) element;
+			return TasksUiPlugin.getRepositoryManager().getRepository(query.getRepositoryUrl(), query.getRepositoryKind());
+		} else if (element instanceof AbstractQueryHit) {
+			AbstractQueryHit queryHit = (AbstractQueryHit) element;
+			if (queryHit.getParent() != null) {
+				return TasksUiPlugin.getRepositoryManager().getRepository(queryHit.getRepositoryUrl(), queryHit.getParent().getRepositoryKind());
+			} else {
+				return TasksUiPlugin.getRepositoryManager().getRepository(queryHit.getRepositoryUrl());
+			}
+		} else if (element instanceof AbstractRepositoryTask) {
+			AbstractRepositoryTask task = (AbstractRepositoryTask) element;
+			return TasksUiPlugin.getRepositoryManager().getRepository(task.getRepositoryUrl(), task.getRepositoryKind());
+		} else if (element instanceof IResource) {
+			IResource resource = (IResource) element;
+			return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true);
+		} else if( element instanceof IAdaptable) {
+			IAdaptable adaptable = (IAdaptable) element;
+			IResource resource = (IResource) adaptable.getAdapter(IResource.class);
+			if(resource!=null) {
+				return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true);
+			} else {
+				ITask task = (ITask) adaptable.getAdapter(ITask.class);
+				if(task instanceof AbstractRepositoryTask) {
+					AbstractRepositoryTask rtask = (AbstractRepositoryTask) task;
+					return TasksUiPlugin.getRepositoryManager().getRepository(rtask.getRepositoryUrl(), rtask.getRepositoryKind());
+				}
+			}
+		}
+		
+		// TODO mapping between LogEntry.pliginId and repositories
+		// TODO handle other selection types
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
index 57669d9d4..83660b9b7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/DeleteAction.java
@@ -16,7 +16,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylar.context.core.ContextCorePlugin;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
@@ -67,7 +67,7 @@ public class DeleteAction extends Action {
 				TasksUiPlugin.getTaskListManager().deactivateTask(task);
 				TasksUiPlugin.getTaskListManager().getTaskList().deleteTask(task);
 				ContextCorePlugin.getContextManager().deleteContext(task.getHandleIdentifier());
-				TaskUiUtil.closeEditorInActivePage(task);
+				TasksUiUtil.closeEditorInActivePage(task);
 			} else if (selectedObject instanceof AbstractRepositoryQuery) {
 				boolean deleteConfirmed = MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow()
 						.getShell(), "Confirm delete", "Delete the selected query? Task data will not be deleted.");
@@ -83,7 +83,7 @@ public class DeleteAction extends Action {
 				TaskCategory cat = (TaskCategory) selectedObject;
 				for (ITask task : cat.getChildren()) {
 					ContextCorePlugin.getContextManager().deleteContext(task.getHandleIdentifier());
-					TaskUiUtil.closeEditorInActivePage(task);
+					TasksUiUtil.closeEditorInActivePage(task);
 				}
 				TasksUiPlugin.getTaskListManager().getTaskList().deleteCategory(cat);
 			} else {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java
index 4fb20a1dc..05ef491ce 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/EditRepositoryPropertiesAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView;
 import org.eclipse.mylar.tasks.core.TaskRepository;
 import org.eclipse.ui.IViewPart;
@@ -43,7 +43,7 @@ public class EditRepositoryPropertiesAction extends Action {
 	public void run() {
 		IStructuredSelection selection = (IStructuredSelection) repositoriesView.getViewer().getSelection();
 		if (selection.getFirstElement() instanceof TaskRepository) {
-			TaskUiUtil.openEditRepositoryWizard((TaskRepository) selection.getFirstElement());
+			TasksUiUtil.openEditRepositoryWizard((TaskRepository) selection.getFirstElement());
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java
index d2cec2f24..adc72bb31 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/NewLocalTaskAction.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskInputDialog;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylar.tasks.core.ITask;
@@ -95,7 +95,7 @@ public class NewLocalTaskAction extends Action implements IViewActionDelegate {
 					TasksUiPlugin.getTaskListManager().getTaskList().getRootCategory());
 		}
 
-		TaskUiUtil.openEditor(newTask, true);
+		TasksUiUtil.openEditor(newTask, true);
 		
 		// if (view != null) {
 		// view.getViewer().refresh();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/OpenRemoteTaskHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java
index 70d0ed52c..8e1c45864 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/OpenRemoteTaskHandler.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenRepositoryTask.java
@@ -6,32 +6,34 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.mylar.internal.tasks.ui.commands;
+package org.eclipse.mylar.internal.tasks.ui.actions;
 
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
+import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.mylar.internal.tasks.ui.AddExistingTaskJob;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.commands.RemoteTaskSelectionDialog;
 import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.progress.IProgressService;
 
 /**
- * @author Willian Mitsuda
+ * @author Mik Kersten
  */
-public class OpenRemoteTaskHandler extends AbstractHandler {
+public class OpenRepositoryTask extends Action implements IWorkbenchWindowActionDelegate {
 
-	private static final String OPEN_REMOTE_TASK_DIALOG_DIALOG_SETTINGS = "open.remote.task.dialog.settings";
-
-	@Override
-	public Object execute(ExecutionEvent evt) throws ExecutionException {
+	private static final String OPEN_REMOTE_TASK_DIALOG_DIALOG_SETTINGS = "org.eclipse.mylar.tasks.ui.open.remote";
+	
+	public void run(IAction action) {
 		RemoteTaskSelectionDialog dlg = new RemoteTaskSelectionDialog(PlatformUI.getWorkbench()
 				.getActiveWorkbenchWindow().getShell());
-		dlg.setTitle("Open Remote Task");
+		dlg.setTitle("Open Repository Task");
 
 		IDialogSettings settings = TasksUiPlugin.getDefault().getDialogSettings();
 		IDialogSettings dlgSettings = settings.getSection(OPEN_REMOTE_TASK_DIALOG_DIALOG_SETTINGS);
@@ -47,7 +49,6 @@ public class OpenRemoteTaskHandler extends AbstractHandler {
 				openRemoteTask(dlg);
 			}
 		}
-		return null;
 	}
 
 	/**
@@ -58,7 +59,7 @@ public class OpenRemoteTaskHandler extends AbstractHandler {
 			TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(dlg.getSelectedCategory(),
 					dlg.getSelectedTask());
 		}
-		TaskUiUtil.refreshAndOpenTaskListElement(dlg.getSelectedTask());
+		TasksUiUtil.refreshAndOpenTaskListElement(dlg.getSelectedTask());
 	}
 
 	/**
@@ -78,7 +79,17 @@ public class OpenRemoteTaskHandler extends AbstractHandler {
 
 			});
 		} else {
-			TaskUiUtil.openRepositoryTask(dlg.getSelectedTaskRepository(), dlg.getSelectedId());
+			TasksUiUtil.openRepositoryTask(dlg.getSelectedTaskRepository(), dlg.getSelectedId());
 		}
 	}
+	
+	public void dispose() {
+	}
+
+	public void init(IWorkbenchWindow window) {
+	}
+
+	public void selectionChanged(IAction action, ISelection selection) {
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
index e82bc6dec..f1cd32fe5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskAction.java
@@ -12,7 +12,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 import org.eclipse.mylar.tasks.core.ITask;
 import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
@@ -60,11 +60,11 @@ public class OpenTaskAction extends ActionDelegate implements IWorkbenchWindowAc
 			ITask task = (ITask) result;
 			if (dlg.getOpenInBrowser()) {
 				if (task.hasValidUrl()) {
-					TaskUiUtil.openUrl(task.getUrl());
+					TasksUiUtil.openUrl(task.getUrl());
 					TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task);
 				}
 			} else {
-				TaskUiUtil.refreshAndOpenTaskListElement(task);
+				TasksUiUtil.refreshAndOpenTaskListElement(task);
 				TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task);
 			}
 		} else if (result instanceof AbstractQueryHit) {
@@ -73,11 +73,11 @@ public class OpenTaskAction extends ActionDelegate implements IWorkbenchWindowAc
 			if (task != null) {
 				if (dlg.getOpenInBrowser()) {
 					if (task.hasValidUrl()) {
-						TaskUiUtil.openUrl(task.getUrl());
+						TasksUiUtil.openUrl(task.getUrl());
 						TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task);
 					}
 				} else {
-					TaskUiUtil.refreshAndOpenTaskListElement(task);
+					TasksUiUtil.refreshAndOpenTaskListElement(task);
 					TasksUiPlugin.getTaskListManager().getTaskActivationHistory().addTask(task);
 				}
 			}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java
index ecd864973..361cba3fc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenTaskListElementAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylar.tasks.core.ITaskListElement;
 
@@ -40,7 +40,7 @@ public class OpenTaskListElementAction extends Action {
 		ISelection selection = viewer.getSelection();
 		Object element = ((IStructuredSelection) selection).getFirstElement();
 		if (element instanceof ITaskListElement && !(element instanceof AbstractTaskContainer)) {
-			TaskUiUtil.refreshAndOpenTaskListElement((ITaskListElement)element);	
+			TasksUiUtil.refreshAndOpenTaskListElement((ITaskListElement)element);	
 		}
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java
index 393e4483f..84f34f27f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/OpenWithBrowserAction.java
@@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions;
 
 import java.util.Iterator;
 
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 import org.eclipse.mylar.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylar.tasks.core.ITask;
@@ -61,7 +61,7 @@ public class OpenWithBrowserAction extends BaseSelectionListenerAction {
 			urlString = query.getUrl();
 		}
 		if (urlString != null) {
-			TaskUiUtil.openUrl(urlString);
+			TasksUiUtil.openUrl(urlString);
 		}
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java
index 8d10d4667..a9948682c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/PreviousTaskDropDownAction.java
@@ -15,7 +15,7 @@ import java.util.List;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskActivationHistory;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylar.tasks.core.ITask;
@@ -62,7 +62,7 @@ public class PreviousTaskDropDownAction extends TaskNavigateDropDownAction {
 			new TaskActivateAction().run(previousTask);
 			setButtonStatus();
 			view.refreshAndFocus(false);
-			TaskUiUtil.refreshAndOpenTaskListElement(previousTask);
+			TasksUiUtil.refreshAndOpenTaskListElement(previousTask);
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java
index f32a987f2..79e8f0fb6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskDeactivateAction.java
@@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions;
 import org.eclipse.jface.action.Action;
 import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListView;
 import org.eclipse.mylar.tasks.core.ITask;
 import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
@@ -37,7 +37,7 @@ public class TaskDeactivateAction extends Action {
 			if (task != null) {
 				TasksUiPlugin.getTaskListManager().deactivateTask(task);
 //				TaskListView.getFromActivePerspective().refreshAndFocus();
-				TaskUiUtil.closeEditorInActivePage(task);
+				TasksUiUtil.closeEditorInActivePage(task);
 			}
 		} catch (Exception e) {
 			MylarStatusHandler.log(e, " Closing task editor on task deactivation failed");
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java
index 8548afece..c21c57d62 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskListElementPropertiesAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylar.tasks.core.ITaskListElement;
 import org.eclipse.mylar.tasks.core.TaskCategory;
@@ -42,7 +42,7 @@ public class TaskListElementPropertiesAction extends Action {
 		ISelection selection = viewer.getSelection();
 		Object element = ((IStructuredSelection) selection).getFirstElement();
 		if (element instanceof TaskCategory || element instanceof AbstractRepositoryQuery) {
-			TaskUiUtil.refreshAndOpenTaskListElement((ITaskListElement)element);	
+			TasksUiUtil.refreshAndOpenTaskListElement((ITaskListElement)element);	
 		}
 	}
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java
index 90b0367ec..da9c276ac 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskNavigateDropDownAction.java
@@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.actions;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuCreator;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskActivationHistory;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListView;
@@ -82,7 +82,7 @@ public abstract class TaskNavigateDropDownAction extends Action implements IMenu
 			taskHistory.addTask(targetTask);
 			setButtonStatus();
 			view.refreshAndFocus(false);
-			TaskUiUtil.refreshAndOpenTaskListElement(targetTask);
+			TasksUiUtil.refreshAndOpenTaskListElement(targetTask);
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
index 46e3cccf1..52f12cf6b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java
@@ -14,8 +14,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.eclipse.core.commands.common.CommandException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.layout.GridDataFactory;
@@ -35,14 +33,12 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.mylar.context.core.MylarStatusHandler;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoryLabelProvider;
-import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylar.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylar.tasks.core.ITask;
 import org.eclipse.mylar.tasks.core.TaskList;
 import org.eclipse.mylar.tasks.core.TaskRepository;
 import org.eclipse.mylar.tasks.core.TaskRepositoryFilter;
@@ -64,7 +60,6 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionStatusDialog;
 import org.eclipse.ui.handlers.IHandlerService;
@@ -180,7 +175,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 		repositoriesViewer.setLabelProvider(new TaskRepositoryLabelProvider());
 		repositoriesViewer.setContentProvider(new ArrayContentProvider());
 		repositoriesViewer.setInput(getTaskRepositories());
-		TaskRepository currentRepository = getSelectedRepository();
+		TaskRepository currentRepository = TasksUiUtil.getSelectedRepository(repositoriesViewer);
 		if (currentRepository != null) {
 			repositoriesViewer.setSelection(new StructuredSelection(currentRepository), true);
 		}
@@ -259,66 +254,6 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog {
 		return area;
 	}
 
-	// TODO: the following is a copy-and-paste of SelectRepositoryPage class;
-	// make API?
-	private TaskRepository getSelectedRepository() {
-		IStructuredSelection selection = getSelection();
-		if (selection == null) {
-			return (TaskRepository) tasksViewer.getElementAt(0);
-		}
-
-		Object element = selection.getFirstElement();
-		if (element instanceof AbstractRepositoryQuery) {
-			AbstractRepositoryQuery query = (AbstractRepositoryQuery) element;
-			return getRepository(query.getRepositoryUrl(), query.getRepositoryKind());
-
-		} else if (element instanceof AbstractQueryHit) {
-			AbstractQueryHit queryHit = (AbstractQueryHit) element;
-			if (queryHit.getParent() != null) {
-				return getRepository(queryHit.getRepositoryUrl(), queryHit.getParent().getRepositoryKind());
-			} else {
-				return TasksUiPlugin.getRepositoryManager().getRepository(queryHit.getRepositoryUrl());
-			}
-		} else if (element instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) element;
-			return getRepository(task.getRepositoryUrl(), task.getRepositoryKind());
-		} else if (element instanceof IResource) {
-			IResource resource = (IResource) element;
-			return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true);
-		} else if (element instanceof IAdaptable) {
-			IAdaptable adaptable = (IAdaptable) element;
-			IResource resource = (IResource) adaptable.getAdapter(IResource.class);
-			if (resource != null) {
-				return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true);
-			} else {
-				ITask task = (ITask) adaptable.getAdapter(ITask.class);
-				if (task instanceof AbstractRepositoryTask) {
-					AbstractRepositoryTask rtask = (AbstractRepositoryTask) task;
-					return getRepository(rtask.getRepositoryUrl(), rtask.getRepositoryKind());
-				}
-			}
-		}
-
-		// TODO mapping between LogEntry.pliginId and repositories
-
-		// TODO handle other selection types
-
-		return null;
-	}
-
-	private IStructuredSelection getSelection() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		ISelection selection = window.getSelectionService().getSelection();
-		if (selection instanceof IStructuredSelection) {
-			return (IStructuredSelection) selection;
-		}
-		return null;
-	}
-
-	private TaskRepository getRepository(String repositoryUrl, String repositoryKind) {
-		return TasksUiPlugin.getRepositoryManager().getRepository(repositoryKind, repositoryUrl);
-	}
-
 	private void validate() {
 		if (idText.getText().trim().equals("")) {
 			updateStatus(new Status(IStatus.ERROR, TasksUiPlugin.PLUGIN_ID, 0, "Enter a valid task ID", null));
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
index 3653f8103..a1856b506 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java
@@ -26,7 +26,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.search.SearchHitCollector;
 import org.eclipse.mylar.internal.tasks.ui.views.DatePicker;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListView;
@@ -581,7 +581,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractRepository
 				TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(((TaskCategory) selectedObject),
 						newTask);
 			}
-			TaskUiUtil.refreshAndOpenTaskListElement(newTask);
+			TasksUiUtil.refreshAndOpenTaskListElement(newTask);
 		}
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractRepositoryTaskEditor.java
index 96022a720..d0a165351 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractRepositoryTaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/AbstractRepositoryTaskEditor.java
@@ -55,7 +55,7 @@ import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.context.core.util.DateUtil;
 import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.actions.CopyToClipboardAction;
 import org.eclipse.mylar.internal.tasks.ui.actions.SaveRemoteFileAction;
 import org.eclipse.mylar.internal.tasks.ui.wizards.NewAttachmentWizard;
@@ -909,7 +909,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
 						StructuredSelection selection = (StructuredSelection) event.getSelection();
 						RepositoryAttachment attachment = (RepositoryAttachment) selection.getFirstElement();
 						// address += attachment.getId() + "&amp;action=view";
-						TaskUiUtil.openUrl(attachment.getUrl());
+						TasksUiUtil.openUrl(attachment.getUrl());
 					}
 				}
 			});
@@ -935,7 +935,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
 					RepositoryAttachment attachment = (RepositoryAttachment) (((StructuredSelection) attachmentsTableViewer
 							.getSelection()).getFirstElement());
 					if (attachment != null) {
-						TaskUiUtil.openUrl(attachment.getUrl());
+						TasksUiUtil.openUrl(attachment.getUrl());
 					}
 				}
 			};
@@ -949,7 +949,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage {
 						return;
 
 					if (attachment.getContentType().endsWith(CTYPE_HTML)) {
-						TaskUiUtil.openUrl(attachment.getUrl());
+						TasksUiUtil.openUrl(attachment.getUrl());
 						return;
 					}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java
index 58f4dcba2..f41c004b6 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorUrlHyperlinkDetector.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.text.Region;
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
 import org.eclipse.jface.text.hyperlink.URLHyperlink;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 
 /**
  * @author Rob Elves
@@ -105,7 +105,7 @@ public class TaskEditorUrlHyperlinkDetector implements IHyperlinkDetector {
 		@Override
 		public void open() {
 			// TODO: if url is to a repository task, open task instead of url
-			TaskUiUtil.openUrl(getURLString());
+			TasksUiUtil.openUrl(getURLString());
 		}
 
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java
index c7cf1cc66..06c7ddd9f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/OpenTaskEditorAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.ITask;
 
 /**
@@ -44,7 +44,7 @@ public class OpenTaskEditorAction extends Action {
 		ISelection selection = viewer.getSelection();
 		Object object = ((IStructuredSelection) selection).getFirstElement();
 		if (object instanceof ITask) {
-			TaskUiUtil.openEditor((ITask)object, false);
+			TasksUiUtil.openEditor((ITask)object, false);
 		}
 //		if (obj instanceof Task) {
 //			((Task) obj).openTaskInEditor(false);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java
index f3a0079fb..1c7d4881c 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/OpenSearchResultAction.java
@@ -15,7 +15,7 @@ import java.util.Iterator;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 
 /**
@@ -55,13 +55,13 @@ public class OpenSearchResultAction extends Action {
 			// go through each of the selected items and show it in an editor
 			for (Iterator<AbstractQueryHit> it = selection.iterator(); it.hasNext();) {
 				AbstractQueryHit repositoryHit = it.next();
-				TaskUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getId(), repositoryHit.getUrl());
+				TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getId(), repositoryHit.getUrl());
 				// try {
 				// int id = Integer.parseInt(repositoryHit.getId());
 				// String bugUrl =
 				// BugzillaServerFacade.getBugUrlWithoutLogin(repositoryHit.getRepositoryUrl(),
 				// id);
-				// TaskUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(),
+				// TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(),
 				// "" + repositoryHit.getId(), bugUrl);
 				// } catch (NumberFormatException e) {
 				// MylarStatusHandler.fail(e, "Could not open, malformed id: " +
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
index 78f382435..5591d7370 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/search/RepositorySearchResultView.java
@@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskElementLabelProvider;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskListTableLabelProvider;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
@@ -213,7 +213,7 @@ public class RepositorySearchResultView extends AbstractTextSearchViewPage imple
 			throws PartInitException {
 		AbstractQueryHit repositoryHit = (AbstractQueryHit) match.getElement();
 		
-		TaskUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getId(), repositoryHit.getUrl());
+		TasksUiUtil.openRepositoryTask(repositoryHit.getRepositoryUrl(), repositoryHit.getId(), repositoryHit.getUrl());
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
index 6ebe7bd8d..72ef0a9a4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
@@ -23,7 +23,7 @@ import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.context.core.util.DateUtil;
 import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylar.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylar.tasks.core.DateRangeActivityDelegate;
@@ -63,7 +63,7 @@ public class TaskActivityLabelProvider extends DecoratingLabelProvider implement
 		} else if (columnIndex == 1) {
 			if (element instanceof DateRangeActivityDelegate) {
 				DateRangeActivityDelegate taskElement = (DateRangeActivityDelegate) element;
-				return TaskUiUtil.getImageForPriority(PriorityLevel.fromString(taskElement.getPriority()));
+				return TasksUiUtil.getImageForPriority(PriorityLevel.fromString(taskElement.getPriority()));
 			}
 		}
 		return null;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
index 21bc79a15..c19b28323 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.viewers.ViewerDropAdapter;
 import org.eclipse.mylar.context.core.ContextCorePlugin;
 import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.tasks.ui.RetrieveTitleFromUrlJob;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.actions.NewLocalTaskAction;
 import org.eclipse.mylar.internal.tasks.ui.actions.TaskActivateAction;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
@@ -181,7 +181,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 
 		// NOTE: setting boolean param as false so that we go directly to the
 		// browser tab as with a previously-created task
-		TaskUiUtil.openEditor(newTask, false);
+		TasksUiUtil.openEditor(newTask, false);
 		return true;
 	}
 
@@ -193,7 +193,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter {
 			return false;
 		} else {
 			newTask.setPriority(Task.PriorityLevel.P3.toString());
-			TaskUiUtil.openEditor(newTask, false);
+			TasksUiUtil.openEditor(newTask, false);
 			return true;
 		}
 	}
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 40695e821..5691b0d61 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
@@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.views;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractTaskContainer;
 import org.eclipse.mylar.tasks.core.DateRangeContainer;
 import org.eclipse.mylar.tasks.core.ITask;
@@ -168,7 +168,7 @@ public class TaskListFilteredTree extends AbstractMylarFilteredTree {
 //				TaskListView.getFromActivePerspective().selectedAndFocusTask(
 //						TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask()
 //				);
-				TaskUiUtil.openEditor(TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask(), false);
+				TasksUiUtil.openEditor(TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask(), false);
 			}
 
 		});
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java
index 988f0a07d..5d95d9cdb 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableLabelProvider.java
@@ -25,7 +25,7 @@ import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.mylar.context.core.ContextCorePlugin;
 import org.eclipse.mylar.internal.tasks.ui.TaskListColorsAndFonts;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
@@ -109,7 +109,7 @@ public class TaskListTableLabelProvider extends DecoratingLabelProvider implemen
 		} else if (columnIndex == 2) {
 			if (element instanceof ITaskListElement && !(element instanceof AbstractTaskContainer)) {
 				ITaskListElement taskElement = (ITaskListElement) element;
-				return TaskUiUtil.getImageForPriority(PriorityLevel.fromString(taskElement.getPriority()));
+				return TasksUiUtil.getImageForPriority(PriorityLevel.fromString(taskElement.getPriority()));
 			}
 		} else if (columnIndex == 3) {
 			AbstractRepositoryTask repositoryTask = null;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
index d23ed80d0..94008a63a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java
@@ -55,7 +55,7 @@ import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPatternFilter;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants;
 import org.eclipse.mylar.internal.tasks.ui.TaskPriorityFilter;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.actions.CollapseAllAction;
 import org.eclipse.mylar.internal.tasks.ui.actions.CopyTaskDetailsAction;
 import org.eclipse.mylar.internal.tasks.ui.actions.DeleteAction;
@@ -1210,7 +1210,7 @@ public class TaskListView extends ViewPart {
 					}
 				}
 				if (object instanceof TaskCategory || object instanceof AbstractRepositoryQuery) {
-					TaskUiUtil.refreshAndOpenTaskListElement((ITaskListElement) object);
+					TasksUiUtil.refreshAndOpenTaskListElement((ITaskListElement) object);
 				}
 			}
 		});
@@ -1467,7 +1467,7 @@ public class TaskListView extends ViewPart {
 	public Image[] getPirorityImages() {
 		Image[] images = new Image[Task.PriorityLevel.values().length];
 		for (int i = 0; i < Task.PriorityLevel.values().length; i++) {
-			images[i] = TaskUiUtil.getImageForPriority(Task.PriorityLevel.values()[i]);
+			images[i] = TasksUiUtil.getImageForPriority(Task.PriorityLevel.values()[i]);
 		}
 		return images;
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewWebTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewWebTaskWizard.java
index 0097613fe..40844a10f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewWebTaskWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewWebTaskWizard.java
@@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.wizards;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.tasks.core.TaskRepository;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
@@ -54,7 +54,7 @@ public class NewWebTaskWizard extends Wizard implements INewWizard {
 
 	@Override
 	public boolean performFinish() {
-		TaskUiUtil.openUrl(newTaskUrl);
+		TasksUiUtil.openUrl(newTaskUrl);
 		return true;
 	}
 
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java
index 85bb68888..f5425ed25 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryPage.java
@@ -15,11 +15,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.IOpenListener;
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -31,14 +28,11 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jface.wizard.IWizardNode;
 import org.eclipse.jface.wizard.WizardSelectionPage;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.actions.AddRepositoryAction;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoriesView;
 import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoryLabelProvider;
-import org.eclipse.mylar.tasks.core.AbstractQueryHit;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylar.tasks.core.ITask;
 import org.eclipse.mylar.tasks.core.TaskRepository;
 import org.eclipse.mylar.tasks.core.TaskRepositoryFilter;
 import org.eclipse.mylar.tasks.core.TaskRepositoryManager;
@@ -52,7 +46,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
 /**
@@ -159,7 +152,7 @@ public abstract class SelectRepositoryPage extends WizardSelectionPage {
 			}
 		});
 
-		viewer.setSelection(new StructuredSelection(new Object[] { getSelectedRepository() }));
+		viewer.setSelection(new StructuredSelection(new Object[] { TasksUiUtil.getSelectedRepository(viewer) }));
 
 		viewer.addOpenListener(new IOpenListener() {
 
@@ -173,64 +166,6 @@ public abstract class SelectRepositoryPage extends WizardSelectionPage {
 		return viewer.getTable();
 	}
 
-	protected TaskRepository getSelectedRepository() {
-		IStructuredSelection selection = getSelection();
-		if (selection == null) {
-			return (TaskRepository) viewer.getElementAt(0);
-		}
-
-		Object element = selection.getFirstElement();
-		if (element instanceof AbstractRepositoryQuery) {
-			AbstractRepositoryQuery query = (AbstractRepositoryQuery) element;
-			return getRepository(query.getRepositoryUrl(), query.getRepositoryKind());
-
-		} else if (element instanceof AbstractQueryHit) {
-			AbstractQueryHit queryHit = (AbstractQueryHit) element;
-			if (queryHit.getParent() != null) {
-				return getRepository(queryHit.getRepositoryUrl(), queryHit.getParent().getRepositoryKind());
-			} else {
-				return TasksUiPlugin.getRepositoryManager().getRepository(queryHit.getRepositoryUrl());
-			}
-		} else if (element instanceof AbstractRepositoryTask) {
-			AbstractRepositoryTask task = (AbstractRepositoryTask) element;
-			return getRepository(task.getRepositoryUrl(), task.getRepositoryKind());
-		} else if (element instanceof IResource) {
-			IResource resource = (IResource) element;
-			return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true);
-		} else if( element instanceof IAdaptable) {
-			IAdaptable adaptable = (IAdaptable) element;
-			IResource resource = (IResource) adaptable.getAdapter(IResource.class);
-			if(resource!=null) {
-				return TasksUiPlugin.getDefault().getRepositoryForResource(resource, true);
-			} else {
-				ITask task = (ITask) adaptable.getAdapter(ITask.class);
-				if(task instanceof AbstractRepositoryTask) {
-					AbstractRepositoryTask rtask = (AbstractRepositoryTask) task;
-					return getRepository(rtask.getRepositoryUrl(), rtask.getRepositoryKind());
-				}
-			}
-		}
-		
-		// TODO mapping between LogEntry.pliginId and repositories
-
-		// TODO handle other selection types
-		
-		return null;
-	}
-
-	private IStructuredSelection getSelection() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		ISelection selection = window.getSelectionService().getSelection();
-		if(selection instanceof IStructuredSelection) {
-			return (IStructuredSelection) selection;
-		}		
-		return null;
-	}
-
-	private TaskRepository getRepository(String repositoryUrl, String repositoryKind) {
-		return TasksUiPlugin.getRepositoryManager().getRepository(repositoryKind, repositoryUrl);
-	}
-
 	protected abstract IWizard createWizard(TaskRepository taskRepository);
 
 	private class CustomWizardNode implements IWizardNode {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java
index 004a44a9e..f0d68079b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeTaskJob.java
@@ -26,7 +26,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.tasks.core.UnrecognizedReponseException;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorInput;
 import org.eclipse.mylar.internal.tasks.ui.util.WebBrowserDialog;
@@ -163,7 +163,7 @@ class SynchronizeTaskJob extends Job {
 		// TODO: move out of SynchronizeTaskJob (but beware of race conditions)
 		if (repositoryTask.getSyncState() == RepositoryTaskSyncState.INCOMING
 				|| repositoryTask.getSyncState() == RepositoryTaskSyncState.CONFLICT) {
-			List<MylarTaskEditor> editors = TaskUiUtil.getActiveRepositoryTaskEditors();
+			List<MylarTaskEditor> editors = TasksUiUtil.getActiveRepositoryTaskEditors();
 			for (final MylarTaskEditor editor : editors) {
 				final TaskEditorInput input = (TaskEditorInput) editor.getEditorInput();
 				if (input.getTask().getHandleIdentifier().equals(repositoryTask.getHandleIdentifier())) {
@@ -174,8 +174,8 @@ class SynchronizeTaskJob extends Job {
 									.openConfirm(null, "Stale Editor",
 											"Remote copy of task has changes. Refresh and open report?"))
 									|| repositoryTask.getSyncState() == RepositoryTaskSyncState.CONFLICT) {
-								TaskUiUtil.closeEditorInActivePage(input.getTask());
-								TaskUiUtil.refreshAndOpenTaskListElement(input.getTask());
+								TasksUiUtil.closeEditorInActivePage(input.getTask());
+								TasksUiUtil.refreshAndOpenTaskListElement(input.getTask());
 							}
 						}
 					});
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java
index ff99be49f..4fa5f8ea3 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java
@@ -11,7 +11,7 @@ package org.eclipse.mylar.internal.trac.ui;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.mylar.internal.tasks.ui.OpenRemoteTaskJob;
+import org.eclipse.mylar.internal.tasks.ui.OpenRepositoryTaskJob;
 import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
 import org.eclipse.mylar.internal.tasks.ui.wizards.NewWebTaskWizard;
 import org.eclipse.mylar.internal.trac.core.ITracClient;
@@ -82,7 +82,7 @@ public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
 	public boolean openRemoteTask(String repositoryUrl, String idString) {
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 		String ticketUrl = repositoryUrl + ITracClient.TICKET_URL + idString;
-		OpenRemoteTaskJob job = new OpenRemoteTaskJob(TracCorePlugin.REPOSITORY_KIND, repositoryUrl, idString, ticketUrl, page);
+		OpenRepositoryTaskJob job = new OpenRepositoryTaskJob(TracCorePlugin.REPOSITORY_KIND, repositoryUrl, idString, ticketUrl, page);
 		job.schedule();
 		return true;
 	}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java
index 818c5b1d9..c26fe5e05 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskWizard.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
 import org.eclipse.mylar.internal.tasks.ui.TaskListPreferenceConstants;
-import org.eclipse.mylar.internal.tasks.ui.TaskUiUtil;
+import org.eclipse.mylar.internal.tasks.ui.TasksUiUtil;
 import org.eclipse.mylar.internal.tasks.ui.editors.NewTaskEditorInput;
 import org.eclipse.mylar.tasks.core.TaskRepository;
 import org.eclipse.ui.INewWizard;
@@ -62,7 +62,7 @@ public class NewTracTaskWizard extends Wizard implements INewWizard {
 	public boolean performFinish() {
 		NewTaskEditorInput editorInput = new NewTaskEditorInput(taskRepository, newTaskPage.getRepositoryTaskData());
 		IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		TaskUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
+		TasksUiUtil.openEditor(editorInput, TaskListPreferenceConstants.TASK_EDITOR_ID, page);
 		return true;
 	}