diff options
author | Pascal Rapicault | 2010-02-26 18:26:57 +0000 |
---|---|---|
committer | Pascal Rapicault | 2010-02-26 18:26:57 +0000 |
commit | 18cae7ef48efa5617bbae7d46166b59391eb0648 (patch) | |
tree | 6e3a762ec830a0b960a40567d07bf48dd8c1ef83 | |
parent | cf6db3cd275c261eb0f08858c3fb06ab3099a6a9 (diff) | |
download | rt.equinox.p2-18cae7ef48efa5617bbae7d46166b59391eb0648.tar.gz rt.equinox.p2-18cae7ef48efa5617bbae7d46166b59391eb0648.tar.xz rt.equinox.p2-18cae7ef48efa5617bbae7d46166b59391eb0648.zip |
Rename getRequiredCapabilities to getRequirements
34 files changed, 67 insertions, 67 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java index 57424c20f..57e430ea9 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Projector.java @@ -263,7 +263,7 @@ public class Projector { BigInteger optionalWeight = maxWeight.negate(); long countOptional = 1; List<IInstallableUnit> requestedPatches = new ArrayList<IInstallableUnit>(); - Collection<IRequirement> reqs = metaIu.getRequiredCapabilities(); + Collection<IRequirement> reqs = metaIu.getRequirements(); for (IRequirement req : reqs) { if (req.getMin() > 0) continue; @@ -429,7 +429,7 @@ public class Projector { } private Collection<IRequirement> getRequiredCapabilities(IInstallableUnit iu) { - Collection<IRequirement> rqs = iu.getRequiredCapabilities(); + Collection<IRequirement> rqs = iu.getRequirements(); if (!considerMetaRequirements) return rqs; @@ -668,7 +668,7 @@ public class Projector { if (patch == null) return null; List<IRequirementChange> changes = patch.getRequirementsChange(); - Collection<IRequirement> iuRequirements = iu.getRequiredCapabilities(); + Collection<IRequirement> iuRequirements = iu.getRequirements(); IRequirement[] originalRequirements = iuRequirements.toArray(new IRequirement[iuRequirements.size()]); List<IRequirement[]> rrr = new ArrayList<IRequirement[]>(); boolean found = false; diff --git a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Slicer.java b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Slicer.java index bdf252567..73b35b67d 100644 --- a/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Slicer.java +++ b/bundles/org.eclipse.equinox.p2.director/src/org/eclipse/equinox/internal/p2/director/Slicer.java @@ -131,7 +131,7 @@ public class Slicer { } private Collection<IRequirement> getRequiredCapabilities(IInstallableUnit iu) { - Collection<IRequirement> iuRequirements = iu.getRequiredCapabilities(); + Collection<IRequirement> iuRequirements = iu.getRequirements(); int initialRequirementCount = iuRequirements.size(); if (!(iu instanceof IInstallableUnitPatch)) { if (!considerMetaRequirements) diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java index fdcdf6cad..ebf8df917 100644 --- a/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java +++ b/bundles/org.eclipse.equinox.p2.metadata.repository/src/org/eclipse/equinox/internal/p2/metadata/repository/io/MetadataWriter.java @@ -72,7 +72,7 @@ public abstract class MetadataWriter extends XMLWriter implements XMLConstants { writeProperties(iu.getProperties()); writeMetaRequiredCapabilities(iu.getMetaRequirements()); writeProvidedCapabilities(iu.getProvidedCapabilities()); - writeRequiredCapabilities(iu.getRequiredCapabilities()); + writeRequiredCapabilities(iu.getRequirements()); writeTrimmedCdata(IU_FILTER_ELEMENT, iu.getFilter() == null ? null : iu.getFilter().toString()); writeArtifactKeys(iu.getArtifacts()); 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 97f5b745b..96b3a9a8d 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 @@ -164,7 +164,7 @@ public class InstallableUnit implements IInstallableUnit, IMemberProvider { return TranslationSupport.getInstance().getIUProperty(this, key, locale); } - public List<IRequirement> getRequiredCapabilities() { + public List<IRequirement> getRequirements() { return CollectionUtils.unmodifiableList(requires); } diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java index f94db9195..e0213d43b 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitFragment.java @@ -30,7 +30,7 @@ public class InstallableUnitFragment extends InstallableUnit implements IInstall } private void addRequiredCapability(IRequirement[] toAdd) { - List<IRequirement> current = super.getRequiredCapabilities(); + List<IRequirement> current = super.getRequirements(); int currSize = current.size(); IRequirement[] result = new IRequirement[currSize + toAdd.length]; for (int i = 0; i < currSize; ++i) diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java index 6d6ab11b6..6b097910d 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/p2/metadata/InstallableUnitPatch.java @@ -22,7 +22,7 @@ public class InstallableUnitPatch extends InstallableUnit implements IInstallabl private IRequirement[][] scope; private void addRequiredCapability(IRequirement[] toAdd) { - List<IRequirement> current = super.getRequiredCapabilities(); + List<IRequirement> current = super.getRequirements(); int currSize = current.size(); IRequirement[] result = new IRequirement[currSize + toAdd.length]; for (int i = 0; i < currSize; ++i) 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 98e149cd0..742f32d81 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 @@ -81,14 +81,14 @@ public class ResolvedInstallableUnit implements IInstallableUnit { return result; } - public Collection<IRequirement> getRequiredCapabilities() { - Collection<IRequirement> originalCapabilities = original.getRequiredCapabilities(); + public Collection<IRequirement> getRequirements() { + Collection<IRequirement> originalCapabilities = original.getRequirements(); if (fragments.length == 0) return originalCapabilities; ArrayList<IRequirement> result = new ArrayList<IRequirement>(originalCapabilities); for (int i = 0; i < fragments.length; i++) - result.addAll(fragments[i].getRequiredCapabilities()); + result.addAll(fragments[i].getRequirements()); return result; } diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java index 430e86b93..38747c60d 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/internal/provisional/p2/metadata/MetadataFactory.java @@ -75,7 +75,7 @@ public class MetadataFactory { public void addRequiredCapabilities(Collection<IRequirement> additional) { if (additional == null || additional.size() == 0) return; - List<IRequirement> current = unit().getRequiredCapabilities(); + List<IRequirement> current = unit().getRequirements(); ArrayList<IRequirement> all = new ArrayList<IRequirement>(additional.size() + current.size()); all.addAll(current); all.addAll(additional); @@ -96,7 +96,7 @@ public class MetadataFactory { } public List<IRequirement> getRequiredCapabilities() { - return unit().getRequiredCapabilities(); + return unit().getRequirements(); } public Collection<IRequirement> getMetaRequiredCapabilities() { 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 161753e80..b781133b1 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 @@ -182,7 +182,7 @@ public interface IInstallableUnit extends IVersionedId, Comparable<IInstallableU */ public Collection<IProvidedCapability> getProvidedCapabilities(); - public Collection<IRequirement> getRequiredCapabilities(); + public Collection<IRequirement> getRequirements(); public Collection<IRequirement> getMetaRequirements(); diff --git a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java index 15b79d65a..2f49ba30f 100644 --- a/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java +++ b/bundles/org.eclipse.equinox.p2.metadata/src/org/eclipse/equinox/p2/query/QueryUtil.java @@ -181,7 +181,7 @@ public class QueryUtil { */ public static IQuery<IInstallableUnit> createIUCategoryMemberQuery(IInstallableUnit category) { if (QueryUtil.isCategory(category)) - return QueryUtil.createMatchQuery(matchesRequirementsExpression, category.getRequiredCapabilities()); + return QueryUtil.createMatchQuery(matchesRequirementsExpression, category.getRequirements()); return NO_UNITS; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java index 4421bba82..ef1446d80 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AbstractProvisioningTest.java @@ -495,7 +495,7 @@ public abstract class AbstractProvisioningTest extends TestCase { desc.setId(prototype.getId()); Collection<ILicense> originalLicenses = prototype.getLicenses(); desc.setLicenses(originalLicenses.toArray(new ILicense[originalLicenses.size()])); - Collection<IRequirement> originalRequirements = prototype.getRequiredCapabilities(); + Collection<IRequirement> originalRequirements = prototype.getRequirements(); desc.setRequiredCapabilities(originalRequirements.toArray(new IRequirement[originalRequirements.size()])); originalRequirements = prototype.getMetaRequirements(); desc.setMetaRequiredCapabilities(originalRequirements.toArray(new IRequirement[originalRequirements.size()])); @@ -1078,7 +1078,7 @@ public abstract class AbstractProvisioningTest extends TestCase { } assertEquals(message, iu1.getProvidedCapabilities(), iu2.getProvidedCapabilities()); - assertEquals(message, iu1.getRequiredCapabilities(), iu2.getRequiredCapabilities()); + assertEquals(message, iu1.getRequirements(), iu2.getRequirements()); assertEquals(message, iu1.getArtifacts(), iu2.getArtifacts()); assertEquals(message, iu1.getTouchpointType(), iu2.getTouchpointType()); assertEquals(message, iu1.getTouchpointData(), iu2.getTouchpointData()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java index 4fc56b22f..ec81c4059 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/GeneratorTests.java @@ -130,13 +130,13 @@ public class GeneratorTests extends AbstractProvisioningTest { File siteXml = new File(rootFolder, "site.xml"); IInstallableUnit iu = getIU(metadataRepo, URIUtil.toUnencodedString(siteXml.toURI()) + ".More Examples"); assertNotNull(iu); - assertEquals(iu.getRequiredCapabilities().size(), 3); + assertEquals(iu.getRequirements().size(), 3); assertEquals(iu.getProperty("org.eclipse.equinox.p2.type.category"), "true"); assertEquals(iu.getProperty("org.eclipse.equinox.p2.name"), "More Fine Examples"); iu = getIU(metadataRepo, URIUtil.toUnencodedString(siteXml.toURI()) + ".Examples"); assertNotNull(iu); - assertEquals(iu.getRequiredCapabilities().size(), 5); + assertEquals(iu.getRequirements().size(), 5); assertEquals(iu.getProperty("org.eclipse.equinox.p2.type.category"), "true"); assertEquals(iu.getProperty("org.eclipse.equinox.p2.name"), "Platform Examples"); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/PatchIUGeneration.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/PatchIUGeneration.java index 4b9793119..121ebf8bc 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/PatchIUGeneration.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/generator/PatchIUGeneration.java @@ -41,8 +41,8 @@ public class PatchIUGeneration extends AbstractProvisioningTest { assertEquals("org.eclipse.jdt.core", patchIU.getRequirementsChange().get(0).newValue().getName()); assertEquals(new VersionRange("[3.2.2,3.2.2]"), patchIU.getRequirementsChange().get(0).newValue().getRange()); assertTrue(QueryUtil.isPatch(patchIU)); - assertEquals(1, patchIU.getRequiredCapabilities().size()); - assertEquals(featureIU.getId(), ((IRequiredCapability) patchIU.getRequiredCapabilities().iterator().next()).getName()); + assertEquals(1, patchIU.getRequirements().size()); + assertEquals(featureIU.getId(), ((IRequiredCapability) patchIU.getRequirements().iterator().next()).getName()); assertEquals("org.eclipse.jdt.feature.group", ((IRequiredCapability) patchIU.getLifeCycle()).getName()); assertFalse(patchIU.getLifeCycle().isGreedy()); assertFalse(patchIU.getLifeCycle().getMin() == 0); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java index 6bc662ed5..df3ce99ef 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPatchPersistenceTest.java @@ -294,7 +294,7 @@ public class IUPatchPersistenceTest extends AbstractProvisioningTest { private static void validateIUPatch(IInstallableUnitPatch iu) { validateIU(iu); assertTrue(iu.getApplicabilityScope() != null); - assertTrue(iu.getRequiredCapabilities() != null); + assertTrue(iu.getRequirements() != null); assertEquals(3, iu.getRequirementsChange().size()); assertEquals(null, iu.getRequirementsChange().get(1).applyOn()); assertNotNull(iu.getRequirementsChange().get(1).newValue()); @@ -355,7 +355,7 @@ public class IUPatchPersistenceTest extends AbstractProvisioningTest { } private static String[][] extractRequires(IInstallableUnit iu) { - Collection<IRequirement> reqs = iu.getRequiredCapabilities(); + Collection<IRequirement> reqs = iu.getRequirements(); String[][] tuples = new String[reqs.size()][4]; int i = 0; for (Iterator iterator = reqs.iterator(); iterator.hasNext();) { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java index c2d8e077b..9f43986b9 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/metadata/IUPersistenceTest.java @@ -243,7 +243,7 @@ public class IUPersistenceTest extends AbstractProvisioningTest { } private static String[][] extractRequires(IInstallableUnit iu) { - Collection<IRequirement> requyres = iu.getRequiredCapabilities(); + Collection<IRequirement> requyres = iu.getRequirements(); String[][] tuples = new String[requyres.size()][4]; int i = 0; for (Iterator iterator = requyres.iterator(); iterator.hasNext();) { @@ -424,7 +424,7 @@ public class IUPersistenceTest extends AbstractProvisioningTest { private void validateIUPatch(IInstallableUnitPatch iu) { validateIU(iu); assertTrue(iu.getApplicabilityScope() != null); - assertTrue(iu.getRequiredCapabilities() != null); + assertTrue(iu.getRequirements() != null); assertEquals(3, iu.getRequirementsChange().size()); assertEquals(null, iu.getRequirementsChange().get(1).applyOn()); assertNotNull(iu.getRequirementsChange().get(1).newValue()); @@ -439,7 +439,7 @@ public class IUPersistenceTest extends AbstractProvisioningTest { private void validateIUPatchWithEmptyScope(IInstallableUnitPatch iu) { validateIU(iu); assertTrue(iu.getApplicabilityScope() != null); - assertTrue(iu.getRequiredCapabilities() != null); + assertTrue(iu.getRequirements() != null); assertEquals(3, iu.getRequirementsChange().size()); assertEquals(null, iu.getRequirementsChange().get(1).applyOn()); assertNotNull(iu.getRequirementsChange().get(1).newValue()); 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 e8fa5d849..3f290ab79 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 @@ -274,7 +274,7 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest { return providedCapabilities; } - public List<IRequirement> getRequiredCapabilities() { + public List<IRequirement> getRequirements() { return requiredCapabilities; } @@ -724,8 +724,8 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest { assertEquals(1, queryResultSize(queryResult)); IInstallableUnit unit = (IInstallableUnit) queryResult.iterator().next(); - assertEquals(unit.getRequiredCapabilities().size(), 1); - assertTrue(unit.getRequiredCapabilities().iterator().next() instanceof SPIRequiredCapability); + assertEquals(unit.getRequirements().size(), 1); + assertTrue(unit.getRequirements().iterator().next() instanceof SPIRequiredCapability); repo = manager.refreshRepository(repoLocation.toURI(), null); queryResult = repo.query(new AllAcceptingQuery(), new NullProgressMonitor()); @@ -733,9 +733,9 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest { assertEquals(1, queryResultSize(queryResult)); unit = (IInstallableUnit) queryResult.iterator().next(); - assertEquals(unit.getRequiredCapabilities().size(), 1); - assertTrue(unit.getRequiredCapabilities().iterator().next() instanceof RequiredCapability); - assertTrue(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getName().equals("bar")); + assertEquals(unit.getRequirements().size(), 1); + assertTrue(unit.getRequirements().iterator().next() instanceof RequiredCapability); + assertTrue(((IRequiredCapability) unit.getRequirements().iterator().next()).getName().equals("bar")); } /** @@ -803,13 +803,13 @@ public class SPIMetadataRepositoryTest extends AbstractProvisioningTest { assertFalse(unit == null); assertFalse(patchUnit == null); - assertEquals(unit.getRequiredCapabilities().size(), 1); + assertEquals(unit.getRequirements().size(), 1); assertEquals(unit.getProvidedCapabilities().size(), 1); assertEquals(unit.getTouchpointData().size(), 1); - assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getNamespace(), spiRequiredCapability.getNamespace()); - assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getName(), spiRequiredCapability.getName()); - assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getMin(), spiRequiredCapability.getMin()); - assertEquals(((IRequiredCapability) unit.getRequiredCapabilities().iterator().next()).getMax(), spiRequiredCapability.getMax()); + assertEquals(((IRequiredCapability) unit.getRequirements().iterator().next()).getNamespace(), spiRequiredCapability.getNamespace()); + assertEquals(((IRequiredCapability) unit.getRequirements().iterator().next()).getName(), spiRequiredCapability.getName()); + assertEquals(((IRequiredCapability) unit.getRequirements().iterator().next()).getMin(), spiRequiredCapability.getMin()); + assertEquals(((IRequiredCapability) unit.getRequirements().iterator().next()).getMax(), spiRequiredCapability.getMax()); assertEquals(unit.getProvidedCapabilities().iterator().next(), spiProvidedCapability); assertEquals(unit.getTouchpointData().iterator().next(), spiTouchpointData); assertEquals(unit.getTouchpointType(), spiTouchpointType); @@ -826,7 +826,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().iterator().next()); - assertFalse(spiRequiredCapability == unit.getRequiredCapabilities().iterator().next()); + assertFalse(spiRequiredCapability == unit.getRequirements().iterator().next()); assertFalse(spiProvidedCapability == unit.getProvidedCapabilities().iterator().next()); assertFalse(spiTouchpointType == unit.getTouchpointType()); assertFalse(spiLicense == unit.getLicenses().iterator().next()); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java index 58d766c9e..fc02d1fcf 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/planner/NonMinimalState.java @@ -85,7 +85,7 @@ public class NonMinimalState extends AbstractProvisioningTest { visited.add(iu); return false; } - Collection<IRequirement> reqs = iu.getRequiredCapabilities(); + Collection<IRequirement> reqs = iu.getRequirements(); for (IRequirement req : reqs) { boolean result = expandRequirement(iu, req); if (result) { 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 37477519b..1f5b9597a 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 @@ -275,7 +275,7 @@ public class AdviceFileParserTest extends TestCase { assertEquals(null, iu0.getFilter()); assertEquals(0, iu0.getLicenses().size()); assertEquals(0, iu0.getProperties().size()); - assertEquals(0, iu0.getRequiredCapabilities().size()); + assertEquals(0, iu0.getRequirements().size()); assertEquals(0, iu0.getProvidedCapabilities().size()); assertEquals(0, iu0.getMetaRequirements().size()); assertEquals(0, iu0.getTouchpointData().size()); @@ -304,7 +304,7 @@ public class AdviceFileParserTest extends TestCase { assertEquals("testValue1", iu1.getProperty("testName1")); assertEquals("testValue2", iu1.getProperty("testName2")); - Collection<IRequirement> reqs = iu1.getRequiredCapabilities(); + Collection<IRequirement> reqs = iu1.getRequirements(); Iterator it2 = reqs.iterator(); IRequirement req0 = (IRequirement) it2.next(); IRequirement req1 = (IRequirement) it2.next(); 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 c5eb6e00a..749c55bb7 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 @@ -189,7 +189,7 @@ public class BundlesActionTest extends ActionTest { assertEquals("1.1", bundle1IU.getVersion(), BUNDLE1_VERSION); // check required capabilities - Collection<IRequirement> requiredCapability = bundle1IU.getRequiredCapabilities(); + Collection<IRequirement> requiredCapability = bundle1IU.getRequirements(); verifyRequiredCapability(requiredCapability, TEST1_IUD_NAMESPACE, TEST1_IUD_NAME, TEST1_IUD_VERSION_RANGE); assertEquals("2.0", 1, requiredCapability.size()); @@ -224,7 +224,7 @@ public class BundlesActionTest extends ActionTest { assertEquals(bundle2IU.getVersion(), BUNDLE2_VERSION); // check required capabilities - Collection<IRequirement> requiredCapabilities = bundle2IU.getRequiredCapabilities(); + Collection<IRequirement> requiredCapabilities = bundle2IU.getRequirements(); verifyRequiredCapability(requiredCapabilities, TEST2_IUA_NAMESPACE, TEST2_REQA_NAME, TEST2_IUA_VERSION_RANGE); verifyRequiredCapability(requiredCapabilities, TEST2_IUB_NAMESPACE, TEST2_REQB_NAME, TEST2_IUB_VERSION_RANGE); verifyRequiredCapability(requiredCapabilities, TEST2_IUC_NAMESPACE, TEST2_REQC_NAME, TEST2_IUC_VERSION_RANGE); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java index 319786f0b..a473cd480 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/ConfigCUsActionTest.java @@ -63,7 +63,7 @@ public class ConfigCUsActionTest extends ActionTest { assertTrue(providedCapabilities.size() == 1); //verify RequiredCapabilities - List<IRequirement> requiredCapability = iu.getRequiredCapabilities(); + List<IRequirement> requiredCapability = iu.getRequirements(); verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, flavor + id + ".config." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$ verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, flavor + id + ".ini." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$ assertTrue(requiredCapability.size() == 2); @@ -86,7 +86,7 @@ public class ConfigCUsActionTest extends ActionTest { verifyProvidedCapability(providedCapabilities, IInstallableUnit.NAMESPACE_IU_ID, flavor + id + "." + cuType + "." + configSpec, version); //$NON-NLS-1$//$NON-NLS-2$ verifyProvidedCapability(providedCapabilities, flavor + id, id + "." + cuType, version); //$NON-NLS-1$ assertTrue(providedCapabilities.size() == 2); - assertTrue(iu.getRequiredCapabilities().size() == 0); + assertTrue(iu.getRequirements().size() == 0); return; //pass } } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java index f63b64cad..93664f6d2 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java @@ -94,7 +94,7 @@ public class EquinoxExecutableActionTest extends ActionTest { Collection<IProvidedCapability> providedCapability = fragment.getProvidedCapabilities(); verifyProvidedCapability(providedCapability, IInstallableUnit.NAMESPACE_IU_ID, flavorArg + idBase + ".executable." + configSpec, version); //$NON-NLS-1$ assertTrue(providedCapability.size() == 1); - Collection<IRequirement> requiredCapability = fragment.getRequiredCapabilities(); + Collection<IRequirement> requiredCapability = fragment.getRequirements(); verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec, new VersionRange(version, true, version, true)); //$NON-NLS-1$ assertTrue(requiredCapability.size() == 1); assertTrue(fragment.getFilter().equals(ExpressionUtil.parseLDAP("(& (osgi.ws=" + ws + ")(osgi.os=" + os + ")(osgi.arch=" + arch + "))"))); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ @@ -114,7 +114,7 @@ public class EquinoxExecutableActionTest extends ActionTest { Collection<IProvidedCapability> providedCapability = possibleEclipse.getProvidedCapabilities(); verifyProvidedCapability(providedCapability, IInstallableUnit.NAMESPACE_IU_ID, idBase + ".executable." + configSpec + ".eclipse", version); //$NON-NLS-1$ //$NON-NLS-2$ assertTrue(providedCapability.size() == 1); - Collection<IRequirement> req = possibleEclipse.getRequiredCapabilities(); + Collection<IRequirement> req = possibleEclipse.getRequirements(); assertTrue(req.size() == 0); return;//pass } @@ -142,7 +142,7 @@ public class EquinoxExecutableActionTest extends ActionTest { verifyProvidedCapability(providedCapabilities, flavorArg + idBase, idBase + ".executable", version); //$NON-NLS-1$ assertTrue(providedCapabilities.size() == 2); - Collection<IRequirement> requiredCapability = possibleExec.getRequiredCapabilities(); + Collection<IRequirement> requiredCapability = possibleExec.getRequirements(); verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, "org.eclipse.equinox.launcher." + (idBase.equals("mac") || idBase.equals("macCocoa") ? configSpec.substring(0, configSpec.lastIndexOf(".")) : configSpec), VersionRange.emptyRange); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ assertTrue(requiredCapability.size() == 1); return;//pass diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java index c237e2fc4..0cb6f7f73 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxLauncherCUActionTest.java @@ -62,9 +62,9 @@ public class EquinoxLauncherCUActionTest extends ActionTest { if (iu.getId().equals(flavorArg + EquinoxLauncherCUAction.ORG_ECLIPSE_EQUINOX_LAUNCHER)) { assertTrue(iu instanceof InstallableUnitFragment); //verify required capability - verifyRequiredCapability(iu.getRequiredCapabilities(), PublisherHelper.OSGI_BUNDLE_CLASSIFIER, EquinoxLauncherCUAction.ORG_ECLIPSE_EQUINOX_LAUNCHER, VersionRange.emptyRange); - verifyRequiredCapability(iu.getRequiredCapabilities(), PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "bundle", new VersionRange(Version.create("1.0.0"), true, Version.create("2.0.0"), false)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - assertTrue(iu.getRequiredCapabilities().size() == 2); + verifyRequiredCapability(iu.getRequirements(), PublisherHelper.OSGI_BUNDLE_CLASSIFIER, EquinoxLauncherCUAction.ORG_ECLIPSE_EQUINOX_LAUNCHER, VersionRange.emptyRange); + verifyRequiredCapability(iu.getRequirements(), PublisherHelper.NAMESPACE_ECLIPSE_TYPE, "bundle", new VersionRange(Version.create("1.0.0"), true, Version.create("2.0.0"), false)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + assertTrue(iu.getRequirements().size() == 2); Collection<IProvidedCapability> cap = iu.getProvidedCapabilities(); verifyProvidedCapability(cap, IInstallableUnit.NAMESPACE_IU_ID, flavorArg + "org.eclipse.equinox.launcher", Version.emptyVersion); //$NON-NLS-1$ 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 3338cd685..ce9c43377 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 @@ -87,7 +87,7 @@ public class FeaturesActionTest extends ActionTest { action.perform(publisherInfo, publisherResult, new NullProgressMonitor()); IInstallableUnit iu = publisherResult.getIU("test.feature.feature.group", Version.parseVersion("1.0.0"), null); - Collection<IRequirement> requires = iu.getRequiredCapabilities(); + Collection<IRequirement> requires = iu.getRequirements(); assertEquals(5, requires.size()); for (IRequirement require : requires) { if (((IRequiredCapability) require).getName().equals("org.foo.feature.group")) { @@ -132,7 +132,7 @@ public class FeaturesActionTest extends ActionTest { String fooValue = tpData.iterator().next().getInstructions().get("zipped").getBody(); //$NON-NLS-1$ assertTrue(fooValue.equalsIgnoreCase("true")); //$NON-NLS-1$ - Collection<IRequirement> fooRequiredCapabilities = foo.getRequiredCapabilities(); + Collection<IRequirement> fooRequiredCapabilities = foo.getRequirements(); assertTrue(fooRequiredCapabilities.size() == 0); Collection<IProvidedCapability> fooProvidedCapabilities = foo.getProvidedCapabilities(); @@ -170,7 +170,7 @@ public class FeaturesActionTest extends ActionTest { barIUs = new ArrayList(publisherResult.getIUs("bar.feature.group", IPublisherResult.ROOT)); //$NON-NLS-1$ assertTrue(fooIUs.size() == 1); IInstallableUnit barGroup = (IInstallableUnit) barIUs.get(0); - Collection<IRequirement> barRequiredCapabilities = barGroup.getRequiredCapabilities(); + Collection<IRequirement> barRequiredCapabilities = barGroup.getRequirements(); //contains(barRequiredCapabilities, IInstallableUnit.NAMESPACE_IU_ID, "bar_root", new VersionRange(barVersion, true, barVersion, true), null, false /*multiple*/, false /*optional*/); //$NON-NLS-1$//$NON-NLS-2$ contains(barRequiredCapabilities, IInstallableUnit.NAMESPACE_IU_ID, "bar.feature.jar", new VersionRange(barVersion, true, barVersion, true), "(org.eclipse.update.install.features=true)", false /*multiple*/, false /*optional*/); //$NON-NLS-1$//$NON-NLS-2$ contains(barRequiredCapabilities, IInstallableUnit.NAMESPACE_IU_ID, "org.bar.feature.feature.group", VersionRange.emptyRange, "(&(|(osgi.nl=de)(osgi.nl=en)(osgi.nl=fr)))", false /*multiple*/, false /*optional*/); //$NON-NLS-1$//$NON-NLS-2$ @@ -184,7 +184,7 @@ public class FeaturesActionTest extends ActionTest { assertTrue(bar.getTouchpointType().getId().equalsIgnoreCase("org.eclipse.equinox.p2.osgi")); //$NON-NLS-1$ assertTrue(bar.getTouchpointType().getVersion().equals(fooVersion)); //String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple, boolean greedy) - barRequiredCapabilities = bar.getRequiredCapabilities(); + barRequiredCapabilities = bar.getRequirements(); assertTrue(barRequiredCapabilities.size() == 0); 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 94a0eac75..942614885 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 @@ -92,7 +92,7 @@ public class JREActionTest extends ActionTest { 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$ } - Collection<IRequirement> requiredCapability = bar.getRequiredCapabilities(); + Collection<IRequirement> requiredCapability = bar.getRequirements(); verifyRequiredCapability(requiredCapability, IInstallableUnit.NAMESPACE_IU_ID, id, new VersionRange(JREVersion, true, Version.MAX_VERSION, true)); //$NON-NLS-1$ assertTrue(requiredCapability.size() == 1); 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 9c51eb546..1c2a68f29 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 @@ -82,7 +82,7 @@ public class ProductActionWithAdviceFileTest extends ActionTest { IQueryResult results = publisherResult.query(new IUQuery("org.eclipse.platform.ide", Version.create("3.5.0.I20081118")), null); assertEquals("1.0", 1, queryResultSize(results)); IInstallableUnit unit = (IInstallableUnit) results.iterator().next(); - Collection<IRequirement> requiredCapabilities = unit.getRequiredCapabilities(); + Collection<IRequirement> requiredCapabilities = unit.getRequirements(); IRequiredCapability capability = null; for (Iterator iterator = requiredCapabilities.iterator(); iterator.hasNext();) { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java index d724773fc..ebee6443b 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/RootIUActionTest.java @@ -268,7 +268,7 @@ public class RootIUActionTest extends ActionTest { IInstallableUnit iu = (IInstallableUnit) ius.get(0); assertTrue(iu != null); assertTrue(iu.getVersion().equals(versionArg)); - Collection<IRequirement> required = iu.getRequiredCapabilities(); + Collection<IRequirement> required = iu.getRequirements(); if ((testSpec & EMPTY) > 0) assertEquals(required.size(), 0); String confirmedIUs = ""; //$NON-NLS-1$ 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 2bb3c0c46..fd2a87a99 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 @@ -602,7 +602,7 @@ public class UpdateSiteTest extends AbstractProvisioningTest { IQueryResult result = metadataRepo.query(query, null); assertEquals("1.0", 1, queryResultSize(result)); IInstallableUnit featureIU = (IInstallableUnit) result.iterator().next(); - Collection<IRequirement> required = featureIU.getRequiredCapabilities(); + Collection<IRequirement> required = featureIU.getRequirements(); for (Iterator iterator = required.iterator(); iterator.hasNext();) { IRequiredCapability req = (IRequiredCapability) iterator.next(); if (req.getName().equals("org.eclipse.ui.ide")) { diff --git a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java index 619fd0af7..bac19c220 100644 --- a/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java +++ b/bundles/org.eclipse.equinox.p2.ui.admin/src/org/eclipse/equinox/internal/p2/ui/admin/dialogs/IUImplementationGroup.java @@ -162,7 +162,7 @@ public class IUImplementationGroup extends IUGroup { } touchpointData.setItems(items); - Collection<IRequirement> reqs = iu.getRequiredCapabilities(); + Collection<IRequirement> reqs = iu.getRequirements(); items = new String[reqs.size()]; i = 0; for (IRequirement req : reqs) { diff --git a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java index c83eea13b..bcf8fc5ff 100644 --- a/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java +++ b/bundles/org.eclipse.equinox.p2.ui.discovery/src/org/eclipse/equinox/internal/p2/ui/discovery/repository/RepositoryDiscoveryStrategy.java @@ -83,7 +83,7 @@ public class RepositoryDiscoveryStrategy extends AbstractDiscoveryStrategy { for (CatalogCategory category : categories) { if (category.getData() instanceof IInstallableUnit) { IInstallableUnit categoryIU = (IInstallableUnit) category.getData(); - Collection<IRequirement> required = categoryIU.getRequiredCapabilities(); + Collection<IRequirement> required = categoryIU.getRequirements(); for (IRequirement requirement : required) { if (requirement instanceof IRequiredCapability) { IRequiredCapability capability = (IRequiredCapability) requirement; diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java index e82c0464c..abf72fd49 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/AvailableIUElement.java @@ -123,7 +123,7 @@ public class AvailableIUElement extends QueriedElement implements IIUElement { * @see org.eclipse.equinox.internal.p2.ui.model.IUElement#getRequirements() */ public Collection<IRequirement> getRequirements() { - return iu.getRequiredCapabilities(); + return iu.getRequirements(); } /* (non-Javadoc) diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java index 639af85c4..e929b79bd 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/CategoryElement.java @@ -109,11 +109,11 @@ public class CategoryElement extends RemoteQueriedElement implements IIUElement return CollectionUtils.emptyList(); if (requirements == null) { if (ius.size() == 1) - requirements = getIU().getRequiredCapabilities(); + requirements = getIU().getRequirements(); else { ArrayList<IRequirement> capabilities = new ArrayList<IRequirement>(); for (IInstallableUnit iu : ius) { - capabilities.addAll(iu.getRequiredCapabilities()); + capabilities.addAll(iu.getRequirements()); } requirements = capabilities; } diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java index 0b180a4d0..2283f24e3 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/model/InstalledIUElement.java @@ -85,7 +85,7 @@ public class InstalledIUElement extends QueriedElement implements IIUElement { * @see org.eclipse.equinox.internal.p2.ui.model.IUElement#getRequirements() */ public Collection<IRequirement> getRequirements() { - return iu.getRequiredCapabilities(); + return iu.getRequirements(); } /* (non-Javadoc) diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementWrapper.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementWrapper.java index 02788d2e2..e66e85bd9 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementWrapper.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/CategoryElementWrapper.java @@ -38,7 +38,7 @@ public class CategoryElementWrapper extends QueriedElementWrapper { protected boolean shouldWrap(Object match) { if (match instanceof IInstallableUnit) { IInstallableUnit iu = (IInstallableUnit) match; - Collection<IRequirement> requirements = iu.getRequiredCapabilities(); + Collection<IRequirement> requirements = iu.getRequirements(); for (IRequirement requirement : requirements) { if (requirement instanceof IRequiredCapability) { if (((IRequiredCapability) requirement).getNamespace().equals(IInstallableUnit.NAMESPACE_IU_ID)) { diff --git a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/RequiredIUsQuery.java b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/RequiredIUsQuery.java index 24bd4c3d1..61333bcc6 100644 --- a/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/RequiredIUsQuery.java +++ b/bundles/org.eclipse.equinox.p2.ui/src/org/eclipse/equinox/internal/p2/ui/query/RequiredIUsQuery.java @@ -40,6 +40,6 @@ public class RequiredIUsQuery extends ExpressionMatchQuery<IInstallableUnit> { * @param iu The IU whose requirements are to be checked */ public RequiredIUsQuery(IInstallableUnit iu) { - super(IInstallableUnit.class, expression, iu.getRequiredCapabilities()); + super(IInstallableUnit.class, expression, iu.getRequirements()); } } |