From eef9d84b084ef4c1e2468915fedabff3a1dc3361 Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 15 Sep 2015 17:28:57 -0400 Subject: [PATCH] Only add core libraries that are installed in the sketchbook (fixes #3688) --- app/src/processing/app/Library.java | 2 +- app/src/processing/app/contrib/ContributionTab.java | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/Library.java b/app/src/processing/app/Library.java index 7a5eb0dd9..d8692b060 100644 --- a/app/src/processing/app/Library.java +++ b/app/src/processing/app/Library.java @@ -28,7 +28,7 @@ public class Library extends LocalContribution { StringList packageList; /** Per-platform exports for this library. */ - HashMap exportList; + HashMap exportList; /** Applet exports (cross-platform by definition). */ String[] appletExportList; diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java index e46aae784..e5569db4c 100644 --- a/app/src/processing/app/contrib/ContributionTab.java +++ b/app/src/processing/app/contrib/ContributionTab.java @@ -386,7 +386,18 @@ public class ContributionTab { List libraries = new ArrayList(editor.getMode().contribLibraries); - libraries.addAll(editor.getMode().coreLibraries); + + // Only add core libraries that are installed in the sketchbook + // https://github.com/processing/processing/issues/3688 + //libraries.addAll(editor.getMode().coreLibraries); + final String sketchbookPath = + Base.getSketchbookLibrariesFolder().getAbsolutePath(); + for (Library lib : editor.getMode().coreLibraries) { + if (lib.getLibraryPath().startsWith(sketchbookPath)) { + libraries.add(lib); + } + } + contributions.addAll(libraries); Base base = editor.getBase();