diff options
author | Susan Franklin | 2010-03-18 23:05:58 +0000 |
---|---|---|
committer | Susan Franklin | 2010-03-18 23:05:58 +0000 |
commit | 6595e2236aa77b2cefec536eea8ac91f41f397db (patch) | |
tree | 6d0181f4ac195fa5b9f7e0fe1d55e987a4aec1c4 /examples/org.eclipse.equinox.p2.examples.rcp.cloud | |
parent | d6dd2d5315bd1cd222616cb9d427455d93cb1ce4 (diff) | |
download | rt.equinox.p2-6595e2236aa77b2cefec536eea8ac91f41f397db.tar.gz rt.equinox.p2-6595e2236aa77b2cefec536eea8ac91f41f397db.tar.xz rt.equinox.p2-6595e2236aa77b2cefec536eea8ac91f41f397db.zip |
Bug 290973 - [ui] [example] RCP Simple Update UI Example
Diffstat (limited to 'examples/org.eclipse.equinox.p2.examples.rcp.cloud')
3 files changed, 25 insertions, 4 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 7e078dcc7..5ac9fd19e 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 @@ -24,6 +24,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.0", org.eclipse.ecf.provider.filetransfer.httpclient;bundle-version="3.0.0", org.apache.commons.codec;bundle-version="1.2.0", org.apache.commons.httpclient;bundle-version="3.0.1", - org.eclipse.equinox.p2.ui.sdk.scheduler;bundle-version="1.0.0" + org.eclipse.equinox.p2.ui.sdk.scheduler;bundle-version="1.0.0", + org.eclipse.equinox.ds;bundle-version="1.2.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product index 7e8413c75..a95f241f8 100644 --- a/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product +++ b/examples/org.eclipse.equinox.p2.examples.rcp.cloud/cloud.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> -<product name="RCP Mail Example (Cloud Update)" id="org.eclipse.equinox.p2.examples.rcp.cloud.product" application="org.eclipse.equinox.p2.examples.rcp.cloud.application" version="1.0.0.qualifier" useFeatures="false"> +<product name="RCP Mail Example (Cloud Update)" id="org.eclipse.equinox.p2.examples.rcp.cloud.product" application="org.eclipse.equinox.p2.examples.rcp.cloud.application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true"> <aboutInfo> <image path="product_lg.gif"/> @@ -55,24 +55,30 @@ <plugin id="org.eclipse.ecf.ssl" fragment="true"/> <plugin id="org.eclipse.equinox.app"/> <plugin id="org.eclipse.equinox.common"/> + <plugin id="org.eclipse.equinox.ds"/> + <plugin id="org.eclipse.equinox.event"/> <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.p2.artifact.repository"/> <plugin id="org.eclipse.equinox.p2.core"/> <plugin id="org.eclipse.equinox.p2.director"/> <plugin id="org.eclipse.equinox.p2.directorywatcher"/> + <plugin id="org.eclipse.equinox.p2.discovery"/> + <plugin id="org.eclipse.equinox.p2.discovery.compatibility"/> <plugin id="org.eclipse.equinox.p2.engine"/> <plugin id="org.eclipse.equinox.p2.examples.rcp.cloud"/> - <plugin id="org.eclipse.equinox.p2.exemplarysetup"/> <plugin id="org.eclipse.equinox.p2.extensionlocation"/> <plugin id="org.eclipse.equinox.p2.garbagecollector"/> <plugin id="org.eclipse.equinox.p2.jarprocessor"/> <plugin id="org.eclipse.equinox.p2.metadata"/> <plugin id="org.eclipse.equinox.p2.metadata.repository"/> + <plugin id="org.eclipse.equinox.p2.operations"/> <plugin id="org.eclipse.equinox.p2.publisher"/> + <plugin id="org.eclipse.equinox.p2.ql"/> <plugin id="org.eclipse.equinox.p2.repository"/> <plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/> <plugin id="org.eclipse.equinox.p2.ui"/> + <plugin id="org.eclipse.equinox.p2.ui.discovery"/> <plugin id="org.eclipse.equinox.p2.ui.sdk.scheduler"/> <plugin id="org.eclipse.equinox.p2.updatechecker"/> <plugin id="org.eclipse.equinox.p2.updatesite"/> @@ -83,14 +89,17 @@ <plugin id="org.eclipse.equinox.security.win32.x86" fragment="true"/> <plugin id="org.eclipse.equinox.simpleconfigurator"/> <plugin id="org.eclipse.equinox.simpleconfigurator.manipulator"/> + <plugin id="org.eclipse.equinox.util"/> <plugin id="org.eclipse.help"/> <plugin id="org.eclipse.jface"/> <plugin id="org.eclipse.jface.databinding"/> <plugin id="org.eclipse.osgi"/> <plugin id="org.eclipse.osgi.services"/> <plugin id="org.eclipse.swt"/> + <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/> <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/> <plugin id="org.eclipse.ui"/> + <plugin id="org.eclipse.ui.browser"/> <plugin id="org.eclipse.ui.workbench"/> <plugin id="org.sat4j.core"/> <plugin id="org.sat4j.pb"/> 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 ee65b365e..e484212a0 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 @@ -10,9 +10,11 @@ *******************************************************************************/ package org.eclipse.equinox.p2.examples.rcp.cloud.p2; +import org.eclipse.equinox.internal.p2.ui.dialogs.UpdateSingleIUWizard; import org.eclipse.equinox.p2.operations.RepositoryTracker; import org.eclipse.equinox.p2.operations.UpdateOperation; import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob; +import org.eclipse.jface.wizard.WizardDialog; /** * UpdateHandler invokes the check for updates UI @@ -31,7 +33,16 @@ public class UpdateHandler extends PreloadingRepositoryHandler { // check for updates operation.resolveModal(null); if (getProvisioningUI().getPolicy().continueWorkingWithOperation(operation, getShell())) { - getProvisioningUI().openUpdateWizard(true, operation, job); + if (UpdateSingleIUWizard.validFor(operation)) { + // Special case for only updating a single root + UpdateSingleIUWizard wizard = new UpdateSingleIUWizard(getProvisioningUI(), operation); + WizardDialog dialog = new WizardDialog(getShell(), wizard); + dialog.create(); + dialog.open(); + } else { + // Open the normal version of the update wizard + getProvisioningUI().openUpdateWizard(false, operation, job); + } } } |