NEW - bug 246149: [patch] delete task repository should delete the tasks and queries automatically

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

3 files changed, 28 insertions, 9 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java
index 627212d3f..3641fda77 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java
@@ -73,6 +73,12 @@ public class Messages extends NLS {
 
 	public static String TasksUiInternal__seconds;
 
+	public static String TasksUiInternal_Failed_to_open_task;
+
+	public static String TasksUiInternal_No_repository_found;
+
+	public static String TasksUiInternal_See_error_log_for_details;
+
 	public static String TasksUiMenus_Copy_Contents;
 
 	public static String TasksUiMenus_Copy_URL;
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
index c4ea21242..ca2ea3916 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiInternal.java
@@ -216,10 +216,8 @@ public class TasksUiInternal {
 				TaskRepository repository = TasksUi.getRepositoryManager().getRepository(repositoryKind,
 						task.getRepositoryUrl());
 				if (repository == null) {
-					StatusHandler.fail(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
-							"No repository found for task. Please create repository in " //$NON-NLS-1$
-									+ org.eclipse.mylyn.internal.tasks.ui.Messages.TasksUiPlugin_Task_Repositories
-									+ ".")); //$NON-NLS-1$
+					displayStatus(Messages.TasksUiInternal_Failed_to_open_task, new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN,
+							Messages.TasksUiInternal_No_repository_found));
 					return;
 				}
 
@@ -420,7 +418,7 @@ public class TasksUiInternal {
 		return new MessageDialog(shell, title, null, message, type, new String[] { IDialogConstants.OK_LABEL }, 0);
 	}
 
-	public static void displayStatus(Shell shell, final String title, final IStatus status) {
+	private static void displayStatus(Shell shell, final String title, final IStatus status, boolean showLinkToErrorLog) {
 		// avoid blocking ui when in test mode
 		if (CoreUtil.TEST_MODE) {
 			StatusHandler.log(status);
@@ -434,17 +432,21 @@ public class TasksUiInternal {
 				WebBrowserDialog.openAcceptAgreement(shell, title, status.getMessage(),
 						((RepositoryStatus) status).getHtmlMessage());
 			} else {
+				String message = status.getMessage();
+				if (showLinkToErrorLog) {
+					message += "\n\n" + Messages.TasksUiInternal_See_error_log_for_details; //$NON-NLS-1$
+				}
 				switch (status.getSeverity()) {
 				case IStatus.CANCEL:
 				case IStatus.INFO:
-					createDialog(shell, title, status.getMessage(), MessageDialog.INFORMATION).open();
+					createDialog(shell, title, message, MessageDialog.INFORMATION).open();
 					break;
 				case IStatus.WARNING:
-					createDialog(shell, title, status.getMessage(), MessageDialog.WARNING).open();
+					createDialog(shell, title, message, MessageDialog.WARNING).open();
 					break;
 				case IStatus.ERROR:
 				default:
-					createDialog(shell, title, status.getMessage(), MessageDialog.ERROR).open();
+					createDialog(shell, title, message, MessageDialog.ERROR).open();
 					break;
 				}
 			}
@@ -464,10 +466,18 @@ public class TasksUiInternal {
 		}
 	}
 
+	public static void logAndDisplayStatus(final String title, final IStatus status) {
+		StatusHandler.log(status);
+		IWorkbench workbench = PlatformUI.getWorkbench();
+		if (workbench != null && !workbench.getDisplay().isDisposed()) {
+			displayStatus(getShell(), title, status, true);
+		}
+	}
+
 	public static void displayStatus(final String title, final IStatus status) {
 		IWorkbench workbench = PlatformUI.getWorkbench();
 		if (workbench != null && !workbench.getDisplay().isDisposed()) {
-			displayStatus(getShell(), title, status);
+			displayStatus(getShell(), title, status, false);
 		} else {
 			StatusHandler.log(status);
 		}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties
index 8b46bccee..423c4cc6d 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties
@@ -26,6 +26,9 @@ TasksUiInternal__minute_=\ minute
 TasksUiInternal__minutes_=\ minutes 
 TasksUiInternal__second=\ second
 TasksUiInternal__seconds=\ seconds
+TasksUiInternal_Failed_to_open_task=Failed to Open Task
+TasksUiInternal_No_repository_found=No repository found for task. Please create repository in Task Repositories view.
+TasksUiInternal_See_error_log_for_details=See error log for details.
 
 TasksUiMenus_Copy_Contents=Copy Contents
 TasksUiMenus_Copy_URL=Copy &URL