From 534d62653c07cf9cd146d844a5acbbbe47121946 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Sun, 17 Dec 2017 21:55:31 +0100 Subject: [PATCH] Removed deprecated method Base.getLibraries() --- app/src/processing/app/Base.java | 5 ----- app/src/processing/app/syntax/PdeKeywords.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index a66daaa5d..3134a0791 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -1877,11 +1877,6 @@ public class Base { getEditors().forEach(Editor::applyPreferences); } - // XXX: Remove this method and make librariesIndexer non-static - static public LibraryList getLibraries() { - return BaseNoGui.librariesIndexer.getInstalledLibraries(); - } - public List getBoardsCustomMenus() { return boardsCustomMenus; } diff --git a/app/src/processing/app/syntax/PdeKeywords.java b/app/src/processing/app/syntax/PdeKeywords.java index 914ff05c5..aa4f000f3 100644 --- a/app/src/processing/app/syntax/PdeKeywords.java +++ b/app/src/processing/app/syntax/PdeKeywords.java @@ -89,7 +89,7 @@ public class PdeKeywords { File platformKeywords = new File(tp.getFolder(), "keywords.txt"); if (platformKeywords.exists()) parseKeywordsTxt(platformKeywords); } - for (ContributedLibrary lib : Base.getLibraries()) { + for (ContributedLibrary lib : BaseNoGui.librariesIndexer.getInstalledLibraries()) { File keywords = new File(lib.getInstalledFolder(), "keywords.txt"); if (keywords.exists()) { parseKeywordsTxt(keywords);