Make AbstractNamedBean.getDisplayName() final

JMRI · Jan 18, 2019 · f54e4be · f54e4be
1 parent c083cae
commit f54e4be
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/java/src/jmri/implementation/AbstractNamedBean.java b/java/src/jmri/implementation/AbstractNamedBean.java
@@ -84,15 +84,11 @@ final public void setComment(String comment) {
 
     /**
      * {@inheritDoc}
-     * <p>
-     * It would be good to eventually make this final to 
-     * keep it consistent system-wide, but 
-     * we have some existing classes to update first.
      * 
      * @return user name if not null or empty, else return system name
      */
     @Override
-    public String getDisplayName() {
+    final public String getDisplayName() {
         String name = getUserName();
         if (name != null && !name.isEmpty()) {
             return name;

diff --git a/java/src/jmri/jmrit/entryexit/DestinationPoints.java b/java/src/jmri/jmrit/entryexit/DestinationPoints.java
@@ -97,15 +97,6 @@ public void propertyChange(PropertyChangeEvent e) {
         };
     }
 
-    @Override
-    public String getDisplayName() {
-        String uName = getUserName();
-        if (uName != null) {
-            return uName;
-        }
-        return getSystemName();
-    }
-
     String getUniqueId() {
         return getSystemName();
     }