Attachment 136107 Details for Bug 276133 – Contextualization of the optionality constraint

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

[patch] Contextualization of the optionality constraint

OptionalityEncodingPatch.txt (text/plain), 2.00 KB, created by Daniel Le Berre

on 2009-05-16 17:35:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Le Berre

Created: 2009-05-16 17:35:44 EDT

Size: 2.00 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.40
>diff -u -r1.40 Projector.java
>--- src/org/eclipse/equinox/internal/p2/director/Projector.java	7 May 2009 12:46:33 -0000	1.40
>+++ src/org/eclipse/equinox/internal/p2/director/Projector.java	16 May 2009 21:29:04 -0000
>@@ -343,7 +343,7 @@
> 		} else {
> 			if (!matches.isEmpty()) {
> 				AbstractVariable abs = getAbstractVariable();
>-				createImplication(abs, matches, Explanation.OPTIONAL_REQUIREMENT);
>+				createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
> 				optionalAbstractRequirements.add(abs);
> 			}
> 		}
>@@ -447,7 +447,7 @@
> 					} else {
> 						if (!matches.isEmpty()) {
> 							AbstractVariable abs = getAbstractVariable();
>-							createImplication(new Object[] {patch, abs}, matches, Explanation.OPTIONAL_REQUIREMENT);
>+							createImplication(new Object[] {patch, abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
> 							optionalAbstractRequirements.add(abs);
> 						}
> 					}
>@@ -483,7 +483,7 @@
> 						if (!matches.isEmpty()) {
> 							AbstractVariable abs = getAbstractVariable();
> 							matches.add(patch);
>-							createImplication(abs, matches, Explanation.OPTIONAL_REQUIREMENT);
>+							createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
> 							optionalAbstractRequirements.add(abs);
> 						}
> 					}
>@@ -535,7 +535,7 @@
> 					if (!requiredPatches.isEmpty())
> 						matches.addAll(requiredPatches);
> 					AbstractVariable abs = getAbstractVariable();
>-					createImplication(abs, matches, Explanation.OPTIONAL_REQUIREMENT);
>+					createImplication(new Object[] {abs, iu}, matches, Explanation.OPTIONAL_REQUIREMENT);
> 					optionalAbstractRequirements.add(abs);
> 				}
> 			}

Actions: View | Diff

Attachments on bug 276133: 135643 | 136104 | 136107 | 136141