Attachment 188261 Details for Bug 336015 – Use ProvisioningContext from ProfileChangeOperation

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Use ProvisioningContext from ProfileChangeOperation

ProvisioningOperationWizard.patch (text/plain), 3.02 KB, created by Matthew Piggott

on 2011-02-03 13:20:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Piggott

Created: 2011-02-03 13:20:48 EST

Size: 3.02 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.ui
>Index: src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java,v
>retrieving revision 1.3
>diff -u -r1.3 PreselectedIUInstallWizard.java
>--- src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java	11 Feb 2010 15:43:24 -0000	1.3
>+++ src/org/eclipse/equinox/internal/p2/ui/dialogs/PreselectedIUInstallWizard.java	3 Feb 2011 16:47:56 -0000
>@@ -79,7 +79,6 @@
> 		InstallOperation op = new InstallOperation(ui.getSession(), ElementUtils.elementsToIUs(elements));
> 		op.setProfileId(getProfileId());
> 		//		op.setRootMarkerKey(getRootMarkerKey());
>-		op.setProvisioningContext(getProvisioningContext());
> 		return op;
> 	}
> }
>Index: src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java,v
>retrieving revision 1.27
>diff -u -r1.27 ProvisioningOperationWizard.java
>--- src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java	12 May 2010 17:47:54 -0000	1.27
>+++ src/org/eclipse/equinox/internal/p2/ui/dialogs/ProvisioningOperationWizard.java	3 Feb 2011 16:47:56 -0000
>@@ -60,6 +60,9 @@
> 		this.repoPreloadJob = job;
> 		setForcePreviousAndNextButtons(true);
> 		setNeedsProgressMonitor(true);
>+		if (operation != null) {
>+			provisioningContext = operation.getProvisioningContext();
>+		}
> 	}
> 
> 	/*
>@@ -182,6 +185,9 @@
> 	protected abstract void initializeResolutionModelElements(Object[] selectedElements);
> 
> 	protected ProvisioningContext getProvisioningContext() {
>+		if (operation != null) {
>+			return operation.getProvisioningContext();
>+		}
> 		return new ProvisioningContext(ui.getSession().getProvisioningAgent());
> 	}
> 
>Index: src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java,v
>retrieving revision 1.5
>diff -u -r1.5 UpdateWizard.java
>--- src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java	11 Feb 2010 15:43:24 -0000	1.5
>+++ src/org/eclipse/equinox/internal/p2/ui/dialogs/UpdateWizard.java	3 Feb 2011 16:47:56 -0000
>@@ -137,8 +137,6 @@
> 			operation = new UpdateOperation(ui.getSession(), getIUsToReplace(elements));
> 			operation.setProfileId(getProfileId());
> 			//			operation.setRootMarkerKey(getRootMarkerKey());
>-			operation.setProvisioningContext(getProvisioningContext());
>-
> 		} else {
> 			((UpdateOperation) operation).setSelectedUpdates(makeUpdatesFromElements(elements));
> 		}

Flags:

pascal: review+

Actions: View | Diff

Attachments on bug 336015: 188089 | 188261