Moved version compare methods to its own class

Author: jantje

io.sloeber.core/src/io/sloeber/core/managers/LibraryIndex.java

@@ -11,6 +11,7 @@
 import java.util.regex.Pattern;
 
 import io.sloeber.core.api.Defaults;
+import io.sloeber.core.tools.Version;
 
 public class LibraryIndex {
 	private String indexName;
@@ -40,7 +41,7 @@ public void resolve() {
 
 			Library current = this.latestLibs.get(name);
 			if (current != null) {
-				if (Manager.compareVersions(library.getVersion(), current.getVersion()) > 0) {
+				if (Version.compare(library.getVersion(), current.getVersion()) > 0) {
 					this.latestLibs.put(name, library);
 				}
 			} else {

io.sloeber.core/src/io/sloeber/core/managers/Manager.java

@@ -281,7 +281,7 @@ static public List<LibraryIndex> getLibraryIndices() {
 		}
 		return libraryIndices;
 	}
-	
+
 	static public LibraryIndex getLibraryIndex(String name) {
 		for (LibraryIndex index : getLibraryIndices()) {
 			if (index.getName().equals(name)) {
@@ -745,60 +745,6 @@ private static void copyStreamToFile(InputStream in, long size, File outputFile)
 		}
 	}
 
-	/**
-	 * compares 2 strings as if they are version numbers if version1<version2
-	 * returns -1 if version1==version2(also if both are null) returns 0 else
-	 * return 1 This method caters for the null case
-	 *
-	 * @param version1
-	 * @param version2
-	 * @return
-	 */
-	public static int compareVersions(String version1, String version2) {
-		if (version1 == null) {
-			return version2 == null ? 0 : -1;
-		}
-
-		if (version2 == null) {
-			return 1;
-		}
-
-		String[] v1 = version1.split("\\."); //$NON-NLS-1$
-		String[] v2 = version2.split("\\."); //$NON-NLS-1$
-		for (int i = 0; i < Math.max(v1.length, v2.length); ++i) {
-			if (v1.length <= i) {
-				return v2.length < i ? 0 : -1;
-			}
-
-			if (v2.length <= i) {
-				return 1;
-			}
-
-			try {
-				int vi1 = Integer.parseInt(v1[i]);
-				int vi2 = Integer.parseInt(v2[i]);
-				if (vi1 < vi2) {
-					return -1;
-				}
-
-				if (vi1 > vi2) {
-					return 1;
-				}
-			} catch (@SuppressWarnings("unused") NumberFormatException e) {
-				// not numbers, do string compares
-				int c = v1[i].compareTo(v2[i]);
-				if (c < 0) {
-					return -1;
-				}
-				if (c > 0) {
-					return 1;
-				}
-			}
-		}
-
-		return 0;
-	}
-
 	/**
 	 * This method removes the json files from disk and removes memory
 	 * references to these files or their content

io.sloeber.core/src/io/sloeber/core/managers/Package.java

@@ -13,6 +13,8 @@
 import java.util.List;
 import java.util.Map;
 
+import io.sloeber.core.tools.Version;
+
 public class Package implements Comparable<Package> {
 
 	private String name;
@@ -51,7 +53,7 @@ public String getWebsiteURL() {
 	public String getEmail() {
 		return this.email;
 	}
-	
+
 	public Help getHelp() {
 		return this.help;
 	}
@@ -69,7 +71,7 @@ public Collection<ArduinoPlatform> getLatestPlatforms() {
 		Map<String, ArduinoPlatform> platformMap = new HashMap<>();
 		for (ArduinoPlatform platform : this.platforms) {
 			ArduinoPlatform p = platformMap.get(platform.getName());
-			if (p == null || Manager.compareVersions(platform.getVersion(), p.getVersion()) > 0) {
+			if (p == null || Version.compare(platform.getVersion(), p.getVersion()) > 0) {
 				platformMap.put(platform.getName(), platform);
 			}
 		}
@@ -89,7 +91,7 @@ public Collection<ArduinoPlatform> getInstalledPlatforms() {
 		for (ArduinoPlatform platform : this.platforms) {
 			if (platform.isInstalled()) {
 				ArduinoPlatform p = platformMap.get(platform.getName());
-				if (p == null || Manager.compareVersions(platform.getVersion(), p.getVersion()) > 0) {
+				if (p == null || Version.compare(platform.getVersion(), p.getVersion()) > 0) {
 					platformMap.put(platform.getName(), platform);
 				}
 			}
@@ -104,7 +106,7 @@ public ArduinoPlatform getLatestPlatform(String platformName) {
 				if (foundPlatform == null) {
 					foundPlatform = platform;
 				} else {
-					if (Manager.compareVersions(platform.getVersion(), foundPlatform.getVersion()) > 0) {
+					if (Version.compare(platform.getVersion(), foundPlatform.getVersion()) > 0) {
 						foundPlatform = platform;
 					}
 				}
@@ -117,7 +119,7 @@ public ArduinoPlatform getPlatform(String platformName, String version) {
 
 		for (ArduinoPlatform platform : this.platforms) {
 			if (platform.getName().equals(platformName)) {
-				if (Manager.compareVersions(platform.getVersion(), version) == 0) {
+				if (Version.compare(platform.getVersion(), version) == 0) {
 					return platform;
 				}
 			}
@@ -142,7 +144,7 @@ public Tool getLatestTool(String toolName) {
 		Tool latestTool = null;
 		for (Tool tool : this.tools) {
 			if (tool.getName().equals(toolName)) {
-				if (latestTool == null || Manager.compareVersions(tool.getVersion(), latestTool.getVersion()) > 0) {
+				if (latestTool == null || Version.compare(tool.getVersion(), latestTool.getVersion()) > 0) {
 					latestTool = tool;
 				}
 			}

io.sloeber.core/src/io/sloeber/core/tools/Helpers.java

@@ -706,7 +706,7 @@ private static void setTheEnvironmentVariablesAddThePlatformInfo(IContributedEnv
 			addPlatformFileTools(curPlatform, contribEnv, confDesc);
 			if (curPlatform.isInstalled() && "avr".equalsIgnoreCase(curPlatform.getArchitecture())
 					&& "arduino".equalsIgnoreCase(curPlatform.getPackage().getMaintainer())) {
-				if (Manager.compareVersions(curPlatform.getVersion(), curversion) > 0) {
+				if (Version.compare(curPlatform.getVersion(), curversion) > 0) {
 					curversion = curPlatform.getVersion();
 					platform = curPlatform;
 				}

io.sloeber.core/src/io/sloeber/core/tools/Version.java

@@ -0,0 +1,58 @@
+package io.sloeber.core.tools;
+
+public class Version {
+	/**
+	 * compares 2 strings as if they are version numbers if version1<version2
+	 * returns -1 if version1==version2(also if both are null) returns 0 else
+	 * return 1 This method caters for the null case
+	 *
+	 * @param version1
+	 * @param version2
+	 * @return
+	 */
+	public static int compare(String version1, String version2) {
+		if (version1 == null) {
+			return version2 == null ? 0 : -1;
+		}
+
+		if (version2 == null) {
+			return 1;
+		}
+
+		String[] v1 = version1.split("\\."); //$NON-NLS-1$
+		String[] v2 = version2.split("\\."); //$NON-NLS-1$
+		for (int i = 0; i < Math.max(v1.length, v2.length); ++i) {
+			if (v1.length <= i) {
+				return v2.length < i ? 0 : -1;
+			}
+
+			if (v2.length <= i) {
+				return 1;
+			}
+
+			try {
+				int vi1 = Integer.parseInt(v1[i]);
+				int vi2 = Integer.parseInt(v2[i]);
+				if (vi1 < vi2) {
+					return -1;
+				}
+
+				if (vi1 > vi2) {
+					return 1;
+				}
+			} catch (NumberFormatException e) {
+				// not numbers, do string compares
+				int c = v1[i].compareTo(v2[i]);
+				if (c < 0) {
+					return -1;
+				}
+				if (c > 0) {
+					return 1;
+				}
+			}
+		}
+
+		return 0;
+	}
+
+}