302193 : Return type inconsistency on IInstallableUnit's getters

2 files changed, 16 insertions, 14 deletions

diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
index ec9ebd502..29671627e 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/DebugHelper.java
@@ -14,7 +14,8 @@ import java.io.File;
 import java.util.*;
 import java.util.Map.Entry;
 import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
-import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.engine.IProfile;
+import org.eclipse.equinox.p2.engine.ProvisioningContext;
 import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
@@ -53,22 +54,23 @@ public class DebugHelper {
 		System.out.println(buffer.toString());
 	}
 
-	public static String formatArray(List<? extends Object> array, boolean toString, boolean newLines) {
+	public static String formatArray(Collection<? extends Object> array, boolean toString, boolean newLines) {
 		if (array == null || array.size() == 0)
 			return "[]"; //$NON-NLS-1$
 
 		StringBuffer buffer = new StringBuffer();
 		buffer.append('[');
-		int i = 0;
-		for (;;) {
+		boolean first = true;
+		for (Object elem : array) {
+			if (first)
+				first = false;
+			else
+				buffer.append(',');
+
 			if (toString)
-				buffer.append(array.get(i).toString());
+				buffer.append(elem.toString());
 			else
-				buffer.append(array.get(i).getClass().getName());
-			i++;
-			if (i == array.size())
-				break;
-			buffer.append(',');
+				buffer.append(elem.getClass().getName());
 			if (newLines)
 				buffer.append(DebugHelper.LINE_SEPARATOR);
 			else
diff --git a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java
index 8bf334353..3cdb6a7e1 100644
--- a/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java
+++ b/bundles/org.eclipse.equinox.p2.engine/src/org/eclipse/equinox/internal/p2/engine/InstallableUnitPhase.java
@@ -14,7 +14,7 @@ package org.eclipse.equinox.internal.p2.engine;
 import java.util.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
-import org.eclipse.equinox.p2.engine.*;
+import org.eclipse.equinox.p2.engine.IProfile;
 import org.eclipse.equinox.p2.engine.spi.ProvisioningAction;
 import org.eclipse.equinox.p2.engine.spi.Touchpoint;
 import org.eclipse.equinox.p2.metadata.*;
@@ -106,14 +106,14 @@ public abstract class InstallableUnitPhase extends Phase {
 	}
 
 	private final static List<ITouchpointInstruction> getInstructions(IInstallableUnit unit, String key) {
-		List<ITouchpointData> data = unit.getTouchpointData();
+		Collection<ITouchpointData> data = unit.getTouchpointData();
 		int dataSize = data.size();
 		if (dataSize == 0)
 			return CollectionUtils.emptyList();
 
 		ArrayList<ITouchpointInstruction> matches = new ArrayList<ITouchpointInstruction>(dataSize);
-		for (int i = 0; i < dataSize; i++) {
-			ITouchpointInstruction instructions = data.get(i).getInstruction(key);
+		for (ITouchpointData td : data) {
+			ITouchpointInstruction instructions = td.getInstruction(key);
 			if (instructions != null)
 				matches.add(instructions);
 		}