Cleaned up the discovery service and monitor warnings

Author: jantje

it.baeyens.arduino.core/config/pre_processing_platform_default.txt

@@ -9,6 +9,6 @@ runtime.IDE.version=10606
 build.system.path={RUNTIME.PLATFORM.PATH}/system
 
 #for esp8266 network upload
-tools.esp8266ATO={tools.esptool.network_cmd}
-tools.esp8266ATO.upload.pattern={tools.esptool.upload.network_pattern}
-esp8266.network.upload.tool=esp8266ATO
+tools.esp8266OTA={tools.esptool.network_cmd}
+tools.esp8266OTA.upload.pattern={tools.esptool.upload.network_pattern}
+esp8266.network.upload.tool=esp8266OTA

it.baeyens.arduino.core/src/processing/app/zeroconf/jmdns/ArduinoDNSTaskStarter.java renamed to it.baeyens.arduino.core/src/cc/arduino/packages/discoverers/ArduinoDNSTaskStarter.java

@@ -1,4 +1,4 @@
-package processing.app.zeroconf.jmdns;
+package cc.arduino.packages.discoverers;
 
 import java.util.Timer;
 

it.baeyens.arduino.core/src/cc/arduino/packages/discoverers/network/NetworkChecker.java renamed to it.baeyens.arduino.core/src/cc/arduino/packages/discoverers/NetworkChecker.java

