ASSIGNED - bug 193841: TasksUiUtil.openUrl should open the task editor if the url is for a task

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

1 files changed, 8 insertions, 6 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
index c5e9e779c..5a54d6b6d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java
@@ -90,16 +90,15 @@ public class TasksUiUtil {
 					refreshAndOpenTaskListElement(task);
 				} else {
 					boolean opened = false;
-					AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getConnectorForRepositoryTaskUrl(
-							url);
+					AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager()
+							.getConnectorForRepositoryTaskUrl(url);
 					if (connector != null) {
 						String repositoryUrl = connector.getRepositoryUrlFromTaskUrl(url);
 						String id = connector.getTaskIdFromTaskUrl(url);
 						TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(repositoryUrl);
-						
 						opened = openRepositoryTask(repository, id);
 					}
-					if(!opened){
+					if (!opened) {
 						openUrl(url, 0);
 					}
 
@@ -114,7 +113,7 @@ public class TasksUiUtil {
 			MessageDialog.openError(Display.getDefault().getActiveShell(), "URL not found", "URL Could not be opened");
 		}
 	}
-	 
+
 	private static void openUrl(String url, int customFlags) throws PartInitException, MalformedURLException {
 		if (WebBrowserPreference.getBrowserChoice() == WebBrowserPreference.EXTERNAL) {
 			try {
@@ -124,7 +123,7 @@ public class TasksUiUtil {
 				StatusManager.fail(e, "could not open task url", true);
 			}
 		} else {
-			IWebBrowser browser = null; 
+			IWebBrowser browser = null;
 			int flags = 0;
 			if (WorkbenchBrowserSupport.getInstance().isInternalWebBrowserAvailable()) {
 				flags = WorkbenchBrowserSupport.AS_EDITOR | WorkbenchBrowserSupport.LOCATION_BAR
@@ -141,6 +140,9 @@ public class TasksUiUtil {
 	}
 
 	public static boolean openRepositoryTask(TaskRepository repository, String taskId) {
+		if (repository == null || taskId == null) {
+			return false;
+		}
 		boolean opened = false;
 		AbstractTask task = TasksUiPlugin.getTaskListManager().getTaskList().getTask(repository.getUrl(), taskId);
 		if (task != null) {