Attachment 177172 Details for Bug 323319 – Change to the slicer

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

[patch] Change to the slicer

323319.patch (text/plain), 1.78 KB, created by Pascal Rapicault

on 2010-08-21 21:43:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2010-08-21 21:43:48 EDT

Size: 1.78 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.p2.director
>Index: src/org/eclipse/equinox/internal/p2/director/Slicer.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/p2/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Slicer.java,v
>retrieving revision 1.29
>diff -u -r1.29 Slicer.java
>--- src/org/eclipse/equinox/internal/p2/director/Slicer.java	8 May 2010 02:23:45 -0000	1.29
>+++ src/org/eclipse/equinox/internal/p2/director/Slicer.java	22 Aug 2010 01:43:12 -0000
>@@ -64,6 +64,7 @@
> 				}
> 				processIU(toProcess.removeFirst());
> 			}
>+			computeNonGreedyIUs();
> 			if (DEBUG) {
> 				long stop = System.currentTimeMillis();
> 				System.out.println("Slicing complete: " + (stop - start)); //$NON-NLS-1$
>@@ -78,6 +79,22 @@
> 		return new QueryableArray(considered.toArray(new IInstallableUnit[considered.size()]));
> 	}
> 
>+	private void computeNonGreedyIUs() {
>+		IQueryable<IInstallableUnit> queryable = new QueryableArray(considered.toArray(new IInstallableUnit[considered.size()]));
>+		Iterator<IInstallableUnit> it = queryable.query(QueryUtil.ALL_UNITS, new NullProgressMonitor()).iterator();
>+		while (it.hasNext()) {
>+			Collection<IRequirement> reqs = getRequirements(it.next().unresolved());
>+			for (IRequirement req : reqs) {
>+				if (!isApplicable(req))
>+					continue;
>+
>+				if (!isGreedy(req)) {
>+					nonGreedyIUs.addAll(queryable.query(QueryUtil.createMatchQuery(req.getMatches()), null).toUnmodifiableSet());
>+				}
>+			}
>+		}
>+	}
>+
> 	public MultiStatus getStatus() {
> 		return result;
> 	}
>@@ -123,7 +140,6 @@
> 				continue;
> 
> 			if (!isGreedy(req)) {
>-				nonGreedyIUs.addAll(possibilites.query(QueryUtil.createMatchQuery(req.getMatches()), null).toUnmodifiableSet());
> 				continue;
> 			}
>

Actions: View | Diff

Attachments on bug 323319: 177172