From 4dc5176c0f5055e45ac3a653813be24a5306656b Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 15 Jul 2019 22:56:08 +0200
Subject: [PATCH] Fix some linter suggestions

---
 .../libraries/ui/MultiLibraryInstallDialog.java       |  2 +-
 .../contributions/libraries/LibrariesIndex.java       | 11 +++++------
 .../libraries/UnavailableContributedLibrary.java      |  1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java b/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java
index 8996b57f6..75f7703f4 100644
--- a/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java
+++ b/app/src/cc/arduino/contributions/libraries/ui/MultiLibraryInstallDialog.java
@@ -62,7 +62,7 @@ public class MultiLibraryInstallDialog extends JDialog {
     ALL, NONE, CANCEL
   }
 
-  Result result = Result.CANCEL;
+  private Result result = Result.CANCEL;
 
   public MultiLibraryInstallDialog(Window parent, ContributedLibrary lib,
                                    List<ContributedLibrary> dependencies) {
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java
index 371d85951..d66a31fd3 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java
@@ -38,6 +38,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import cc.arduino.contributions.VersionComparator;
+
 public abstract class LibrariesIndex {
 
   public abstract List<ContributedLibrary> getLibraries();
@@ -121,11 +123,8 @@ public abstract class LibrariesIndex {
     for (ContributedLibraryDependency dep : requirements) {
 
       // If the current solution already contains this dependency, skip over
-      boolean alreadyInSolution = false;
-      for (ContributedLibrary c : solution) {
-        if (c.getName().equals(dep.getName()))
-          alreadyInSolution = true;
-      }
+      boolean alreadyInSolution = solution.stream()
+          .anyMatch(l -> l.getName().equals(dep.getName()));
       if (alreadyInSolution)
         continue;
 
@@ -146,7 +145,7 @@ public abstract class LibrariesIndex {
         selected = installed.get();
       } else {
         // otherwise pick the latest version
-        selected = possibleDeps.stream().reduce((a, b) -> b.isBefore(a) ? a : b).get();
+        selected = possibleDeps.stream().reduce(VersionComparator::max).get();
       }
 
       // Add dependency to the solution and process recursively
diff --git a/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java
index 1e0468aa9..277d969de 100644
--- a/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java
+++ b/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java
@@ -73,6 +73,7 @@ public class UnavailableContributedLibrary extends ContributedLibrary {
 
   @Override
   public void setCategory(String category) {
+    // Empty
   }
 
   @Override