Using Collection instead of List on some Library types

This helps in transitioning to GRPC on next commits.

Author: cmaglie

app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java

@@ -46,8 +46,10 @@ public int compare(UserLibrary o1, UserLibrary o2) {
     if (o2.getTypes().isEmpty()) {
       return -1;
     }
-    if (!o1.getTypes().get(0).equals(o2.getTypes().get(0))) {
-      return o1.getTypes().get(0).compareTo(o2.getTypes().get(0));
+    String t1 = o1.getTypes().iterator().next();
+    String t2 = o2.getTypes().iterator().next();
+    if (!t1.equals(t2)) {
+      return t1.compareTo(t2);
     }
     return o1.getName().compareTo(o2.getName());
   }

app/src/processing/app/Base.java

@@ -1133,7 +1133,7 @@ public void actionPerformed(ActionEvent e) {
       LibraryList libs = getSortedLibraries();
       String lastLibType = null;
       for (UserLibrary lib : libs) {
-        String libType = lib.getTypes().get(0);
+        String libType = lib.getTypes().iterator().next();
         if (!libType.equals(lastLibType)) {
           if (lastLibType != null) {
             importMenu.addSeparator();
@@ -1215,7 +1215,7 @@ public void rebuildExamplesMenu(JMenu menu) {
       // Get the library's location - used for sorting into categories
       Location location = lib.getLocation();
       // Is this library compatible?
-      List<String> arch = lib.getArchitectures();
+      Collection<String> arch = lib.getArchitectures();
       boolean compatible;
       if (myArch == null || arch == null || arch.contains("*")) {
         compatible = true;

app/src/processing/app/SketchController.java

@@ -43,6 +43,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
@@ -599,7 +600,7 @@ public void importLibrary(UserLibrary lib) throws IOException {
     // make sure the user didn't hide the sketch folder
     ensureExistence();
 
-    List<String> list = lib.getIncludes();
+    Collection<String> list = lib.getIncludes();
     if (list == null) {
       File srcFolder = lib.getSrcFolder();
       String[] headers = Base.headerListFromIncludePath(srcFolder);

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

@@ -111,7 +111,7 @@ public List<UserLibraryFolder> getLibrariesFolders() {
     return librariesFolders;
   }
 
-  private UserLibraryPriorityComparator priorityComparator = new UserLibraryPriorityComparator(
+  private Comparator<UserLibrary> priorityComparator = new UserLibraryPriorityComparator(
       null);
 
   public void addToInstalledLibraries(UserLibrary lib) {

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

@@ -36,6 +36,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
@@ -59,11 +60,11 @@ public class UserLibrary {
   private String website;
   private String category;
   private String license;
-  private List<String> architectures;
-  private List<String> types = new ArrayList<>();
-  private List<String> declaredTypes;
+  private Collection<String> architectures;
+  private Collection<String> types = new ArrayList<>();
+  private Collection<String> declaredTypes;
   private boolean onGoingDevelopment;
-  private List<String> includes;
+  private Collection<String> includes;
   protected File installedFolder;
   protected Location location;
 
@@ -182,7 +183,7 @@ public String getName() {
     return name;
   }
 
-  public List<String> getArchitectures() {
+  public Collection<String> getArchitectures() {
     return architectures;
   }
 
@@ -206,11 +207,11 @@ public String getCategory() {
     return category;
   }
 
-  public List<String> getTypes() {
+  public Collection<String> getTypes() {
     return types;
   }
 
-  public void setTypes(List<String> types) {
+  public void setTypes(Collection<String> types) {
     this.types = types;
   }
 
@@ -234,15 +235,15 @@ public List<ContributedLibraryDependency> getRequires() {
     return null;
   }
 
-  public List<String> getDeclaredTypes() {
+  public Collection<String> getDeclaredTypes() {
     return declaredTypes;
   }
 
   public boolean onGoingDevelopment() {
     return onGoingDevelopment;
   }
 
-  public List<String> getIncludes() {
+  public Collection<String> getIncludes() {
     return includes;
   }