add toMonitorString (with default implementation) to jmri.jmrix.Messa…

…ge interface. Remove definition of toMonitorString from derived classes for which this is now redundant.
JMRI · Sep 10, 2018 · 288f0f5 · 288f0f5
1 parent d9393ef
commit 288f0f5
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/java/src/jmri/jmrix/Message.java b/java/src/jmri/jmrix/Message.java
@@ -16,4 +16,12 @@ public interface Message {
     @Override
     String toString();
 
+
+    /*
+     * @return a human readable representation of the message.
+     */
+    public default String toMonitorString(){
+          return toString();
+    };
+
 }
diff --git a/java/src/jmri/jmrix/ieee802154/IEEE802154Message.java b/java/src/jmri/jmrix/ieee802154/IEEE802154Message.java
@@ -105,9 +105,5 @@ public int getResponseLength() {
         return responseLength;
     }
 
-    public String toMonitorString() {
-        return toString();
-    }
-
 }
 
diff --git a/java/src/jmri/jmrix/ieee802154/IEEE802154Reply.java b/java/src/jmri/jmrix/ieee802154/IEEE802154Reply.java
@@ -275,8 +275,4 @@ public boolean checkParity() {
         return ((chksum & 0xFFFF) == ((getElement(len - 2) << 8) + getElement(len - 1)));
     }
 
-    public String toMonitorString() {
-        return toString();
-    }
-
 }
diff --git a/java/src/jmri/jmrix/powerline/SerialMessage.java b/java/src/jmri/jmrix/powerline/SerialMessage.java
@@ -79,8 +79,6 @@ public int getResponseLength() {
         return responseLength;
     }
 
-    abstract public String toMonitorString();
-
     // static methods to recognize a message
     public boolean isPoll() {
         return getElement(1) == 48;

diff --git a/java/src/jmri/jmrix/powerline/SerialReply.java b/java/src/jmri/jmrix/powerline/SerialReply.java
@@ -49,8 +49,6 @@ protected int skipPrefix(int index) {
         return index;
     }
 
-    abstract public String toMonitorString();
-
     private final static Logger log = LoggerFactory.getLogger(SerialReply.class);
 
 }

diff --git a/java/src/jmri/jmrix/rfid/RfidMessage.java b/java/src/jmri/jmrix/rfid/RfidMessage.java
@@ -89,11 +89,4 @@ public int getResponseLength() {
         return responseLength;
     }
 
-    /**
-     * Returns a string representation of this message to use in a monitor
-     *
-     * @return monitor string
-     */
-    abstract public String toMonitorString();
-
 }
diff --git a/java/src/jmri/jmrix/rfid/RfidReply.java b/java/src/jmri/jmrix/rfid/RfidReply.java
@@ -40,6 +40,4 @@ protected int skipPrefix(int index) {
         return index;
     }
 
-    abstract public String toMonitorString();
-
 }