Attachment #155154 for bug #292691

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 292691 | Differences between

and this patch

Collapse All | Expand All




		Iterator iterator = queryResult.iterator();
		while (iterator.hasNext()) {
			IInstallableUnit unit = (IInstallableUnit) iterator.next();
			Collection/*<IArtifactKey*/artifacts = unit.getArtifacts();
			for (Iterator iterator2 = artifacts.iterator(); iterator2.hasNext();) {
				File file = repo.getArtifactFile((IArtifactKey) iterator2.next());
				File file = repo.getArtifactFile(key);
				if (file == null) {
					// TODO: missing bundle
				} else {

		Iterator iterator = queryResult.iterator();
		while (iterator.hasNext()) {
			IInstallableUnit unit = (IInstallableUnit) iterator.next();
			Collection/*<IArtifactKey>*/artifacts = unit.getArtifacts();
			for (Iterator iterator2 = artifacts.iterator(); iterator2.hasNext();) {
				File file = repo.getArtifactFile((IArtifactKey) iterator2.next());
				File file = repo.getArtifactFile(key);
				if (file == null) {
					// TODO: missing bundle
				} else {





import java.io.File;
import java.net.URI;
import java.util.*;
import java.util.List;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;

		IQueryResult queryMatches = profile.query(new MatchQuery() {
			public boolean isMatch(Object candidate) {
				if (candidate instanceof IInstallableUnit) {
					Collection/*<IRequirement>*/reqs = ((IInstallableUnit) candidate).getRequiredCapabilities();
					for (Iterator iterator = reqs.iterator(); iterator.hasNext();) {
						IRequiredCapability reqCap = (IRequiredCapability) iterator.next();
						if (reqCap.getName().equals(id)) {
							if (new VersionRange(existingVersion, true, existingVersion, true).equals(reqCap.getRange())) {
								return true;

Return to bug 292691

Lines 259-268 Link Here

(-)src/org/eclipse/pde/internal/core/target/IUBundleContainer.java (-8 / +6 lines)
259	Iterator iterator = queryResult.iterator();	259	Iterator iterator = queryResult.iterator();
260	while (iterator.hasNext()) {	260	while (iterator.hasNext()) {
261	IInstallableUnit unit = (IInstallableUnit) iterator.next();	261	IInstallableUnit unit = (IInstallableUnit) iterator.next();
262	List/<IArtifactKey/artifacts = unit.getArtifacts();	262	Collection/<IArtifactKey/artifacts = unit.getArtifacts();
263	for (int i = 0; i < artifacts.size(); i++) {	263	for (Iterator iterator2 = artifacts.iterator(); iterator2.hasNext();) {
264	IArtifactKey key = (IArtifactKey) artifacts.get(i);	264	File file = repo.getArtifactFile((IArtifactKey) iterator2.next());
265	File file = repo.getArtifactFile(key);
266	if (file == null) {	265	if (file == null) {
267	// TODO: missing bundle	266	// TODO: missing bundle
268	} else {	267	} else {
Lines 417-426 Link Here
417	Iterator iterator = queryResult.iterator();	416	Iterator iterator = queryResult.iterator();
418	while (iterator.hasNext()) {	417	while (iterator.hasNext()) {
419	IInstallableUnit unit = (IInstallableUnit) iterator.next();	418	IInstallableUnit unit = (IInstallableUnit) iterator.next();
420	List/<IArtifactKey>/artifacts = unit.getArtifacts();	419	Collection/<IArtifactKey>/artifacts = unit.getArtifacts();
421	for (int i = 0; i < artifacts.size(); i++) {	420	for (Iterator iterator2 = artifacts.iterator(); iterator2.hasNext();) {
422	IArtifactKey key = (IArtifactKey) artifacts.get(i);	421	File file = repo.getArtifactFile((IArtifactKey) iterator2.next());
423	File file = repo.getArtifactFile(key);
424	if (file == null) {	422	if (file == null) {
425	// TODO: missing bundle	423	// TODO: missing bundle
426	} else {	424	} else {

Lines 12-19 Link Here

(-)src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java (-5 / +4 lines)
12		12
13	import java.io.File;	13	import java.io.File;
14	import java.net.URI;	14	import java.net.URI;
15	import java.util.ArrayList;	15	import java.util.*;
16	import java.util.List;
17	import org.eclipse.core.runtime.*;	16	import org.eclipse.core.runtime.*;
18	import org.eclipse.core.runtime.jobs.Job;	17	import org.eclipse.core.runtime.jobs.Job;
19	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;	18	import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
Lines 204-212 Link Here
204	IQueryResult queryMatches = profile.query(new MatchQuery() {	203	IQueryResult queryMatches = profile.query(new MatchQuery() {
205	public boolean isMatch(Object candidate) {	204	public boolean isMatch(Object candidate) {
206	if (candidate instanceof IInstallableUnit) {	205	if (candidate instanceof IInstallableUnit) {
207	List/<IRequirement>/reqs = ((IInstallableUnit) candidate).getRequiredCapabilities();	206	Collection/<IRequirement>/reqs = ((IInstallableUnit) candidate).getRequiredCapabilities();
208	for (int i = 0; i < reqs.size(); i++) {	207	for (Iterator iterator = reqs.iterator(); iterator.hasNext();) {
209	IRequiredCapability reqCap = (IRequiredCapability) reqs.get(i);	208	IRequiredCapability reqCap = (IRequiredCapability) iterator.next();
210	if (reqCap.getName().equals(id)) {	209	if (reqCap.getName().equals(id)) {
211	if (new VersionRange(existingVersion, true, existingVersion, true).equals(reqCap.getRange())) {	210	if (new VersionRange(existingVersion, true, existingVersion, true).equals(reqCap.getRange())) {
212	return true;	211	return true;