X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Ftechtype%2FTechTypeUtils.java;h=377253dde3d108b433c572d6e0ddc576872b30ab;hb=62f9a86961adc4fd44782e3c2f79852b1269810d;hp=dce4abb7e47f904ba21e5e1a50b2acf7eaf925bb;hpb=3f1f36bf0eb4eabd3d4f34c8ec0f63a3c16111a8;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/techtype/TechTypeUtils.java b/org.simantics.district.network/src/org/simantics/district/network/techtype/TechTypeUtils.java
index dce4abb7..377253dd 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/techtype/TechTypeUtils.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/techtype/TechTypeUtils.java
@@ -346,4 +346,46 @@ public class TechTypeUtils {
 		if (name == null) name = "_" + DEFAULT_KEY_NAME;
 		return name; 
 	}
+
+	/**
+	 * Compare strings so that contained numbers are sorted in numerical order instead of lexicographic.
+	 * (From https://stackoverflow.com/questions/104599/sort-on-a-string-that-may-contain-a-number)
+	 */
+	public static final int compareNatural(String s1, String s2) {
+		// Skip all identical characters
+		int len1 = s1.length();
+		int len2 = s2.length();
+		int i;
+		char c1, c2;
+		for (i = 0, c1 = 0, c2 = 0; (i < len1) && (i < len2) && (c1 = s1.charAt(i)) == (c2 = s2.charAt(i)); i++)
+			;
+
+		// Check end of string
+		if (c1 == c2)
+			return (len1 - len2);
+
+		// Check digit in first string
+		if (Character.isDigit(c1)) {
+			// Check digit only in first string
+			if (!Character.isDigit(c2))
+				return (1);
+
+			// Scan all integer digits
+			int x1, x2;
+			for (x1 = i + 1; (x1 < len1) && Character.isDigit(s1.charAt(x1)); x1++)
+				;
+			for (x2 = i + 1; (x2 < len2) && Character.isDigit(s2.charAt(x2)); x2++)
+				;
+
+			// Longer integer wins, first digit otherwise
+			return (x2 == x1 ? c1 - c2 : x1 - x2);
+		}
+
+		// Check digit only in second string
+		if (Character.isDigit(c2))
+			return (-1);
+
+		// No digits
+		return (c1 - c2);
+	}
 }