rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-27 21:54:30 +01:00
Code Issues Releases Activity

Invalid use of toString in Optional<Version>

Browse Source 
It should be used on the actual Version.

Fix #8034
This commit is contained in:
Cristian Maglie 2018-10-08 11:51:34 +02:00
parent d3cb01424f
commit 6a1c1f4df9
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/processing/app/Base.java
View File

@ -74,6 +74,7 @@ import java.util.logging.Logger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import static processing.app.I18n.format;
import static processing.app.I18n.tr; import static processing.app.I18n.tr;
@ -307,9 +308,13 @@ public class Base {
String[] boardToInstallParts = parser.getBoardToInstall().split(":"); String[] boardToInstallParts = parser.getBoardToInstall().split(":");
ContributedPlatform selected = null; ContributedPlatform selected = null;
if (boardToInstallParts.length == 3 && VersionHelper.valueOf(boardToInstallParts[2]).isPresent()) { if (boardToInstallParts.length == 3) {
Version vs = VersionHelper.valueOf(boardToInstallParts[2]).get(); Optional<Version> version = VersionHelper.valueOf(boardToInstallParts[2]);
selected = indexer.getIndex().findPlatform(boardToInstallParts[0], boardToInstallParts[1], vs.toString()); if (!version.isPresent()) {
System.out.println(format(tr("Invalid version {0}"), boardToInstallParts[2]));
System.exit(1);
}
selected = indexer.getIndex().findPlatform(boardToInstallParts[0], boardToInstallParts[1], version.get().toString());
} else if (boardToInstallParts.length == 2) { } else if (boardToInstallParts.length == 2) {
List<ContributedPlatform> platformsByName = indexer.getIndex().findPlatforms(boardToInstallParts[0], boardToInstallParts[1]); List<ContributedPlatform> platformsByName = indexer.getIndex().findPlatforms(boardToInstallParts[0], boardToInstallParts[1]);
Collections.sort(platformsByName, new DownloadableContributionVersionComparator()); Collections.sort(platformsByName, new DownloadableContributionVersionComparator());
@ -350,7 +355,12 @@ public class Base {
ContributedLibrary selected = null; ContributedLibrary selected = null;
if (libraryToInstallParts.length == 2) { if (libraryToInstallParts.length == 2) {
selected = indexer.getIndex().find(libraryToInstallParts[0], VersionHelper.valueOf(libraryToInstallParts[1]).toString()); Optional<Version> version = VersionHelper.valueOf(libraryToInstallParts[1]);
if (!version.isPresent()) {
System.out.println(format(tr("Invalid version {0}"), libraryToInstallParts[1]));
System.exit(1);
}
selected = indexer.getIndex().find(libraryToInstallParts[0], version.get().toString());
} else if (libraryToInstallParts.length == 1) { } else if (libraryToInstallParts.length == 1) {
List<ContributedLibrary> librariesByName = indexer.getIndex().find(libraryToInstallParts[0]); List<ContributedLibrary> librariesByName = indexer.getIndex().find(libraryToInstallParts[0]);
Collections.sort(librariesByName, new DownloadableContributionVersionComparator()); Collections.sort(librariesByName, new DownloadableContributionVersionComparator());