Bug 267518 - [planner] p2 should favor optional pieces installed by the user

1 files changed, 10 insertions, 4 deletions

diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
index 21cf3dff8..46b714e5b 100644
--- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
+++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java
@@ -224,14 +224,20 @@ public class Projector {
 
 		maxWeight = maxWeight.multiply(POWER);
 
-		BigInteger patchWeight = maxWeight.negate();
+		BigInteger optionalWeight = maxWeight.negate();
+		BigInteger patchWeight = maxWeight.multiply(POWER).multiply(POWER).negate();
 		if (patches != null) {
 			IRequiredCapability[] reqs = metaIu.getRequiredCapabilities();
 			for (int j = 0; j < reqs.length; j++) {
-				Collector matches = patches.query(new CapabilityQuery(reqs[j]), new Collector(), null);
+				if (!reqs[j].isOptional())
+					continue;
+				Collector matches = picker.query(new CapabilityQuery(reqs[j]), new Collector(), null);
 				for (Iterator iterator = matches.iterator(); iterator.hasNext();) {
-					IInstallableUnitPatch match = (IInstallableUnitPatch) iterator.next();
-					weightedObjects.add(WeightedObject.newWO(match, patchWeight));
+					IInstallableUnit match = (IInstallableUnit) iterator.next();
+					if (match instanceof IInstallableUnitPatch)
+						weightedObjects.add(WeightedObject.newWO(match, patchWeight));
+					else
+						weightedObjects.add(WeightedObject.newWO(match, optionalWeight));
 				}
 			}