Library and Boards Manager: preserving filter selections

Author: Federico Fissore

app/src/cc/arduino/contributions/libraries/ui/DropdownBuiltInLibrariesItem.java

@@ -17,4 +17,10 @@ public String toString() {
   public Predicate<DownloadableContribution> getFilterPredicate() {
     return new BuiltInPredicate();
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DropdownBuiltInLibrariesItem;
+  }
+
 }

app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibraryItem.java

@@ -24,4 +24,10 @@ public String toString() {
   public Predicate<ContributedLibrary> getFilterPredicate() {
     return new InstalledLibraryPredicate(index);
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DropdownInstalledLibraryItem;
+  }
+
 }

app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfCategoryItem.java

@@ -21,4 +21,10 @@ public String toString() {
   public Predicate<ContributedLibrary> getFilterPredicate() {
     return new CategoryPredicate(category);
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DropdownLibraryOfCategoryItem && ((DropdownLibraryOfCategoryItem) obj).category.equals(category);
+  }
+
 }

app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfTypeItem.java

@@ -22,4 +22,10 @@ public String toString() {
   public Predicate<ContributedLibrary> getFilterPredicate() {
     return new TypePredicate(type);
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DropdownLibraryOfTypeItem && ((DropdownLibraryOfTypeItem) obj).type.equals(type);
+  }
+
 }

app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java

@@ -30,6 +30,7 @@
 
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
+import cc.arduino.contributions.packages.DownloadableContribution;
 import cc.arduino.contributions.packages.ui.InstallerJDialogUncaughtExceptionHandler;
 import cc.arduino.contributions.ui.*;
 import cc.arduino.utils.Progress;
@@ -124,6 +125,10 @@ public void updateIndexFilter(String[] filters, Predicate<ContributedLibrary>...
 
   public void setIndexer(LibrariesIndexer indexer) {
     this.indexer = indexer;
+
+    DropdownItem<DownloadableContribution> previouslySelectedCategory = (DropdownItem<DownloadableContribution>) categoryChooser.getSelectedItem();
+    DropdownItem<DownloadableContribution> previouslySelectedType = (DropdownItem<DownloadableContribution>) typeChooser.getSelectedItem();
+
     categoryChooser.removeActionListener(categoryChooserActionListener);
     typeChooser.removeActionListener(typeChooserActionListener);
 
@@ -144,7 +149,11 @@ public void setIndexer(LibrariesIndexer indexer) {
     categoryChooser.setEnabled(categoryChooser.getItemCount() > 1);
 
     categoryChooser.addActionListener(categoryChooserActionListener);
-    categoryChooser.setSelectedIndex(0);
+    if (previouslySelectedCategory != null) {
+      categoryChooser.setSelectedItem(previouslySelectedCategory);
+    } else {
+      categoryChooser.setSelectedIndex(0);
+    }
 
     typeFilter = null;
     typeChooser.removeAllItems();
@@ -156,6 +165,11 @@ public void setIndexer(LibrariesIndexer indexer) {
     }
     typeChooser.setEnabled(typeChooser.getItemCount() > 1);
     typeChooser.addActionListener(typeChooserActionListener);
+    if (previouslySelectedType != null) {
+      typeChooser.setSelectedItem(previouslySelectedType);
+    } else {
+      typeChooser.setSelectedIndex(0);
+    }
 
     filterField.setEnabled(contribModel.getRowCount() > 0);
 

app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java

@@ -31,6 +31,8 @@
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributionInstaller;
 import cc.arduino.contributions.packages.ContributionsIndexer;
+import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.ui.DropdownItem;
 import cc.arduino.contributions.ui.FilteredAbstractTableModel;
 import cc.arduino.contributions.ui.InstallerJDialog;
 import cc.arduino.contributions.ui.InstallerTableCell;
@@ -88,6 +90,8 @@ public ContributionManagerUI(Frame parent) {
   }
 
   public void setIndexer(ContributionsIndexer indexer) {
+    DropdownItem<DownloadableContribution> previouslySelectedCategory = (DropdownItem<DownloadableContribution>) categoryChooser.getSelectedItem();
+
     categoryChooser.removeActionListener(categoryChooserActionListener);
 
     getContribModel().setIndex(indexer.getIndex());
@@ -105,6 +109,11 @@ public void setIndexer(ContributionsIndexer indexer) {
     for (String s : categories) {
       categoryChooser.addItem(new DropdownCoreOfCategoryItem(s));
     }
+    if (previouslySelectedCategory != null) {
+      categoryChooser.setSelectedItem(previouslySelectedCategory);
+    } else {
+      categoryChooser.setSelectedIndex(0);
+    }
 
     // Create ConstributionInstaller tied with the provided index
     installer = new ContributionInstaller(indexer) {

app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java

@@ -17,4 +17,9 @@ public String toString() {
   public Predicate<ContributedPlatform> getFilterPredicate() {
     return new NoopPredicate<ContributedPlatform>();
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DropdownAllCoresItem;
+  }
 }

app/src/cc/arduino/contributions/packages/ui/DropdownCoreOfCategoryItem.java

@@ -21,4 +21,10 @@ public String toString() {
   public Predicate<ContributedPlatform> getFilterPredicate() {
     return new CategoryPredicate(category);
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DropdownCoreOfCategoryItem && ((DropdownCoreOfCategoryItem) obj).category.equals(category);
+  }
+
 }

app/src/cc/arduino/contributions/ui/DropdownAllItem.java

@@ -17,4 +17,10 @@ public String toString() {
   public Predicate<DownloadableContribution> getFilterPredicate() {
     return new NoopPredicate<DownloadableContribution>();
   }
+
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof DropdownAllItem;
+  }
+
 }