Attachment 155154 Details for Bug 292691 – Adapt more changes wrt generics in p2 API

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

[patch] Adapt more changes wrt generics in p2 API

PDE-Generics.patch (text/plain), 3.44 KB, created by Pascal Rapicault

on 2009-12-31 09:00:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Pascal Rapicault

Created: 2009-12-31 09:00:04 EST

Size: 3.44 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java,v
>retrieving revision 1.5.2.9
>diff -u -r1.5.2.9 IUBundleContainer.java
>--- src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	30 Dec 2009 12:45:56 -0000	1.5.2.9
>+++ src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	31 Dec 2009 14:02:03 -0000
>@@ -259,10 +259,9 @@
> 		Iterator iterator = queryResult.iterator();
> 		while (iterator.hasNext()) {
> 			IInstallableUnit unit = (IInstallableUnit) iterator.next();
>-			List/*<IArtifactKey*/artifacts = unit.getArtifacts();
>-			for (int i = 0; i < artifacts.size(); i++) {
>-				IArtifactKey key = (IArtifactKey) artifacts.get(i);
>-				File file = repo.getArtifactFile(key);
>+			Collection/*<IArtifactKey*/artifacts = unit.getArtifacts();
>+			for (Iterator iterator2 = artifacts.iterator(); iterator2.hasNext();) {
>+				File file = repo.getArtifactFile((IArtifactKey) iterator2.next());
> 				if (file == null) {
> 					// TODO: missing bundle
> 				} else {
>@@ -417,10 +416,9 @@
> 		Iterator iterator = queryResult.iterator();
> 		while (iterator.hasNext()) {
> 			IInstallableUnit unit = (IInstallableUnit) iterator.next();
>-			List/*<IArtifactKey>*/artifacts = unit.getArtifacts();
>-			for (int i = 0; i < artifacts.size(); i++) {
>-				IArtifactKey key = (IArtifactKey) artifacts.get(i);
>-				File file = repo.getArtifactFile(key);
>+			Collection/*<IArtifactKey>*/artifacts = unit.getArtifacts();
>+			for (Iterator iterator2 = artifacts.iterator(); iterator2.hasNext();) {
>+				File file = repo.getArtifactFile((IArtifactKey) iterator2.next());
> 				if (file == null) {
> 					// TODO: missing bundle
> 				} else {
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java,v
>retrieving revision 1.16.2.11
>diff -u -r1.16.2.11 RuntimeInstallJob.java
>--- src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java	30 Dec 2009 12:45:59 -0000	1.16.2.11
>+++ src/org/eclipse/pde/internal/ui/build/RuntimeInstallJob.java	31 Dec 2009 14:02:04 -0000
>@@ -12,8 +12,7 @@
> 
> import java.io.File;
> import java.net.URI;
>-import java.util.ArrayList;
>-import java.util.List;
>+import java.util.*;
> import org.eclipse.core.runtime.*;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
>@@ -204,9 +203,9 @@
> 		IQueryResult queryMatches = profile.query(new MatchQuery() {
> 			public boolean isMatch(Object candidate) {
> 				if (candidate instanceof IInstallableUnit) {
>-					List/*<IRequirement>*/reqs = ((IInstallableUnit) candidate).getRequiredCapabilities();
>-					for (int i = 0; i < reqs.size(); i++) {
>-						IRequiredCapability reqCap = (IRequiredCapability) reqs.get(i);
>+					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;

Actions: View | Diff

Attachments on bug 292691: 152095 | 152205 | 152362 | 152365 | 152504 | 152544 | 152984 | 152986 | 153141 | 153282 | 153349 | 153895 | 153988 | 154541 | 154542 | 154883 | 155120 | 155154 | 155466 | 155547 | 155813 | 155814 | 155879 | 155912 | 155913 | 155979