NEW - bug 339467: [discovery] inform users when new versions or connectors are available

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

7 files changed, 197 insertions, 68 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
index e032f10f7..6a1ef30b2 100644
--- a/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.mylyn.commons.ui;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.mylyn.commons.repositories;bundle-version="0.1.0"
+ org.eclipse.mylyn.commons.repositories;bundle-version="0.1.0",
+ org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.mylyn.internal.provisional.tasks.ui.wizards;x-internal:=true,
diff --git a/org.eclipse.mylyn.tasks.ui/plugin.xml b/org.eclipse.mylyn.tasks.ui/plugin.xml
index b683f884e..c9316d897 100644
--- a/org.eclipse.mylyn.tasks.ui/plugin.xml
+++ b/org.eclipse.mylyn.tasks.ui/plugin.xml
@@ -2105,5 +2105,27 @@
 	      </toolbar>
 	    </menuContribution>
 	</extension>
-    
+   <extension
+         point="org.eclipse.ui.commands">
+      <command
+            description="%command.description"
+            id="org.eclipse.mylyn.tasks.ui.discoveryWizardCommand"
+            name="%command.name">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.mylyn.internal.tasks.ui.commands.ShowTasksConnectorDiscoveryWizardCommandHandler"
+            commandId="org.eclipse.mylyn.tasks.ui.discoveryWizardCommand">
+         <enabledWhen>
+         	<and>
+	     		<test
+	     			property="org.eclipse.core.runtime.isBundleInstalled" args="org.eclipse.mylyn.discovery.ui"/>
+	     		<test
+	     			property="org.eclipse.core.runtime.isBundleInstalled" args="org.eclipse.equinox.p2.repository"/>
+	     	</and>
+         </enabledWhen>
+      </handler>
+   </extension>    
 </plugin>
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
index 71ae0d530..fc0893f22 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java
@@ -58,6 +58,7 @@ import org.eclipse.mylyn.internal.commons.identity.IdentityModel;
 import org.eclipse.mylyn.internal.commons.identity.gravatar.GravatarConnector;
 import org.eclipse.mylyn.internal.commons.ui.TaskBarManager;
 import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
+import org.eclipse.mylyn.internal.discovery.ui.DiscoveryUi;
 import org.eclipse.mylyn.internal.monitor.ui.MonitorUiPlugin;
 import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotification;
 import org.eclipse.mylyn.internal.provisional.commons.ui.CommonColors;
@@ -83,6 +84,7 @@ import org.eclipse.mylyn.internal.tasks.core.externalization.ExternalizationMana
 import org.eclipse.mylyn.internal.tasks.core.externalization.IExternalizationParticipant;
 import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizationParticipant;
 import org.eclipse.mylyn.internal.tasks.core.externalization.TaskListExternalizer;
+import org.eclipse.mylyn.internal.tasks.core.notifications.Environment;
 import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageManager;
 import org.eclipse.mylyn.internal.tasks.ui.actions.ActivateTaskDialogAction;
 import org.eclipse.mylyn.internal.tasks.ui.actions.NewTaskAction;
@@ -666,12 +668,23 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 
 			Long checktime = getPreferenceStore().getLong(ITasksUiPreferenceConstants.LAST_SERVICE_MESSAGE_CHECKTIME);
 
-			serviceMessageManager = new ServiceMessageManager(serviceMessageUrl, lastMod, etag, checktime);
+			serviceMessageManager = new ServiceMessageManager(serviceMessageUrl, lastMod, etag, checktime,
+					new Environment() {
+						private Set<String> installedFeatures;
+
+						@Override
+						public Set<String> getInstalledFeatures(IProgressMonitor monitor) {
+							if (installedFeatures == null) {
+								installedFeatures = DiscoveryUi.createInstallJob().getInstalledFeatures(monitor);
+							}
+							return installedFeatures;
+						}
+					});
 
 			// Disabled for initial 3.4 release as per bug#263528
-//			if (getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED)) {
-//				serviceMessageManager.start();
-//			}
+			if (getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED)) {
+				serviceMessageManager.start();
+			}
 
 			// trigger lazy initialization
 			new TasksUiInitializationJob().schedule();
@@ -943,7 +956,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 		store.setDefault(ITasksUiPreferenceConstants.PREF_DATA_DIR, getDefaultDataDirectory());
 		store.setDefault(ITasksUiPreferenceConstants.GROUP_SUBTASKS, true);
 		store.setDefault(ITasksUiPreferenceConstants.NOTIFICATIONS_ENABLED, true);
