From ebf6ca5b34ca5d2211e407afea180415e1b26247 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 4 Dec 2021 16:03:53 -0500 Subject: [PATCH] Console: Case-insensitive sort of jobs on /jobs --- .../src/net/i2p/router/web/helpers/JobQueueHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/JobQueueHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/JobQueueHelper.java index a9e25cfe6..b5a67fcac 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/JobQueueHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/JobQueueHelper.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.StringWriter; import java.io.Serializable; import java.io.Writer; +import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -222,14 +223,17 @@ public class JobQueueHelper extends HelperBase { /** @since 0.8.9 */ private static class JobStatsComparator implements Comparator, Serializable { + private final Collator coll = Collator.getInstance(); + public int compare(JobStats l, JobStats r) { - return l.getName().compareTo(r.getName()); + return coll.compare(l.getName(), r.getName()); } } /** @since 0.9.5 */ private static class JobCountComparator implements Comparator, Serializable { private final ObjectCounter _counter; + private final Collator coll = Collator.getInstance(); public JobCountComparator(ObjectCounter counter) { _counter = counter; @@ -243,7 +247,7 @@ public class JobQueueHelper extends HelperBase { return -1; if (lc < rc) return 1; - return l.compareTo(r); + return coll.compare(l, r); } } }