big crusty

FOME-Tech · Nov 26, 2023 · d624e4d · d624e4d
1 parent c7c9f4e
commit d624e4d
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 150 deletions.
diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java b/java_console/io/src/main/java/com/rusefi/autodetect/PortDetector.java
@@ -4,16 +4,13 @@
 import com.rusefi.NamedThreadFactory;
 import com.rusefi.io.LinkManager;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
 
 /**
  * Andrey Belomutskiy, (c) 2013-2020

diff --git a/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java b/java_console/io/src/main/java/com/rusefi/autodetect/SerialAutoChecker.java
@@ -9,7 +9,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.util.function.Function;
 
 import static com.rusefi.binaryprotocol.IoHelper.checkResponseCode;
 

diff --git a/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java b/java_console/io/src/main/java/com/rusefi/binaryprotocol/BinaryProtocol.java
@@ -3,7 +3,6 @@
 import com.devexperts.logging.Logging;
 import com.opensr5.ConfigurationImage;
 import com.opensr5.io.DataListener;
-import com.rusefi.ConfigurationImageDiff;
 import com.rusefi.NamedThreadFactory;
 import com.rusefi.core.SignatureHelper;
 import com.rusefi.Timeouts;
@@ -19,9 +18,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
 import java.util.concurrent.*;
 
 import static com.devexperts.logging.Logging.getLogging;

diff --git a/java_console/io/src/main/java/com/rusefi/io/CommandQueue.java b/java_console/io/src/main/java/com/rusefi/io/CommandQueue.java
@@ -151,10 +151,6 @@ public void write(String command, int timeout) {
         write(command, timeout, InvocationConfirmationListener.VOID);
     }
 
-    public void write(String command, InvocationConfirmationListener listener) {
-        write(command, DEFAULT_TIMEOUT, listener, true);
-    }
-
     public void write(String command, int timeoutMs, InvocationConfirmationListener listener) {
         write(command, timeoutMs, listener, true);
     }

diff --git a/java_console/io/src/main/java/com/rusefi/io/commands/Command.java b/java_console/io/src/main/java/com/rusefi/io/commands/Command.java
diff --git a/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java b/java_console/io/src/main/java/com/rusefi/io/commands/HelloCommand.java
@@ -11,7 +11,7 @@
 
 import static com.rusefi.binaryprotocol.IoHelper.checkResponseCode;
 
-public class HelloCommand implements Command {
+public class HelloCommand {
     private final String tsSignature;
 
     public HelloCommand(String tsSignature) {
@@ -35,12 +35,10 @@ public static String getStringResponse(String msg, IncomingDataBuffer incomingDa
         return new String(response, 1, response.length - 1);
     }
 
-    @Override
     public byte getCommand() {
         return Fields.TS_HELLO_COMMAND;
     }
 
-    @Override
     public void handle(IoStream stream) throws IOException {
         stream.sendPacket((BinaryProtocolServer.TS_OK + tsSignature).getBytes());
     }

diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/RateCounter.java b/java_console/io/src/main/java/com/rusefi/io/serial/RateCounter.java
diff --git a/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStream.java b/java_console/io/src/main/java/com/rusefi/io/serial/SerialIoStream.java
@@ -35,13 +35,6 @@ public SerialIoStream(@Nullable SerialPort sp, String port) {
         this.port = port;
     }
 
-    public static IoStream openPort(String port) {
-        log.info("[SerialIoStream] openPort " + port);
-        SerialPort serialPort = openSerial(port);
-//        FileLog.LOGGER.info("[SerialIoStreamJSerialComm] opened " + port);
-        return new SerialIoStream(serialPort, port);
-    }
-
     @Nullable
     protected static SerialPort openSerial(String port) {
         SerialPort serialPort = SerialPort.getCommPort(port);

diff --git a/java_console/io/src/test/java/com/rusefi/io/serial/RateCounterTest.java b/java_console/io/src/test/java/com/rusefi/io/serial/RateCounterTest.java
diff --git a/java_console/io/src/testFixtures/java/com/rusefi/MockitoTestHelper.java b/java_console/io/src/testFixtures/java/com/rusefi/MockitoTestHelper.java
diff --git a/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java b/java_console/io/src/testFixtures/java/com/rusefi/TestHelper.java
@@ -28,7 +28,7 @@
 import static com.rusefi.io.tcp.TcpConnector.LOCALHOST;
 import org.junit.Assert;
 
-public class TestHelper extends MockitoTestHelper {
+public class TestHelper {
     private static final Logging log = getLogging(TestHelper.class);
     public static final String TEST_SIGNATURE_1 = "rusEFI master.2020.07.06.frankenso_na6.2468827536";
     public static final String TEST_SIGNATURE_2 = "rusEFI master.2020.07.11.proteus_f4.1986715563";

diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
@@ -1,7 +1,6 @@
 package com.rusefi;
 
 import com.devexperts.logging.Logging;
-import com.rusefi.autodetect.PortDetector;
 import com.rusefi.core.MessagesCentral;
 import com.rusefi.io.CommandQueue;
 import com.rusefi.io.LinkManager;

diff --git a/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java b/java_console/ui/src/main/java/com/rusefi/ui/RecentCommands.java
@@ -1,18 +1,14 @@
 package com.rusefi.ui;
 
 import com.devexperts.logging.Logging;
-import com.rusefi.AverageAnglesUtil;
 import com.rusefi.config.generated.Fields;
-import com.rusefi.core.MessagesCentral;
 import com.rusefi.io.CommandQueue;
 import com.rusefi.ui.util.UiUtils;
 
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.IOException;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;

diff --git a/java_console/ui/src/main/java/com/rusefi/ui/RpmLabel.java b/java_console/ui/src/main/java/com/rusefi/ui/RpmLabel.java
@@ -66,12 +66,11 @@ public JPanel getContent() {
         return content;
     }
 
-    public RpmLabel setSize(int size) {
+    public void setSize(int size) {
         Font f = rpmCaption.getFont();
         int fontSize = size * f.getSize();
         Font font = new Font(f.getName(), f.getStyle(), fontSize);
         setFont(font);
-        return this;
     }
 
     private void setFont(Font font) {

diff --git a/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java b/java_console/ui/src/main/java/com/rusefi/ui/console/TabbedPanel.java
@@ -3,13 +3,10 @@
 import com.rusefi.config.generated.Fields;
 import com.rusefi.core.MessagesCentral;
 import com.rusefi.io.ConnectionStatusLogic;
-import com.rusefi.ui.UIContext;
 
 import javax.swing.*;
 import java.awt.*;
 
-import static com.rusefi.core.preferences.storage.PersistentConfiguration.getConfig;
-
 public class TabbedPanel {
     // todo: the logic around 'criticalError' could be implemented nicer
     private String criticalError;

diff --git a/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java b/java_console/ui/src/main/java/com/rusefi/ui/util/UiUtils.java
@@ -15,13 +15,9 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.URLStreamHandlerFactory;
 
 import static com.rusefi.ui.util.LocalizedMessages.CLEAR;
 import static com.rusefi.ui.util.LocalizedMessages.PAUSE;

diff --git a/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java b/java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
@@ -1,6 +1,5 @@
 package com.rusefi.ui.widgets;
 
-import com.rusefi.NamedThreadFactory;
 import com.rusefi.io.CommandQueue;
 import com.rusefi.ui.RecentCommands;
 import com.rusefi.ui.UIContext;
@@ -16,7 +15,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**