From 21ee817f6bc3d6cf5bd4e871202d0a7462bab590 Mon Sep 17 00:00:00 2001
From: dsand47 <gh@dfm.sandsys.org>
Date: Thu, 18 Apr 2019 00:31:44 -0500
Subject: [PATCH] Modify NBH methods to match NamedBean changes

---
 java/src/jmri/jmrit/ctc/NBHSensor.java     | 24 +++++++++++++++++++++
 java/src/jmri/jmrit/ctc/NBHSignalHead.java | 24 +++++++++++++++++++++
 java/src/jmri/jmrit/ctc/NBHSignalMast.java | 25 ++++++++++++++++++++++
 java/src/jmri/jmrit/ctc/NBHTurnout.java    | 25 ++++++++++++++++++++++
 4 files changed, 98 insertions(+)

diff --git a/java/src/jmri/jmrit/ctc/NBHSensor.java b/java/src/jmri/jmrit/ctc/NBHSensor.java
index 3267d0a779e1..2438efc7aed9 100755
--- a/java/src/jmri/jmrit/ctc/NBHSensor.java
+++ b/java/src/jmri/jmrit/ctc/NBHSensor.java
@@ -282,6 +282,30 @@ public String getFullyFormattedDisplayName() {
         return _mNamedBeanHandleSensor.getBean().getFullyFormattedDisplayName();
     }
 
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l, String name, String listenerRef) {
+    }
+
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
+
+    @Override
+    public void removePropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
+
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners(String name) {
+        if (_mNamedBeanHandleSensor == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleSensor.getBean().getPropertyChangeListeners(name);
+    }
+
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners() {
+        if (_mNamedBeanHandleSensor == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleSensor.getBean().getPropertyChangeListeners();
+    }
+
     @Override
     public void addPropertyChangeListener(PropertyChangeListener l, String name, String listenerRef) {
         if (_mNamedBeanHandleSensor == null) return;
diff --git a/java/src/jmri/jmrit/ctc/NBHSignalHead.java b/java/src/jmri/jmrit/ctc/NBHSignalHead.java
index 79d68bf23804..3a648fa7311a 100755
--- a/java/src/jmri/jmrit/ctc/NBHSignalHead.java
+++ b/java/src/jmri/jmrit/ctc/NBHSignalHead.java
@@ -169,7 +169,31 @@ public String getFullyFormattedDisplayName() {
         if (_mNamedBeanHandleSignalHead == null) return DEFAULT_STRING_RV;
         return _mNamedBeanHandleSignalHead.getBean().getFullyFormattedDisplayName();
     }
+// 4.15.5 fix
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l, String name, String listenerRef) {
+    }
+
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
+
+    @Override
+    public void removePropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
 
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners(String name) {
+        if (_mNamedBeanHandleSignalHead == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleSignalHead.getBean().getPropertyChangeListeners(name);
+    }
+
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners() {
+        if (_mNamedBeanHandleSignalHead == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleSignalHead.getBean().getPropertyChangeListeners();
+    }
+// end fix
     @Override
     public void addPropertyChangeListener(PropertyChangeListener l, String name, String listenerRef) {
         if (_mNamedBeanHandleSignalHead == null) return;
diff --git a/java/src/jmri/jmrit/ctc/NBHSignalMast.java b/java/src/jmri/jmrit/ctc/NBHSignalMast.java
index 4f27af689f00..dc9b8f30698d 100755
--- a/java/src/jmri/jmrit/ctc/NBHSignalMast.java
+++ b/java/src/jmri/jmrit/ctc/NBHSignalMast.java
@@ -197,6 +197,31 @@ public String getFullyFormattedDisplayName() {
         return _mNamedBeanHandleSignalMast.getBean().getFullyFormattedDisplayName();
     }
 
+// 4.15.5 fix
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l, String name, String listenerRef) {
+    }
+
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
+
+    @Override
+    public void removePropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
+
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners(String name) {
+        if (_mNamedBeanHandleSignalMast == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleSignalMast.getBean().getPropertyChangeListeners(name);
+    }
+
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners() {
+        if (_mNamedBeanHandleSignalMast == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleSignalMast.getBean().getPropertyChangeListeners();
+    }
+// end fix
     @Override
     public void addPropertyChangeListener(PropertyChangeListener l, String name, String listenerRef) {
         if (_mNamedBeanHandleSignalMast == null) return;
diff --git a/java/src/jmri/jmrit/ctc/NBHTurnout.java b/java/src/jmri/jmrit/ctc/NBHTurnout.java
index bf57b73d176e..a866591cd3cd 100755
--- a/java/src/jmri/jmrit/ctc/NBHTurnout.java
+++ b/java/src/jmri/jmrit/ctc/NBHTurnout.java
@@ -390,6 +390,31 @@ public String getFullyFormattedDisplayName() {
         return _mNamedBeanHandleTurnout.getBean().getFullyFormattedDisplayName();
     }
 
+// 4.15.5 fix
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l, String name, String listenerRef) {
+    }
+
+    @Override
+    public void addPropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
+
+    @Override
+    public void removePropertyChangeListener(String xyz, PropertyChangeListener l) {
+    }
+
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners(String name) {
+        if (_mNamedBeanHandleTurnout == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleTurnout.getBean().getPropertyChangeListeners(name);
+    }
+
+    @Override
+    public PropertyChangeListener[] getPropertyChangeListeners() {
+        if (_mNamedBeanHandleTurnout == null) return new PropertyChangeListener[0];
+        return _mNamedBeanHandleTurnout.getBean().getPropertyChangeListeners();
+    }
+// end fix
     @Override
     public void addPropertyChangeListener(PropertyChangeListener l, String name, String listenerRef) {
         if (_mNamedBeanHandleTurnout == null) return;