move shutdown task to FacelessServer from UserInterface

JMRI · Feb 14, 2018 · fc0b46f · fc0b46f
1 parent 45940b1
commit fc0b46f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 17 deletions.
diff --git a/java/src/jmri/jmrit/withrottle/FacelessServer.java b/java/src/jmri/jmrit/withrottle/FacelessServer.java
@@ -38,6 +38,7 @@ public class FacelessServer implements DeviceListener, DeviceManager, ZeroConfSe
 
     FacelessServer() {
         createServerThread();
+        setShutDownTask();
     } // End of constructor
 
     @Override
@@ -236,6 +237,20 @@ private void stopDevices() {
         deviceList.clear();
     }
 
+    private jmri.implementation.AbstractShutDownTask task = null;
+
+    private void setShutDownTask() {
+        if (jmri.InstanceManager.getNullableDefault(jmri.ShutDownManager.class) != null) {
+            task = new jmri.implementation.AbstractShutDownTask("WiThrottle Server ShutdownTask") {
+                @Override
+                public boolean execute() {
+                    disableServer();
+                    return true;
+                }
+            };
+            jmri.InstanceManager.getDefault(jmri.ShutDownManager.class).register(task);
+        }
+    }
 
     @Override
     public void serviceUnpublished(ZeroConfServiceEvent se) {

diff --git a/java/src/jmri/jmrit/withrottle/UserInterface.java b/java/src/jmri/jmrit/withrottle/UserInterface.java
@@ -105,7 +105,6 @@ public class UserInterface extends JmriJFrame implements DeviceListener, RosterG
 
         createWindow();
 
-        setShutDownTask();
     } // End of constructor
 
     protected void createWindow() {
@@ -318,22 +317,6 @@ public void notifyDeviceInfoChanged(DeviceServer device) {
         withrottlesListModel.updateDeviceList(deviceList);
     }
 
-    private jmri.implementation.AbstractShutDownTask task = null;
-
-    @Override
-    protected void setShutDownTask() {
-        if (jmri.InstanceManager.getNullableDefault(jmri.ShutDownManager.class) != null) {
-            task = new jmri.implementation.AbstractShutDownTask(getTitle()) {
-                @Override
-                public boolean execute() {
-                    disableServer();
-                    return true;
-                }
-            };
-            jmri.InstanceManager.getDefault(jmri.ShutDownManager.class).register(task);
-        }
-    }
-
     // this is package protected so tests can trigger easilly.
     void disableServer() {
         facelessServer.disableServer();