mirror of https://github.com/noisymime/Arduino.git
Moved some code from Base to BaseNoGui and removed leftover self class references from BaseNoGui.
This commit is contained in:
parent
f2d92bbd0f
commit
b7d1846eb9
|
@ -1309,27 +1309,7 @@ public class Base {
|
||||||
showWarning(_("Error"), _("Error loading libraries"), e);
|
showWarning(_("Error"), _("Error loading libraries"), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Populate importToLibraryTable
|
BaseNoGui.populateImportToLibraryTable();
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update editors status bar
|
// Update editors status bar
|
||||||
for (Editor editor : editors)
|
for (Editor editor : editors)
|
||||||
|
|
|
@ -159,8 +159,8 @@ public class BaseNoGui {
|
||||||
}
|
}
|
||||||
|
|
||||||
static public File getSettingsFolder() {
|
static public File getSettingsFolder() {
|
||||||
if (BaseNoGui.getPortableFolder() != null)
|
if (getPortableFolder() != null)
|
||||||
return BaseNoGui.getPortableFolder();
|
return getPortableFolder();
|
||||||
|
|
||||||
File settingsFolder = null;
|
File settingsFolder = null;
|
||||||
|
|
||||||
|
@ -326,7 +326,7 @@ public class BaseNoGui {
|
||||||
File subfolder = new File(folder, target);
|
File subfolder = new File(folder, target);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
BaseNoGui.packages.put(target, new TargetPackage(target, subfolder));
|
packages.put(target, new TargetPackage(target, subfolder));
|
||||||
} catch (TargetPlatformException e) {
|
} catch (TargetPlatformException e) {
|
||||||
System.out.println("WARNING: Error loading hardware folder " + target);
|
System.out.println("WARNING: Error loading hardware folder " + target);
|
||||||
System.out.println(" " + e.getMessage());
|
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>();
|
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[]) {
|
static public void prescanParameters(String args[]) {
|
||||||
|
|
Loading…
Reference in New Issue