Merge branch 'master' of github.com:openlcb/OpenLCB_Java

openlcb · Jul 26, 2020 · 33d0786 · 33d0786
2 parents e031bf6 + 9ba5b0e
commit 33d0786
Show file tree

Hide file tree

Showing 36 changed files with 1,510 additions and 968 deletions.
diff --git a/pom.xml b/pom.xml
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.11.0</version>
+            <version>2.12.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>

diff --git a/src/org/openlcb/AddressedMessage.java b/src/org/openlcb/AddressedMessage.java
@@ -1,7 +1,5 @@
 package org.openlcb;
 
-// For annotations
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
 import net.jcip.annotations.Immutable;
 import net.jcip.annotations.ThreadSafe;
 
@@ -14,13 +12,11 @@
  * pattern to do message specific-processing in e.g. a node implementation.
  *
  * @author  Bob Jacobsen   Copyright 2009, 2010
- * @version $Revision$
  * @see MessageDecoder
  */
 @Immutable
 @ThreadSafe
 abstract public class AddressedMessage extends Message {
-
     public AddressedMessage(NodeID source, NodeID dest) {
         super(source);
         destNodeID = dest;
@@ -29,28 +25,32 @@ public AddressedMessage(NodeID source, NodeID dest) {
     // cannot create without sourceID, destID
     protected AddressedMessage() {}
 
-    @SuppressWarnings("JCIP_FIELD_ISNT_FINAL_IN_IMMUTABLE_CLASS")
     NodeID destNodeID;
 
     public NodeID getDestNodeID() { return destNodeID; }
 
-     /**
-      * To be equal, messages have to have the
-      * same type and content
-      */
+    /**
+     * To be equal, messages have to have the same type and content
+     */
     @Override
-     public boolean equals(Object o) {
-        if (o == null) return false;
-        if (! (o instanceof AddressedMessage))
+    public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
+        if (! (o instanceof AddressedMessage)) {
             return false;
+        }
         AddressedMessage msg = (AddressedMessage) o;
-        if (!this.getDestNodeID().equals(msg.getDestNodeID()))
+        if (!this.getDestNodeID().equals(msg.getDestNodeID())) {
             return false;
-        else return super.equals(o);
-     }
+        }
+        return super.equals(o);
+    }
 
-     @Override
-     public int hashCode() { return super.hashCode()+getDestNodeID().hashCode(); }
+    @Override
+    public int hashCode() {
+        return super.hashCode()+getDestNodeID().hashCode();
+    }
 
     @Override
     public String toString() {