fixes bug due to different behavior between Map.Get/Dictionary.Get and string formatting

Author: LordVeovis

XBeeLibrary/AbstractXBeeDevice.cs

@@ -764,9 +764,9 @@ protected ATCommandResponse SendATCommand(ATCommand command)
 							packet = new ATCommandQueuePacket(GetNextFrameID(), command.Command, command.Parameter);
 					}
 					if (command.Parameter == null)
-						logger.DebugFormat(ToString() + "Sending AT command '{}'.", command.Command);
+						logger.DebugFormat(ToString() + "Sending AT command '{0}'.", command.Command);
 					else
-						logger.DebugFormat(ToString() + "Sending AT command '{} {}'.", command.Command, HexUtils.PrettyHexString(command.Parameter));
+						logger.DebugFormat(ToString() + "Sending AT command '{0} {1}'.", command.Command, HexUtils.PrettyHexString(command.Parameter));
 					try
 					{
 						// Send the packet and build the corresponding response depending on if the device is local or remote.
@@ -781,7 +781,7 @@ protected ATCommandResponse SendATCommand(ATCommand command)
 							response = new ATCommandResponse(command, ((RemoteATCommandResponsePacket)answerPacket).getCommandValue(), ((RemoteATCommandResponsePacket)answerPacket).Status);
 
 						if (response != null && response.Response != null)
-							logger.DebugFormat(ToString() + "AT command response: {}.", HexUtils.PrettyHexString(response.Response));
+							logger.DebugFormat(ToString() + "AT command response: {0}.", HexUtils.PrettyHexString(response.Response));
 						else
 							logger.Debug(ToString() + "AT command response: null.");
 					}
@@ -1113,7 +1113,7 @@ private bool isSamePacket(XBeePacket sentPacket, XBeePacket receivedPacket)
 		 * @see com.digi.xbee.api.packet.XBeePacket
 		 */
 		private void WritePacket(XBeePacket packet)/*throws IOException */{
-			logger.DebugFormat(ToString() + "Sending XBee packet: \n{}", packet.ToPrettyString());
+			logger.DebugFormat(ToString() + "Sending XBee packet: \n{0}", packet.ToPrettyString());
 			// Write bytes with the required escaping mode.
 			switch (operatingMode)
 			{

XBeeLibrary/Connection/Serial/AbstractSerialPort.cs

@@ -255,11 +255,16 @@ public override string ToString()
 					flowControl = "H";
 				else if (parameters.FlowControl == Handshake.XOnXOff)
 					flowControl = "S";
-				return "[" + port + " - " + baudRate + "/" + parameters.DataBits +
-						"/" + parity + "/" + parameters.StopBits + "/" + flowControl + "] ";
+				return string.Format("[{0} - {1}/{2}/{3}/{4}/{5}] ",
+					port,
+					baudRate,
+					parameters.DataBits,
+					parity,
+					parameters.StopBits,
+					flowControl);
 			}
 			else
-				return "[" + port + " - " + baudRate + "/8/N/1/N] ";
+				return string.Format("[{0} - {1}/8/N/1/N] ", port, baudRate);
 		}
 
 		public SerialPort SerialPort { get; protected set; }

XBeeLibrary/NodeDiscovery.cs

@@ -90,7 +90,7 @@ public NodeDiscovery(XBeeDevice xbeeDevice)
 		 * 
 		 * @see #discoverDevices(List)
 		 */
