Modify NBH methods to match NamedBean changes

JMRI · Apr 18, 2019 · 21ee817 · 21ee817
1 parent 11067fa
commit 21ee817
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;