Bug 217272 - [prov] [ui] Need to prompt user when it is about installing a feature with install handlers

2 files changed, 9 insertions, 4 deletions

diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java
index ee877ecf1..8b724e5f1 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java
@@ -17,6 +17,7 @@ import org.eclipse.equinox.internal.provisional.p2.ui.policy.*;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
@@ -106,7 +107,11 @@ public class ProvAdminUIActivator extends AbstractUIPlugin {
 						if (ret == 1) // continue anyway
 							return true;
 						if (ret == 0)
-							UpdateManagerCompatibility.openInstaller();
+							BusyIndicator.showWhile(shell.getDisplay(), new Runnable() {
+								public void run() {
+									UpdateManagerCompatibility.openInstaller();
+								}
+							});
 						return false;
 					}
 					return true;
diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
index 4c913a6f2..6790c6c93 100644
--- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties
@@ -10,10 +10,10 @@
 ###############################################################################
 
 ProvAdminQueryProvider_UpdateQueryError=Unexpected error while looking for updates
-ProvAdminUIActivator_ContinueAnyway=Continue anyway
-ProvAdminUIActivator_LaunchUpdateManager=Launch Update Manager...
+ProvAdminUIActivator_ContinueAnyway=Continue
+ProvAdminUIActivator_LaunchUpdateManager=Launch UM...
 ProvAdminUIActivator_UnsupportedInstallHandler=Unsupported Install Handler
-ProvAdminUIActivator_UnsupportedInstallHandlerMessage=The IU you are trying to install represents a feature that defined an install handler.  This feature should only be installed with the old update UI.
+ProvAdminUIActivator_UnsupportedInstallHandlerMessage=The feature you are trying to install has defined an Update Manager install handler.  You may launch the old Update Manager in order to get the install handler support, or continue the install and ignore the install handler.
 ProvisioningPrefPage_Description=Provisioning
 ProvisioningPrefPage_ShowGroupsOnly=Show only &group IU's in profile or repository views
 ProvisioningPrefPage_ShowInstallRootsOnly=Show only the install &roots in a profile