close #516: fixed sort to always used a collator to sort strings

torakiki · Oct 31, 2023 · a62dd12 · a62dd12
1 parent 41813cb
commit a62dd12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...m-ui-components/src/main/java/org/pdfsam/ui/components/selection/multiple/FileColumn.java b/...m-ui-components/src/main/java/org/pdfsam/ui/components/selection/multiple/FileColumn.java
@@ -34,14 +34,12 @@
 
 /**
  * Definition of the {@link File} columns of the selection table
- * 
+ *
  * @author Andrea Vacondio
- * 
  */
 public enum FileColumn implements SelectionTableColumn<File> {
 
     NAME {
-
         @Override
         public String getColumnTitle() {
             return i18n().tr("Name");
@@ -85,7 +83,8 @@ public Float prefWidth() {
 
         @Override
         public Comparator<File> comparator() {
-            return new NumericalSortFilenameComparator(Comparator.comparing(File::getName, Collator.getInstance()));
+            var collator = Collator.getInstance();
+            return new NumericalSortFilenameComparator(collator::compare);
         }
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -290,7 +290,7 @@
         <hibernate-validator.version>7.0.5.Final</hibernate-validator.version>
         <sejda.version>5.0.11</sejda.version>
         <sejda-io.version>4.0.0.M3</sejda-io.version>
-        <sejda.commons.version>2.0.0</sejda.commons.version>
+        <sejda.commons.version>3.0.0</sejda.commons.version>
         <eventstudio.version>4.0.0</eventstudio.version>
         <injector.version>5.0.0</injector.version>
         <rxjava.version>3.1.8</rxjava.version>