From 89e0dd988ea7152d2efff487a65d3c0e4d512f05 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 19 Nov 2013 11:12:28 +0200 Subject: Bug 422032 - Generify comparator in SimpleConfiguratorManipulatorUtils. Make use of 1.5 features for simplicity and readability. Change-Id: I0c97b59a985bd953385008703c72b2bc2ae2ff1e Signed-off-by: Alexander Kurtakov --- .../SimpleConfiguratorManipulatorUtils.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'bundles') 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() { + 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())); } }); -- cgit v1.2.3