Rename ContributeLibrary and ContributeLibraryReleases

the classes have been renamed as:

  ContributedLibrary -> ContributedLibraryRelease
  ContributedLibraryReleases -> ContributedLibrary

The reason is that a ContributedLibrary will have a name and a list of
releases, each one containing the relative metadata. The changes to
reflect that will be made in the next commits.

Author: cmaglie

app/src/cc/arduino/contributions/libraries/filters/UpdatableLibraryPredicate.java

@@ -33,11 +33,11 @@
 import java.util.function.Predicate;
 
 import cc.arduino.contributions.VersionComparator;
-import cc.arduino.contributions.libraries.ContributedLibrary;
+import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import processing.app.BaseNoGui;
 
-public class UpdatableLibraryPredicate implements Predicate<ContributedLibrary> {
+public class UpdatableLibraryPredicate implements Predicate<ContributedLibraryRelease> {
 
   LibrariesIndexer librariesIndexer;
 
@@ -50,13 +50,13 @@ public UpdatableLibraryPredicate(LibrariesIndexer indexer) {
   }
 
   @Override
-  public boolean test(ContributedLibrary lib) {
+  public boolean test(ContributedLibraryRelease lib) {
     if (!lib.isLibraryInstalled()) {
       return false;
     }
     String libraryName = lib.getName();
-    List<ContributedLibrary> libraries = librariesIndexer.getIndex().find(libraryName);
-    ContributedLibrary latest = libraries.stream().reduce(VersionComparator::max).get();
+    List<ContributedLibraryRelease> libraries = librariesIndexer.getIndex().find(libraryName);
+    ContributedLibraryRelease latest = libraries.stream().reduce(VersionComparator::max).get();
     return !latest.isLibraryInstalled();
   }
 }

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

@@ -29,12 +29,12 @@
 
 package cc.arduino.contributions.libraries.ui;
 
+import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
 
 import java.util.Comparator;
 
-public class ContributedLibraryReleasesComparator implements Comparator<ContributedLibraryReleases> {
+public class ContributedLibraryReleasesComparator implements Comparator<ContributedLibrary> {
 
   private final String firstType;
 
@@ -43,9 +43,9 @@ public ContributedLibraryReleasesComparator(String firstType) {
   }
 
   @Override
-  public int compare(ContributedLibraryReleases o1, ContributedLibraryReleases o2) {
-    ContributedLibrary lib1 = o1.getLatest();
-    ContributedLibrary lib2 = o2.getLatest();
+  public int compare(ContributedLibrary o1, ContributedLibrary o2) {
+    ContributedLibraryRelease lib1 = o1.getLatest();
+    ContributedLibraryRelease lib2 = o2.getLatest();
 
     if (lib1.getTypes() == null || lib2.getTypes() == null) {
       return compareName(lib1, lib2);
@@ -62,7 +62,7 @@ public int compare(ContributedLibraryReleases o1, ContributedLibraryReleases o2)
     return compareName(lib1, lib2);
   }
 
-  private int compareName(ContributedLibrary lib1, ContributedLibrary lib2) {
+  private int compareName(ContributedLibraryRelease lib1, ContributedLibraryRelease lib2) {
     return lib1.getName().compareToIgnoreCase(lib2.getName());
   }
 

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

@@ -43,15 +43,15 @@
 
 import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.VersionComparator;
+import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.utils.ReverseComparator;
 
 @SuppressWarnings("serial")
 public class ContributedLibraryTableCellEditor extends InstallerTableCell {
 
-  private ContributedLibraryReleases editorValue;
+  private ContributedLibrary editorValue;
   private ContributedLibraryTableCellJPanel editorCell;
 
   @Override
@@ -63,30 +63,30 @@ public Object getCellEditorValue() {
   public Component getTableCellEditorComponent(JTable table, Object value,
                                                boolean isSelected, int row,
                                                int column) {
-    editorValue = (ContributedLibraryReleases) value;
+    editorValue = (ContributedLibrary) value;
 
     editorCell = new ContributedLibraryTableCellJPanel(table, value, true);
     editorCell.installButton
         .addActionListener(e -> onInstall(editorValue.getSelected(),
                                           editorValue.getInstalled()));
     editorCell.downgradeButton.addActionListener(e -> {
       JComboBox chooser = editorCell.downgradeChooser;
-      ContributedLibrary lib = (ContributedLibrary) chooser.getSelectedItem();
+      ContributedLibraryRelease lib = (ContributedLibraryRelease) chooser.getSelectedItem();
       onInstall(lib, editorValue.getInstalled());
     });
     editorCell.versionToInstallChooser.addActionListener(e -> {
-      editorValue.select((ContributedLibrary) editorCell.versionToInstallChooser.getSelectedItem());
+      editorValue.select((ContributedLibraryRelease) editorCell.versionToInstallChooser.getSelectedItem());
       if (editorCell.versionToInstallChooser.getSelectedIndex() != 0) {
         InstallerTableCell.dropdownSelected(true);
       }
     });
 
     setEnabled(true);
 
-    final Optional<ContributedLibrary> mayInstalled = editorValue.getInstalled();
+    final Optional<ContributedLibraryRelease> mayInstalled = editorValue.getInstalled();
 
-    List<ContributedLibrary> releases = editorValue.getReleases();
-    List<ContributedLibrary> notInstalled = new LinkedList<>(releases);
+    List<ContributedLibraryRelease> releases = editorValue.getReleases();
+    List<ContributedLibraryRelease> notInstalled = new LinkedList<>(releases);
     if (mayInstalled.isPresent()) {
       notInstalled.remove(editorValue.getInstalled().get());
     }
@@ -97,8 +97,8 @@ public Component getTableCellEditorComponent(JTable table, Object value,
     editorCell.downgradeChooser.removeAllItems();
     editorCell.downgradeChooser.addItem(tr("Select version"));
 
-    final List<ContributedLibrary> notInstalledPrevious = new LinkedList<>();
-    final List<ContributedLibrary> notInstalledNewer = new LinkedList<>();
+    final List<ContributedLibraryRelease> notInstalledPrevious = new LinkedList<>();
+    final List<ContributedLibraryRelease> notInstalledNewer = new LinkedList<>();
 
     notInstalled.stream().forEach(input -> {
       if (!mayInstalled.isPresent()
@@ -139,12 +139,12 @@ public void setStatus(String status) {
     editorCell.statusLabel.setText(status);
   }
 
-  protected void onRemove(ContributedLibrary selected) {
+  protected void onRemove(ContributedLibraryRelease selected) {
     // Empty
   }
 
-  protected void onInstall(ContributedLibrary selected,
-                           Optional<ContributedLibrary> mayInstalled) {
+  protected void onInstall(ContributedLibraryRelease selected,
+                           Optional<ContributedLibraryRelease> mayInstalled) {
     // Empty
   }
 

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

@@ -15,8 +15,8 @@
 import javax.swing.text.html.StyleSheet;
 
 import cc.arduino.contributions.DownloadableContributionVersionComparator;
+import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import processing.app.Base;
 import processing.app.PreferencesData;
@@ -113,17 +113,17 @@ public ContributedLibraryTableCellJPanel(JTable parentTable, Object value,
 
     add(Box.createVerticalStrut(15));
 
-    ContributedLibraryReleases releases = (ContributedLibraryReleases) value;
+    ContributedLibrary releases = (ContributedLibrary) value;
 
     // FIXME: happens on macosx, don't know why
     if (releases == null)
       return;
 
-    ContributedLibrary selected = releases.getSelected();
+    ContributedLibraryRelease selected = releases.getSelected();
     TitledBorder titledBorder = BorderFactory.createTitledBorder(selected.getName());
     titledBorder.setTitleFont(getFont().deriveFont(Font.BOLD));
     setBorder(titledBorder);
-    Optional<ContributedLibrary> mayInstalled = releases.getInstalled();
+    Optional<ContributedLibraryRelease> mayInstalled = releases.getInstalled();
 
     boolean installable, upgradable;
     if (!mayInstalled.isPresent()) {

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

@@ -29,21 +29,21 @@
 
 package cc.arduino.contributions.libraries.ui;
 
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
+import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.ui.DropdownItem;
 
 import java.util.function.Predicate;
 
 import static processing.app.I18n.tr;
 
-public class DropdownAllLibraries implements DropdownItem<ContributedLibraryReleases> {
+public class DropdownAllLibraries implements DropdownItem<ContributedLibrary> {
 
   public String toString() {
     return tr("All");
   }
 
   @Override
-  public Predicate<ContributedLibraryReleases> getFilterPredicate() {
+  public Predicate<ContributedLibrary> getFilterPredicate() {
     return x -> true;
   }
 

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

@@ -33,20 +33,20 @@
 
 import java.util.function.Predicate;
 
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
+import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.ui.DropdownItem;
 
-public class DropdownInstalledLibraryItem implements DropdownItem<ContributedLibraryReleases> {
+public class DropdownInstalledLibraryItem implements DropdownItem<ContributedLibrary> {
 
   public String toString() {
     return tr("Installed");
   }
 
   @Override
-  public Predicate<ContributedLibraryReleases> getFilterPredicate() {
-    return new Predicate<ContributedLibraryReleases>() {
+  public Predicate<ContributedLibrary> getFilterPredicate() {
+    return new Predicate<ContributedLibrary>() {
       @Override
-      public boolean test(ContributedLibraryReleases t) {
+      public boolean test(ContributedLibrary t) {
         return t.getInstalled().isPresent();
       }
     };

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

@@ -29,15 +29,15 @@
 
 package cc.arduino.contributions.libraries.ui;
 
+import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
 import cc.arduino.contributions.ui.DropdownItem;
 
 import java.util.function.Predicate;
 
 import static processing.app.I18n.tr;
 
-public class DropdownLibraryOfCategoryItem implements DropdownItem<ContributedLibraryReleases> {
+public class DropdownLibraryOfCategoryItem implements DropdownItem<ContributedLibrary> {
 
   private final String category;
 
@@ -50,11 +50,11 @@ public String toString() {
   }
 
   @Override
-  public Predicate<ContributedLibraryReleases> getFilterPredicate() {
-    return new Predicate<ContributedLibraryReleases>() {
+  public Predicate<ContributedLibrary> getFilterPredicate() {
+    return new Predicate<ContributedLibrary>() {
       @Override
-      public boolean test(ContributedLibraryReleases rel) {
-        ContributedLibrary lib = rel.getLatest();
+      public boolean test(ContributedLibrary rel) {
+        ContributedLibraryRelease lib = rel.getLatest();
         return category.equals(lib.getCategory());
       }
     };

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

@@ -29,15 +29,15 @@
 
 package cc.arduino.contributions.libraries.ui;
 
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
+import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.ui.DropdownItem;
 
 import java.util.List;
 import java.util.function.Predicate;
 
 import static processing.app.I18n.tr;
 
-public class DropdownLibraryOfTypeItem implements DropdownItem<ContributedLibraryReleases> {
+public class DropdownLibraryOfTypeItem implements DropdownItem<ContributedLibrary> {
 
   private final String type;
 
@@ -50,10 +50,10 @@ public String toString() {
   }
 
   @Override
-  public Predicate<ContributedLibraryReleases> getFilterPredicate() {
-    return new Predicate<ContributedLibraryReleases>() {
+  public Predicate<ContributedLibrary> getFilterPredicate() {
+    return new Predicate<ContributedLibrary>() {
       @Override
-      public boolean test(ContributedLibraryReleases lib) {
+      public boolean test(ContributedLibrary lib) {
         List<String> types = lib.getLatest().getTypes();
         return types != null && types.contains(type);
       }

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

@@ -29,23 +29,23 @@
 
 package cc.arduino.contributions.libraries.ui;
 
+import cc.arduino.contributions.libraries.ContributedLibraryRelease;
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import cc.arduino.contributions.libraries.ContributedLibraryReleases;
 import cc.arduino.contributions.ui.DropdownItem;
 
 import java.util.Optional;
 import java.util.function.Predicate;
 
 import static processing.app.I18n.tr;
 
-public class DropdownUpdatableLibrariesItem implements DropdownItem<ContributedLibraryReleases> {
+public class DropdownUpdatableLibrariesItem implements DropdownItem<ContributedLibrary> {
 
   @Override
-  public Predicate<ContributedLibraryReleases> getFilterPredicate() {
-    return new Predicate<ContributedLibraryReleases>() {
+  public Predicate<ContributedLibrary> getFilterPredicate() {
+    return new Predicate<ContributedLibrary>() {
       @Override
-      public boolean test(ContributedLibraryReleases lib) {
-        Optional<ContributedLibrary> mayInstalled = lib.getInstalled();
+      public boolean test(ContributedLibrary lib) {
+        Optional<ContributedLibraryRelease> mayInstalled = lib.getInstalled();
         if (!mayInstalled.isPresent()) {
           return false;
         }