Attachment #136107 for bug #276133

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




		} else {
			if (!matches.isEmpty()) {
				AbstractVariable abs = getAbstractVariable();
				createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
				optionalAbstractRequirements.add(abs);
			}
		}

					} else {
						if (!matches.isEmpty()) {
							AbstractVariable abs = getAbstractVariable();
							createImplication(new Object[] {patch, abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
							optionalAbstractRequirements.add(abs);
						}
					}

						if (!matches.isEmpty()) {
							AbstractVariable abs = getAbstractVariable();
							matches.add(patch);
							createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
							optionalAbstractRequirements.add(abs);
						}
					}

					if (!requiredPatches.isEmpty())
						matches.addAll(requiredPatches);
					AbstractVariable abs = getAbstractVariable();
					createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
					optionalAbstractRequirements.add(abs);
				}
			}

Return to bug 276133

Lines 343-349 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/Projector.java (-4 / +4 lines)
343	} else {	343	} else {
344	if (!matches.isEmpty()) {	344	if (!matches.isEmpty()) {
345	AbstractVariable abs = getAbstractVariable();	345	AbstractVariable abs = getAbstractVariable();
346	createImplication(abs, matches, Explanation.OPTIONAL_REQUIREMENT);	346	createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
347	optionalAbstractRequirements.add(abs);	347	optionalAbstractRequirements.add(abs);
348	}	348	}
349	}	349	}
Lines 447-453 Link Here
447	} else {	447	} else {
448	if (!matches.isEmpty()) {	448	if (!matches.isEmpty()) {
449	AbstractVariable abs = getAbstractVariable();	449	AbstractVariable abs = getAbstractVariable();
450	createImplication(new Object[] {patch, abs}, matches, Explanation.OPTIONAL_REQUIREMENT);	450	createImplication(new Object[] {patch, abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
451	optionalAbstractRequirements.add(abs);	451	optionalAbstractRequirements.add(abs);
452	}	452	}
453	}	453	}
Lines 483-489 Link Here
483	if (!matches.isEmpty()) {	483	if (!matches.isEmpty()) {
484	AbstractVariable abs = getAbstractVariable();	484	AbstractVariable abs = getAbstractVariable();
485	matches.add(patch);	485	matches.add(patch);
486	createImplication(abs, matches, Explanation.OPTIONAL_REQUIREMENT);	486	createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
487	optionalAbstractRequirements.add(abs);	487	optionalAbstractRequirements.add(abs);
488	}	488	}
489	}	489	}
Lines 535-541 Link Here
535	if (!requiredPatches.isEmpty())	535	if (!requiredPatches.isEmpty())
536	matches.addAll(requiredPatches);	536	matches.addAll(requiredPatches);
537	AbstractVariable abs = getAbstractVariable();	537	AbstractVariable abs = getAbstractVariable();
538	createImplication(abs, matches, Explanation.OPTIONAL_REQUIREMENT);	538	createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
539	optionalAbstractRequirements.add(abs);	539	optionalAbstractRequirements.add(abs);
540	}	540	}
541	}	541	}