-		store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED, true);
+		store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED, false);
 		store.setDefault(ITasksUiPreferenceConstants.FILTER_PRIORITY, PriorityLevel.P5.toString());
 		store.setDefault(ITasksUiPreferenceConstants.EDITOR_TASKS_RICH, true);
 		store.setDefault(ITasksUiPreferenceConstants.EDITOR_CURRENT_LINE_HIGHLIGHT, false);
@@ -972,7 +985,7 @@ public class TasksUiPlugin extends AbstractUIPlugin {
 		store.setDefault(ITasksUiPreferenceConstants.AUTO_EXPAND_TASK_LIST, true);
 		store.setDefault(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED, true);
 
-		store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGE_URL, "http://eclipse.org/mylyn/message.xml"); //$NON-NLS-1$
+		store.setDefault(ITasksUiPreferenceConstants.SERVICE_MESSAGE_URL, "http://eclipse.org/mylyn/updates.xml"); //$NON-NLS-1$
 	}
 
 	public static TaskActivityManager getTaskActivityManager() {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/ShowTasksConnectorDiscoveryWizardCommandHandler.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/ShowTasksConnectorDiscoveryWizardCommandHandler.java
new file mode 100644
index 000000000..970b0b553
--- /dev/null
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/ShowTasksConnectorDiscoveryWizardCommandHandler.java
@@ -0,0 +1,76 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Tasktop Technologies.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.mylyn.internal.tasks.ui.commands;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.mylyn.internal.discovery.ui.wizards.ConnectorDiscoveryWizard;
+import org.eclipse.mylyn.internal.provisional.commons.ui.WorkbenchUtil;
+import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
+import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * A command that causes the {@link ConnectorDiscoveryWizard} to appear in a dialog.
+ * 
+ * @author David Green
+ * @author Steffen Pingel
+ */
+public class ShowTasksConnectorDiscoveryWizardCommandHandler extends AbstractHandler {
+
+	private static final String ID_P2_INSTALL_UI = "org.eclipse.equinox.p2.ui.sdk/org.eclipse.equinox.p2.ui.sdk.install"; //$NON-NLS-1$
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		// check to make sure that the p2 install ui is enabled
+		if (WorkbenchUtil.allowUseOf(ID_P2_INSTALL_UI)) {
+			ConnectorDiscoveryWizard wizard = new ConnectorDiscoveryWizard();
+			WizardDialog dialog = new WizardDialog(WorkbenchUtil.getShell(), wizard) {
+				@Override
+				protected void createButtonsForButtonBar(Composite parent) {
+					super.createButtonsForButtonBar(parent);
+					((GridLayout) parent.getLayout()).numColumns++;
+					final Button button = new Button(parent, SWT.CHECK);
+					button.setSelection(TasksUiPlugin.getDefault()
+							.getPreferenceStore()
+							.getBoolean(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
+					button.setText("Notify when new connectors are available");
+					button.setFont(JFaceResources.getDialogFont());
+					button.addSelectionListener(new SelectionAdapter() {
+						@Override
+						public void widgetSelected(SelectionEvent event) {
+							TasksUiPlugin.getDefault()
+									.getPreferenceStore()
+									.setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
+											button.getSelection());
+						}
+					});
+					button.moveAbove(null);
+				}
+			};
+			dialog.open();
+		} else {
+			MessageDialog.openWarning(WorkbenchUtil.getShell(), "Install Connectors",
+					"Unable to launch connector install since the required platform support is not available.");
+		}
+
+		return null;
+	}
+}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListServiceMessageControl.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListServiceMessageControl.java
index 6c6ce2a0d..d4c3f996a 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListServiceMessageControl.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListServiceMessageControl.java
@@ -12,6 +12,8 @@
 
 package org.eclipse.mylyn.internal.tasks.ui.notifications;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Collections;
 import java.util.Date;
 
@@ -29,10 +31,10 @@ import org.eclipse.mylyn.internal.tasks.core.notifications.ServiceMessageEvent;
 import org.eclipse.mylyn.internal.tasks.ui.ITasksUiPreferenceConstants;
 import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
 import org.eclipse.mylyn.internal.tasks.ui.actions.AddRepositoryAction;
+import org.eclipse.mylyn.internal.tasks.ui.preferences.TasksUiPreferencePage;
 import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
 import org.eclipse.mylyn.internal.tasks.ui.wizards.Messages;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
-import org.eclipse.osgi.service.resolver.VersionRange;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -41,7 +43,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.handlers.IHandlerService;
-import org.osgi.framework.Version;
 
 /**
  * @author Robert Elves
@@ -54,6 +55,7 @@ public class TaskListServiceMessageControl extends ServiceMessageControl impleme
 
 	public TaskListServiceMessageControl(Composite parent) {
 		super(parent);
+		setPreferencesPageId(TasksUiPreferencePage.ID);
 	}
 
 	static ExecutionEvent createExecutionEvent(Command command, IHandlerService handlerService) {
@@ -83,12 +85,15 @@ public class TaskListServiceMessageControl extends ServiceMessageControl impleme
 					continue;
 				}
 
-				if (!lastMessageId.equals(message.getId()) && isForCurrentVersion(message)) {
+				if (message.getId().compareTo(lastMessageId) > 0) {
 					Display.getDefault().asyncExec(new Runnable() {
 						public void run() {
 							setMessage(message);
+							// event id is not used but must be set to make configure link visible
+							setEventId(""); //$NON-NLS-1$
 						}
 					});
+					break;
 				}
 			}
 			break;
@@ -98,21 +103,6 @@ public class TaskListServiceMessageControl extends ServiceMessageControl impleme
 		}
 	}
 
-	private boolean isForCurrentVersion(ServiceMessage message) {
-		if (message.getVersion() == null) {
-			return true;
-		}
-
-		try {
-			VersionRange version = new VersionRange(message.getVersion());
-			String versionString = (String) TasksUiPlugin.getDefault().getBundle().getHeaders().get("Bundle-Version"); //$NON-NLS-1$
-			return version.isIncluded(new Version(versionString));
-		} catch (IllegalArgumentException e) {
-			// invalid version range
-			return false;
-		}
-	}
-
 	public void setMessage(ServiceMessage message) {
 		if (message != null) {
 			ensureControl();
@@ -126,8 +116,8 @@ public class TaskListServiceMessageControl extends ServiceMessageControl impleme
 			this.currentMessage = message;
 
 			setTitle(message.getTitle());
-			setDescription(message.getDescription());
 			setTitleImage(Dialog.getImage(message.getImage()));
+			setDescription(message.getDescription());
 		}
 	}
 
@@ -136,35 +126,67 @@ public class TaskListServiceMessageControl extends ServiceMessageControl impleme
 		return new SelectionAdapter() {
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				if (e.text != null) {
-					String action = e.text.toLowerCase();
-					if ("create-local-task".equals(action)) { //$NON-NLS-1$
-						closeMessage();
-						LocalTask task = TasksUiInternal.createNewLocalTask(null);
-						TasksUiUtil.openTask(task);
-					} else if ("connect".equals(action)) { //$NON-NLS-1$
-						closeMessage();
-						new AddRepositoryAction().run();
-					} else if ("discovery".equals(action)) { //$NON-NLS-1$
-						closeMessage();
-						final Command discoveryWizardCommand = TasksUiInternal.getConfiguredDiscoveryWizardCommand();
-						if (discoveryWizardCommand != null && discoveryWizardCommand.isEnabled()) {
-							IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(
-									IHandlerService.class);
-							try {
-								handlerService.executeCommand(discoveryWizardCommand.getId(), null);
-							} catch (Exception e1) {
-								IStatus status = new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, NLS.bind(
-										Messages.SelectRepositoryConnectorPage_discoveryProblemMessage,
-										new Object[] { e1.getMessage() }), e1);
-								TasksUiInternal.logAndDisplayStatus(
-										Messages.SelectRepositoryConnectorPage_discoveryProblemTitle, status);
-							}
+				if (e.text == null) {
+					return;
+				}
+
+				String action = getAction(e.text);
+				if ("create-local-task".equals(action)) { //$NON-NLS-1$
+					closeMessage();
+					LocalTask task = TasksUiInternal.createNewLocalTask(null);
+					TasksUiUtil.openTask(task);
+				} else if ("connect".equals(action)) { //$NON-NLS-1$
+					closeMessage();
+					new AddRepositoryAction().run();
+				} else if ("discovery".equals(action)) { //$NON-NLS-1$
+					closeMessage();
+					final Command discoveryWizardCommand = TasksUiInternal.getConfiguredDiscoveryWizardCommand();
+					if (discoveryWizardCommand != null && discoveryWizardCommand.isEnabled()) {
+						IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(
+								IHandlerService.class);
+						try {
+							handlerService.executeCommand(discoveryWizardCommand.getId(), null);
+						} catch (Exception e1) {
+							IStatus status = new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, NLS.bind(
+									Messages.SelectRepositoryConnectorPage_discoveryProblemMessage,
+									new Object[] { e1.getMessage() }), e1);
+							TasksUiInternal.logAndDisplayStatus(
+									Messages.SelectRepositoryConnectorPage_discoveryProblemTitle, status);
 						}
 					}
+				} else if (TasksUiInternal.isValidUrl(e.text)) {
+					TasksUiUtil.openUrl(e.text);
 				}
 			}
+
 		};
 	}
 
+	/**
+	 * Extracts action from query part or a URL if applicable.
+	 */
+	public static String getAction(String action) {
+		if (action.startsWith("http")) { //$NON-NLS-1$
+			URL url;
+			try {
+				url = new URL(action);
+				String query = url.getQuery();
+				if (query != null && query.startsWith("action=")) { //$NON-NLS-1$
+					int i = query.indexOf("&"); //$NON-NLS-1$
+					if (i != -1) {
+						action = query.substring(7, i);
+					} else {
+						action = query.substring(7);
+					}
+				} else {
+					return null;
+				}
+			} catch (MalformedURLException e1) {
+				// ignore
+				return null;
+			}
+		}
+		return action.toLowerCase();
+	}
+
 }
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java
index 9dfa3266e..5fac8ff7f 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/preferences/TasksUiPreferencePage.java
@@ -111,8 +111,7 @@ public class TasksUiPreferencePage extends PreferencePage implements IWorkbenchP
 
 	private Button showTaskTrimButton;
 
