arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

cleanup

Browse Source
This commit is contained in:
Federico Fissore
2013-07-10 09:42:27 +02:00
parent 915d6d92c7
commit 39c032b490
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/cc/arduino/packages/DiscoveryManager.java
View File

@ -10,9 +10,10 @@ import static processing.app.I18n._;
public class DiscoveryManager { public class DiscoveryManager {
private List<Discovery> discoverers = new ArrayList<Discovery>(); private final List<Discovery> discoverers;
public DiscoveryManager() { public DiscoveryManager() {
discoverers = new ArrayList<Discovery>();
discoverers.add(new SerialDiscovery()); discoverers.add(new SerialDiscovery());
discoverers.add(new NetworkDiscovery()); discoverers.add(new NetworkDiscovery());
@ -26,17 +27,7 @@ public class DiscoveryManager {
} }
} }
Runtime.getRuntime().addShutdownHook(closeHook); Thread closeHook = new Thread(new Runnable() {
}
public List<BoardPort> discovery() {
List<BoardPort> res = new ArrayList<BoardPort>();
for (Discovery d : discoverers)
res.addAll(d.discovery());
return res;
}
private Thread closeHook = new Thread(new Runnable() {
@Override @Override
public void run() { public void run() {
for (Discovery d : discoverers) { for (Discovery d : discoverers) {
@ -48,4 +39,14 @@ public class DiscoveryManager {
} }
} }
}); });
Runtime.getRuntime().addShutdownHook(closeHook);
}
public List<BoardPort> discovery() {
List<BoardPort> res = new ArrayList<BoardPort>();
for (Discovery d : discoverers)
res.addAll(d.discovery());
return res;
}
} }

2
app/src/cc/arduino/packages/discoverers/NetworkDiscovery.java
View File

@ -18,7 +18,7 @@ import java.util.*;
public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.packages.discoverers.network.NetworkTopologyListener { public class NetworkDiscovery implements Discovery, ServiceListener, cc.arduino.packages.discoverers.network.NetworkTopologyListener {
private Timer timer; private Timer timer;
private List<BoardPort> ports; private final List<BoardPort> ports;
private final Map<InetAddress, JmDNS> mappedJmDNSs; private final Map<InetAddress, JmDNS> mappedJmDNSs;
public NetworkDiscovery() { public NetworkDiscovery() {

2
app/src/cc/arduino/packages/uploaders/ssh/SCP.java
View File

@ -17,7 +17,7 @@ public class SCP extends SSH {
super(session); super(session);
} }
public void open() throws JSchException, IOException { public void open() throws IOException {
try { try {
channel = session.openChannel("exec"); channel = session.openChannel("exec");
((ChannelExec) channel).setCommand("scp -t -r -d /"); ((ChannelExec) channel).setCommand("scp -t -r -d /");