noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If parsing a core fails, don't crash but report a warning. Fixes #3307

This commit is contained in:
Federico Fissore 2015-06-10 15:42:47 +02:00
parent c1c5e70fe1
commit 0a6577f85c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
View File

@ -300,7 +300,7 @@ public class ContributionsIndexer {
return index.toString(); return index.toString();
} }
public List<TargetPackage> createTargetPackages() throws TargetPlatformException { public List<TargetPackage> createTargetPackages() {
List<TargetPackage> packages = new ArrayList<TargetPackage>(); List<TargetPackage> packages = new ArrayList<TargetPackage>();
if (index == null) { if (index == null) {
@ -317,9 +317,13 @@ public class ContributionsIndexer {
String arch = platform.getArchitecture(); String arch = platform.getArchitecture();
File folder = platform.getInstalledFolder(); File folder = platform.getInstalledFolder();
TargetPlatform targetPlatform = new ContributedTargetPlatform(arch, folder, targetPackage, index); try {
if (!targetPackage.hasPlatform(targetPlatform)) { TargetPlatform targetPlatform = new ContributedTargetPlatform(arch, folder, targetPackage, index);
targetPackage.addPlatform(targetPlatform); if (!targetPackage.hasPlatform(targetPlatform)) {
targetPackage.addPlatform(targetPlatform);
}
} catch (TargetPlatformException e) {
System.err.println(e.getMessage());
} }
} }

2
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -826,7 +826,7 @@ public class BaseNoGui {
populateImportToLibraryTable(); populateImportToLibraryTable();
} }
static protected void loadContributedHardware(ContributionsIndexer indexer) throws TargetPlatformException { static protected void loadContributedHardware(ContributionsIndexer indexer) {
for (TargetPackage pack : indexer.createTargetPackages()) { for (TargetPackage pack : indexer.createTargetPackages()) {
packages.put(pack.getId(), pack); packages.put(pack.getId(), pack);
} }