Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Wellmann2021-07-24 10:51:58 +0000
committerLars Vogel2021-07-29 14:45:21 +0000
commitd93243f137ef3d2bdaa9c4da8bf55b4e05479539 (patch)
tree1b8ab010c0d271b065b787437745e7f202ec4931
parent6d705d5c3af4083ecf608ebdc639ab85b788c1e3 (diff)
downloadrt.equinox.framework-d93243f137ef3d2bdaa9c4da8bf55b4e05479539.tar.gz
rt.equinox.framework-d93243f137ef3d2bdaa9c4da8bf55b4e05479539.tar.xz
rt.equinox.framework-d93243f137ef3d2bdaa9c4da8bf55b4e05479539.zip
Bug 575015 - [Clean-up] Use Comparator.comparing()
Clean up using the JDT clean-up: - Use Comparator.comparing() Change-Id: I70bcd308b90d6e63a4ba94d69d788acb318443d0 Signed-off-by: Hannes Wellmann <wellmann.hannes1@gmx.net> Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.framework/+/183388 Tested-by: Equinox Bot <equinox-bot@eclipse.org> Reviewed-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java3
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java2
-rw-r--r--bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java3
3 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
index 9356ddec1..a22e7740d 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
@@ -574,7 +575,7 @@ public class ModuleDatabase {
if (modules.size() < 2)
return;
if (sortOptions == null || Sort.BY_ID.isContained(sortOptions) || sortOptions.length == 0) {
- Collections.sort(modules, (m1, m2) -> m1.getId().compareTo(m2.getId()));
+ Collections.sort(modules, Comparator.comparing(Module::getId));
return;
}
// first sort by start-level
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
index 663c96c52..0c3b523a9 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
@@ -1280,7 +1280,7 @@ final class ModuleResolver {
return Collections.emptyMap();
}
// we only care about versions here
- Collections.sort(dynamicAttachableFrags, (r1, r2) -> -(r1.getVersion().compareTo(r2.getVersion())));
+ Collections.sort(dynamicAttachableFrags, Comparator.comparing(ModuleRevision::getVersion).reversed());
Map<ModuleCapability, DynamicFragments> hostDynamicFragments = new HashMap<>();
// first find the hosts to dynamically attach to
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
index 4d0dfec70..e78a9c2ce 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/legacy/PackageAdminImpl.java
@@ -18,6 +18,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -197,7 +198,7 @@ public class PackageAdminImpl implements PackageAdmin {
sorted.add(b);
}
}
- Collections.sort(sorted, (b1, b2) -> b2.getVersion().compareTo(b1.getVersion()));
+ Collections.sort(sorted, Comparator.comparing(Bundle::getVersion).reversed());
if (sorted.isEmpty()) {
return null;

Back to the top