From 39c032b49094b20a325579f31da149c6b7cb6f63 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Wed, 10 Jul 2013 09:42:27 +0200
Subject: [PATCH] cleanup

---
 .../cc/arduino/packages/DiscoveryManager.java | 27 ++++++++++---------
 .../discoverers/NetworkDiscovery.java         |  2 +-
 .../arduino/packages/uploaders/ssh/SCP.java   |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/cc/arduino/packages/DiscoveryManager.java b/app/src/cc/arduino/packages/DiscoveryManager.java
index 8681acc9b..267febeda 100644
--- a/app/src/cc/arduino/packages/DiscoveryManager.java
+++ b/app/src/cc/arduino/packages/DiscoveryManager.java
@@ -10,9 +10,10 @@ import static processing.app.I18n._;
 
 public class DiscoveryManager {
 
-  private List<Discovery> discoverers = new ArrayList<Discovery>();
+  private final List<Discovery> discoverers;
 
   public DiscoveryManager() {
+    discoverers = new ArrayList<Discovery>();
     discoverers.add(new SerialDiscovery());
     discoverers.add(new NetworkDiscovery());
 
@@ -26,6 +27,18 @@ public class DiscoveryManager {
       }
     }
 
+    Thread closeHook = new Thread(new Runnable() {
+      @Override
+      public void run() {
+        for (Discovery d : discoverers) {
+          try {
+            d.stop();
+          } catch (Exception e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+          }
+        }
+      }
+    });
     Runtime.getRuntime().addShutdownHook(closeHook);
   }
 
@@ -36,16 +49,4 @@ public class DiscoveryManager {
     return res;
   }
 
-  private Thread closeHook = new Thread(new Runnable() {
-    @Override
-    public void run() {
-      for (Discovery d : discoverers) {
-        try {
-          d.stop();
-        } catch (Exception e) {
-          e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-      }
-    }
-  });
 }
diff --git a/app/src/cc/arduino/packages/discoverers/NetworkDiscovery.java b/app/src/cc/arduino/packages/discoverers/NetworkDiscovery.java
index b0056ac95..925e91b65 100644
--- a/app/src/cc/arduino/packages/discoverers/NetworkDiscovery.java
+++ b/app/src/cc/arduino/packages/discoverers/NetworkDiscovery.java
@@ -18,7 +18,7 @@ import java.util.*;
 public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.packages.discoverers.network.NetworkTopologyListener {
 
   private Timer timer;
-  private List<BoardPort> ports;
+  private final List<BoardPort> ports;
   private final Map<InetAddress, JmDNS> mappedJmDNSs;
 
   public NetworkDiscovery() {
diff --git a/app/src/cc/arduino/packages/uploaders/ssh/SCP.java b/app/src/cc/arduino/packages/uploaders/ssh/SCP.java
index 8e718f550..01df89bd5 100644
--- a/app/src/cc/arduino/packages/uploaders/ssh/SCP.java
+++ b/app/src/cc/arduino/packages/uploaders/ssh/SCP.java
@@ -17,7 +17,7 @@ public class SCP extends SSH {
     super(session);
   }
 
-  public void open() throws JSchException, IOException {
+  public void open() throws IOException {
     try {
       channel = session.openChannel("exec");
       ((ChannelExec) channel).setCommand("scp -t -r -d /");