Applying code inspection suggestions

Author: Federico Fissore

app/src/cc/arduino/contributions/BuiltInCoreIsNewerCheck.java

@@ -34,7 +34,6 @@
 import cc.arduino.contributions.packages.ContributedPackage;
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.view.Event;
-import com.google.common.base.Function;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -73,12 +72,7 @@ private void builtInPackageIsNewerCheck() throws InterruptedException {
       return;
     }
 
-    LinkedList<ContributedPlatform> contributedPlatforms = Lists.newLinkedList(Iterables.concat(Collections2.transform(BaseNoGui.indexer.getPackages(), new Function<ContributedPackage, List<ContributedPlatform>>() {
-      @Override
-      public List<ContributedPlatform> apply(ContributedPackage input) {
-        return input.getPlatforms();
-      }
-    })));
+    LinkedList<ContributedPlatform> contributedPlatforms = Lists.newLinkedList(Iterables.concat(Collections2.transform(BaseNoGui.indexer.getPackages(), ContributedPackage::getPlatforms)));
 
     List<ContributedPlatform> installedBuiltInPlatforms = contributedPlatforms.stream().filter(new InstalledPredicate()).filter(new BuiltInPredicate()).collect(Collectors.toList());
     if (installedBuiltInPlatforms.size() != 1) {
@@ -96,18 +90,15 @@ public List<ContributedPlatform> apply(ContributedPackage input) {
     }
 
     if (VersionHelper.valueOf(installedBuiltIn.getParsedVersion()).greaterThan(VersionHelper.valueOf(installedNotBuiltIn.getParsedVersion()))) {
-      SwingUtilities.invokeLater(new Runnable() {
-        @Override
-        public void run() {
-          PreferencesData.setInteger("builtin_platform_is_newer", BaseNoGui.REVISION);
-          assert base.hasActiveEditor();
-          int chosenOption = JOptionPane.showConfirmDialog(base.getActiveEditor(), I18n.format(_("The IDE includes an updated {0} package, but you're using an older one.\nDo you want to upgrade {0}?"), installedBuiltIn.getName()), I18n.format(_("A newer {0} package is available"), installedBuiltIn.getName()), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-          if (chosenOption == JOptionPane.YES_OPTION) {
-            Action openBoardsManager = base.getOpenBoardsManager();
-            Event event = new Event(base.getActiveEditor(), ActionEvent.ACTION_PERFORMED, installedBuiltIn.getName());
-            event.getPayload().put("filterText", installedBuiltIn.getName());
-            openBoardsManager.actionPerformed(event);
-          }
+      SwingUtilities.invokeLater(() -> {
+        PreferencesData.setInteger("builtin_platform_is_newer", BaseNoGui.REVISION);
+        assert base.hasActiveEditor();
+        int chosenOption = JOptionPane.showConfirmDialog(base.getActiveEditor(), I18n.format(_("The IDE includes an updated {0} package, but you're using an older one.\nDo you want to upgrade {0}?"), installedBuiltIn.getName()), I18n.format(_("A newer {0} package is available"), installedBuiltIn.getName()), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+        if (chosenOption == JOptionPane.YES_OPTION) {
+          Action openBoardsManager = base.getOpenBoardsManager();
+          Event event = new Event(base.getActiveEditor(), ActionEvent.ACTION_PERFORMED, installedBuiltIn.getName());
+          event.getPayload().put("filterText", installedBuiltIn.getName());
+          openBoardsManager.actionPerformed(event);
         }
       });
     }

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

@@ -29,7 +29,6 @@
 
 package cc.arduino.contributions.libraries.ui;
 
-import cc.arduino.contributions.DownloadableContribution;
 import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.VersionComparator;
 import cc.arduino.contributions.filters.BuiltInPredicate;
@@ -39,22 +38,18 @@
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
 import cc.arduino.utils.ReverseComparator;
-import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import processing.app.Base;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.HyperlinkEvent;
-import javax.swing.event.HyperlinkListener;
 import javax.swing.text.Document;
 import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.StyleSheet;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -65,59 +60,43 @@
 @SuppressWarnings("serial")
 public class ContributedLibraryTableCell extends InstallerTableCell {
 
-  private JPanel panel;
-  private JButton installButton;
-  private Component installButtonPlaceholder;
+  private final JPanel panel;
+  private final JButton installButton;
+  private final Component installButtonPlaceholder;
   private JComboBox downgradeChooser;
-  private JComboBox versionToInstallChooser;
-  private JButton downgradeButton;
-  private JPanel buttonsPanel;
-  private JPanel inactiveButtonsPanel;
-  private JLabel statusLabel;
+  private final JComboBox versionToInstallChooser;
+  private final JButton downgradeButton;
+  private final JPanel buttonsPanel;
+  private final JPanel inactiveButtonsPanel;
+  private final JLabel statusLabel;
 
   public ContributedLibraryTableCell() {
     {
       installButton = new JButton(_("Install"));
-      installButton.addActionListener(new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-          onInstall(editorValue.getSelected(), editorValue.getInstalled());
-        }
-      });
+      installButton.addActionListener(e -> onInstall(editorValue.getSelected(), editorValue.getInstalled()));
       int width = installButton.getPreferredSize().width;
       installButtonPlaceholder = Box.createRigidArea(new Dimension(width, 1));
     }
 
     downgradeButton = new JButton(_("Install"));
-    downgradeButton.addActionListener(new ActionListener() {
-      @Override
-      public void actionPerformed(ActionEvent e) {
-        ContributedLibrary selected = (ContributedLibrary) downgradeChooser.getSelectedItem();
-        onInstall(selected, editorValue.getInstalled());
-      }
+    downgradeButton.addActionListener(e -> {
+      ContributedLibrary selected = (ContributedLibrary) downgradeChooser.getSelectedItem();
+      onInstall(selected, editorValue.getInstalled());
     });
 
     downgradeChooser = new JComboBox();
     downgradeChooser.addItem("-");
     downgradeChooser.setMaximumSize(downgradeChooser.getPreferredSize());
-    downgradeChooser.addItemListener(new ItemListener() {
-      @Override
-      public void itemStateChanged(ItemEvent e) {
-        Object selectVersionItem = downgradeChooser.getItemAt(0);
-        boolean disableDowngrade = (e.getItem() == selectVersionItem);
-        downgradeButton.setEnabled(!disableDowngrade);
-      }
+    downgradeChooser.addItemListener(e -> {
+      Object selectVersionItem = downgradeChooser.getItemAt(0);
+      boolean disableDowngrade = (e.getItem() == selectVersionItem);
+      downgradeButton.setEnabled(!disableDowngrade);
     });
 
     versionToInstallChooser = new JComboBox();
     versionToInstallChooser.addItem("-");
     versionToInstallChooser.setMaximumSize(versionToInstallChooser.getPreferredSize());
-    versionToInstallChooser.addItemListener(new ItemListener() {
-      @Override
-      public void itemStateChanged(ItemEvent e) {
-        editorValue.select((ContributedLibrary) versionToInstallChooser.getSelectedItem());
-      }
-    });
+    versionToInstallChooser.addItemListener(e -> editorValue.select((ContributedLibrary) versionToInstallChooser.getSelectedItem()));
 
     panel = new JPanel();
     panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
@@ -186,12 +165,9 @@ private JTextPane makeNewDescription(JPanel panel) {
     description.setBorder(new EmptyBorder(4, 7, 7, 7));
     description.setHighlighter(null);
     description.setEditable(false);
-    description.addHyperlinkListener(new HyperlinkListener() {
-      @Override
-      public void hyperlinkUpdate(HyperlinkEvent e) {
-        if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
-          Base.openURL(e.getDescription());
-        }
+    description.addHyperlinkListener(e -> {
+      if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+        Base.openURL(e.getDescription());
       }
     });
     description.addKeyListener(new DelegatingKeyListener(parentTable));
@@ -255,7 +231,7 @@ public Component getTableCellEditorComponent(JTable table, Object value,
       uninstalledReleases.addAll(installedBuiltIn);
     }
 
-    Collections.sort(uninstalledReleases, new ReverseComparator<DownloadableContribution>(new DownloadableContributionVersionComparator()));
+    Collections.sort(uninstalledReleases, new ReverseComparator<>(new DownloadableContributionVersionComparator()));
 
     downgradeChooser.removeAllItems();
     downgradeChooser.addItem(_("Select version"));
@@ -264,32 +240,23 @@ public Component getTableCellEditorComponent(JTable table, Object value,
     final List<ContributedLibrary> uninstalledNewerReleases = Lists.newLinkedList();
 
     final VersionComparator versionComparator = new VersionComparator();
-    Lists.newLinkedList(Lists.transform(uninstalledReleases, new Function<ContributedLibrary, ContributedLibrary>() {
-      @Override
-      public ContributedLibrary apply(ContributedLibrary input) {
-        if (installed == null || versionComparator.greaterThan(installed.getParsedVersion(), input.getParsedVersion())) {
-          uninstalledPreviousReleases.add(input);
-        } else {
-          uninstalledNewerReleases.add(input);
-        }
-
-        return input;
+    Lists.newLinkedList(Lists.transform(uninstalledReleases, input -> {
+      if (installed == null || versionComparator.greaterThan(installed.getParsedVersion(), input.getParsedVersion())) {
+        uninstalledPreviousReleases.add(input);
+      } else {
+        uninstalledNewerReleases.add(input);
       }
+
+      return input;
     }));
-    for (ContributedLibrary release : uninstalledNewerReleases) {
-      downgradeChooser.addItem(release);
-    }
-    for (ContributedLibrary release : uninstalledPreviousReleases) {
-      downgradeChooser.addItem(release);
-    }
+    uninstalledNewerReleases.forEach(downgradeChooser::addItem);
+    uninstalledPreviousReleases.forEach(downgradeChooser::addItem);
 
     downgradeChooser.setVisible(installed != null && (!uninstalledPreviousReleases.isEmpty() || uninstalledNewerReleases.size() > 1));
     downgradeButton.setVisible(installed != null && (!uninstalledPreviousReleases.isEmpty() || uninstalledNewerReleases.size() > 1));
 
     versionToInstallChooser.removeAllItems();
-    for (ContributedLibrary release : uninstalledReleases) {
-      versionToInstallChooser.addItem(release);
-    }
+    uninstalledReleases.forEach(versionToInstallChooser::addItem);
     versionToInstallChooser.setVisible(installed == null && uninstalledReleases.size() > 1);
 
     Component component = getUpdatedCellComponent(value, true, row, !installedBuiltIn.isEmpty());
@@ -310,14 +277,12 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
     ContributedLibrary selected = releases.getSelected();
     ContributedLibrary installed = releases.getInstalled();
 
-    boolean removable, installable, upgradable;
+    boolean installable, upgradable;
     if (installed == null) {
       installable = true;
-      removable = false;
       upgradable = false;
     } else {
       installable = false;
-      removable = !installed.isReadOnly() && !hasBuiltInRelease;
       upgradable = new DownloadableContributionVersionComparator().compare(selected, installed) > 0;
     }
     if (installable) {
@@ -405,7 +370,7 @@ private Component getUpdatedCellComponent(Object value, boolean isSelected, int
     return panel;
   }
 
-  private Timer enabler = new Timer(100, new ActionListener() {
+  private final Timer enabler = new Timer(100, new ActionListener() {
     @Override
     public void actionPerformed(ActionEvent e) {
       enable(true);

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

@@ -59,8 +59,8 @@ public static class ContributedLibraryReleases implements Comparable<Contributed
 
     public ContributedLibraryReleases(ContributedLibrary library) {
       this.name = library.getName();
-      this.versions = new LinkedList<String>();
-      this.releases = new LinkedList<ContributedLibrary>();
+      this.versions = new LinkedList<>();
+      this.releases = new LinkedList<>();
       this.selected = null;
       add(library);
     }
@@ -112,7 +112,7 @@ public int compareTo(ContributedLibraryReleases o) {
     }
   }
 
-  private final List<ContributedLibraryReleases> contributions = new ArrayList<ContributedLibraryReleases>();
+  private final List<ContributedLibraryReleases> contributions = new ArrayList<>();
 
   private final String[] columnNames = {"Description"};
 
@@ -267,12 +267,8 @@ public void updateLibrary(ContributedLibrary lib) {
 
   private void updateContributions() {
     contributions.clear();
-    for (ContributedLibrary l : indexer.getIndex().getLibraries()) {
-      applyFilterToLibrary(l);
-    }
-    for (ContributedLibrary l : indexer.getInstalledLibraries()) {
-      applyFilterToLibrary(l);
-    }
+    indexer.getIndex().getLibraries().forEach(this::applyFilterToLibrary);
+    indexer.getInstalledLibraries().forEach(this::applyFilterToLibrary);
     Collections.sort(contributions);
   }
 

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

@@ -167,7 +167,7 @@ public void setIndexer(LibrariesIndexer indexer) {
     typeChooser.addItem(new DropdownAllItem());
     typeChooser.addItem(new DropdownUpdatableLibrariesItem(indexer));
     typeChooser.addItem(new DropdownInstalledLibraryItem(indexer.getIndex()));
-    java.util.List<String> types = new LinkedList<String>(indexer.getIndex().getTypes());
+    java.util.List<String> types = new LinkedList<>(indexer.getIndex().getTypes());
     Collections.sort(types, new LibraryTypeComparator());
     for (String type : types) {
       typeChooser.addItem(new DropdownLibraryOfTypeItem(type));
@@ -217,18 +217,15 @@ protected void onCancelPressed() {
   @Override
   protected void onUpdatePressed() {
     super.onUpdatePressed();
-    installerThread = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          setProgressVisible(true, "");
-          installer.updateIndex();
-          onIndexesUpdated();
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        } finally {
-          setProgressVisible(false, "");
-        }
+    installerThread = new Thread(() -> {
+      try {
+        setProgressVisible(true, "");
+        installer.updateIndex();
+        onIndexesUpdated();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      } finally {
+        setProgressVisible(false, "");
       }
     });
     installerThread.setUncaughtExceptionHandler(new InstallerJDialogUncaughtExceptionHandler(this, noConnectionErrorMessage));
@@ -237,19 +234,16 @@ public void run() {
 
   public void onInstallPressed(final ContributedLibrary lib, final ContributedLibrary replaced) {
     clearErrorMessage();
-    installerThread = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          setProgressVisible(true, _("Installing..."));
-          installer.install(lib, replaced);
-          onIndexesUpdated(); // TODO: Do a better job in refreshing only the needed element
-          //getContribModel().updateLibrary(lib);
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        } finally {
-          setProgressVisible(false, "");
-        }
+    installerThread = new Thread(() -> {
+      try {
+        setProgressVisible(true, _("Installing..."));
+        installer.install(lib, replaced);
+        onIndexesUpdated(); // TODO: Do a better job in refreshing only the needed element
+        //getContribModel().updateLibrary(lib);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      } finally {
+        setProgressVisible(false, "");
       }
     });
     installerThread.setUncaughtExceptionHandler(new InstallerJDialogUncaughtExceptionHandler(this, noConnectionErrorMessage));
@@ -267,19 +261,16 @@ public void onRemovePressed(final ContributedLibrary lib) {
     }
 
     clearErrorMessage();
-    installerThread = new Thread(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          setProgressVisible(true, _("Removing..."));
-          installer.remove(lib);
-          onIndexesUpdated(); // TODO: Do a better job in refreshing only the needed element
-          //getContribModel().updateLibrary(lib);
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        } finally {
-          setProgressVisible(false, "");
-        }
+    installerThread = new Thread(() -> {
+      try {
+        setProgressVisible(true, _("Removing..."));
+        installer.remove(lib);
+        onIndexesUpdated(); // TODO: Do a better job in refreshing only the needed element
+        //getContribModel().updateLibrary(lib);
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      } finally {
+        setProgressVisible(false, "");
       }
     });
     installerThread.setUncaughtExceptionHandler(new InstallerJDialogUncaughtExceptionHandler(this, noConnectionErrorMessage));