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

Moved some code from Base to BaseNoGui and removed leftover self class references from BaseNoGui.

Browse Source
This commit is contained in:
Claudio Indellicati 2014-08-22 13:41:41 +02:00 committed by Cristian Maglie
parent f2d92bbd0f
commit b7d1846eb9
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1309,27 +1309,7 @@ public class Base {
showWarning(_("Error"), _("Error loading libraries"), e);
}
// Populate importToLibraryTable
BaseNoGui.newImportToLibraryTable();
for (Library lib : getLibraries()) {
try {
String headers[] = headerListFromIncludePath(lib.getSrcFolder());
for (String header : headers) {
Library old = BaseNoGui.importToLibraryTable.get(header);
if (old != null) {
// If a library was already found with this header, keep
// it if the library's name matches the header name.
String name = header.substring(0, header.length() - 2);
if (old.getFolder().getPath().endsWith(name))
continue;
}
BaseNoGui.importToLibraryTable.put(header, lib);
}
} catch (IOException e) {
showWarning(_("Error"), I18n
.format("Unable to list header files in {0}", lib.getSrcFolder()), e);
}
}
BaseNoGui.populateImportToLibraryTable();
// Update editors status bar
for (Editor editor : editors)

28
app/src/processing/app/BaseNoGui.java
View File

@ -159,8 +159,8 @@ public class BaseNoGui {
}
static public File getSettingsFolder() {
if (BaseNoGui.getPortableFolder() != null)
return BaseNoGui.getPortableFolder();
if (getPortableFolder() != null)
return getPortableFolder();
File settingsFolder = null;
@ -326,7 +326,7 @@ public class BaseNoGui {
File subfolder = new File(folder, target);
try {
BaseNoGui.packages.put(target, new TargetPackage(target, subfolder));
packages.put(target, new TargetPackage(target, subfolder));
} catch (TargetPlatformException e) {
System.out.println("WARNING: Error loading hardware folder " + target);
System.out.println(" " + e.getMessage());
@ -334,8 +334,28 @@ public class BaseNoGui {
}
}
static public void newImportToLibraryTable() {
static public void populateImportToLibraryTable() {
// Populate importToLibraryTable
importToLibraryTable = new HashMap<String, Library>();
for (Library lib : getLibraries()) {
try {
String headers[] = headerListFromIncludePath(lib.getSrcFolder());
for (String header : headers) {
Library old = importToLibraryTable.get(header);
if (old != null) {
// If a library was already found with this header, keep
// it if the library's name matches the header name.
String name = header.substring(0, header.length() - 2);
if (old.getFolder().getPath().endsWith(name))
continue;
}
importToLibraryTable.put(header, lib);
}
} catch (IOException e) {
showWarning(_("Error"), I18n
.format("Unable to list header files in {0}", lib.getSrcFolder()), e);
}
}
}
static public void prescanParameters(String args[]) {