diff options
author | Pascal Rapicault (JBoss) | 2013-04-29 19:24:06 +0000 |
---|---|---|
committer | Pascal Rapicault | 2013-04-29 20:55:35 +0000 |
commit | df57b8a2a5eb635cf3eddd4617dbeee19e213669 (patch) | |
tree | 0ed6b4273cffed0a2e765e9777246e9d08c9b15d /bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2 | |
parent | d287d7ac898af36e2e4aba587218528b5956ca80 (diff) | |
download | rt.equinox.p2-df57b8a2a5eb635cf3eddd4617dbeee19e213669.tar.gz rt.equinox.p2-df57b8a2a5eb635cf3eddd4617dbeee19e213669.tar.xz rt.equinox.p2-df57b8a2a5eb635cf3eddd4617dbeee19e213669.zip |
Add remediation support to Discovery UII20130430-0800I20130430-0031I20130429-2000
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2')
-rw-r--r-- | bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java index 7d4518823..10a548c40 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java @@ -21,6 +21,7 @@ import org.eclipse.equinox.p2.operations.InstallOperation; import org.eclipse.equinox.p2.operations.ProfileChangeOperation; import org.eclipse.equinox.p2.ui.LoadMetadataRepositoryJob; import org.eclipse.equinox.p2.ui.ProvisioningUI; +import org.eclipse.jface.wizard.IWizardPage; /** * An Install wizard that is invoked when the user has already selected which @@ -38,6 +39,14 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses { setDefaultPageImageDescriptor(ProvUIImages.getImageDescriptor(ProvUIImages.WIZARD_BANNER_INSTALL)); } + @Override + public IWizardPage getStartingPage() { + if (remediationOperation != null && remediationOperation.hasRemedies()) { + return getNextPage(mainPage); + } + return super.getStartingPage(); + } + protected ISelectableIUsPage createMainPage(IUElementListRoot input, Object[] selections) { mainPage = new SelectableIUsPage(ui, this, input, selections); mainPage.setTitle(ProvUIMessages.PreselectedIUInstallWizard_Title); @@ -88,8 +97,8 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses { @Override protected RemediationPage createRemediationPage() { - // TODO Auto-generated method stub - return null; + remediationPage = new RemediationPage(ui, this, root, operation); + return remediationPage; } } |