diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java index afba623d37..6c28d4d24e 100644 --- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java +++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java @@ -7,6 +7,7 @@ import com.rusefi.NamedThreadFactory; import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocolState; import com.rusefi.core.EngineState; +import com.rusefi.core.MessagesCentral; import com.rusefi.io.serial.StreamConnector; import com.rusefi.io.serial.SerialIoStreamJSerialComm; import com.rusefi.io.tcp.TcpConnector; @@ -205,6 +206,7 @@ public class LinkManager implements Closeable { Callable streamFactory = new Callable() { @Override public IoStream call() { + MessagesCentral.getInstance().postMessage(getClass(), "Opening port: " + port); Socket socket; try { int portPart = TcpConnector.getTcpPort(port); @@ -220,12 +222,13 @@ public class LinkManager implements Closeable { } }; - setConnector(new StreamConnector(this, port, streamFactory)); + setConnector(new StreamConnector(this, streamFactory)); isSimulationMode = true; } else { Callable ioStreamCallable = new Callable() { @Override public IoStream call() { + MessagesCentral.getInstance().postMessage(getClass(), "Opening port: " + port); IoStream stream = ((Callable) () -> SerialIoStreamJSerialComm.openPort(port)).call(); if (stream == null) { // error already reported @@ -234,7 +237,7 @@ public class LinkManager implements Closeable { return stream; } }; - setConnector(new StreamConnector(this, port, ioStreamCallable)); + setConnector(new StreamConnector(this, ioStreamCallable)); } } diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java b/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java index 3434bc88eb..d0a49e8c1a 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/PortHolder.java @@ -3,7 +3,6 @@ package com.rusefi.io.serial; import com.devexperts.logging.Logging; import com.rusefi.Callable; import com.rusefi.binaryprotocol.BinaryProtocol; -import com.rusefi.core.MessagesCentral; import com.rusefi.io.ConnectionStateListener; import com.opensr5.io.DataListener; import com.rusefi.io.IoStream; @@ -25,30 +24,23 @@ public class PortHolder { private static final Logging log = getLogging(PortHolder.class); private final DataListener dataListener; - private final Callable ioStreamCallable; + private final Callable ioStreamFactory; private final LinkManager linkManager; public ConnectionStateListener listener; private final Object portLock = new Object(); - private final String port; @Nullable private BinaryProtocol bp; - protected PortHolder(String port, LinkManager linkManager, Callable ioStreamCallable) { - this.port = port; + protected PortHolder(LinkManager linkManager, Callable ioStreamFactory) { this.linkManager = linkManager; dataListener = freshData -> linkManager.getEngineState().processNewData(new String(freshData), LinkManager.ENCODER); - this.ioStreamCallable = ioStreamCallable; + this.ioStreamFactory = ioStreamFactory; } boolean connectAndReadConfiguration() { - if (port == null) - return false; - - MessagesCentral.getInstance().postMessage(getClass(), "Opening port: " + port); - - IoStream stream = ioStreamCallable.call(); + IoStream stream = ioStreamFactory.call(); if (stream == null) { // error already reported return false; diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java index ae0c2c0d10..b535f73786 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java @@ -21,10 +21,10 @@ public class StreamConnector implements LinkConnector { private final PortHolder portHolder; private final LinkManager linkManager; - public StreamConnector(LinkManager linkManager, String portName, Callable ioStreamCallable) { + public StreamConnector(LinkManager linkManager, Callable ioStreamCallable) { this.linkManager = linkManager; - portHolder = new PortHolder(portName, linkManager, ioStreamCallable); + portHolder = new PortHolder(linkManager, ioStreamCallable); } @Override