add foundation libraries (video/sound) to the library stats

benfry · benfry · commit 532c68ead535 · 2023-01-10T19:07:42.000-05:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -937,14 +937,14 @@ public void populateToolsMenu(JMenu toolsMenu) {
     }
     toolsMenu.addSeparator();
 
-    if (coreTools.size() > 0) {
+    if (!coreTools.isEmpty()) {
       for (Tool tool : coreTools) {
         toolsMenu.add(createToolItem(tool));
       }
       toolsMenu.addSeparator();
     }
 
-    if (contribTools.size() > 0) {
+    if (!contribTools.isEmpty()) {
       for (Tool tool : contribTools) {
         toolsMenu.add(createToolItem(tool));
       }
@@ -1032,18 +1032,23 @@ public List<ExamplesContribution> getContribExamples() {
   }
 
 
+  /**
+   * Get all the contributed Modes, Libraries, Tools, and Examples
+   * so that they can be reported for an update check.
+   */
   private Set<Contribution> getInstalledContribs() {
     List<ModeContribution> modeContribs = getModeContribs();
     Set<Contribution> contributions = new HashSet<>(modeContribs);
 
     for (ModeContribution modeContrib : modeContribs) {
       Mode mode = modeContrib.getMode();
-      contributions.addAll(new ArrayList<>(mode.contribLibraries));
+      contributions.addAll(mode.contribLibraries);
+      contributions.addAll(mode.foundationLibraries);
     }
 
-    // how is this different from getToolContribs()?
-    // TODO this duplicates code in Editor, but it's not editor-specific
-    contributions.addAll(ToolContribution.loadAll(getSketchbookToolsFolder()));
+    // For 4.1.2, not reloading all the tools here. Just in case it causes a
+    // regression b/c it's not clear why it was written that way. [fry 230110]
+    contributions.addAll(contribTools);
 
     contributions.addAll(getContribExamples());
     return contributions;
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -73,6 +73,7 @@ public abstract class Mode {
 
   public List<Library> coreLibraries;
   public List<Library> contribLibraries;
+  public List<Library> foundationLibraries;
 
   /** Library folder for core. (Used for OpenGL in particular.) */
   protected Library coreLibrary;
@@ -320,7 +321,7 @@ public void rebuildLibraryList() {
 
     // Check to see if video and sound are installed and move them
     // from the contributed list to the core list.
-    List<Library> foundationLibraries = new ArrayList<>();
+    foundationLibraries = new ArrayList<>();
     for (Library lib : contribLibraries) {
       if (lib.isFoundation()) {
         foundationLibraries.add(lib);
diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,8 @@
 1290 (4.1.2?)
+X add foundation libraries to the stats (https://download.processing.org/stats/)
+X   make foundationLibraries a class var, and then access it when calling download()
+X also removed the "new ArrayList()" wrapping in getInstalledContribs()
+X   seemed extraneous, perhaps dates to that being an array instead of a List?
 
 contrib
 X “Cannot find a class or type named ‘PApplet’” error
@@ -9,6 +13,7 @@ X   https://github.com/processing/processing4/issues/619
 X   https://github.com/processing/processing4/pull/622
 
 
+
 _ make ctrl-g work inside the find window
 
 _ export to IntelliJ? how tricky?
