diff options
author | Mykola Nikishov | 2018-02-14 20:29:14 +0000 |
---|---|---|
committer | Mykola Nikishov | 2018-02-14 22:58:47 +0000 |
commit | e5de7889121fc2c05563d4b198be4ddabfc529a2 (patch) | |
tree | b54854175e150da086dcd7074a50f708f6bd9e51 /bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2 | |
parent | 96587d0026176e10c2e40dca6fc34dde5acd7733 (diff) | |
download | rt.equinox.p2-e5de7889121fc2c05563d4b198be4ddabfc529a2.tar.gz rt.equinox.p2-e5de7889121fc2c05563d4b198be4ddabfc529a2.tar.xz rt.equinox.p2-e5de7889121fc2c05563d4b198be4ddabfc529a2.zip |
Bug 423715 - ArtifactComparatorFactory reports available comparators
Method getArtifactComparator(String) should report which artifact
comparators are available. When troubleshooting, user of standalone
applications and Ant tasks will have more information.
Change-Id: Iba7ea48c139c5ae365bc898804b38dc7cd75cc55
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2')
-rw-r--r-- | bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/repository/tools/comparator/ArtifactComparatorFactory.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/repository/tools/comparator/ArtifactComparatorFactory.java b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/repository/tools/comparator/ArtifactComparatorFactory.java index 49bdf7302..b8a6dcbff 100644 --- a/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/repository/tools/comparator/ArtifactComparatorFactory.java +++ b/bundles/org.eclipse.equinox.p2.repository.tools/src/org/eclipse/equinox/p2/repository/tools/comparator/ArtifactComparatorFactory.java @@ -13,6 +13,7 @@ package org.eclipse.equinox.p2.repository.tools.comparator; import java.util.*; +import java.util.stream.Collectors; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.RegistryFactory; import org.eclipse.equinox.internal.p2.artifact.repository.Messages; @@ -40,8 +41,10 @@ public class ArtifactComparatorFactory { if (artifactComparator.isPresent()) return artifactComparator.get(); - if (comparatorID != null) - throw new IllegalArgumentException(NLS.bind(Messages.exception_comparatorNotFound, comparatorID)); + if (comparatorID != null) { + String comparators = extensions.stream().map(extension -> extension.getAttribute(ATTR_ID)).collect(Collectors.joining(", ")); //$NON-NLS-1$ + throw new IllegalArgumentException(NLS.bind(Messages.exception_comparatorNotFound, comparatorID, comparators)); + } throw new IllegalArgumentException(Messages.exception_noComparators); } |