From 2ac19f52793eead145571ab9a08de7461fb2d20d Mon Sep 17 00:00:00 2001 From: kifir23917 Date: Mon, 20 Jan 2025 23:11:08 +0300 Subject: [PATCH] refactoring: rename `StatusConsumer.append` method into 'appendStatus` to distinguish it from `UpdateStatusWindow.append` method #7199 --- .../io/src/main/java/com/rusefi/io/can/PCanIoStream.java | 6 +++--- .../main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java | 2 +- .../main/java/com/rusefi/io/tcp/BinaryProtocolServer.java | 2 +- .../io/src/main/java/com/rusefi/ui/StatusConsumer.java | 2 +- java_console/ui/src/main/java/MassUpdater.java | 6 +++--- .../main/java/com/rusefi/tools/CANConnectorStartup.java | 8 +++----- .../ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java | 2 +- 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/java_console/io/src/main/java/com/rusefi/io/can/PCanIoStream.java b/java_console/io/src/main/java/com/rusefi/io/can/PCanIoStream.java index 259b58aa7b..ebe69cd627 100644 --- a/java_console/io/src/main/java/com/rusefi/io/can/PCanIoStream.java +++ b/java_console/io/src/main/java/com/rusefi/io/can/PCanIoStream.java @@ -59,10 +59,10 @@ public class PCanIoStream extends AbstractIoStream { PCANBasic can = PCanHelper.create(); TPCANStatus status = PCanHelper.init(can); if (status != TPCANStatus.PCAN_ERROR_OK) { - statusListener.append("Error initializing PCAN: " + status); + statusListener.appendStatus("Error initializing PCAN: " + status); return null; } - statusListener.append("Creating PCAN stream..."); + statusListener.appendStatus("Creating PCAN stream..."); return new PCanIoStream(can, statusListener); } @@ -75,7 +75,7 @@ public class PCanIoStream extends AbstractIoStream { TPCANStatus status = PCanHelper.send(can, isoTpConnector.canId(), payLoad); if (status != TPCANStatus.PCAN_ERROR_OK) { - statusListener.append("Unable to write the CAN message: " + status); + statusListener.appendStatus("Unable to write the CAN message: " + status); System.exit(0); } // log.info("Send OK! length=" + payLoad.length); diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java index adc6d861ea..605bc52b60 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolProxy.java @@ -44,7 +44,7 @@ public class BinaryProtocolProxy { clientStream = new TcpIoStream("[[proxy]] ", clientSocket); runProxy(targetEcuSocket, clientStream, clientApplicationActivityListener, USER_IO_TIMEOUT); } catch (IOException e) { - statusConsumer.append("ERROR BinaryProtocolProxy::run " + e); + statusConsumer.appendStatus("ERROR BinaryProtocolProxy::run " + e); close(clientStream); } }; diff --git a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java index ba61fc3024..8d8907e877 100644 --- a/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java +++ b/java_console/io/src/main/java/com/rusefi/io/tcp/BinaryProtocolServer.java @@ -97,7 +97,7 @@ public class BinaryProtocolServer { public static ServerSocketReference tcpServerSocket(int port, String threadName, CompatibleFunction socketRunnableFactory, Listener serverSocketCreationCallback, StatusConsumer statusConsumer) throws IOException { return tcpServerSocket(socketRunnableFactory, port, threadName, serverSocketCreationCallback, p -> { ServerSocket serverSocket = new ServerSocket(p); - statusConsumer.append("ServerSocket " + p + " created. Feel free to point TS at IP Address 'localhost' port " + p); + statusConsumer.appendStatus("ServerSocket " + p + " created. Feel free to point TS at IP Address 'localhost' port " + p); return serverSocket; }); } diff --git a/java_console/io/src/main/java/com/rusefi/ui/StatusConsumer.java b/java_console/io/src/main/java/com/rusefi/ui/StatusConsumer.java index 8f8475b7cb..73cfd3e646 100644 --- a/java_console/io/src/main/java/com/rusefi/ui/StatusConsumer.java +++ b/java_console/io/src/main/java/com/rusefi/ui/StatusConsumer.java @@ -18,7 +18,7 @@ public interface StatusConsumer { StatusConsumer VOID = (status, breakLineOnTextArea, sendToLogger) -> { }; - default void append(String status) { + default void appendStatus(String status) { appendStatus(status, true, true); } diff --git a/java_console/ui/src/main/java/MassUpdater.java b/java_console/ui/src/main/java/MassUpdater.java index 6d1ad96b82..53eb72e18a 100644 --- a/java_console/ui/src/main/java/MassUpdater.java +++ b/java_console/ui/src/main/java/MassUpdater.java @@ -31,7 +31,7 @@ public class MassUpdater { SerialPortScanner.INSTANCE.addListener(currentHardware -> { if (!isUsingDfu.get() && currentHardware.isDfuFound() != previousDfuState.get()) { - mainStatus.append(currentHardware.isDfuFound() ? "I see a DFU device!" : "No DFU..."); + mainStatus.appendStatus(currentHardware.isDfuFound() ? "I see a DFU device!" : "No DFU..."); if (currentHardware.isDfuFound()) { isUsingDfu.set(true); UpdateOperationCallbacks releaseSemaphore = new UpdateOperationCallbacks() { @@ -60,14 +60,14 @@ public class MassUpdater { for (Iterator it = knownBlts.iterator(); it.hasNext(); ) { String port = it.next(); if (!currentSet.contains(port)) { - mainStatus.append(port + ": No longer present"); + mainStatus.appendStatus(port + ": No longer present"); it.remove(); } } for (SerialPortScanner.PortResult openBltPort : currentBltList) { if (!knownBlts.contains(openBltPort.port)) { knownBlts.add(openBltPort.port); - mainStatus.append("New OpenBlt " + openBltPort); + mainStatus.appendStatus("New OpenBlt " + openBltPort); SwingUtilities.invokeLater(() -> AsyncJobExecutor.INSTANCE.executeJob(new OpenBltManualJob(openBltPort, mainStatus.getContent()))); } diff --git a/java_console/ui/src/main/java/com/rusefi/tools/CANConnectorStartup.java b/java_console/ui/src/main/java/com/rusefi/tools/CANConnectorStartup.java index 55a73654dd..8dcc87a9ee 100644 --- a/java_console/ui/src/main/java/com/rusefi/tools/CANConnectorStartup.java +++ b/java_console/ui/src/main/java/com/rusefi/tools/CANConnectorStartup.java @@ -1,11 +1,9 @@ package com.rusefi.tools; import com.rusefi.binaryprotocol.BinaryProtocol; -import com.rusefi.config.generated.Integration; import com.rusefi.io.serial.AbstractIoStream; import com.rusefi.io.serial.RateCounter; import com.rusefi.io.tcp.BinaryProtocolProxy; -import com.rusefi.io.tcp.BinaryProtocolServer; import com.rusefi.io.tcp.TcpConnector; import com.rusefi.ui.StatusConsumer; @@ -23,9 +21,9 @@ public class CANConnectorStartup { String signature = BinaryProtocol.getSignature(tsStream); if (signature == null) { - statusListener.append("Error: no ECU signature from " + tsStream); + statusListener.appendStatus("Error: no ECU signature from " + tsStream); } else { - statusListener.append("Got [" + signature + "] ECU signature via " + tsStream); + statusListener.appendStatus("Got [" + signature + "] ECU signature via " + tsStream); } Map rateCounters = new HashMap<>(); @@ -35,7 +33,7 @@ public class CANConnectorStartup { for (Map.Entry e : rateCounters.entrySet()) { String name = BinaryProtocol.findCommand(e.getKey()); - statusListener.append(new Date() + ": Command " + name + ": " + e.getValue().getCurrentRate()); + statusListener.appendStatus(new Date() + ": Command " + name + ": " + e.getValue().getCurrentRate()); } } }); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java b/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java index 444e427f20..b6fdd3ec5a 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/PcanConnectorUI.java @@ -48,7 +48,7 @@ public class PcanConnectorUI { if (stream != null) CANConnectorStartup.start(stream, statusConsumer); } catch (IOException e) { - statusConsumer.append("Error " + e); + statusConsumer.appendStatus("Error " + e); } }).start();