@@ -27,7 +27,7 @@
  * Copyright 2013 Arduino LLC (http://www.arduino.cc/)
  */
 
-package cc.arduino.packages.discoverers.network;
+package cc.arduino.packages.discoverers;
 
 import java.net.InetAddress;
 import java.util.Collections;
@@ -40,14 +40,12 @@
 
 public class NetworkChecker extends TimerTask {
 
-    private final NetworkTopologyListener topologyListener;
     private final NetworkTopologyDiscovery topology;
 
     private Set<InetAddress> knownAddresses;
 
-    public NetworkChecker(NetworkTopologyListener topologyListener, NetworkTopologyDiscovery topology) {
+    public NetworkChecker(NetworkTopologyDiscovery topology) {
 	super();
-	this.topologyListener = topologyListener;
 	this.topology = topology;
 	this.knownAddresses = Collections.synchronizedSet(new HashSet<InetAddress>());
     }
@@ -64,12 +62,12 @@ public void run() {
 	    for (InetAddress address : curentAddresses) {
 		current.add(address);
 		if (!this.knownAddresses.contains(address)) {
-		    this.topologyListener.inetAddressAdded(address);
+		    NetworkDiscovery.inetAddressAdded(address);
 		}
 	    }
 	    for (InetAddress address : this.knownAddresses) {
 		if (!current.contains(address)) {
-		    this.topologyListener.inetAddressRemoved(address);
+		    NetworkDiscovery.inetAddressRemoved(address);
 		}
 	    }
 	    this.knownAddresses = current;

it.baeyens.arduino.core/src/cc/arduino/packages/discoverers/NetworkDiscovery.java

@@ -29,8 +29,6 @@
 
 package cc.arduino.packages.discoverers;
 
-//import cc.arduino.packages.BoardPort;
-//import cc.arduino.packages.Discovery;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.HashSet;
@@ -46,11 +44,7 @@
 import javax.jmdns.ServiceListener;
 import javax.jmdns.impl.DNSTaskStarter;
 
-import cc.arduino.packages.discoverers.network.NetworkChecker;
-import processing.app.zeroconf.jmdns.ArduinoDNSTaskStarter;
-
-public class NetworkDiscovery
-	implements ServiceListener, cc.arduino.packages.discoverers.network.NetworkTopologyListener {
+public class NetworkDiscovery implements ServiceListener {
 
     private class bonour {
 	public String address;
@@ -79,35 +73,41 @@ public String getLabel() {
 
     }
 
-    private Timer timer;
-    private final HashSet<bonour> myComPorts; // well not really com ports but
-					      // we treat them like com ports
-    private final Map<InetAddress, JmDNS> mappedJmDNSs;
+    private static Timer timer = new Timer("Network discovery timer"); //$NON-NLS-1$ ;
+    private static final HashSet<bonour> myComPorts = new HashSet<>(); // well
+								       // not
+								       // really
+								       // com
+								       // ports
+								       // but
+    // we treat them like com ports
+    private final static Map<InetAddress, JmDNS> mappedJmDNSs = new Hashtable<>();
+    private static NetworkDiscovery me = null;
 
-    public NetworkDiscovery() {
+    private NetworkDiscovery() {
 	DNSTaskStarter.Factory.setClassDelegate(new ArduinoDNSTaskStarter());
-	this.myComPorts = new HashSet<>();
-	this.mappedJmDNSs = new Hashtable<>();
     }
 
-    public String[] getList() {
-	String[] ret = new String[this.myComPorts.size()];
+    public static String[] getList() {
+	String[] ret = new String[myComPorts.size()];
 	int curPort = 0;
-	Iterator<bonour> iterator = this.myComPorts.iterator();
+	Iterator<bonour> iterator = myComPorts.iterator();
 	while (iterator.hasNext()) {
 	    bonour board = iterator.next();
 	    ret[curPort++] = board.getLabel();
 	}
 	return ret;
     }
 
-    public void start() {
-	this.timer = new Timer(this.getClass().getName() + " timer"); //$NON-NLS-1$
-	new NetworkChecker(this, NetworkTopologyDiscovery.Factory.getInstance()).start(this.timer);
+    public static void start() {
+	if (me == null) {
+	    me = new NetworkDiscovery();
+	}
+	new NetworkChecker(NetworkTopologyDiscovery.Factory.getInstance()).start(timer);
     }
 
-    public void stop() {
-	this.timer.purge();
+    public static void stop() {
+	timer.purge();
 	// we don't close each JmDNS instance as it's too slow
     }
 
@@ -163,13 +163,13 @@ public void serviceResolved(ServiceEvent serviceEvent) {
 
 	    synchronized (this) {
 		removeBoardswithSameAdress(newItem);
-		this.myComPorts.add(newItem);
+		myComPorts.add(newItem);
 	    }
 	}
     }
 
-    private void removeBoardswithSameAdress(bonour newBoard) {
-	Iterator<bonour> iterator = this.myComPorts.iterator();
+    private static void removeBoardswithSameAdress(bonour newBoard) {
+	Iterator<bonour> iterator = myComPorts.iterator();
 	while (iterator.hasNext()) {
 	    bonour board = iterator.next();
 	    if (newBoard.address.equals(board.address)) {
@@ -178,8 +178,8 @@ private void removeBoardswithSameAdress(bonour newBoard) {
 	}
     }
 
-    private void removeBoardswithSameName(String name) {
-	Iterator<bonour> iterator = this.myComPorts.iterator();
+    private static void removeBoardswithSameName(String name) {
+	Iterator<bonour> iterator = myComPorts.iterator();
 	while (iterator.hasNext()) {
 	    bonour board = iterator.next();
 	    if (name.equals(board.name)) {
@@ -189,24 +189,22 @@ private void removeBoardswithSameName(String name) {
     }
 
     @SuppressWarnings("resource")
-    @Override
-    public void inetAddressAdded(InetAddress address) {
-	if (this.mappedJmDNSs.containsKey(address)) {
+    public static void inetAddressAdded(InetAddress address) {
+	if (mappedJmDNSs.containsKey(address)) {
 	    return;
 	}
 	try {
 	    JmDNS jmDNS = JmDNS.create(address);
-	    jmDNS.addServiceListener("_arduino._tcp.local.", this); //$NON-NLS-1$
-	    this.mappedJmDNSs.put(address, jmDNS);
+	    jmDNS.addServiceListener("_arduino._tcp.local.", me); //$NON-NLS-1$
+	    mappedJmDNSs.put(address, jmDNS);
 	} catch (Exception e) {
 	    e.printStackTrace();
 	}
     }
 
     @SuppressWarnings("resource")
-    @Override
-    public void inetAddressRemoved(InetAddress address) {
-	JmDNS jmDNS = this.mappedJmDNSs.remove(address);
+    public static void inetAddressRemoved(InetAddress address) {
+	JmDNS jmDNS = mappedJmDNSs.remove(address);
 	if (jmDNS != null) {
 	    try {
 		jmDNS.close();
@@ -216,8 +214,8 @@ public void inetAddressRemoved(InetAddress address) {
 	}
     }
 
-    private bonour getBoardByName(String name) {
-	Iterator<bonour> iterator = this.myComPorts.iterator();
+    private static bonour getBoardByName(String name) {
+	Iterator<bonour> iterator = myComPorts.iterator();
 	while (iterator.hasNext()) {
 	    bonour board = iterator.next();
 	    if (name.equals(board.name)) {
@@ -227,35 +225,35 @@ private bonour getBoardByName(String name) {
 	return null;
     }
 
-    public String getAddress(String name) {
+    public static String getAddress(String name) {
 	bonour board = getBoardByName(name);
 	if (board == null)
 	    return null;
 	return board.address;
     }
 
-    public String getPort(String name) {
+    public static String getPort(String name) {
 	bonour board = getBoardByName(name);
 	if (board == null)
 	    return null;
 	return board.port;
     }
 
-    public boolean hasAuth(String name) {
+    public static boolean hasAuth(String name) {
 	bonour board = getBoardByName(name);
 	if (board == null)
 	    return false;
 	return board.auth_upload;
     }
 
-    public boolean isSSH(String name) {
+    public static boolean isSSH(String name) {
 	bonour board = getBoardByName(name);
 	if (board == null)
 	    return false;
 	return board.ssh_upload;
     }
 
-    public boolean needstcpCheck(String name) {
+    public static boolean needstcpCheck(String name) {
 	bonour board = getBoardByName(name);
 	if (board == null)
 	    return false;

it.baeyens.arduino.core/src/cc/arduino/packages/discoverers/network/NetworkTopologyListener.java

@@ -59,14 +59,14 @@
 import org.eclipse.ui.console.IConsoleManager;
 import org.eclipse.ui.console.MessageConsole;
 
+import cc.arduino.packages.discoverers.NetworkDiscovery;
 import it.baeyens.arduino.common.Common;
 import it.baeyens.arduino.common.ConfigurationPreferences;
 import it.baeyens.arduino.common.Const;
 import it.baeyens.arduino.common.InstancePreferences;
 import it.baeyens.arduino.managers.ArduinoPlatform;
 import it.baeyens.arduino.managers.Manager;
 import it.baeyens.arduino.managers.ToolDependency;
-import it.baeyens.arduino.ui.Activator;
 
 /**
  * ArduinoHelpers is a static class containing general purpose functions
@@ -1080,10 +1080,9 @@ private static void setTheEnvironmentVariablesPostProcessing(IContributedEnviron
 	    String host = getHostFromComPort(MComPort);
 	    if (host != null) {
 		String platform = contribEnv.getVariable(Const.ENV_KEY_JANTJE_ARCITECTURE_ID, confDesc).getValue();
-		setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_NETWORK_PORT,
-			Activator.bonjourDiscovery.getPort(host));
+		setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_NETWORK_PORT, NetworkDiscovery.getPort(host));
 		setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_NETWORK_AUTH,
-			Activator.bonjourDiscovery.hasAuth(host) ? TRUE : FALSE);
+			NetworkDiscovery.hasAuth(host) ? TRUE : FALSE);
 		setBuildEnvironmentVariable(contribEnv, confDesc, ENV_KEY_SERIAL_PORT, host);
 
 		try {

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/Helpers.java

@@ -44,7 +44,6 @@
  * 
  */
 public class Activator implements BundleActivator {
-    public static NetworkDiscovery bonjourDiscovery;
     public URL pluginStartInitiator = null; // Initiator to start the plugin
     public Object mstatus; // status of the plugin
     protected String flagStart = 'F' + 's' + 'S' + 't' + 'a' + 't' + 'u' + Const.EMPTY_STRING;
@@ -101,7 +100,6 @@ private static void testKnownIssues() {
     }
 
     private static void registerListeners() {
-	// TODO Auto-generated method stub
 	IndexerListener myindexerListener = new IndexerListener();
 	CCorePlugin.getIndexManager().addIndexChangeListener(myindexerListener);
 	CCorePlugin.getIndexManager().addIndexerStateListener(myindexerListener);
@@ -111,7 +109,6 @@ private static void registerListeners() {
     }
 
     private static void runGUIRegistration() {
-	// TODO Auto-generated method stub
 	UIJob installJob = new UIJob("Arduino installer job") { //$NON-NLS-1$
 
 	    @Override
@@ -171,15 +168,13 @@ protected IStatus run(IProgressMonitor monitor) {
 		    makeOurOwnCustomBoards_txt();
 		    Manager.startup_Pluging(monitor);
 		    monitor.setTaskName("Done!"); //$NON-NLS-1$
-		    bonjourDiscovery = new NetworkDiscovery();
-		    bonjourDiscovery.start();
+		    NetworkDiscovery.start();
 		    InstancePreferences.setConfigured();
 		    registerListeners();
 		    return Status.OK_STATUS;
 		}
 		addFileAssociations();
-		bonjourDiscovery = new NetworkDiscovery();
-		bonjourDiscovery.start();
+		NetworkDiscovery.start();
 		return Status.CANCEL_STATUS;
 	    }