Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/ProvAdminUIActivator.java7
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/messages.properties6
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java7
-rw-r--r--bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties8
4 files changed, 20 insertions, 8 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
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
index d5637a94f..b250d4517 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/ProvSDKUIActivator.java
@@ -25,6 +25,7 @@ import org.eclipse.equinox.internal.provisional.p2.ui.policy.IPlanValidator;
import org.eclipse.equinox.internal.provisional.p2.ui.policy.IQueryProvider;
import org.eclipse.jface.dialogs.*;
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.eclipse.ui.statushandlers.StatusManager;
@@ -202,7 +203,11 @@ public class ProvSDKUIActivator extends AbstractUIPlugin {
if (UpdateManagerCompatibility.requiresInstallHandlerSupport(plan)) {
MessageDialog dialog = new MessageDialog(shell, ProvSDKMessages.ProvSDKUIActivator_UnsupportedFeatureTitle, null, ProvSDKMessages.ProvSDKUIActivator_UnsupportedFeatureMessage, MessageDialog.WARNING, new String[] {ProvSDKMessages.ProvSDKUIActivator_LaunchUpdateManager, IDialogConstants.CANCEL_LABEL}, 0);
if (dialog.open() == 0)
- UpdateManagerCompatibility.openInstaller();
+ BusyIndicator.showWhile(shell.getDisplay(), new Runnable() {
+ public void run() {
+ UpdateManagerCompatibility.openInstaller();
+ }
+ });
return false;
}
if (plan.getStatus().isOK())
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties
index 59c98f676..fe1c93988 100644
--- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/messages.properties
@@ -90,13 +90,15 @@ AutomaticUpdatesPreferencePage_RemindOnce=Notify me &once about updates
AutomaticUpdatesJob_Updates=Updates
ProvSDKQueryProvider_ErrorRetrievingProfile=Error while retrieving profile {0}
ProvSDKUIActivator_ErrorWritingLicenseRegistry=Error writing license registry. Accepted licenses will not be remembered.
-ProvSDKUIActivator_LaunchUpdateManager=Launch Update Manager...
+ProvSDKUIActivator_LaunchUpdateManager=Launch...
ProvSDKUIActivator_LicenseManagerReadError=Error reading license registry. Accepted licenses will not be remembered.
ProvSDKUIActivator_NoSelfProfile=Could not locate the running profile instance
ProvSDKUIActivator_OpenWizardAnyway=The software items you selected may not be valid with your current installation. Do you want open the wizard anyway to review the selections?
ProvSDKUIActivator_Question=Question
-ProvSDKUIActivator_UnsupportedFeatureMessage=The feature that you are trying to install uses older Update Manager mechanisms. This software can only be installed by the old update manager.
-ProvSDKUIActivator_UnsupportedFeatureTitle=Unsupported Feature
+ProvSDKUIActivator_UnsupportedFeatureMessage=A feature that you have selected uses install procedures that are not compatible with the current installation support. This feature can only be installed by the older Update Manager. \
+\
+Do you want to launch the older Update Manager?
+ProvSDKUIActivator_UnsupportedFeatureTitle=Unsupported Install
ProvisioningPreferencePage_Always=&Open the wizard anyway to review or change selections
ProvisioningPreferencePage_BrowsingPrefsGroup=Browsing for updates
ProvisioningPreferencePage_ShowLatestVersions=Show only the &latest versions of available software

Back to the top