From 674419a4643019e17166781f18ae2f7905a25722 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 22 Mar 2017 12:12:46 +0100 Subject: [PATCH] Fixed a bunch of trivial javac warnings --- app/src/processing/app/EditorStatus.java | 2 +- app/src/processing/app/EditorToolbar.java | 3 +++ app/src/processing/app/SerialMonitor.java | 2 ++ arduino-core/src/cc/arduino/Compiler.java | 2 +- .../src/cc/arduino/packages/discoverers/NetworkDiscovery.java | 3 --- .../packages/discoverers/network/BoardReachabilityFilter.java | 4 ---- arduino-core/src/processing/app/packages/LibraryList.java | 3 ++- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/processing/app/EditorStatus.java b/app/src/processing/app/EditorStatus.java index cda17fdc5..3c200b852 100644 --- a/app/src/processing/app/EditorStatus.java +++ b/app/src/processing/app/EditorStatus.java @@ -98,7 +98,7 @@ public class EditorStatus extends JPanel { this.message = NO_MESSAGE; this.mode = NOTICE; this.font = Theme.getFont("status.font"); - this.compilerProgressListeners = new ArrayList(); + this.compilerProgressListeners = new ArrayList<>(); this.compilerProgressListeners.add(this::progressUpdate); initialize(); } diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java index 18c48ff16..09d22d4d0 100644 --- a/app/src/processing/app/EditorToolbar.java +++ b/app/src/processing/app/EditorToolbar.java @@ -382,6 +382,9 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key case SERIAL: editor.handleSerial(); break; + + default: + break; } } diff --git a/app/src/processing/app/SerialMonitor.java b/app/src/processing/app/SerialMonitor.java index bcf39ce90..3d5f24ea3 100644 --- a/app/src/processing/app/SerialMonitor.java +++ b/app/src/processing/app/SerialMonitor.java @@ -76,6 +76,8 @@ public class SerialMonitor extends AbstractTextMonitor { case 3: s += "\r\n"; break; + default: + break; } if ("".equals(s) && lineEndings.getSelectedIndex() == 0 && !PreferencesData.has("runtime.line.ending.alert.notified")) { noLineEndingAlert.setForeground(Color.RED); diff --git a/arduino-core/src/cc/arduino/Compiler.java b/arduino-core/src/cc/arduino/Compiler.java index 0cf36b2ff..6eefc612b 100644 --- a/arduino-core/src/cc/arduino/Compiler.java +++ b/arduino-core/src/cc/arduino/Compiler.java @@ -153,7 +153,7 @@ public class Compiler implements MessageConsumer { } public String build(CompilerProgressListener progListener, boolean exportHex) throws RunnerException, PreferencesMapException, IOException { - ArrayList listeners = new ArrayList(); + ArrayList listeners = new ArrayList<>(); listeners.add(progListener); return this.build(listeners, exportHex); } diff --git a/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java b/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java index 42d6ec78c..4ed374a57 100644 --- a/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java +++ b/arduino-core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java @@ -34,7 +34,6 @@ import cc.arduino.packages.Discovery; import processing.app.BaseNoGui; import javax.jmdns.*; -import java.io.IOException; import java.net.InetAddress; import java.util.*; @@ -42,8 +41,6 @@ import cc.arduino.packages.discoverers.network.BoardReachabilityFilter; public class NetworkDiscovery implements Discovery, ServiceListener { - private static final int MAX_TIME_AWAITING_FOR_PACKAGES = 5000; - private final List reachableBoardPorts = new LinkedList<>(); private final List boardPortsDiscoveredWithJmDNS = new LinkedList<>(); private Timer reachabilityTimer; diff --git a/arduino-core/src/cc/arduino/packages/discoverers/network/BoardReachabilityFilter.java b/arduino-core/src/cc/arduino/packages/discoverers/network/BoardReachabilityFilter.java index c8fbc1557..494a9ad6a 100644 --- a/arduino-core/src/cc/arduino/packages/discoverers/network/BoardReachabilityFilter.java +++ b/arduino-core/src/cc/arduino/packages/discoverers/network/BoardReachabilityFilter.java @@ -34,16 +34,12 @@ import cc.arduino.packages.discoverers.NetworkDiscovery; import processing.app.helpers.NetUtils; import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.Enumeration; import java.net.UnknownHostException; import java.util.*; public class BoardReachabilityFilter extends TimerTask { private final NetworkDiscovery networkDiscovery; - private Enumeration staticNetworkInterfaces; - private final List staticNetworkInterfacesList = new LinkedList<>(); public BoardReachabilityFilter(NetworkDiscovery networkDiscovery) { this.networkDiscovery = networkDiscovery; diff --git a/arduino-core/src/processing/app/packages/LibraryList.java b/arduino-core/src/processing/app/packages/LibraryList.java index b83e5265e..bfd114f95 100644 --- a/arduino-core/src/processing/app/packages/LibraryList.java +++ b/arduino-core/src/processing/app/packages/LibraryList.java @@ -33,6 +33,7 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import cc.arduino.contributions.libraries.ContributedLibrary; import processing.app.helpers.FileUtils; @SuppressWarnings("serial") @@ -79,7 +80,7 @@ public class LibraryList extends LinkedList { } public synchronized void sort() { - Collections.sort(this, UserLibrary.CASE_INSENSITIVE_ORDER); + Collections.sort(this, ContributedLibrary.CASE_INSENSITIVE_ORDER); } public synchronized LibraryList filterLibrariesInSubfolder(File subFolder) {