Skip to content

Commit f52fc1f

Browse files
committed
Slightly improved DownloadableContributionVersionComparator
1 parent f5f8b7f commit f52fc1f

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

arduino-core/src/cc/arduino/contributions/DownloadableContributionVersionComparator.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,9 @@
3333

3434
public class DownloadableContributionVersionComparator implements Comparator<DownloadableContribution> {
3535

36-
private final VersionComparator versionComparator;
37-
38-
public DownloadableContributionVersionComparator() {
39-
versionComparator = new VersionComparator();
40-
}
41-
4236
@Override
4337
public int compare(DownloadableContribution lib1, DownloadableContribution lib2) {
44-
return versionComparator.compare(lib1.getParsedVersion(), lib2.getParsedVersion());
38+
return VersionComparator.compareTo(lib1.getParsedVersion(), lib2.getParsedVersion());
4539
}
4640

4741

arduino-core/src/cc/arduino/contributions/VersionComparator.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public int compare(String a, String b) {
6161
public static boolean greaterThan(String a, String b) {
6262
return compareTo(a, b) > 0;
6363
}
64-
64+
6565
public static boolean greaterThanOrEqual(String a, String b) {
6666
return compareTo(a, b) >= 0;
6767
}
@@ -77,4 +77,8 @@ public static ContributedLibrary max(ContributedLibrary a, ContributedLibrary b)
7777
public static boolean greaterThan(ContributedLibrary a, ContributedLibrary b) {
7878
return greaterThan(a.getParsedVersion(), b.getParsedVersion());
7979
}
80+
81+
public static int compareTo(ContributedLibrary a, ContributedLibrary b) {
82+
return compareTo(a.getParsedVersion(), b.getParsedVersion());
83+
}
8084
}

0 commit comments

Comments
 (0)