Attachment #177172 for bug #323319

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

View | Details | Raw Unified | Return to bug 323319
Collapse All | Expand All




				}
				processIU(toProcess.removeFirst());
			}
			computeNonGreedyIUs();
			if (DEBUG) {
				long stop = System.currentTimeMillis();
				System.out.println("Slicing complete: " + (stop - start)); //$NON-NLS-1$

		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;
	}

				continue;

			if (!isGreedy(req)) {
				nonGreedyIUs.addAll(possibilites.query(QueryUtil.createMatchQuery(req.getMatches()), null).toUnmodifiableSet());
				continue;
			}


Return to bug 323319

Lines 64-69 Link Here

(-)src/org/eclipse/equinox/internal/p2/director/Slicer.java (-1 / +17 lines)
64	}	64	}
65	processIU(toProcess.removeFirst());	65	processIU(toProcess.removeFirst());
66	}	66	}
		67	computeNonGreedyIUs();
67	if (DEBUG) {	68	if (DEBUG) {
68	long stop = System.currentTimeMillis();	69	long stop = System.currentTimeMillis();
69	System.out.println("Slicing complete: " + (stop - start)); //$NON-NLS-1$	70	System.out.println("Slicing complete: " + (stop - start)); //$NON-NLS-1$
Lines 78-83 Link Here
78	return new QueryableArray(considered.toArray(new IInstallableUnit[considered.size()]));	79	return new QueryableArray(considered.toArray(new IInstallableUnit[considered.size()]));
79	}	80	}
80		81
		82	private void computeNonGreedyIUs() {
		83	IQueryable<IInstallableUnit> queryable = new QueryableArray(considered.toArray(new IInstallableUnit[considered.size()]));
		84	Iterator<IInstallableUnit> it = queryable.query(QueryUtil.ALL_UNITS, new NullProgressMonitor()).iterator();
		85	while (it.hasNext()) {
		86	Collection<IRequirement> reqs = getRequirements(it.next().unresolved());
		87	for (IRequirement req : reqs) {
		88	if (!isApplicable(req))
		89	continue;
		90
		91	if (!isGreedy(req)) {
		92	nonGreedyIUs.addAll(queryable.query(QueryUtil.createMatchQuery(req.getMatches()), null).toUnmodifiableSet());
		93	}
		94	}
		95	}
		96	}
		97
81	public MultiStatus getStatus() {	98	public MultiStatus getStatus() {
82	return result;	99	return result;
83	}	100	}
Lines 123-129 Link Here
123	continue;	140	continue;
124		141
125	if (!isGreedy(req)) {	142	if (!isGreedy(req)) {
126	nonGreedyIUs.addAll(possibilites.query(QueryUtil.createMatchQuery(req.getMatches()), null).toUnmodifiableSet());
127	continue;	143	continue;
128	}	144	}
129		145