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 /examples | |
parent | 4ac2e5c553b7f30bbb08de2c7d1b4171d2ee813d (diff) | |
download | rt.equinox.p2-130f552776b5eaf042b98b6ad0272bcc4d838c2c.tar.gz rt.equinox.p2-130f552776b5eaf042b98b6ad0272bcc4d838c2c.tar.xz rt.equinox.p2-130f552776b5eaf042b98b6ad0272bcc4d838c2c.zip |
Diffstat (limited to 'examples')
12 files changed, 19 insertions, 19 deletions
diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/META-INF/MANIFEST.MF index 5796e7571..7e078dcc7 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.examples.rcp.cloud; singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.equinox.p2.examples.rcp.cloud.Activator Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, +Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime, org.eclipse.equinox.p2.operations;bundle-version="2.0.0", org.eclipse.equinox.p2.ui;bundle-version="2.0.0", diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java index a7e9b7921..06643cca1 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/InstallNewSoftwareHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/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/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java index 66aa00c4a..a4c4710a2 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/PreloadingRepositoryHandler.java @@ -99,6 +99,6 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler { * @return a Shell */ protected Shell getShell() { - return getProvisioningUI().getDefaultParentShell(); + return PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(); } } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java index 77db223a1..ee65b365e 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/src/org/eclipse/equinox/p2/examples/rcp/cloud/p2/UpdateHandler.java @@ -31,7 +31,7 @@ public class UpdateHandler extends PreloadingRepositoryHandler { // check for updates operation.resolveModal(null); if (getProvisioningUI().getPolicy().continueWorkingWithOperation(operation, getShell())) { - getProvisioningUI().openUpdateWizard(getShell(), true, operation, job); + getProvisioningUI().openUpdateWizard(true, operation, job); } } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF index 8f48754d0..72b45e32f 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility; si Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Bundle-Activator: org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.Activator -Require-Bundle: org.eclipse.ui, +Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.core.runtime, org.eclipse.equinox.ds, org.eclipse.equinox.p2.operations;bundle-version="2.0.0", diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/plugin.xml b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/plugin.xml index 4847b0eb0..13964a440 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/plugin.xml +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/plugin.xml @@ -154,16 +154,16 @@ point="org.eclipse.ui.preferencePages"> <page name="%provisioningPrefPage" - class="org.eclipse.equinox.internal.p2.ui.sdk.prefs.ProvisioningPreferencePage" - id="org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"> + class="org.eclipse.equinox.p2.ui.ProvisioningPreferencePage" + id="org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.ProvisioningPreferencePage"> <keywordReference id="org.eclipse.equinox.p2.ui.sdk.updates.general"/> </page> <page name="%sitesPrefPage" - category="org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage" - class="org.eclipse.equinox.internal.provisional.p2.ui.dialogs.RepositoryManipulationPage" - id="org.eclipse.equinox.internal.p2.ui.sdk.SitesPreferencePage"> + category="org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.ProvisioningPreferencePage" + class="org.eclipse.equinox.p2.ui.RepositoryManipulationPage" + id="org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.SitesPreferencePage"> <keywordReference id="org.eclipse.equinox.p2.ui.sdk.updates.general"/> </page> diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/InstallNewSoftwareHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/InstallNewSoftwareHandler.java index 96e3758b9..4432c07fa 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/InstallNewSoftwareHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/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/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreferenceConstants.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreferenceConstants.java index ea29eb88a..bd133104e 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreferenceConstants.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreferenceConstants.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007 IBM Corporation and others. + * Copyright (c) 2007, 2010 IBM Corporation and others. * 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 @@ -11,11 +11,11 @@ package org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.p2; /** - * @since 3.4 + * @since 3.6 */ public class PreferenceConstants { - public static final String PREF_PAGE_PROVISIONING = "org.eclipse.equinox.internal.p2.ui.sdk.ProvisioningPreferencePage"; //$NON-NLS-1$ - public static final String PREF_PAGE_SITES = "org.eclipse.equinox.internal.p2.ui.sdk.SitesPreferencePage"; //$NON-NLS-1$ + public static final String PREF_PAGE_PROVISIONING = "org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.ProvisioningPreferencePage"; //$NON-NLS-1$ + public static final String PREF_PAGE_SITES = "org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility.SitesPreferencePage"; //$NON-NLS-1$ public static final String PREF_SHOW_LATEST_VERSION = "showLatestVersion"; //$NON-NLS-1$ public static final String PREF_OPEN_WIZARD_ON_ERROR_PLAN = "allowNonOKPlan"; //$NON-NLS-1$ } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java index 552bc3b6c..df8436790 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/PreloadingRepositoryHandler.java @@ -99,6 +99,6 @@ abstract class PreloadingRepositoryHandler extends AbstractHandler { * @return a Shell */ protected Shell getShell() { - return getProvisioningUI().getDefaultParentShell(); + return PlatformUI.getWorkbench().getModalDialogShellProvider().getShell(); } } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/UpdateHandler.java b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/UpdateHandler.java index b9e2fcdec..1883b78fc 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/UpdateHandler.java +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkbundlevisibility/src/org/eclipse/equinox/p2/examples/rcp/sdkbundlevisibility/p2/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(), true, operation, job); + getProvisioningUI().openUpdateWizard(true, operation, job); } } diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF index d3eaf0c57..d574720e3 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.equinox.p2.examples.rcp.sdknoautoupdates.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.equinox.p2.ui;bundle-version="1.0.100", + org.eclipse.equinox.p2.ui;bundle-version="2.0.0", org.eclipse.equinox.p2.metadata;bundle-version="1.0.0", org.eclipse.equinox.p2.metadata.repository;bundle-version="1.0.0", org.eclipse.equinox.p2.artifact.repository;bundle-version="1.0.0", diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF index 58bab2409..d3e191cb5 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.equinox.p2.examples.rcp.sdkui/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.equinox.p2.examples.rcp.sdkui.Activator Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.eclipse.equinox.p2.ui;bundle-version="1.0.100", + org.eclipse.equinox.p2.ui;bundle-version="2.0.0", org.eclipse.equinox.p2.metadata;bundle-version="1.0.0", org.eclipse.equinox.p2.metadata.repository;bundle-version="1.0.0", org.eclipse.equinox.p2.artifact.repository;bundle-version="1.0.0", |