diff options
author | Susan Franklin | 2010-02-22 23:49:55 +0000 |
---|---|---|
committer | Susan Franklin | 2010-02-22 23:49:55 +0000 |
commit | 130f552776b5eaf042b98b6ad0272bcc4d838c2c (patch) | |
tree | 6aba819734fa6036ba77fdc3f4b867f814cd448d /bundles/org.eclipse.equinox.p2.ui.sdk | |
parent | 4ac2e5c553b7f30bbb08de2c7d1b4171d2ee813d (diff) | |
download | rt.equinox.p2-130f552776b5eaf042b98b6ad0272bcc4d838c2c.tar.gz rt.equinox.p2-130f552776b5eaf042b98b6ad0272bcc4d838c2c.tar.xz rt.equinox.p2-130f552776b5eaf042b98b6ad0272bcc4d838c2c.zip |
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui.sdk')
4 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF index 2106b3c4f..c04920c66 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/META-INF/MANIFEST.MF @@ -20,7 +20,7 @@ Import-Package: javax.xml.parsers, org.xml.sax Export-Package: org.eclipse.equinox.internal.p2.ui.sdk;x-internal:=true, org.eclipse.equinox.internal.p2.ui.sdk.prefs;x-internal:=true -Require-Bundle: org.eclipse.ui, +Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime, org.eclipse.equinox.p2.ui Bundle-ActivationPolicy: lazy diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/InstallNewSoftwareHandler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/InstallNewSoftwareHandler.java index 20f281b10..621b658e7 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/InstallNewSoftwareHandler.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/InstallNewSoftwareHandler.java @@ -28,7 +28,7 @@ public class InstallNewSoftwareHandler extends PreloadingRepositoryHandler { } protected void doExecute(LoadMetadataRepositoryJob job) { - getProvisioningUI().openInstallWizard(getShell(), null, null, job); + getProvisioningUI().openInstallWizard(null, null, job); } protected boolean waitForPreload() { diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/PreloadingRepositoryHandler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/PreloadingRepositoryHandler.java index 6aa65fa61..4139b4fa2 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/PreloadingRepositoryHandler.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/PreloadingRepositoryHandler.java @@ -97,6 +97,6 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler { * @return a Shell */ protected Shell getShell() { - return getProvisioningUI().getDefaultParentShell(); + return PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(); } } diff --git a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java index 8e1a72670..07d7e3023 100644 --- a/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java +++ b/bundles/org.eclipse.equinox.p2.ui.sdk/src/org/eclipse/equinox/internal/p2/ui/sdk/UpdateHandler.java @@ -38,7 +38,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { // check for updates operation.resolveModal(null); if (getProvisioningUI().getPolicy().continueWorkingWithOperation(operation, getShell())) { - getProvisioningUI().openUpdateWizard(getShell(), false, operation, job); + getProvisioningUI().openUpdateWizard(false, operation, job); } } |