From 9cd91aafcb81515aafd18ba5f035716f78738c36 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 8 Jul 2020 20:09:07 -0400 Subject: [PATCH] proxy progress --- .../io/src/main/java/com/rusefi/io/LinkManager.java | 6 +++--- .../serial/{SerialConnector.java => StreamConnector.java} | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) rename java_console/io/src/main/java/com/rusefi/io/serial/{SerialConnector.java => StreamConnector.java} (91%) 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 c69bb64b47..992e6fe6dc 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,7 +7,7 @@ import com.rusefi.NamedThreadFactory; import com.rusefi.binaryprotocol.BinaryProtocol; import com.rusefi.binaryprotocol.BinaryProtocolState; import com.rusefi.core.EngineState; -import com.rusefi.io.serial.SerialConnector; +import com.rusefi.io.serial.StreamConnector; import com.rusefi.io.serial.SerialIoStreamJSerialComm; import com.rusefi.io.tcp.TcpConnector; import com.rusefi.io.tcp.TcpIoStream; @@ -179,7 +179,7 @@ public class LinkManager { if (isLogViewerMode(port)) { setConnector(LinkConnector.VOID); } else if (TcpConnector.isTcpPort(port)) { - setConnector(new SerialConnector(this, port, logger, new Callable() { + setConnector(new StreamConnector(this, port, logger, new Callable() { @Override public IoStream call() { Socket socket; @@ -196,7 +196,7 @@ public class LinkManager { })); isSimulationMode = true; } else { - setConnector(new SerialConnector(this, port, logger, () -> SerialIoStreamJSerialComm.openPort(port, logger))); + setConnector(new StreamConnector(this, port, logger, () -> SerialIoStreamJSerialComm.openPort(port, logger))); } } diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/SerialConnector.java b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java similarity index 91% rename from java_console/io/src/main/java/com/rusefi/io/serial/SerialConnector.java rename to java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java index c954501f2a..f95bbfd546 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/SerialConnector.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/StreamConnector.java @@ -14,13 +14,13 @@ import com.rusefi.io.LinkManager; * @author Andrey Belomutskiy * 3/3/14 */ -public class SerialConnector implements LinkConnector { +public class StreamConnector implements LinkConnector { private final PortHolder portHolder; private final Logger logger; private final LinkManager linkManager; - public SerialConnector(LinkManager linkManager, String portName, Logger logger, Callable streamFactory) { + public StreamConnector(LinkManager linkManager, String portName, Logger logger, Callable streamFactory) { this.linkManager = linkManager; this.logger = logger; @@ -43,7 +43,7 @@ public class SerialConnector implements LinkConnector { @Override public void connectAndReadConfiguration(ConnectionStateListener listener) { - logger.info("SerialConnector: connecting"); + logger.info("StreamConnector: connecting"); portHolder.listener = listener; logger.info("scheduleOpening"); linkManager.execute(new Runnable() { @@ -70,7 +70,7 @@ public class SerialConnector implements LinkConnector { linkManager.execute(new Runnable() { @Override public void run() { - MessagesCentral.getInstance().postMessage(logger, SerialConnector.this.getClass(), "Restarting serial IO"); + MessagesCentral.getInstance().postMessage(logger, StreamConnector.this.getClass(), "Restarting serial IO"); portHolder.close(); portHolder.connectAndReadConfiguration(); }