From 3b399ab655269e835dca9bf9415f21b4d7e25db9 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 8 Jul 2020 20:07:28 -0400 Subject: [PATCH] proxy progress one more go? it makes no sense :( --- .../io/src/main/java/com/rusefi/io/serial/PortHolder.java | 8 ++------ .../main/java/com/rusefi/io/serial/SerialConnector.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) 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 5efd7c900e..c2accd98b3 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.opensr5.Logger; import com.rusefi.Callable; import com.rusefi.binaryprotocol.BinaryProtocol; -import com.rusefi.binaryprotocol.IncomingDataBuffer; import com.rusefi.core.MessagesCentral; import com.rusefi.io.ConnectionStateListener; import com.opensr5.io.DataListener; @@ -23,24 +22,21 @@ import java.awt.*; public class PortHolder { private final DataListener dataListener; private final Logger logger; - private final Callable streamFactory; private final Callable ioStreamCallable; private final LinkManager linkManager; public ConnectionStateListener listener; private final Object portLock = new Object(); private final String port; - private IoStream stream; @Nullable private BinaryProtocol bp; - protected PortHolder(String port, LinkManager linkManager, Logger logger, Callable streamFactory, Callable ioStreamCallable) { + protected PortHolder(String port, LinkManager linkManager, Logger logger, Callable ioStreamCallable) { this.port = port; this.linkManager = linkManager; dataListener = freshData -> linkManager.getEngineState().processNewData(new String(freshData), LinkManager.ENCODER); this.logger = logger; - this.streamFactory = streamFactory; this.ioStreamCallable = ioStreamCallable; } @@ -50,7 +46,7 @@ public class PortHolder { MessagesCentral.getInstance().postMessage(logger, getClass(), "Opening port: " + port); - stream = ioStreamCallable.call(); + IoStream stream = ioStreamCallable.call(); if (stream == null) { // error already reported return false; 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/SerialConnector.java index b2dfe36a4c..c954501f2a 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/SerialConnector.java @@ -38,7 +38,7 @@ public class SerialConnector implements LinkConnector { } }; - portHolder = new PortHolder(portName, linkManager, logger, streamFactory, ioStreamCallable); + portHolder = new PortHolder(portName, linkManager, logger, ioStreamCallable); } @Override