Only add core libraries that are installed in the sketchbook (fixes #3688)

benfry · benfry · commit 75db627132df · 2015-09-15T17:28:57.000-04:00
diff --git 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<String,String[]> exportList;
+  HashMap<String, String[]> 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
@@ -386,7 +386,18 @@ protected void updateContributionListing() {
 
       List<Library> libraries =
         new ArrayList<Library>(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();
