302193 : Return type inconsistency on IInstallableUnit's getters

7 files changed, 24 insertions, 34 deletions

diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java
index 96b3a9a8d..c5f7950cd 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnit.java
@@ -11,11 +11,6 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.metadata;
 
-import org.eclipse.equinox.p2.metadata.ITouchpointData;
-
-import java.util.Collection;
-import org.eclipse.equinox.p2.metadata.IInstallableUnitFragment;
-
 import java.util.*;
 import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
 import org.eclipse.equinox.internal.p2.core.helpers.OrderedProperties;
@@ -289,8 +284,8 @@ public class InstallableUnit implements IInstallableUnit, IMemberProvider {
 		return CollectionUtils.unmodifiableList(licenses);
 	}
 
-	public ILicense[] getLicenses(String locale) {
-		return TranslationSupport.getInstance().getLicenses(this, locale);
+	public Collection<ILicense> getLicenses(String locale) {
+		return CollectionUtils.unmodifiableList(TranslationSupport.getInstance().getLicenses(this, locale));
 	}
 
 	public void setCopyright(ICopyright copyright) {
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
index 742f32d81..60f26b875 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/ResolvedInstallableUnit.java
@@ -172,7 +172,7 @@ public class ResolvedInstallableUnit implements IInstallableUnit {
 		return original.getLicenses();
 	}
 
-	public ILicense[] getLicenses(String locale) {
+	public Collection<ILicense> getLicenses(String locale) {
 		return original.getLicenses(locale);
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
index a9837a1b3..b4e1b96f5 100644
--- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
+++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/metadata/IInstallableUnit.java
@@ -12,8 +12,7 @@
 package org.eclipse.equinox.p2.metadata;
 
 import java.util.Collection;
-
-import java.util.*;
+import java.util.Map;
 import org.osgi.framework.Filter;
 
 /**
@@ -258,7 +257,7 @@ public interface IInstallableUnit extends IVersionedId, Comparable<IInstallableU
 	 * @param locale The locale to translate the license for, or null to use the current locale.
 	 * @return the translated licenses that apply to this installable unit
 	 */
-	public ILicense[] getLicenses(String locale);
+	public Collection<ILicense> getLicenses(String locale);
 
 	/**
 	 * Returns the untranslated copyright that applies to this installable unit.
diff --git a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/TranslationSupportTests.java b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/TranslationSupportTests.java
index 80f80f328..2376a3503 100644
--- a/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/TranslationSupportTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests.ui/src/org/eclipse/equinox/p2/tests/ui/query/TranslationSupportTests.java
@@ -18,7 +18,7 @@ import java.util.*;
 import org.eclipse.equinox.internal.p2.engine.Profile;
 import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
 import org.eclipse.equinox.internal.p2.metadata.TranslationSupport;
-import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
+import org.eclipse.equinox.internal.provisional.p2.metadata.*;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription;
 import org.eclipse.equinox.p2.core.ProvisionException;
@@ -62,7 +62,7 @@ public class TranslationSupportTests extends AbstractQueryTest {
 
 		ICopyright copyright = unit.getCopyright(null);
 		assertEquals("1.1", "Test Copyright", copyright.getBody());
-		ILicense license = unit.getLicenses(null)[0];
+		ILicense license = unit.getLicenses(null).iterator().next();
 		assertEquals("1.2", "Test License", license.getBody());
 		//		assertEquals("1.3", "license.html", license.getURL().toExternalForm());
 		String name = unit.getProperty(IInstallableUnit.PROP_NAME, null);
@@ -128,9 +128,9 @@ public class TranslationSupportTests extends AbstractQueryTest {
 		profile.addInstallableUnit(iuFragment);
 		profile.addInstallableUnit(iu);
 
-		ILicense license = iu.getLicenses(Locale.GERMAN.toString())[0];
+		ILicense license = iu.getLicenses(Locale.GERMAN.toString()).iterator().next();
 		assertEquals("1.0", germanLicense, license.getBody());
-		license = iu.getLicenses(Locale.CANADA_FRENCH.toString())[0];
+		license = iu.getLicenses(Locale.CANADA_FRENCH.toString()).iterator().next();
 		assertEquals("1.1", canadianFRLicense, license.getBody());
 	}
 
@@ -138,7 +138,7 @@ public class TranslationSupportTests extends AbstractQueryTest {
 		IInstallableUnit unit = createIU("f1");
 
 		assertNull("1.1", unit.getCopyright(null));
-		assertEquals("1.2", 0, unit.getLicenses(null).length);;
+		assertEquals("1.2", 0, unit.getLicenses(null).size());
 		assertNull("1.3", unit.getProperty(IInstallableUnit.PROP_NAME, null));
 		assertNull("1.4", unit.getProperty(IInstallableUnit.PROP_DESCRIPTION, null));
 		assertNull("1.5", unit.getProperty(IInstallableUnit.PROP_PROVIDER, null));
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 3f290ab79..b4ed6f10c 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
@@ -19,7 +19,6 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
 import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
 import org.eclipse.equinox.internal.p2.metadata.*;
 import org.eclipse.equinox.internal.p2.metadata.query.MatchQuery;
 import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
@@ -220,7 +219,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
 		ICopyright copyright = null;
 		Filter filter = null;
 		String id = null;
-		ILicense[] license = null;
+		Collection<ILicense> license = null;
 		Map properties = new HashMap();
 		ITouchpointType touchpointType = null;
 		IUpdateDescriptor updateDescriptor = null;
@@ -259,7 +258,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
 		}
 
 		public Collection<ILicense> getLicenses() {
-			return CollectionUtils.unmodifiableList(license);
+			return license;
 		}
 
 		public Map getProperties() {
@@ -330,7 +329,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest {
 			return getProperty(key);
 		}
 
-		public ILicense[] getLicenses(String locale) {
+		public Collection<ILicense> getLicenses(String locale) {
 			return license;
 		}
 
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java
index 685e654c0..2f773c767 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/dialogs/IULicensePropertyPage.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.equinox.internal.p2.ui.dialogs;
 
-import org.eclipse.equinox.p2.metadata.ILicense;
-
+import java.util.Iterator;
 import org.eclipse.core.runtime.URIUtil;
 import org.eclipse.equinox.internal.p2.ui.ProvUIMessages;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.ILicense;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -32,11 +32,10 @@ public class IULicensePropertyPage extends IUPropertyPage {
 
 	protected Control createIUPage(Composite parent, IInstallableUnit iu) {
 		// Get the license in the default locale
-		ILicense[] licenses = iu.getLicenses(null);
-		final ILicense license;
+		Iterator<ILicense> licenses = iu.getLicenses(null).iterator();
+		final ILicense license = licenses.hasNext() ? licenses.next() : null;
 		//FIXME
-		if (licenses.length > 0 && licenses[0].getBody() != null && licenses[0].getBody().length() > 0) {
-			license = licenses[0];
+		if (license != null && license.getBody().length() > 0) {
 			Composite composite = new Composite(parent, SWT.NONE);
 			GridLayout layout = new GridLayout();
 			layout.marginWidth = 0;
diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java
index cbdbe7f63..57d2e882c 100644
--- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java
+++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/p2/ui/AcceptLicensesWizardPage.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.equinox.p2.ui;
 
-import org.eclipse.equinox.p2.query.QueryUtil;
-
 import java.util.*;
 import java.util.List;
 import org.eclipse.core.runtime.IStatus;
@@ -24,6 +22,7 @@ import org.eclipse.equinox.p2.engine.IProvisioningPlan;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.equinox.p2.metadata.ILicense;
 import org.eclipse.equinox.p2.operations.ProfileChangeOperation;
+import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.viewers.*;
@@ -286,9 +285,10 @@ public class AcceptLicensesWizardPage extends WizardPage {
 		if (singleIU != null) {
 			String licenseBody = ""; //$NON-NLS-1$
 			// We've already established before calling this method that it's a single IU with a single license
-			ILicense[] licenses = singleIU.getLicenses(null);
-			if (licenses.length > 0 && licenses[0].getBody() != null) {
-				licenseBody = licenses[0].getBody();
+			Iterator<ILicense> licenses = singleIU.getLicenses(null).iterator();
+			ILicense license = licenses.hasNext() ? licenses.next() : null;
+			if (license != null && license.getBody() != null) {
+				licenseBody = license.getBody();
 			}
 			licenseTextBox.setText(licenseBody);
 		}
@@ -387,9 +387,7 @@ public class AcceptLicensesWizardPage extends WizardPage {
 		HashMap<ILicense, HashSet<String>> namesSeen = new HashMap<ILicense, HashSet<String>>(); // map of License->HashSet of names with that license
 		for (int i = 0; i < iusToCheck.length; i++) {
 			IInstallableUnit iu = iusToCheck[i];
-			ILicense[] licenses = iu.getLicenses(null);
-			for (int k = 0; k < licenses.length; k++) {
-				ILicense license = licenses[k];
+			for (ILicense license : iu.getLicenses(null)) {
 				if (manager != null && !manager.isAccepted(license)) {
 					String name = iu.getProperty(IInstallableUnit.PROP_NAME, null);
 					if (name == null)