fixed some trivial warnings

cmaglie · cmaglie · commit 3218b4fa202b · 2020-01-19T21:25:23.000+01:00
diff --git a/app/src/cc/arduino/contributions/ui/InstallerJDialog.java b/app/src/cc/arduino/contributions/ui/InstallerJDialog.java
@@ -71,7 +71,6 @@
 
 import cc.arduino.contributions.ui.listeners.AbstractKeyListener;
 import processing.app.Base;
-import processing.app.Theme;
 
 public abstract class InstallerJDialog<T> extends JDialog {
 
diff --git a/app/src/processing/app/AbstractMonitor.java b/app/src/processing/app/AbstractMonitor.java
@@ -1,7 +1,6 @@
 package processing.app;
 
 import cc.arduino.packages.BoardPort;
-import cc.arduino.packages.DiscoveryManager;
 import processing.app.legacy.PApplet;
 
 import javax.swing.*;
@@ -10,7 +9,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.List;
 
 @SuppressWarnings("serial")
 public abstract class AbstractMonitor extends JFrame implements ActionListener {
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -207,6 +207,7 @@ public Base(String[] args) throws Exception {
     BaseNoGui.getPlatform().init();
 
     BaseNoGui.initPortableFolder();
+
     // This configure the logs root folder
     System.out.println("Set log4j store directory " + BaseNoGui.getSettingsFolder().getAbsolutePath());
     System.setProperty("log4j.dir", BaseNoGui.getSettingsFolder().getAbsolutePath());
@@ -986,9 +987,9 @@ public boolean handleQuit() {
     // kill uploader (if still alive)
     UploaderUtils uploaderInstance = new UploaderUtils();
     Uploader uploader = uploaderInstance.getUploaderByPreferences(false);
-    if (uploader != null && uploader.programmerPid != null && uploader.programmerPid.isAlive()) {
+    if (uploader != null && Uploader.programmerPid != null && Uploader.programmerPid.isAlive()) {
         // kill the stuck programmer
-        uploader.programmerPid.destroyForcibly();
+        Uploader.programmerPid.destroyForcibly();
     }
 
     if (handleQuitEach()) {
@@ -1565,7 +1566,7 @@ public void actionPerformed(ActionEvent e) {
           };
           List<TargetBoard> boards = (List<TargetBoard>) subAction.getValue("board");
           if (boards == null) {
-            boards = new ArrayList<TargetBoard>();
+            boards = new ArrayList<>();
           }
           boards.add(board);
           subAction.putValue("board", boards);
@@ -1943,6 +1944,7 @@ public void addEditorFontResizeMouseWheelListener(Component comp) {
    */
   public void addEditorFontResizeKeyListener(Component comp) {
     comp.addKeyListener(new KeyAdapter() {
+      @SuppressWarnings("incomplete-switch")
       @Override
       public void keyPressed(KeyEvent e) {
         if (e.getModifiersEx() == KeyEvent.CTRL_DOWN_MASK
diff --git a/app/src/processing/app/CommandHistory.java b/app/src/processing/app/CommandHistory.java
@@ -9,7 +9,7 @@
  */
 public class CommandHistory {
 
-  private final LinkedList<String> commandHistory = new LinkedList<String>();
+  private final LinkedList<String> commandHistory = new LinkedList<>();
   private final int maxHistorySize;
   private ListIterator<String> iterator = null;
   private boolean iteratorAsc;
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -80,8 +80,6 @@
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
 import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
-import javax.swing.text.Element;
 
 import org.fife.ui.rsyntaxtextarea.folding.FoldManager;
 
@@ -237,7 +235,7 @@ public boolean test(SketchController controller) {
   private UploadHandler uploadUsingProgrammerHandler;
   private Runnable timeoutUploadHandler;
 
-  private Map<String, Tool> internalToolCache = new HashMap<String, Tool>();
+  private Map<String, Tool> internalToolCache = new HashMap<>();
 
   public Editor(Base ibase, File file, int[] storedLocation, int[] defaultLocation, Platform platform) throws Exception {
     super("Arduino");
@@ -1832,7 +1830,7 @@ public void updateTitle() {
     SketchFile current = getCurrentTab().getSketchFile();
     String customFormat = PreferencesData.get("editor.custom_title_format");
     if (customFormat != null && !customFormat.trim().isEmpty()) {
-      Map<String, String> titleMap = new HashMap<String, String>();
+      Map<String, String> titleMap = new HashMap<>();
       titleMap.put("file", current.getFileName());
       String path = sketch.getFolder().getAbsolutePath();
       titleMap.put("folder", path);
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
@@ -461,9 +461,9 @@ private void handleSelectionPressed(int sel) {
   private void handleSelectionPressed(int sel, boolean isShiftDown, int x, int y) {
     switch (sel) {
       case RUN:
-        if (!editor.avoidMultipleOperations) {
+        if (!Editor.avoidMultipleOperations) {
           editor.handleRun(false, editor.presentHandler, editor.runHandler);
-          editor.avoidMultipleOperations = true;
+          Editor.avoidMultipleOperations = true;
         }
         break;
 
@@ -494,7 +494,7 @@ private void handleSelectionPressed(int sel, boolean isShiftDown, int x, int y)
 
       case EXPORT:
         // launch a timeout timer which can reenable to upload button functionality an
-        if (!editor.avoidMultipleOperations) {
+        if (!Editor.avoidMultipleOperations) {
           editor.handleExport(isShiftDown);
         }
         break;
diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java
@@ -23,7 +23,6 @@
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
@@ -71,6 +70,7 @@ public SerialMonitor(BoardPort port) {
 
     // Add key listener to UP, DOWN, ESC keys for command history traversal.
     textField.addKeyListener(new KeyAdapter() {
+      @SuppressWarnings("incomplete-switch")
       @Override
       public void keyPressed(KeyEvent e) {
         switch (e.getKeyCode()) {
diff --git a/app/src/processing/app/SerialPlotter.java b/app/src/processing/app/SerialPlotter.java
@@ -317,7 +317,7 @@ public void windowGainedFocus(WindowEvent e) {
     noLineEndingAlert.setMinimumSize(minimumSize);
 
 
-    lineEndings = new JComboBox<String>(new String[]{tr("No line ending"), tr("Newline"), tr("Carriage return"), tr("Both NL & CR")});
+    lineEndings = new JComboBox<>(new String[]{tr("No line ending"), tr("Newline"), tr("Carriage return"), tr("Both NL & CR")});
     lineEndings.addActionListener((ActionEvent event) -> {
       PreferencesData.setInteger("serial.line_ending", lineEndings.getSelectedIndex());
       noLineEndingAlert.setForeground(pane.getBackground());
diff --git a/arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java b/arduino-core/src/cc/arduino/packages/discoverers/PluggableDiscovery.java
@@ -56,10 +56,10 @@ public class PluggableDiscovery implements Discovery {
   private final String discoveryName;
   private final String[] cmd;
   private final List<BoardPort> portList = new ArrayList<>();
-  private Process program=null;
+  Process program = null;
   private Thread pollingThread;
 
-  private void debug(String x) {
+  void debug(String x) {
     if (PreferencesData.getBoolean("discovery.debug"))
       System.out.println(discoveryName + ": " + x);
   }
@@ -211,6 +211,7 @@ private void startPolling() {
     debug("START");
     write("START\n");
     Thread pollingThread = new Thread() {
+      @Override
       public void run() {
         try {
           while (program != null && program.isAlive()) {
@@ -238,7 +239,7 @@ public void stop() throws Exception {
     }
   }
 
-  private void write(String command) {
+  void write(String command) {
     if (program != null && program.isAlive()) {
       OutputStream out = program.getOutputStream();
       try {
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SSHUploader.java
@@ -60,7 +60,7 @@
 public class SSHUploader extends Uploader {
 
   private static final Set<String> FILES_NOT_TO_COPY =
-      Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(".DS_Store", ".Trash", "Thumbs.db", "__MACOSX")));
+      Collections.unmodifiableSet(new HashSet<>(Arrays.asList(".DS_Store", ".Trash", "Thumbs.db", "__MACOSX")));
 
   private final BoardPort port;
 
diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -232,14 +232,14 @@ private String waitForUploadPort(String uploadPort, List<String> before) throws
 	  return waitForUploadPort(uploadPort, before, verbose, 10000);
   }
 
-  private String waitForUploadPort(String uploadPort, List<String> before, boolean verbose, int timeout) throws InterruptedException, RunnerException {
+  private String waitForUploadPort(String uploadPort, List<String> before, boolean verboseDebug, int timeout) throws InterruptedException, RunnerException {
     // Wait for a port to appear on the list
     int elapsed = 0;
     while (elapsed < timeout) {
       List<String> now = Serial.list();
       List<String> diff = new ArrayList<>(now);
       diff.removeAll(before);
-      if (verbose) {
+      if (verboseDebug) {
         System.out.print("PORTS {");
         for (String p : before)
           System.out.print(p + ", ");
@@ -253,7 +253,7 @@ private String waitForUploadPort(String uploadPort, List<String> before, boolean
       }
       if (diff.size() > 0) {
         String newPort = diff.get(0);
-        if (verbose)
+        if (verboseDebug)
           System.out.println("Found upload port: " + newPort);
         return newPort;
       }
@@ -267,7 +267,7 @@ private String waitForUploadPort(String uploadPort, List<String> before, boolean
       // come back, so use a time out before assuming that the selected port is the
       // bootloader (not the sketch).
       if (elapsed >= 5000 && now.contains(uploadPort)) {
-        if (verbose)
+        if (verboseDebug)
           System.out.println("Uploading using selected port: " + uploadPort);
         return uploadPort;
       }
diff --git a/arduino-core/src/cc/arduino/utils/network/FileDownloaderCache.java b/arduino-core/src/cc/arduino/utils/network/FileDownloaderCache.java
@@ -64,9 +64,9 @@
 
 public class FileDownloaderCache {
   private final static String CACHE_ENABLE_PREFERENCE_KEY = "cache.enable";
-  private final static Logger log = LogManager
+  final static Logger log = LogManager
     .getLogger(FileDownloaderCache.class);
-  private final static Map<String, FileCached> cachedFiles = Collections
+  final static Map<String, FileCached> cachedFiles = Collections
     .synchronizedMap(new HashMap<>());
   private final static String cacheFolder;
   private static boolean enableCache;
@@ -123,11 +123,11 @@ public static Optional<FileCached> getFileCached(final URL remoteURL)
     return getFileCached(remoteURL, true);
   }
 
-  public static Optional<FileCached> getFileCached(final URL remoteURL, boolean enableCache)
+  public static Optional<FileCached> getFileCached(final URL remoteURL, boolean _enableCache)
     throws URISyntaxException, NoSuchMethodException, ScriptException,
     IOException {
     // Return always and empty file if the cache is not enable
-    if (!(enableCache && FileDownloaderCache.enableCache)) {
+    if (!(_enableCache && FileDownloaderCache.enableCache)) {
       log.info("The cache is not enable.");
       return Optional.empty();
     }
@@ -208,7 +208,7 @@ private static Optional<FileCached> updateCacheInfo(URL remoteURL, BiFunction<St
     return Optional.empty();
   }
 
-  private synchronized static void updateCacheFilesInfo() throws IOException {
+  synchronized static void updateCacheFilesInfo() throws IOException {
     ObjectMapper mapper = new ObjectMapper();
     // Generate a pretty json
     mapper.enable(SerializationFeature.INDENT_OUTPUT);
@@ -236,10 +236,10 @@ private static Path getCachedInfoPath() {
   static class FileCached {
     private final String remoteURL;
     private final String localPath;
-    private final String eTag;
+    final String eTag;
     private final String lastETag;
-    private final String md5;
-    private final String createdAt;
+    final String md5;
+    final String createdAt;
     private final CacheControl cacheControl;
 
     FileCached() {
@@ -324,20 +324,20 @@ public synchronized void updateCacheFile(File fileToCache) throws Exception {
         Files.createDirectories(cacheFilePath.getParent());
       }
       FileUtils.copyFile(fileToCache, cacheFilePath.toFile());
-      final String md5 = this.calculateMD5();
-      final String eTag;
+      final String _md5 = this.calculateMD5();
+      final String _eTag;
       if (lastETag == null) {
-        log.warn("The eTag was not calculate this time, is not the right behaviour fileCached={}, md5={}", this, md5);
-        eTag = this.eTag;
+        log.warn("The eTag was not calculate this time, is not the right behaviour fileCached={}, md5={}", this, _md5);
+        _eTag = this.eTag;
       } else {
-        eTag = this.lastETag;
+        _eTag = this.lastETag;
       }
       FileCached newFileCached = new FileCached(
         this.remoteURL,
         this.localPath,
-        eTag, // Initialize the right eTag with the last eTag because the file was updated
-        eTag,
-        md5,
+        _eTag, // Initialize the right eTag with the last eTag because the file was updated
+        _eTag,
+        _md5,
         this.cacheControl
       );
       log.info("Update cache file: {}", newFileCached);
diff --git a/arduino-core/src/cc/arduino/utils/network/HttpConnectionManager.java b/arduino-core/src/cc/arduino/utils/network/HttpConnectionManager.java
@@ -113,29 +113,29 @@ public HttpURLConnection makeConnection()
     });
   }
 
-  private HttpURLConnection makeConnection(URL requestURL, int movedTimes,
+  private HttpURLConnection makeConnection(URL url, int movedTimes,
                                            Consumer<HttpURLConnection> beforeConnection) throws IOException, URISyntaxException, ScriptException, NoSuchMethodException {
     if (movedTimes > maxRedirectNumber) {
-      log.warn("Too many redirect " + requestURL);
-      throw new IOException("Too many redirect " + requestURL);
+      log.warn("Too many redirect " + url);
+      throw new IOException("Too many redirect " + url);
     }
 
     Proxy proxy = new CustomProxySelector(PreferencesData.getMap())
-      .getProxyFor(requestURL.toURI());
+      .getProxyFor(url.toURI());
     log.debug("Using proxy {}", proxy);
 
     final String requestId = UUID.randomUUID().toString()
       .toUpperCase().replace("-", "").substring(0, 16);
-    HttpURLConnection connection = (HttpURLConnection) requestURL
+    HttpURLConnection connection = (HttpURLConnection) url
       .openConnection(proxy);
     connection.setRequestProperty("User-agent", userAgent);
     connection.setRequestProperty("X-Request-ID", requestId);
     if (id != null) {
       connection.setRequestProperty("X-ID", id);
     }
-    if (requestURL.getUserInfo() != null) {
+    if (url.getUserInfo() != null) {
       String auth = "Basic " + new String(
-        new Base64().encode(requestURL.getUserInfo().getBytes()));
+        new Base64().encode(url.getUserInfo().getBytes()));
       connection.setRequestProperty("Authorization", auth);
     }
 
@@ -145,12 +145,12 @@ private HttpURLConnection makeConnection(URL requestURL, int movedTimes,
     beforeConnection.accept(connection);
 
     // Connect
-    log.info("Connect to {}, method={}, request id={}", requestURL, connection.getRequestMethod(), requestId);
+    log.info("Connect to {}, method={}, request id={}", url, connection.getRequestMethod(), requestId);
 
     connection.connect();
     int resp = connection.getResponseCode();
     log.info("Request complete URL=\"{}\", method={}, response code={}, request id={}, headers={}",
-      requestURL, connection.getRequestMethod(), resp, requestId, StringUtils.join(connection.getHeaderFields()));
+      url, connection.getRequestMethod(), resp, requestId, StringUtils.join(connection.getHeaderFields()));
 
     if (resp == HttpURLConnection.HTTP_MOVED_PERM
       || resp == HttpURLConnection.HTTP_MOVED_TEMP) {
diff --git a/arduino-core/src/processing/app/helpers/BoardCloudResolver.java b/arduino-core/src/processing/app/helpers/BoardCloudResolver.java
@@ -107,30 +107,37 @@ public String getName() {
       return name;
     }
 
+    @SuppressWarnings("unused")
     public void setName(String tmp) {
       name = tmp;
     }
 
+    @SuppressWarnings("unused")
     public String getFqbn() {
       return fqbn;
     }
 
+    @SuppressWarnings("unused")
     public void setFqbn(String fqbn) {
       this.fqbn = fqbn;
     }
 
+    @SuppressWarnings("unused")
     public String getArchitecture() {
       return architecture;
     }
 
+    @SuppressWarnings("unused")
     public void setArchitecture(String tmp) {
       architecture = tmp;
     }
 
+    @SuppressWarnings("unused")
     public String getId() {
       return id;
     }
 
+    @SuppressWarnings("unused")
     public void setId(String tmp) {
       id = tmp;
     }
