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

diff --git a/org.simantics.district.network/src/org/simantics/district/network/techtype/variable/Functions.java b/org.simantics.district.network/src/org/simantics/district/network/techtype/variable/Functions.java
index e9065f49..a6a3ed2d 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/techtype/variable/Functions.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/techtype/variable/Functions.java
@@ -89,47 +89,8 @@ public class Functions {
 		ArrayList<String> result = new ArrayList<String>(data.keySet());
 		
 		// Sort so that all numbers are in growing order
-		result.sort(Functions::compareNatural);
+		result.sort(TechTypeUtils::compareNatural);
 		
 		return result;
 	}
-	
-	// From https://stackoverflow.com/questions/104599/sort-on-a-string-that-may-contain-a-number
-	private 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);
-	}
 }