Merge "Sort symbol item contributions alphanumerically, not lexicographically"

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/BasicSymbolProviderFactory.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/BasicSymbolProviderFactory.java
index 704ffda0ed6f0e18acbe08512f05aaadbb455fa2..ac934cc7ee2b7ed6b26b8bb45560d0ba71c44d12 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/BasicSymbolProviderFactory.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/BasicSymbolProviderFactory.java
@@ -27,6 +27,7 @@ import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.diagram.symbollibrary.ISymbolGroup;
 import org.simantics.diagram.symbollibrary.ISymbolItem;
 import org.simantics.layer0.Layer0;
+import org.simantics.utils.strings.AlphanumComparator;
 
 /**
  * A basic SymbolProviderFactory implementation for the graph database. It is
@@ -152,7 +153,7 @@ public class BasicSymbolProviderFactory implements SymbolProviderFactory {
         Collections.sort(items, new Comparator<ISymbolItem>() {
             @Override
             public int compare(ISymbolItem o1, ISymbolItem o2) {
-                return o1.getName().compareToIgnoreCase(o2.getName());
+                return AlphanumComparator.CASE_INSENSITIVE_COMPARATOR.compare(o1.getName(), o2.getName());
             }
         });