Attachment 194534 Details for Bug 323340 – Previous patch updated to be applied on HEAD.

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

[patch] Previous patch updated to be applied on HEAD.

Bug323340 .patch (text/plain), 1.77 KB, created by Daniel Le Berre

on 2011-05-02 15:26:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Le Berre

Created: 2011-05-02 15:26:04 EDT

Size: 1.77 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.director
>Index: src/org/eclipse/equinox/internal/p2/director/Projector.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java,v
>retrieving revision 1.72
>diff -u -r1.72 Projector.java
>--- src/org/eclipse/equinox/internal/p2/director/Projector.java	11 Feb 2011 20:00:15 -0000	1.72
>+++ src/org/eclipse/equinox/internal/p2/director/Projector.java	2 May 2011 19:24:01 -0000
>@@ -284,23 +284,19 @@
> 
> 		BigInteger maxWeight = POWER;
> 		for (Entry<String, Map<Version, IInstallableUnit>> entry : s) {
>-			Map<Version, IInstallableUnit> conflictingEntries = entry.getValue();
>-
>-			List<IInstallableUnit> toSort = new ArrayList<IInstallableUnit>(conflictingEntries.values());
>+			List<IInstallableUnit> conflictingEntries = new ArrayList<IInstallableUnit>(entry.getValue().values());
> 			if (conflictingEntries.size() == 1) {
>-				IInstallableUnit iu = toSort.get(0);
>+				IInstallableUnit iu = conflictingEntries.get(0);
> 				if (iu != metaIu) {
> 					weightedObjects.add(WeightedObject.newWO(iu, POWER));
> 				}
> 				continue;
> 			}
>-			Collections.sort(toSort, Collections.reverseOrder());
>+			Collections.sort(conflictingEntries, Collections.reverseOrder());
> 			BigInteger weight = POWER;
>-			int count = toSort.size();
> 			boolean installedIuMet = false;
> 			boolean rootedMet = false;
>-			for (int i = 0; i < count; i++) {
>-				IInstallableUnit iu = toSort.get(i);
>+			for (IInstallableUnit iu : conflictingEntries) {
> 				if (!rootedMet && isInstalled(iu) && !transitiveClosure.contains(iu)) {
> 					installedIuMet = true;
> 					weightedObjects.add(WeightedObject.newWO(iu, BigInteger.ONE));

Flags:

pascal: review+

Actions: View | Diff

Attachments on bug 323340: 177191 | 194534