Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2011-05-10 14:27:25 +0000
committerPascal Rapicault2011-05-10 14:27:25 +0000
commit120d8051fdffddf067bc3b60bfb5390a9a6df52f (patch)
tree884d9590c08ba6c04073da53a9ef73c86516b64c /bundles/org.eclipse.equinox.p2.ui
parent47e1d43cc64c2b74eabf89b5d186cd156ee7efa5 (diff)
downloadrt.equinox.p2-120d8051fdffddf067bc3b60bfb5390a9a6df52f.tar.gz
rt.equinox.p2-120d8051fdffddf067bc3b60bfb5390a9a6df52f.tar.xz
rt.equinox.p2-120d8051fdffddf067bc3b60bfb5390a9a6df52f.zip
Bug 336015 - [ui] ProvisioningOperationWizard will not use ProfileChangeOperation
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.ui')
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java3
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java2
3 files changed, 8 insertions, 5 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 d11f62d62..a3366dabc 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2010 IBM Corporation and others.
+ * Copyright (c) 2009, 2011 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
@@ -79,7 +79,6 @@ public class PreselectedIUInstallWizard extends WizardWithLicenses {
InstallOperation op = new InstallOperation(ui.getSession(), ElementUtils.elementsToIUs(elements));
op.setProfileId(getProfileId());
// op.setRootMarkerKey(getRootMarkerKey());
- op.setProvisioningContext(getProvisioningContext());
return op;
}
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
index 81fc022c8..10e05ff3a 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2010 IBM Corporation and others.
+ * Copyright (c) 2008, 2011 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
@@ -60,6 +60,9 @@ public abstract class ProvisioningOperationWizard extends Wizard {
this.repoPreloadJob = job;
setForcePreviousAndNextButtons(true);
setNeedsProgressMonitor(true);
+ if (operation != null) {
+ provisioningContext = operation.getProvisioningContext();
+ }
}
/*
@@ -182,6 +185,9 @@ public abstract class ProvisioningOperationWizard extends Wizard {
protected abstract void initializeResolutionModelElements(Object[] selectedElements);
protected ProvisioningContext getProvisioningContext() {
+ if (operation != null) {
+ return operation.getProvisioningContext();
+ }
return new ProvisioningContext(ui.getSession().getProvisioningAgent());
}
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java
index c421f7cef..47281e679 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java
@@ -160,8 +160,6 @@ public class UpdateWizard extends WizardWithLicenses {
operation = new UpdateOperation(ui.getSession(), getIUsToReplace(elements));
operation.setProfileId(getProfileId());
// operation.setRootMarkerKey(getRootMarkerKey());
- operation.setProvisioningContext(getProvisioningContext());
-
} else {
((UpdateOperation) operation).setSelectedUpdates(makeUpdatesFromElements(elements));
}

Back to the top