addresses: fix several address comparisons using '==' instead of 'equals'

Signed-off-by: Ruben Moral <Ruben.Moral@digi.com>

Author: rubenmoral

library/src/main/java/com/digi/xbee/api/AbstractXBeeDevice.java

@@ -432,7 +432,7 @@ public IConnectionInterface getConnectionInterface() {
 	public void readDeviceInfo() throws TimeoutException, XBeeException {
 		byte[] response = null;
 		// Get the 64-bit address.
-		if (xbee64BitAddress == null || xbee64BitAddress == XBee64BitAddress.UNKNOWN_ADDRESS) {
+		if (xbee64BitAddress == null || xbee64BitAddress.equals(XBee64BitAddress.UNKNOWN_ADDRESS)) {
 			String addressHigh;
 			String addressLow;
 
@@ -627,7 +627,7 @@ public void updateDeviceDataFrom(AbstractXBeeDevice device) {
 
 		// Only update the 64-bit address if the original is null or unknown.
 		XBee64BitAddress addr64 = device.get64BitAddress();
-		if (addr64 != null && addr64 != XBee64BitAddress.UNKNOWN_ADDRESS
+		if (addr64 != null && !addr64.equals(XBee64BitAddress.UNKNOWN_ADDRESS)
 				&& !addr64.equals(xbee64BitAddress) 
 				&& (xbee64BitAddress == null 
 					|| xbee64BitAddress.equals(XBee64BitAddress.UNKNOWN_ADDRESS))) {

library/src/main/java/com/digi/xbee/api/XBeeDevice.java

@@ -2109,7 +2109,7 @@ protected APIOutputMode getAPIOutputMode() throws TimeoutException, XBeeExceptio
 	@Override
 	public String toString() {
 		String id = getNodeID() == null ? "" : getNodeID();
-		String addr64 = get64BitAddress() == null || get64BitAddress() == XBee64BitAddress.UNKNOWN_ADDRESS ? 
+		String addr64 = get64BitAddress() == null || get64BitAddress().equals(XBee64BitAddress.UNKNOWN_ADDRESS) ? 
 				"" : get64BitAddress().toString();
 
 		if (id.length() == 0 && addr64.length() == 0)

library/src/main/java/com/digi/xbee/api/connection/DataReader.java

@@ -699,9 +699,9 @@ public RemoteXBeeDevice getRemoteXBeeDeviceFromPacket(XBeeAPIPacket packet) thro
 			ReceivePacket receivePacket = (ReceivePacket)apiPacket;
 			addr64 = receivePacket.get64bitSourceAddress();
 			addr16 = receivePacket.get16bitSourceAddress();
-			if (addr64 != XBee64BitAddress.UNKNOWN_ADDRESS)
+			if (!addr64.equals(XBee64BitAddress.UNKNOWN_ADDRESS))
 				remoteDevice = network.getDevice(addr64);
-			else if (addr16 != XBee16BitAddress.UNKNOWN_ADDRESS)
+			else if (!addr16.equals(XBee16BitAddress.UNKNOWN_ADDRESS))
 				remoteDevice = network.getDevice(addr16);
 			break;
 		case RX_64:
@@ -747,7 +747,7 @@ else if (addr16 != XBee16BitAddress.UNKNOWN_ADDRESS)
 		// If the origin is not in the network, add it.
 		if (remoteDevice == null) {
 			remoteDevice = createRemoteXBeeDevice(addr64, addr16, null);
-			if (addr64 != XBee64BitAddress.UNKNOWN_ADDRESS || addr16 != XBee16BitAddress.UNKNOWN_ADDRESS)
+			if (!addr64.equals(XBee64BitAddress.UNKNOWN_ADDRESS) || !addr16.equals(XBee16BitAddress.UNKNOWN_ADDRESS))
 				network.addRemoteDevice(remoteDevice);
 		}
 

library/src/test/java/com/digi/xbee/api/connection/DataReaderTest.java

@@ -214,10 +214,10 @@ public void setUp() throws Exception {
 		NOT_SPECIFIC_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x04, 0x08, 0x01, 0x4E, 0x49, 0x5F}, OperatingMode.API);
 		AT_CMD_RESPONSE = parser.parsePacket(new byte[]{0x7E, 0x00, 0x08, 0x08, 0x01, 0x4E, 0x49, 0x4E, 0x41, 0x4D, 0x45, 0x3E}, OperatingMode.API);
 		RMT_AT_CMD_RESPONSE = parser.parsePacket(new byte[]{0x7E, 0x00, 0x13, (byte)0x97, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, (byte)0xFF, (byte)0xFE, 0x4E, 0x49, 0x00, 0x4E, 0x41, 0x4D, 0x45, (byte)0xB2}, OperatingMode.API);
-		RX_64_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x0F, (byte)0x80, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, 0x00, 0x01, 0x64, 0x61, 0x74, 0x61, (byte)0xEC}, OperatingMode.API);
+		RX_64_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x0F, (byte)0x80, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x00, 0x01, 0x64, 0x61, 0x74, 0x61, 0x08}, OperatingMode.API);
 		RX_16_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x09, (byte)0x81, (byte)0xFF, (byte)0xFE, 0x00, 0x01, 0x64, 0x61, 0x74, 0x61, (byte)0xE6}, OperatingMode.API);
-		RX_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x10, (byte)0x90, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFE, 0x01, 0x64, 0x61, 0x74, 0x61, (byte)0xDF}, OperatingMode.API);
-		RX_IO_64_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x10, (byte)0x82, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, 0x4B, 0x40, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF}, OperatingMode.API);
+		RX_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x10, (byte)0x90, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, (byte)0xFF, (byte)0xFE, 0x01, 0x64, 0x61, 0x74, 0x61, (byte)0xFB}, OperatingMode.API);
+		RX_IO_64_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x10, (byte)0x82, 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x4B, 0x40, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, 0x1B}, OperatingMode.API);
 		RX_IO_16_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x0A, (byte)0x83, (byte)0xFF, (byte)0xFE, 0x4B, 0x40, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xF9}, OperatingMode.API);
 		RX_IO_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x12, (byte)0x92, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFE, 0x40, 0x01, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, 0x3C}, OperatingMode.API);
 		MODEM_STATUS_PACKET = parser.parsePacket(new byte[]{0x7E, 0x00, 0x02, (byte)0x8A, 0x11, 0x64}, OperatingMode.API);