From 93f56e1b275a82fff5988cc53bd00050c45f10e7 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Wed, 8 Jul 2020 19:39:00 -0400
Subject: [PATCH] Revert "proxy progress one more go? it makes no sense :("

This reverts commit dc5be4f0
---
 java_console/io/src/main/java/com/rusefi/io/IoStream.java | 3 ---
 .../com/rusefi/io/serial/SerialIoStreamJSerialComm.java   | 8 --------
 .../io/src/main/java/com/rusefi/io/tcp/TcpIoStream.java   | 8 --------
 .../java/com/rusefi/autodetect/SerialAutoChecker.java     | 2 +-
 .../ui/src/main/java/com/rusefi/tools/ConsoleTools.java   | 2 +-
 5 files changed, 2 insertions(+), 21 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 dd511f8b29..58f9c5f4be 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
@@ -4,7 +4,6 @@ import com.opensr5.Logger;
 import com.opensr5.io.DataListener;
 import com.opensr5.io.WriteStream;
 import com.rusefi.binaryprotocol.BinaryProtocol;
-import com.rusefi.binaryprotocol.IncomingDataBuffer;
 import com.rusefi.binaryprotocol.IoHelper;
 
 import java.io.IOException;
@@ -41,8 +40,6 @@ public interface IoStream extends WriteStream {
         write(packet);
     }
 
-    IncomingDataBuffer getDataBuffer();
-
     /**
      * @param listener would be invoked from unknown implementation-dependent thread
      */
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 13e53c21dd..91352f2d1c 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
@@ -5,7 +5,6 @@ import com.fazecast.jSerialComm.SerialPortDataListener;
 import com.fazecast.jSerialComm.SerialPortEvent;
 import com.opensr5.Logger;
 import com.opensr5.io.DataListener;
-import com.rusefi.binaryprotocol.IncomingDataBuffer;
 import com.rusefi.io.IoStream;
 
 /**
@@ -19,7 +18,6 @@ public class SerialIoStreamJSerialComm implements IoStream {
     private SerialPort sp;
     private final String port;
     private final Logger logger;
-    private final IncomingDataBuffer dataBuffer;
 
     /**
      * @see #openPort(String, Logger)
@@ -28,12 +26,6 @@ public class SerialIoStreamJSerialComm implements IoStream {
         this.sp = sp;
         this.port = port;
         this.logger = logger;
-        dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
-    }
-
-    @Override
-    public IncomingDataBuffer getDataBuffer() {
-        return dataBuffer;
     }
 
     @Override
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 58dba9dd3f..c43af15fe5 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
@@ -2,7 +2,6 @@ package com.rusefi.io.tcp;
 
 import com.opensr5.Logger;
 import com.opensr5.io.DataListener;
-import com.rusefi.binaryprotocol.IncomingDataBuffer;
 import com.rusefi.io.ByteReader;
 import com.rusefi.io.IoStream;
 
@@ -21,7 +20,6 @@ public class TcpIoStream implements IoStream {
     private final OutputStream output;
     private final Logger logger;
     private boolean isClosed;
-    private final IncomingDataBuffer dataBuffer;
 
     public TcpIoStream(Logger logger, Socket socket) throws IOException {
         this(logger, new BufferedInputStream(socket.getInputStream()), socket.getOutputStream());
@@ -35,12 +33,6 @@ public class TcpIoStream implements IoStream {
             throw new NullPointerException("output");
         this.output = output;
         this.input = input;
-        dataBuffer = IncomingDataBuffer.createDataBuffer(this, logger);
-    }
-
-    @Override
-    public IncomingDataBuffer getDataBuffer() {
-        return dataBuffer;
     }
 
     @Override
diff --git a/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java b/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
index 620e4f3a9b..cbe5885cbc 100644
--- a/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
+++ b/java_console/ui/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
@@ -39,7 +39,7 @@ public class SerialAutoChecker implements Runnable {
     public void run() {
         IoStream stream = SerialIoStreamJSerialComm.openPort(serialPort, logger);
         Logger logger = FileLog.LOGGER;
-        IncomingDataBuffer incomingData = stream.getDataBuffer();
+        IncomingDataBuffer incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
         try {
             stream.sendPacket(new byte[]{BinaryProtocolCommands.COMMAND_HELLO}, logger);
             byte[] response = incomingData.getPacket(logger, "", false);
diff --git a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
index 880505bd44..56aea4ec75 100644
--- a/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
+++ b/java_console/ui/src/main/java/com/rusefi/tools/ConsoleTools.java
@@ -308,7 +308,7 @@ public class ConsoleTools {
         }
         IoStream stream = SerialIoStreamJSerialComm.openPort(autoDetectedPort, FileLog.LOGGER);
         Logger logger = FileLog.LOGGER;
-        IncomingDataBuffer incomingData = stream.getDataBuffer();
+        IncomingDataBuffer incomingData = IncomingDataBuffer.createDataBuffer(stream, logger);
         byte[] commandBytes = BinaryProtocol.getTextCommandBytes("hello");
         stream.sendPacket(commandBytes, logger);
         // skipping response