LibraryManager: category is now topic, type added to list official/contributed/recommended libs

Author: Federico Fissore

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

@@ -28,10 +28,10 @@
  */
 package cc.arduino.contributions.libraries.ui;
 
+import cc.arduino.contributions.VersionComparator;
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import cc.arduino.contributions.packages.ContributedPlatform;
-import cc.arduino.contributions.VersionComparator;
 import cc.arduino.contributions.ui.FilteredAbstractTableModel;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
@@ -279,10 +279,12 @@ public void updateLibrary(ContributedLibrary lib) {
 
   private void updateContributions() {
     contributions.clear();
-    for (ContributedLibrary l : indexer.getIndex().getLibraries())
+    for (ContributedLibrary l : indexer.getIndex().getLibraries()) {
       applyFilterToLibrary(l);
-    for (ContributedLibrary l : indexer.getInstalledLibraries())
+    }
+    for (ContributedLibrary l : indexer.getInstalledLibraries()) {
       applyFilterToLibrary(l);
+    }
     Collections.sort(contributions);
   }
 

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

@@ -87,16 +87,17 @@ protected void onRemove(ContributedLibrary library) {
   public LibraryManagerUI(Frame parent) {
     super(parent, "Library Manager", Dialog.ModalityType.APPLICATION_MODAL, _("No internet connection available, the list of available libraries is not complete. You will be able to manage only the libraries you've already installed."));
 
-    filtersContainer.add(new JLabel(_("Category:")), 1);
+    filtersContainer.add(new JLabel(_("Topic")), 1);
     filtersContainer.remove(2);
 
     typeChooser = new JComboBox();
     typeChooser.setMaximumRowCount(20);
     typeChooser.setEnabled(false);
 
     filtersContainer.add(Box.createHorizontalStrut(5), 0);
-    filtersContainer.add(new JLabel(_("Type:")), 1);
-    filtersContainer.add(typeChooser, 2);
+    filtersContainer.add(new JLabel(_("Type")), 1);
+    filtersContainer.add(Box.createHorizontalStrut(5), 2);
+    filtersContainer.add(typeChooser, 3);
   }
 
   protected final ActionListener typeChooserActionListener = new ActionListener() {
@@ -136,8 +137,6 @@ public void setIndexer(LibrariesIndexer indexer) {
 
     // Load categories
     categoryChooser.addItem(new DropdownAllItem());
-    categoryChooser.addItem(new DropdownInstalledContributionItem());
-    categoryChooser.addItem(new DropdownBuiltInLibrariesItem());
     Collection<String> categories = indexer.getIndex().getCategories();
     for (String category : categories) {
       categoryChooser.addItem(new DropdownLibraryOfCategoryItem(category));
@@ -151,13 +150,13 @@ public void setIndexer(LibrariesIndexer indexer) {
     typeFilter = null;
     typeChooser.removeAllItems();
     typeChooser.addItem(new DropdownAllItem());
+    typeChooser.addItem(new DropdownInstalledContributionItem());
     Collection<String> types = indexer.getIndex().getTypes();
     for (String type : types) {
       typeChooser.addItem(new DropdownLibraryOfTypeItem(type));
     }
     typeChooser.setEnabled(typeChooser.getItemCount() > 1);
     typeChooser.addActionListener(typeChooserActionListener);
-    typeChooser.setSelectedIndex(1);
 
     filterField.setEnabled(contribModel.getRowCount() > 0);
 

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

@@ -111,7 +111,7 @@ protected void onFilter(String[] _filters) {
       filtersContainer = new JPanel();
       filtersContainer.setLayout(new BoxLayout(filtersContainer, BoxLayout.X_AXIS));
       filtersContainer.add(Box.createHorizontalStrut(5));
-      filtersContainer.add(new JLabel(_("Type:")));
+      filtersContainer.add(new JLabel(_("Type")));
       filtersContainer.add(Box.createHorizontalStrut(5));
       filtersContainer.add(categoryChooser);
       filtersContainer.add(Box.createHorizontalStrut(5));

arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java

@@ -58,8 +58,6 @@ public abstract class ContributedLibrary extends DownloadableContribution {
 
   public abstract String getSentence();
 
-  public abstract String getSupportLevel();
-
   public abstract List<String> getArchitectures();
 
   public abstract List<String> getTypes();
@@ -91,8 +89,7 @@ public int compare(ContributedLibrary o1, ContributedLibrary o2) {
    * @return
    */
   public boolean supportsArchitecture(String reqArch) {
-    return getArchitectures().contains(reqArch) ||
-            getArchitectures().contains("*");
+    return getArchitectures().contains(reqArch) || getArchitectures().contains("*");
   }
 
   /**

arduino-core/src/processing/app/packages/LegacyUserLibrary.java

@@ -123,8 +123,4 @@ public String toString() {
     return "LegacyLibrary:" + name + "\n";
   }
 
-  @Override
-  public String getSupportLevel() {
-    return "Unsupported";
-  }
 }

arduino-core/src/processing/app/packages/UserLibrary.java

@@ -278,8 +278,4 @@ public String toString() {
     return res;
   }
 
-  @Override
-  public String getSupportLevel() {
-    return "Unsupported";
-  }
 }