From 3131a9dda6e58a37dd611116f6ab3d0877f13561 Mon Sep 17 00:00:00 2001 From: Bob Jacobsen Date: Sat, 25 May 2019 09:43:41 -0700 Subject: [PATCH] use pre-existing TC instead of re-creating --- .../easydcc/networkdriver/NetworkDriverAdapter.java | 10 +++++----- .../jmri/jmrix/easydcc/simulator/SimulatorAdapter.java | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/java/src/jmri/jmrix/easydcc/networkdriver/NetworkDriverAdapter.java b/java/src/jmri/jmrix/easydcc/networkdriver/NetworkDriverAdapter.java index a1e5e994b50..6ed3115c15d 100644 --- 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 index d3d5b317606..b7d744b45dd 100644 --- 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();