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

Small cleanup, no code change

This commit is contained in:
Cristian Maglie 2016-11-05 10:18:05 +01:00
parent 5b4af28f47
commit 650840381f
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ public class Base {
private List<JMenuItem> programmerMenus;
private PdeKeywords pdeKeywords;
private final List<JMenuItem> recentSketchesMenuItems;
private final List<JMenuItem> recentSketchesMenuItems = new LinkedList<>();
static public void main(String args[]) throws Exception {
System.setProperty("awt.useSystemAAFontSettings", "on");
@ -228,17 +228,14 @@ public class Base {
public Base(String[] args) throws Exception {
BaseNoGui.notifier = new GUIUserNotifier(this);
this.recentSketchesMenuItems = new LinkedList<>();
CommandlineParser parser = new CommandlineParser(args);
parser.parseArgumentsPhase1();
BaseNoGui.checkInstallationFolder();
String sketchbookPath = BaseNoGui.getSketchbookPath();
// If no path is set, get the default sketchbook folder for this platform
if (sketchbookPath == null) {
if (BaseNoGui.getSketchbookPath() == null) {
File defaultFolder = getDefaultSketchbookFolderOrPromptForIt();
if (BaseNoGui.getPortableFolder() != null)
PreferencesData.set("sketchbook.path", BaseNoGui.getPortableSketchbookFolder());
@ -258,8 +255,8 @@ public class Base {
// Setup board-dependent variables.
onBoardOrPortChange();
this.pdeKeywords = new PdeKeywords();
this.pdeKeywords.reload();
pdeKeywords = new PdeKeywords();
pdeKeywords.reload();
contributionInstaller = new ContributionInstaller(BaseNoGui.getPlatform(), new GPGDetachedSignatureVerifier());
libraryInstaller = new LibraryInstaller(BaseNoGui.getPlatform());

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

@ -833,9 +833,9 @@ public class BaseNoGui {
// Scan for libraries in each library folder.
// Libraries located in the latest folders on the list can override
// other libraries with the same name.
BaseNoGui.librariesIndexer.setSketchbookLibrariesFolder(getSketchbookLibrariesFolder());
BaseNoGui.librariesIndexer.setLibrariesFolders(librariesFolders);
BaseNoGui.librariesIndexer.rescanLibraries();
librariesIndexer.setSketchbookLibrariesFolder(getSketchbookLibrariesFolder());
librariesIndexer.setLibrariesFolders(librariesFolders);
librariesIndexer.rescanLibraries();
populateImportToLibraryTable();
}