use pre-existing TC instead of re-creating

JMRI · May 25, 2019 · 3131a9d · 3131a9d
1 parent 555610d
commit 3131a9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/java/src/jmri/jmrix/easydcc/networkdriver/NetworkDriverAdapter.java b/java/src/jmri/jmrix/easydcc/networkdriver/NetworkDriverAdapter.java
@@ -28,13 +28,13 @@ public NetworkDriverAdapter() {
      */
     @Override
     public void configure() {
-        // connect to the traffic controller
+        // connect to the traffic controller, which is provided via the memo
         log.debug("set tc for memo {}", getSystemConnectionMemo().getUserName());
-        EasyDccTrafficController control = new EasyDccTrafficController(getSystemConnectionMemo());
-        control.connectPort(this);
-        this.getSystemConnectionMemo().setEasyDccTrafficController(control);
+
+        getSystemConnectionMemo().getTrafficController().connectPort(this);
+
         // do the common manager config
-        this.getSystemConnectionMemo().configureManagers();
+        getSystemConnectionMemo().configureManagers();
     }
 
     @Override

diff --git a/java/src/jmri/jmrix/easydcc/simulator/SimulatorAdapter.java b/java/src/jmri/jmrix/easydcc/simulator/SimulatorAdapter.java
@@ -102,12 +102,11 @@ public boolean okToSend() {
      */
     @Override
     public void configure() {
-        // connect to the traffic controller
+        // connect to the traffic controller, which is provided via the memo
         log.debug("set tc for memo {}", getSystemConnectionMemo().getUserName());
-        EasyDccTrafficController control = new EasyDccSimulatorTrafficController(getSystemConnectionMemo());
-        //compare with: XNetTrafficController packets = new XNetPacketizer(new LenzCommandStation());
-        control.connectPort(this);
-        this.getSystemConnectionMemo().setEasyDccTrafficController(control);
+
+        getSystemConnectionMemo().getTrafficController().connectPort(this);
+
         // do the common manager config
         this.getSystemConnectionMemo().configureManagers();