Filter ContributedPlatformReleases after fully building them

Author: cmaglie

Diff for: app/src/cc/arduino/contributions/packages/ui/ContributedPlatformReleases.java

@@ -61,12 +61,6 @@ public boolean shouldContain(ContributedPlatform platform) {
     return platform.getArchitecture().equals(arch);
   }
 
-  public boolean contains(ContributedPlatform platform) {
-    return (platform.getParentPackage().equals(packager)
-        && platform.getArchitecture().equals(arch)
-        && versions.contains(platform.getParsedVersion()));
-  }
-
   public void add(ContributedPlatform platform) {
     releases.add(platform);
     String version = platform.getParsedVersion();

Diff for: app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java

@@ -60,30 +60,32 @@ public void updateIndexFilter(String[] filters,
 
   private void updateContributions() {
     contributions.clear();
+
+    // Generate ContributedPlatformReleases from all platform releases
     for (ContributedPackage pack : BaseNoGui.indexer.getPackages()) {
       for (ContributedPlatform platform : pack.getPlatforms()) {
+        addContribution(platform);
+      }
+    }
+
+    // Filter ContributedPlatformReleases based on search terms
+    contributions.removeIf(releases -> {
+      for (ContributedPlatform platform : releases.releases) {
         String compoundTargetSearchText = platform.getName() + "\n"
                                           + platform.getBoards().stream()
                                               .map(ContributedBoard::getName)
                                               .collect(Collectors.joining(" "));
-
-        // Add all the versions of the same core, even if there's no match
-        for (ContributedPlatformReleases contribution : contributions) {
-          if (contribution.shouldContain(platform)) {
-            addContribution(platform);
-            continue;
-          }
-        }
-
         if (!filter.test(platform)) {
           continue;
         }
         if (!stringContainsAll(compoundTargetSearchText, filters))
           continue;
-
-        addContribution(platform);
+        return false;
       }
-    }
+      return true;
+    });
+
+    // Sort ContributedPlatformReleases and put deprecated platforms to the bottom
     Collections.sort(contributions, (x,y)-> {
       if (x.isDeprecated() != y.isDeprecated()) {
         return x.isDeprecated() ? 1 : -1;
@@ -96,6 +98,7 @@ private void updateContributions() {
       }
       return x1.getName().compareToIgnoreCase(y1.getName());
     });
+
     fireTableDataChanged();
   }
 
@@ -123,10 +126,6 @@ private void addContribution(ContributedPlatform platform) {
       if (!contribution.shouldContain(platform)) {
         continue;
       }
-      if (contribution.contains(platform)) {
-        // no duplicates
-        return;
-      }
       contribution.add(platform);
       return;
     }