processing
diff --git a/‎app/src/processing/app/contrib/ContributionListing.java‎
Lines changed: 10 additions & 55 deletions b/‎app/src/processing/app/contrib/ContributionListing.java‎
Lines changed: 10 additions & 55 deletions
diff --git a/‎app/src/processing/app/contrib/ContributionTab.java‎
Lines changed: 8 additions & 19 deletions b/‎app/src/processing/app/contrib/ContributionTab.java‎
Lines changed: 8 additions & 19 deletions
@@ -53,18 +53,18 @@ public class ContributionListing {
   Map<String, Contribution> librariesByImportHeader;
   // TODO: Every contribution is getting added twice
   // and nothing is replaced ever.
-  List<Contribution> allContributions;
+  Set<Contribution> allContributions;
   boolean listDownloaded;
   boolean listDownloadFailed;
   ReentrantLock downloadingListingLock;
 
 
   private ContributionListing() {
-    listeners = new ArrayList<ChangeListener>();
-    advertisedContributions = new ArrayList<AvailableContribution>();
-    librariesByCategory = new HashMap<String, List<Contribution>>();
-    librariesByImportHeader = new HashMap<String, Contribution>();
-    allContributions = new ArrayList<Contribution>();
+    listeners = new ArrayList<>();
+    advertisedContributions = new ArrayList<>();
+    librariesByCategory = new HashMap<>();
+    librariesByImportHeader = new HashMap<>();
+    allContributions = new LinkedHashSet<>();
     downloadingListingLock = new ReentrantLock();
 
     //listingFile = Base.getSettingsFile("contributions.txt");
@@ -96,7 +96,6 @@ private void setAdvertisedList(File file) {
     for (Contribution contribution : advertisedContributions) {
       addContribution(contribution);
     }
-    Collections.sort(allContributions, COMPARATOR);
   }
 
 
@@ -139,11 +138,8 @@ protected void replaceContribution(Contribution oldLib, Contribution newLib) {
         }
       }
 
-      for (int i = 0; i < allContributions.size(); i++) {
-        if (allContributions.get(i) == oldLib) {
-          allContributions.set(i, newLib);
-        }
-      }
+      allContributions.remove(oldLib);
+      allContributions.add(newLib);
 
       notifyChange(oldLib, newLib);
     }
@@ -169,7 +165,6 @@ private void addContribution(Contribution contribution) {
       }
       allContributions.add(contribution);
       notifyAdd(contribution);
-      Collections.sort(allContributions, COMPARATOR);
     }
   }
 
@@ -234,43 +229,7 @@ protected Set<String> getCategories(Contribution.Filter filter) {
   }
 
 
-//  public List<Contribution> getAllContributions() {
-//    return new ArrayList<Contribution>(allContributions);
-//  }
-
-
-//  public List<Contribution> getLibararies(String category) {
-//    ArrayList<Contribution> libinfos =
-//        new ArrayList<Contribution>(librariesByCategory.get(category));
-//    Collections.sort(libinfos, nameComparator);
-//    return libinfos;
-//  }
-
-
-  protected List<Contribution> getFilteredLibraryList(String category, List<String> filters) {
-    ArrayList<Contribution> filteredList =
-      new ArrayList<Contribution>(allContributions);
-
-    Iterator<Contribution> it = filteredList.iterator();
-    while (it.hasNext()) {
-      Contribution libInfo = it.next();
-      //if (category != null && !category.equals(libInfo.getCategory())) {
-      if (category != null && !libInfo.hasCategory(category)) {
-        it.remove();
-      } else {
-        for (String filter : filters) {
-          if (!matches(libInfo, filter)) {
-            it.remove();
-            break;
-          }
-        }
-      }
-    }
-    return filteredList;
-  }
-
-
-  private boolean matches(Contribution contrib, String typed) {
+  public boolean matches(Contribution contrib, String typed) {
     int colon = typed.indexOf(":");
     if (colon != -1) {
       String isText = typed.substring(0, colon);
@@ -601,11 +560,7 @@ public Map<String, Contribution> getLibrariesByImportHeader() {
   }
 
 
-  static public Comparator<Contribution> COMPARATOR = new Comparator<Contribution>() {
-    public int compare(Contribution o1, Contribution o2) {
-      return o1.getName().toLowerCase().compareTo(o2.getName().toLowerCase());
-    }
-  };
+  static public Comparator<Contribution> COMPARATOR = Comparator.comparing(o -> o.getName().toLowerCase());
 
 
   public interface ChangeListener {
 
@@ -73,24 +73,14 @@ public ContributionTab(ManagerFrame dialog, ContributionType type) {
     this.contribDialog = dialog;
     this.contribType = type;
 
-    filter = new Contribution.Filter() {
-      public boolean matches(Contribution contrib) {
-        return contrib.getType() == contribType;
-      }
-    };
+    filter = contrib -> contrib.getType() == contribType;
 
     contribListing = ContributionListing.getInstance();
     statusPanel = new StatusPanel(this, 650);
-    contributionListPanel = new ListPanel(this, filter);
+    contributionListPanel = new ListPanel(this, filter, false);
     contribListing.addListener(contributionListPanel);
   }
 
-
-//  public boolean hasUpdates(Base base) {
-//    return contribListing.hasUpdates(base);
-//  }
-
-
   public void showFrame(final Editor editor, boolean error, boolean loading) {
     this.editor = editor;
 
@@ -277,9 +267,7 @@ protected void updateCategoryChooser() {
 
 
   protected void filterLibraries(String category, List<String> filters) {
-    List<Contribution> filteredLibraries =
-      contribListing.getFilteredLibraryList(category, filters);
-    contributionListPanel.filterLibraries(filteredLibraries);
+    contributionListPanel.filterLibraries(category, filters);
   }
 
 
@@ -449,15 +437,16 @@ protected void updateAll() {
       contributionListPanel.panelByContribution.values();
     for (DetailPanel detailPanel : collection) {
       detailPanel.update();
-
-    // Refreshing the ContributionUpdateTab's status icons
-    contributionListPanel.updatePanelOrdering(contributionListPanel
-      .panelByContribution.keySet());
     }
+    contributionListPanel.model.fireTableDataChanged();
   }
 
 
   protected boolean hasUpdates() {
     return contributionListPanel.getRowCount() > 0;
   }
+
+  public boolean filterHasFocus() {
+      return filterField != null && filterField.hasFocus();
+  }
 }