Use AlphaNum sorter in Symbol Library

gitlab #158

Change-Id: I753ff1f6fcb0acda780f18645f489850147a5c4c
(cherry picked from commit 05269c19e7da21a4d1412c033c234d3baa97cc48)

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/CompositeSymbolGroup.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/CompositeSymbolGroup.java
index fc9c80650c6d9513fd680d0795db1449274cc076..c217de2f9591de468a42244fe5dc1f17d42fc761 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/CompositeSymbolGroup.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/symbolcontribution/CompositeSymbolGroup.java
@@ -18,6 +18,7 @@ import java.util.Comparator;
 
 import org.simantics.diagram.symbollibrary.ISymbolGroup;
 import org.simantics.diagram.symbollibrary.ISymbolItem;
 
 import org.simantics.diagram.symbollibrary.ISymbolGroup;
 import org.simantics.diagram.symbollibrary.ISymbolItem;

+import org.simantics.utils.strings.AlphanumComparator;

 
 /**
  * @author Hannu Niemistö
 
 /**
  * @author Hannu Niemistö


@@ -47,7 +48,7 @@ public class CompositeSymbolGroup extends ModifiableSymbolGroup {
         Collections.sort(items, new Comparator<ISymbolItem>() {
             @Override
             public int compare(ISymbolItem o1, ISymbolItem o2) {
         Collections.sort(items, new Comparator<ISymbolItem>() {
             @Override
             public int compare(ISymbolItem o1, ISymbolItem o2) {

-                return o1.getName().compareTo(o2.getName());
+                return AlphanumComparator.COMPARATOR.compare(o1.getName(),o2.getName());

             }
         });
         return items.toArray(new ISymbolItem[items.size()]);
             }
         });
         return items.toArray(new ISymbolItem[items.size()]);