From 7e448a66b5db05611ef81d79dda43d83f43e5388 Mon Sep 17 00:00:00 2001 From: "taylor.smock" Date: Tue, 13 Feb 2024 22:09:42 +0000 Subject: [PATCH] See #23471: Temporarily disable fast sorting git-svn-id: https://josm.openstreetmap.de/svn/trunk@18982 0c6e7542-c601-0410-84e7-c038aed88b3b --- src/org/openstreetmap/josm/tools/AlphanumComparator.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/openstreetmap/josm/tools/AlphanumComparator.java b/src/org/openstreetmap/josm/tools/AlphanumComparator.java index 46bf6660f9f..318784358c0 100644 --- a/src/org/openstreetmap/josm/tools/AlphanumComparator.java +++ b/src/org/openstreetmap/josm/tools/AlphanumComparator.java @@ -35,6 +35,9 @@ import java.util.Arrays; import java.util.Comparator; +import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.spi.lifecycle.Lifecycle; + /** * The Alphanum Algorithm is an improved sorting algorithm for strings * containing numbers: Instead of sorting numbers in ASCII order like a standard @@ -182,7 +185,8 @@ private static int compareChunk(String thisChunk, int thisChunkLength, String th } } else { // Check if both chunks are ascii only - if (isAscii(thisChunk, thisChunkLength) && isAscii(thatChunk, thatChunkLength)) { + // FIXME: re-enable once #23471 is fixed (the exception at startup keeps JOSM from finishing startup) + if (false && isAscii(thisChunk, thisChunkLength) && isAscii(thatChunk, thatChunkLength)) { return Utils.clamp(compareString(thisChunk, thisChunkLength, thatChunk, thatChunkLength), -1, 1); } // Instantiate the collator