Address Codacy errors

Author: Joe Wegner

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

@@ -35,8 +35,8 @@
 import cc.arduino.contributions.packages.ContributionInstaller;
 import cc.arduino.contributions.packages.filters.UpdatablePlatformPredicate;
 import cc.arduino.view.NotificationPopup;
-import com.sun.javafx.binding.Logging;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import processing.app.*;
 
 import javax.swing.*;
@@ -84,56 +84,41 @@ public void run() {
       return;
     }
 
+    boolean setAccessible = PreferencesData.getBoolean("ide.accessible");
     final String text;
     final String button1Name;
     final String button2Name;
-    final String boardsButtonName = tr("Boards");
-    final String librariesButtonName = tr("Libraries");
-
-    // default to no anchors
-    String openAnchor1 = "";
-    String closeAnchor1 = "";
-    String openAnchor2 = "";
-    String closeAnchor2 = "";
-    boolean setAccessible = PreferencesData.getBoolean("ide.accessible");
+    String openAnchorBoards  = "<a href=\"" + boardsManagerURL + "\">";
+    String closeAnchorBoards = "</a>";
+    String openAnchorLibraries  = "<a href=\"" + libraryManagerURL + "\">";
+    String closeAnchorLibraries = "</a>";
+
+    // if accessibility mode and board updates are available set the button name and clear the anchors
+    if(setAccessible && updatablePlatforms) {
+        button1Name = tr("Boards");
+        openAnchorBoards = "";
+        closeAnchorBoards = "";
+    }
+    else { // when not accessibility mode or no boards to update no button is needed
+      button1Name = null;
+    }
+
+    // if accessibility mode and libraries updates are available set the button name and clear the anchors
+    if (setAccessible && updatableLibraries) {
+      button2Name = tr("Libraries");
+      openAnchorLibraries = "";
+      closeAnchorLibraries = "";
+    }
+    else { // when not accessibility mode or no libraries to update no button is needed
+      button2Name = null;
+    }
+
     if (updatableLibraries && !updatablePlatforms) {
-      if (setAccessible) {
-        button1Name = null;
-        button2Name = librariesButtonName;
-      }
-      else {
-        button1Name = null;
-        button2Name = null;
-        openAnchor1 = "<a href=\"" + libraryManagerURL + "\">";
-        closeAnchor1 = "</a>";
-      }
-      text = I18n.format(tr("Updates available for some of your {0}libraries{1}"), openAnchor1, closeAnchor1);
+      text = I18n.format(tr("Updates available for some of your {0}libraries{1}"), openAnchorLibraries, closeAnchorLibraries);
     } else if (!updatableLibraries && updatablePlatforms) {
-      if (setAccessible) {
-        button1Name = boardsButtonName;
-        button2Name = null;
-      }
-      else {
-        button1Name = null;
-        button2Name = null;
-        openAnchor1 = "<a href=\"" + boardsManagerURL + "\">";
-        closeAnchor1 = "</a>";
-      }
-      text = I18n.format(tr("Updates available for some of your {0}boards{1}"), openAnchor1, closeAnchor1);
+      text = I18n.format(tr("Updates available for some of your {0}boards{1}"), openAnchorBoards, closeAnchorBoards);
     } else {
-      if (setAccessible) {
-        button1Name = boardsButtonName;
-        button2Name = librariesButtonName;
-      }
-      else {
-        button1Name = null;
-        button2Name = null;
-        openAnchor1 = "<a href=\"" + boardsManagerURL + "\">";
-        closeAnchor1 = "</a>";
-        openAnchor2 = "<a href=\"" + libraryManagerURL + "\">";
-        closeAnchor2 = "</a>";
-      }
-      text = I18n.format(tr("Updates available for some of your {0}libraries{1} and {2}libraries{3}"), openAnchor1, closeAnchor1, openAnchor2, closeAnchor2);
+      text = I18n.format(tr("Updates available for some of your {0}libraries{1} and {2}libraries{3}"), openAnchorBoards, closeAnchorBoards, openAnchorLibraries, closeAnchorLibraries);
     }
 
     if (cancelled) {

app/src/cc/arduino/view/NotificationPopup.java

@@ -50,6 +50,8 @@
 import javax.swing.event.HyperlinkListener;
 
 import cc.arduino.Constants;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import processing.app.PreferencesData;
 import processing.app.Theme;
 
@@ -152,10 +154,12 @@ public void mouseClicked(MouseEvent e) {
       optionalButton2.addMouseListener(button2Action);
 
       KeyListener button2Key = new KeyListener() {
+        // Ignore when the key is typed - only act once the key is released
         public void keyTyped(KeyEvent e) {
           // do nothing here, wait until the key is released
         }
 
+        // Ignore when the key is pressed - only act once the key is released
         public void keyPressed(KeyEvent e) {
           // do nothing here, wait until the key is released
         }
@@ -180,10 +184,14 @@ public void keyReleased(KeyEvent e) {
     closeButton.setBackground(new Color(0, 0, 0, 0));
     closeButton.getAccessibleContext().setAccessibleDescription(tr("Close"));
     KeyListener closeKey = new KeyListener() {
+      // Ignore when the key is typed - only act once the key is released
       public void keyTyped(KeyEvent e) {
+        // do nothing here, wait until the key is released
       }
 
+      // Ignore when the key is pressed - only act once the key is released
       public void keyPressed(KeyEvent e) {
+        // do nothing here, wait until the key is released
       }
 
       public void keyReleased(KeyEvent e) {