-		public RemoteXBeeDevice discoverDevice(string id)/*throws XBeeException */{
+		public RemoteXBeeDevice DiscoverDevice(string id)/*throws XBeeException */{
 			// Check if the connection is open.
 			if (!xbeeDevice.IsOpen)
 				throw new InterfaceNotOpenException();
@@ -133,7 +133,7 @@ public RemoteXBeeDevice discoverDevice(string id)/*throws XBeeException */{
 		 * 
 		 * @see #discoverDevice(String)
 		 */
-		public List<RemoteXBeeDevice> discoverDevices(IList<String> ids)/*throws XBeeException */{
+		public List<RemoteXBeeDevice> discoverDevices(IList<string> ids)/*throws XBeeException */{
 			// Check if the connection is open.
 			if (!xbeeDevice.IsOpen)
 				throw new InterfaceNotOpenException();

XBeeLibrary/XBeeNetwork.cs

@@ -6,21 +6,18 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.Linq;
 
 namespace Kveer.XBeeApi
 {
-	/**
-	 * This class represents an XBee Network.
-	 *  
-	 * <p>The network allows the discovery of remote devices in the same network 
-	 * as the local one and stores them.</p>
-	 */
+	/// <summary>
+	/// This class represents an XBee Network.
+	/// </summary>
+	/// <remarks>The network allows the discovery of remote devices in the same network as the local one and stores them.</remarks>
 	public class XBeeNetwork
 	{
-
 		// Variables.
-
 		private XBeeDevice localDevice;
 
 		private ConcurrentDictionary<XBee64BitAddress, RemoteXBeeDevice> remotesBy64BitAddr;
@@ -79,15 +76,12 @@ public XBeeNetwork(XBeeDevice device)
 		 * @see #getDevice(String)
 		 * @see RemoteXBeeDevice
 		 */
-		public RemoteXBeeDevice discoverDevice(String id)/*throws XBeeException */{
-			if (id == null)
-				throw new ArgumentNullException("Device identifier cannot be null.");
-			if (id.Length == 0)
-				throw new ArgumentException("Device identifier cannot be an empty string.");
+		public RemoteXBeeDevice DiscoverDevice(string id)/*throws XBeeException */{
+			Contract.Requires<ArgumentNullException>(!string.IsNullOrEmpty(id), "Device identifier cannot be null or empty.");
 
 			logger.DebugFormat("{0}Discovering '{1}' device.", localDevice.ToString(), id);
 
-			return nodeDiscovery.discoverDevice(id);
+			return nodeDiscovery.DiscoverDevice(id);
 		}
 
 		/**
@@ -115,7 +109,7 @@ public RemoteXBeeDevice discoverDevice(String id)/*throws XBeeException */{
 		 * @see #discoverDevice(String)
 		 * @see RemoteXBeeDevice
 		 */
-		public List<RemoteXBeeDevice> discoverDevices(IList<String> ids)/*throws XBeeException */{
+		public List<RemoteXBeeDevice> discoverDevices(IList<string> ids)/*throws XBeeException */{
 			if (ids == null)
 				throw new ArgumentNullException("List of device identifiers cannot be null.");
 			if (ids.Count == 0)
@@ -411,7 +405,10 @@ public RemoteXBeeDevice GetDevice(XBee64BitAddress address)
 
 			logger.DebugFormat("{0}Getting device '{1}' from network.", localDevice.ToString(), address);
 
-			return remotesBy64BitAddr[address];
+			RemoteXBeeDevice result;
+			remotesBy64BitAddr.TryGetValue(address, out result);
+
+			return result;
 		}
 
 		/**
@@ -510,8 +507,7 @@ public RemoteXBeeDevice addRemoteDevice(RemoteXBeeDevice remoteDevice)
 			if (addr64 != null && !addr64.Equals(XBee64BitAddress.UNKNOWN_ADDRESS))
 			{
 				// The device has 64-bit address, so look in the 64-bit map.
-				devInNetwork = remotesBy64BitAddr[addr64];
-				if (devInNetwork != null)
+				if (remotesBy64BitAddr.TryGetValue(addr64, out devInNetwork))
 				{
 					// The device exists in the 64-bit map, so update the reference and return it.
 					logger.DebugFormat("{0}Existing device '{1}' in network.", localDevice.ToString(), devInNetwork.ToString());
@@ -524,8 +520,7 @@ public RemoteXBeeDevice addRemoteDevice(RemoteXBeeDevice remoteDevice)
 					if (addr16 != null && !addr16.Equals(XBee16BitAddress.UNKNOWN_ADDRESS))
 					{
 						// The device has 16-bit address, so look in the 16-bit map.
-						devInNetwork = remotesBy16BitAddr[addr16];
-						if (devInNetwork != null)
+						if (remotesBy16BitAddr.TryGetValue(addr16, out devInNetwork))
 						{
 							// The device exists in the 16-bit map, so remove it and add it to the 64-bit map.
 							logger.DebugFormat("{0}Existing device '{1}' in network.", localDevice.ToString(), devInNetwork.ToString());

XBeeLibrary/ZigBeeDevice.cs

@@ -95,17 +95,13 @@ public override void Open()/*throws XBeeException */{
 				throw new XBeeDeviceException("XBee device is not a " + GetXBeeProtocol().GetDescription() + " device, it is a " + xbeeProtocol.GetDescription() + " device.");
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see com.digi.xbee.api.XBeeDevice#GetNetwork()
-		 */
-		//@Override
 		public override XBeeNetwork GetNetwork()
 		{
 			if (!IsOpen)
 				throw new InterfaceNotOpenException();
 			if (network == null)
 				network = new ZigBeeNetwork(this);
+
 			return network;
 		}