Skip to content

Commit 6508403

Browse files
committed
Small cleanup, no code change
1 parent 5b4af28 commit 6508403

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

app/src/processing/app/Base.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public class Base {
116116
private List<JMenuItem> programmerMenus;
117117

118118
private PdeKeywords pdeKeywords;
119-
private final List<JMenuItem> recentSketchesMenuItems;
119+
private final List<JMenuItem> recentSketchesMenuItems = new LinkedList<>();
120120

121121
static public void main(String args[]) throws Exception {
122122
System.setProperty("awt.useSystemAAFontSettings", "on");
@@ -228,17 +228,14 @@ static public File absoluteFile(String path) {
228228

229229
public Base(String[] args) throws Exception {
230230
BaseNoGui.notifier = new GUIUserNotifier(this);
231-
this.recentSketchesMenuItems = new LinkedList<>();
232231

233232
CommandlineParser parser = new CommandlineParser(args);
234233
parser.parseArgumentsPhase1();
235234

236235
BaseNoGui.checkInstallationFolder();
237236

238-
String sketchbookPath = BaseNoGui.getSketchbookPath();
239-
240237
// If no path is set, get the default sketchbook folder for this platform
241-
if (sketchbookPath == null) {
238+
if (BaseNoGui.getSketchbookPath() == null) {
242239
File defaultFolder = getDefaultSketchbookFolderOrPromptForIt();
243240
if (BaseNoGui.getPortableFolder() != null)
244241
PreferencesData.set("sketchbook.path", BaseNoGui.getPortableSketchbookFolder());
@@ -258,8 +255,8 @@ public Base(String[] args) throws Exception {
258255
// Setup board-dependent variables.
259256
onBoardOrPortChange();
260257

261-
this.pdeKeywords = new PdeKeywords();
262-
this.pdeKeywords.reload();
258+
pdeKeywords = new PdeKeywords();
259+
pdeKeywords.reload();
263260

264261
contributionInstaller = new ContributionInstaller(BaseNoGui.getPlatform(), new GPGDetachedSignatureVerifier());
265262
libraryInstaller = new LibraryInstaller(BaseNoGui.getPlatform());

arduino-core/src/processing/app/BaseNoGui.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -833,9 +833,9 @@ static public void onBoardOrPortChange() {
833833
// Scan for libraries in each library folder.
834834
// Libraries located in the latest folders on the list can override
835835
// other libraries with the same name.
836-
BaseNoGui.librariesIndexer.setSketchbookLibrariesFolder(getSketchbookLibrariesFolder());
837-
BaseNoGui.librariesIndexer.setLibrariesFolders(librariesFolders);
838-
BaseNoGui.librariesIndexer.rescanLibraries();
836+
librariesIndexer.setSketchbookLibrariesFolder(getSketchbookLibrariesFolder());
837+
librariesIndexer.setLibrariesFolders(librariesFolders);
838+
librariesIndexer.rescanLibraries();
839839

840840
populateImportToLibraryTable();
841841
}

0 commit comments

Comments
 (0)