arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
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,10 +317,14 @@ public class ContributionsIndexer {
String arch = platform.getArchitecture(); String arch = platform.getArchitecture();
File folder = platform.getInstalledFolder(); File folder = platform.getInstalledFolder();
try {
TargetPlatform targetPlatform = new ContributedTargetPlatform(arch, folder, targetPackage, index); TargetPlatform targetPlatform = new ContributedTargetPlatform(arch, folder, targetPackage, index);
if (!targetPackage.hasPlatform(targetPlatform)) { if (!targetPackage.hasPlatform(targetPlatform)) {
targetPackage.addPlatform(targetPlatform); targetPackage.addPlatform(targetPlatform);
} }
} catch (TargetPlatformException e) {
System.err.println(e.getMessage());
}
} }
if (targetPackage.hasPlatforms()) { if (targetPackage.hasPlatforms()) {

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);
} }