From 825ed7b71af0dd4bf731f5ce6c0c801e3a5bae9b Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 8 Jul 2020 22:10:06 -0400 Subject: [PATCH] proxy progress --- java_console/io/src/main/java/com/rusefi/io/IoStream.java | 2 -- .../io/src/main/java/com/rusefi/io/LinkManager.java | 2 -- .../com/rusefi/io/serial/SerialIoStreamJSerialComm.java | 8 ++------ .../io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java | 7 +------ 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/io/IoStream.java b/java_console/io/src/main/java/com/rusefi/io/IoStream.java index c5cfc5b26f..ae1788659b 100644 --- a/java_console/io/src/main/java/com/rusefi/io/IoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/IoStream.java @@ -50,7 +50,5 @@ public interface IoStream extends WriteStream { void close(); - void setDataBuffer(IncomingDataBuffer dataBuffer); - IncomingDataBuffer getDataBuffer(); } 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 52769f1ef6..a580d8d956 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 @@ -211,8 +211,6 @@ public class LinkManager { // error already reported return null; } - IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(stream, logger); - stream.setDataBuffer(dataBuffer); return stream; } }; diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStreamJSerialComm.java b/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStreamJSerialComm.java index 2ed234a298..7e417a1b47 100644 --- a/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStreamJSerialComm.java +++ b/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStreamJSerialComm.java @@ -19,7 +19,7 @@ public class SerialIoStreamJSerialComm implements IoStream { private SerialPort sp; private final String port; private final Logger logger; - private IncomingDataBuffer dataBuffer; + private final IncomingDataBuffer dataBuffer; /** * @see #openPort(String, Logger) @@ -28,6 +28,7 @@ public class SerialIoStreamJSerialComm implements IoStream { this.sp = sp; this.port = port; this.logger = logger; + this.dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger); } @Override @@ -61,11 +62,6 @@ public class SerialIoStreamJSerialComm implements IoStream { return isClosed; } - @Override - public void setDataBuffer(IncomingDataBuffer dataBuffer) { - this.dataBuffer = dataBuffer; - } - @Override public IncomingDataBuffer getDataBuffer() { return dataBuffer; diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java index 2b909ca02b..b9bfaa1727 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java @@ -21,7 +21,7 @@ public class TcpIoStream implements IoStream { private final OutputStream output; private final Logger logger; private boolean isClosed; - private IncomingDataBuffer dataBuffer; + private final IncomingDataBuffer dataBuffer; public TcpIoStream(Logger logger, Socket socket) throws IOException { InputStream input = new BufferedInputStream(socket.getInputStream()); @@ -34,11 +34,6 @@ public class TcpIoStream implements IoStream { this.output = output; this.input = input; IncomingDataBuffer dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger); - setDataBuffer(dataBuffer); - } - - @Override - public void setDataBuffer(IncomingDataBuffer dataBuffer) { this.dataBuffer = dataBuffer; }