-	// Disabled for initial 3.4 release as per bug#263528
-//	private Button taskListServiceMessageEnabledButton;
+	private Button taskListServiceMessageEnabledButton;
 
 	public TasksUiPreferencePage() {
 		super();
@@ -213,9 +212,8 @@ public class TasksUiPreferencePage extends PreferencePage implements IWorkbenchP
 
 		getPreferenceStore().setValue(ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED,
 				taskListTooltipEnabledButton.getSelection());
-		// Disabled for initial 3.4 release as per bug#263528
-//		getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
-//				taskListServiceMessageEnabledButton.getSelection());
+		getPreferenceStore().setValue(ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED,
+				taskListServiceMessageEnabledButton.getSelection());
 		getPreferenceStore().setValue(ITasksUiPreferenceConstants.SHOW_TRIM, showTaskTrimButton.getSelection());
 
 		getPreferenceStore().setValue(ITasksUiPreferenceConstants.WEEK_START_DAY, getWeekStartValue());
@@ -288,9 +286,8 @@ public class TasksUiPreferencePage extends PreferencePage implements IWorkbenchP
 
 		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
 				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
-		// Disabled for initial 3.4 release as per bug#263528
-//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
-//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
+		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
+				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
 		showTaskTrimButton.setSelection(getPreferenceStore().getBoolean(ITasksUiPreferenceConstants.SHOW_TRIM));
 
 		weekStartCombo.select(getPreferenceStore().getInt(ITasksUiPreferenceConstants.WEEK_START_DAY) - 1);
@@ -328,9 +325,8 @@ public class TasksUiPreferencePage extends PreferencePage implements IWorkbenchP
 
 		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
 				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
-		// Disabled for initial 3.4 release as per bug#263528
-//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
-//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
+		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getDefaultBoolean(
+				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
 		showTaskTrimButton.setSelection(getPreferenceStore().getDefaultBoolean(ITasksUiPreferenceConstants.SHOW_TRIM));
 
 		// synchQueries.setSelection(getPreferenceStore().getDefaultBoolean(
@@ -519,11 +515,10 @@ public class TasksUiPreferencePage extends PreferencePage implements IWorkbenchP
 		taskListTooltipEnabledButton.setSelection(getPreferenceStore().getBoolean(
 				ITasksUiPreferenceConstants.TASK_LIST_TOOL_TIPS_ENABLED));
 
-		// Disabled for initial 3.4 release as per bug#263528
-//		taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
-//		taskListServiceMessageEnabledButton.setText(Messages.TasksUiPreferencePage_show_service_messages);
-//		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
-//				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
+		taskListServiceMessageEnabledButton = new Button(group, SWT.CHECK);
+		taskListServiceMessageEnabledButton.setText("Display notification when new connectors are available"); //$NON-NLS-1$
+		taskListServiceMessageEnabledButton.setSelection(getPreferenceStore().getBoolean(
+				ITasksUiPreferenceConstants.SERVICE_MESSAGES_ENABLED));
 	}
 
 	private void createTaskActivityGroup(Composite container) {
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 3954cfd76..3e1e9a401 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
@@ -165,7 +165,7 @@ public class TasksUiInternal {
 	 */
 	public static Command getConfiguredDiscoveryWizardCommand() {
 		ICommandService service = (ICommandService) PlatformUI.getWorkbench().getService(ICommandService.class);
-		final Command discoveryWizardCommand = service.getCommand("org.eclipse.mylyn.discovery.ui.discoveryWizardCommand"); //$NON-NLS-1$
+		final Command discoveryWizardCommand = service.getCommand("org.eclipse.mylyn.tasks.ui.discoveryWizardCommand"); //$NON-NLS-1$
 		if (discoveryWizardCommand != null) {
 			IHandlerService handlerService = (IHandlerService) PlatformUI.getWorkbench().getService(
 					IHandlerService.class);