diff options
| author | Alexander Kurtakov | 2013-11-19 09:12:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2013-11-19 11:57:14 +0000 |
| commit | 89e0dd988ea7152d2efff487a65d3c0e4d512f05 (patch) | |
| tree | 3264eda5260006fc1c44a709728daa19fd807f96 /bundles | |
| parent | df8b3aceccc548666833df2ff68112fcb08838dd (diff) | |
| download | rt.equinox.p2-89e0dd988ea7152d2efff487a65d3c0e4d512f05.tar.gz rt.equinox.p2-89e0dd988ea7152d2efff487a65d3c0e4d512f05.tar.xz rt.equinox.p2-89e0dd988ea7152d2efff487a65d3c0e4d512f05.zip | |
Bug 422032 - Generify comparator in SimpleConfiguratorManipulatorUtils.I20131119-0800
Make use of 1.5 features for simplicity and readability.
Change-Id: I0c97b59a985bd953385008703c72b2bc2ae2ff1e
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java index c72ef3526..73a1e71b5 100644 --- a/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java +++ b/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/src/org/eclipse/equinox/internal/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorUtils.java @@ -60,18 +60,13 @@ public class SimpleConfiguratorManipulatorUtils { */ public static void writeConfiguration(BundleInfo[] simpleInfos, OutputStream stream) throws IOException { // sort by symbolic name - Arrays.sort(simpleInfos, new Comparator() { - public int compare(Object o1, Object o2) { - if (o1 instanceof BundleInfo && o2 instanceof BundleInfo) { - BundleInfo b1 = (BundleInfo) o1; - BundleInfo b2 = (BundleInfo) o2; - int bsnComparison = b1.getSymbolicName().compareTo(b2.getSymbolicName()); - if (bsnComparison != 0) - return bsnComparison; - // prefer latest version, see https://bugs.eclipse.org/363590 - return new Version(b2.getVersion()).compareTo(new Version(b1.getVersion())); - } - return 0; + Arrays.sort(simpleInfos, new Comparator<BundleInfo>() { + public int compare(BundleInfo b1, BundleInfo b2) { + int bsnComparison = b1.getSymbolicName().compareTo(b2.getSymbolicName()); + if (bsnComparison != 0) + return bsnComparison; + // prefer latest version, see https://bugs.eclipse.org/363590 + return new Version(b2.getVersion()).compareTo(new Version(b1.getVersion())); } }); |