302193 : Return type inconsistency on IInstallableUnit's getters

11 files changed, 35 insertions, 34 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java
index bf2e0a86b..09bc6be33 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/directorywatcher/RepositoryListenerTest.java
@@ -11,7 +11,7 @@
 package org.eclipse.equinox.p2.tests.directorywatcher;
 
 import java.io.File;
-import java.util.List;
+import java.util.Collection;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactDescriptor;
@@ -34,11 +34,11 @@ public class RepositoryListenerTest extends AbstractDirectoryWatcherTest {
 		return new TestSuite(RepositoryListenerTest.class);
 	}
 
-	public static boolean isZipped(List<ITouchpointData> data) {
+	public static boolean isZipped(Collection<ITouchpointData> data) {
 		if (data == null || data.size() == 0)
 			return false;
-		for (int i = 0; i < data.size(); i++) {
-			if (data.get(i).getInstruction("zipped") != null) //$NON-NLS-1$
+		for (ITouchpointData td : data) {
+			if (td.getInstruction("zipped") != null) //$NON-NLS-1$
 				return true;
 		}
 		return false;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
index cfe1f378f..3140552b4 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/FragmentTest.java
@@ -36,7 +36,7 @@ public class FragmentTest extends AbstractProvisioningTest {
 			IInstallableUnit iu = (IInstallableUnit) iterator.next();
 			if (iu.getId().equals(ID)) {
 				assertEquals(iu.getFragments().size(), 1);
-				assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
+				assertEquals(iu.getFragments().iterator().next().getId(), "iuFragment.test1");
 			}
 		}
 	}
@@ -54,11 +54,11 @@ public class FragmentTest extends AbstractProvisioningTest {
 			IInstallableUnit iu = (IInstallableUnit) iterator.next();
 			if (iu.getId().equals(ID1)) {
 				assertEquals(iu.getFragments().size(), 1);
-				assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
+				assertEquals(iu.getFragments().iterator().next().getId(), "iuFragment.test1");
 			}
 			if (iu.getId().equals(ID3)) {
 				assertEquals(iu.getFragments().size(), 1);
-				assertEquals(iu.getFragments().get(0).getId(), "iuFragment.test1");
+				assertEquals(iu.getFragments().iterator().next().getId(), "iuFragment.test1");
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
index 62ee765e3..4bc365be9 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/MultipleIUAndFragmentTest.java
@@ -45,11 +45,11 @@ public class MultipleIUAndFragmentTest extends AbstractProvisioningTest {
 			IInstallableUnit iu = (IInstallableUnit) iterator.next();
 			if (iu.getId().equals(iu1.getId())) {
 				assertEquals(1, iu.getFragments().size());
-				assertEquals(iu.getFragments().get(0).getId(), iu3.getId());
+				assertEquals(iu.getFragments().iterator().next().getId(), iu3.getId());
 			}
 			if (iu.getId().equals(iu2.getId())) {
 				assertEquals(1, iu.getFragments().size());
-				assertEquals(iu.getFragments().get(0).getId(), iu3.getId());
+				assertEquals(iu.getFragments().iterator().next().getId(), iu3.getId());
 			}
 			if (iu.getId().equals(iu3.getId())) {
 				//fragments don't have fragments
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java
index da5b48873..063fc9a40 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/repository/SPIMetadataRepositoryTest.java
@@ -250,7 +250,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
 			return this.filter;
 		}
 
-		public List<IInstallableUnitFragment> getFragments() {
+		public Collection<IInstallableUnitFragment> getFragments() {
 			return fragments;
 		}
 
@@ -278,7 +278,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
 			return requiredCapabilities;
 		}
 
-		public List<ITouchpointData> getTouchpointData() {
+		public Collection<ITouchpointData> getTouchpointData() {
 			return touchpointData;
 		}
 
@@ -811,11 +811,11 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
 		assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getMin(), spiRequiredCapability.getMin());
 		assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getMax(), spiRequiredCapability.getMax());
 		assertEquals(unit.getProvidedCapabilities().iterator().next(), spiProvidedCapability);
-		assertEquals(unit.getTouchpointData().get(0), spiTouchpointData);
+		assertEquals(unit.getTouchpointData().iterator().next(), spiTouchpointData);
 		assertEquals(unit.getTouchpointType(), spiTouchpointType);
 		assertEquals(unit.getLicenses().iterator().next(), spiLicense);
 		assertEquals(spiProvidedCapability, unit.getProvidedCapabilities().iterator().next());
-		assertEquals(spiTouchpointData, unit.getTouchpointData().get(0));
+		assertEquals(spiTouchpointData, unit.getTouchpointData().iterator().next());
 		assertEquals(spiTouchpointType, unit.getTouchpointType());
 		assertEquals(spiLicense, unit.getLicenses().iterator().next());
 
@@ -825,7 +825,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
 
 		// Check to make sure the actual objects are not equal.  This is because the repo has 
 		// been refreshed, and re-parsed, thus using the default implementations.
-		assertFalse(spiTouchpointData == unit.getTouchpointData().get(0));
+		assertFalse(spiTouchpointData == unit.getTouchpointData().iterator().next());
 		assertFalse(spiRequiredCapability == unit.getRequiredCapabilities().iterator().next());
 		assertFalse(spiProvidedCapability == unit.getProvidedCapabilities().iterator().next());
 		assertFalse(spiTouchpointType == unit.getTouchpointType());
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java
index 16efaa492..8ecfcd55f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/AdviceFileParserTest.java
@@ -350,11 +350,11 @@ public class AdviceFileParserTest extends TestCase {
 		assertEquals(1, metaReq1.getMin());
 
 		assertEquals(1, iu1.getTouchpointData().size());
-		ITouchpointInstruction configure = iu1.getTouchpointData().get(0).getInstruction("configure");
+		ITouchpointInstruction configure = iu1.getTouchpointData().iterator().next().getInstruction("configure");
 		assertEquals(null, configure.getImportAttribute());
 		assertEquals("addProgramArg(programArg:-startup); addProgramArg(programArg:@artifact);", configure.getBody());
 
-		ITouchpointInstruction unconfigure = iu1.getTouchpointData().get(0).getInstruction("unconfigure");
+		ITouchpointInstruction unconfigure = iu1.getTouchpointData().iterator().next().getInstruction("unconfigure");
 		assertEquals("some.removeProgramArg", unconfigure.getImportAttribute());
 		assertEquals("removeProgramArg(programArg:-startup); removeProgramArg(programArg:@artifact);)", unconfigure.getBody());
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
index 35d271c67..c5eb6e00a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/BundlesActionTest.java
@@ -201,10 +201,10 @@ public class BundlesActionTest extends ActionTest {
 		verifyProvidedCapability(providedCapabilities, PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "source", Version.create("1.0.0"));//$NON-NLS-1$//$NON-NLS-2$
 		assertEquals("2.1", 4, providedCapabilities.size());
 
-		List<ITouchpointData> data = bundle1IU.getTouchpointData();
+		Collection<ITouchpointData> data = bundle1IU.getTouchpointData();
 		boolean found = false;
-		for (int i = 0; i < data.size(); i++) {
-			ITouchpointInstruction configure = data.get(i).getInstruction("configure");
+		for (ITouchpointData td : data) {
+			ITouchpointInstruction configure = td.getInstruction("configure");
 			if (configure == null)
 				continue;
 			String body = configure.getBody();
@@ -245,10 +245,10 @@ public class BundlesActionTest extends ActionTest {
 		assertTrue(prop.get("org.eclipse.equinox.p2.name").toString().equalsIgnoreCase("%bundleName"));//$NON-NLS-1$//$NON-NLS-2$
 		assertTrue(prop.get("org.eclipse.equinox.p2.provider").toString().equalsIgnoreCase("%providerName"));//$NON-NLS-1$//$NON-NLS-2$
 
-		List<ITouchpointData> data = bundle2IU.getTouchpointData();
+		Collection<ITouchpointData> data = bundle2IU.getTouchpointData();
 		boolean found = false;
-		for (int i = 0; i < data.size(); i++) {
-			ITouchpointInstruction configure = data.get(i).getInstruction("configure");
+		for (ITouchpointData td : data) {
+			ITouchpointInstruction configure = td.getInstruction("configure");
 			if (configure == null)
 				continue;
 			String body = configure.getBody();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java
index c858c0115..3338cd685 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/FeaturesActionTest.java
@@ -128,8 +128,8 @@ public class FeaturesActionTest extends ActionTest {
 		assertTrue(foo.getTouchpointType().getVersion().equals(fooVersion));
 
 		//zipped=true
-		List<ITouchpointData> tpData = foo.getTouchpointData();
-		String fooValue = tpData.get(0).getInstructions().get("zipped").getBody(); //$NON-NLS-1$
+		Collection<ITouchpointData> tpData = foo.getTouchpointData();
+		String fooValue = tpData.iterator().next().getInstructions().get("zipped").getBody(); //$NON-NLS-1$
 		assertTrue(fooValue.equalsIgnoreCase("true")); //$NON-NLS-1$
 
 		Collection<IRequirement> fooRequiredCapabilities = foo.getRequiredCapabilities();
@@ -147,7 +147,7 @@ public class FeaturesActionTest extends ActionTest {
 		IInstallableUnit fooGroup = (IInstallableUnit) fooIUs.get(0);
 		tpData = fooGroup.getTouchpointData();
 		assertEquals(1, tpData.size());
-		ITouchpointInstruction instruction = tpData.get(0).getInstruction("install");
+		ITouchpointInstruction instruction = tpData.iterator().next().getInstruction("install");
 		assertNotNull(instruction);
 		assertEquals("ln(targetDir:@artifact,linkTarget:foo/lib.1.so,linkName:lib.so);chmod(targetDir:@artifact,targetFile:lib/lib.so,permissions:755);", instruction.getBody());
 		System.out.println(fooGroup.getFilter());
@@ -177,7 +177,7 @@ public class FeaturesActionTest extends ActionTest {
 		assertTrue(barGroup.getFilter().equals(ExpressionUtil.parseLDAP("(&(|(osgi.os=macosx)(osgi.os=win32))(|(osgi.ws=carbon)(osgi.ws=win32))(|(osgi.arch=ppc)(osgi.arch=x86))(osgi.nl=en))")));
 
 		//check zipped=true in touchpointData
-		String barValue = bar.getTouchpointData().get(0).getInstructions().get("zipped").getBody(); //$NON-NLS-1$
+		String barValue = bar.getTouchpointData().iterator().next().getInstructions().get("zipped").getBody(); //$NON-NLS-1$
 		assertTrue(barValue.equalsIgnoreCase("true")); //$NON-NLS-1$
 
 		//check touchpointType
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java
index bbca48dd7..94a0eac75 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java
@@ -88,7 +88,7 @@ public class JREActionTest extends ActionTest {
 		IInstallableUnit bar = (IInstallableUnit) barIUs.get(0);
 
 		if (testInstructions) {
-			Map instructions = bar.getTouchpointData().get(0).getInstructions();
+			Map instructions = bar.getTouchpointData().iterator().next().getInstructions();
 			assertTrue(((ITouchpointInstruction) instructions.get("install")).getBody().equals("unzip(source:@artifact, target:${installFolder});")); //$NON-NLS-1$//$NON-NLS-2$
 			assertTrue(((ITouchpointInstruction) instructions.get("uninstall")).getBody().equals("cleanupzip(source:@artifact, target:${installFolder});")); //$NON-NLS-1$ //$NON-NLS-2$
 		}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java
index 3933099a0..f70f52e56 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/LocalUpdateSiteActionTest.java
@@ -56,9 +56,9 @@ public class LocalUpdateSiteActionTest extends ActionTest {
 		Collection ius = publisherResult.getIUs("test.feature.feature.jar", null);
 		assertEquals("1.0", 1, ius.size());
 		IInstallableUnit iu = (IInstallableUnit) ius.iterator().next();
-		List<ITouchpointData> touchpointData = iu.getTouchpointData();
+		Collection<ITouchpointData> touchpointData = iu.getTouchpointData();
 		assertEquals("1.1", 1, touchpointData.size());
-		Map instructions = touchpointData.get(0).getInstructions();
+		Map instructions = touchpointData.iterator().next().getInstructions();
 		Set keys = instructions.keySet();
 		assertEquals("1.2", 1, keys.size());
 		String unzip = (String) keys.iterator().next();
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java
index 076a41dc9..9c51eb546 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ProductActionWithAdviceFileTest.java
@@ -12,7 +12,8 @@ package org.eclipse.equinox.p2.tests.publisher.actions;
 
 import java.io.File;
 import java.net.URI;
-import java.util.*;
+import java.util.Collection;
+import java.util.Iterator;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
 import org.eclipse.equinox.internal.p2.metadata.query.MatchQuery;
@@ -106,9 +107,9 @@ public class ProductActionWithAdviceFileTest extends ActionTest {
 		Collection productIUs = publisherResult.getIUs("productWithAdvice.product", IPublisherResult.NON_ROOT);
 		assertEquals("1.0", 1, productIUs.size());
 		IInstallableUnit product = (IInstallableUnit) productIUs.iterator().next();
-		List<ITouchpointData> data = product.getTouchpointData();
+		Collection<ITouchpointData> data = product.getTouchpointData();
 		assertEquals("1.1", 1, data.size());
-		String configure = data.get(0).getInstruction("configure").getBody();
+		String configure = data.iterator().next().getInstruction("configure").getBody();
 		assertEquals("1.2", "addRepository(type:0,location:http${#58}//download.eclipse.org/releases/fred);addRepository(type:1,location:http${#58}//download.eclipse.org/releases/fred);", configure);
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
index 09f04b410..95996f41b 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/updatesite/UpdateSiteTest.java
@@ -648,9 +648,9 @@ public class UpdateSiteTest extends AbstractProvisioningTest {
 		IQueryResult result = repository.query(QueryUtil.createIUQuery("test.feature.feature.jar"), getMonitor());
 		assertTrue("1.0", !result.isEmpty());
 		IInstallableUnit unit = (IInstallableUnit) result.iterator().next();
-		List<ITouchpointData> data = unit.getTouchpointData();
+		Collection<ITouchpointData> data = unit.getTouchpointData();
 		assertEquals("1.1", 1, data.size());
-		Map instructions = data.get(0).getInstructions();
+		Map instructions = data.iterator().next().getInstructions();
 		assertEquals("1.2", 1, instructions.size());
 		assertEquals("1.3", "true", ((ITouchpointInstruction) instructions.get("zipped")).getBody());
 	}