From ae4e0f75b73c245786d5b3db2198fd3cbd0195c6 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Wed, 8 Dec 2021 19:35:30 -0500
Subject: [PATCH] minor refactoring

---
 .../io/src/main/java/com/rusefi/io/LinkManager.java    |  3 +--
 .../ui/src/main/java/com/rusefi/ConsoleUI.java         | 10 ++++++----
 .../src/main/java/com/rusefi/ui/console/MainFrame.java |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

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 c2a0904c16..10336fb9ea 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
@@ -7,11 +7,10 @@ import com.rusefi.NamedThreadFactory;
 import com.rusefi.binaryprotocol.BinaryProtocol;
 import com.rusefi.binaryprotocol.BinaryProtocolState;
 import com.rusefi.core.EngineState;
-import com.rusefi.io.serial.StreamConnector;
 import com.rusefi.io.serial.BufferedSerialIoStream;
+import com.rusefi.io.serial.StreamConnector;
 import com.rusefi.io.tcp.TcpConnector;
 import com.rusefi.io.tcp.TcpIoStream;
-import jdk.nashorn.internal.runtime.regexp.joni.constants.Arguments;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.Closeable;
diff --git a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
index c82f72c34e..1ff0cbf48e 100644
--- a/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
+++ b/java_console/ui/src/main/java/com/rusefi/ConsoleUI.java
@@ -39,7 +39,6 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
  */
 public class ConsoleUI {
     private static final int DEFAULT_TAB_INDEX = 0;
-    public String port;
     private static SensorCentral.SensorListener wrongVersionListener;
 
     public static final String TAB_INDEX = "main_tab";
@@ -50,8 +49,7 @@ public class ConsoleUI {
     static Frame staticFrame;
 
     private final TabbedPanel tabbedPane;
-
-    private final MainFrame mainFrame;
+    private final String port;
 
     public final UIContext uiContext = new UIContext();
 
@@ -67,7 +65,7 @@ public class ConsoleUI {
     public ConsoleUI(String port) {
         tabbedPane = new TabbedPanel(uiContext);
         this.port = port;
-        mainFrame = new MainFrame(this, tabbedPane);
+        MainFrame mainFrame = new MainFrame(this, tabbedPane);
         ConsoleUI.staticFrame = mainFrame.getFrame().getFrame();
         setFrameIcon(ConsoleUI.staticFrame);
         FileLog.MAIN.logLine("Console " + CONSOLE_VERSION);
@@ -182,6 +180,10 @@ public class ConsoleUI {
         mainFrame.getFrame().showFrame(tabbedPane.tabbedPane);
     }
 
+    public String getPort() {
+        return port;
+    }
+
     static void startUi(String[] args) throws InterruptedException, InvocationTargetException {
         FileLog.MAIN.start();
 
diff --git a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
index 2812b484a3..e8beff741d 100644
--- a/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
+++ b/java_console/ui/src/main/java/com/rusefi/ui/console/MainFrame.java
@@ -111,7 +111,7 @@ public class MainFrame {
         String disconnected = ConnectionStatusLogic.INSTANCE.isConnected() ? "" : "DISCONNECTED ";
         BinaryProtocol bp = consoleUI.uiContext.getLinkManager().getCurrentStreamState();
         String signature = bp == null ? "not loaded" : bp.signature;
-        frame.getFrame().setTitle(disconnected + "Console " + Launcher.CONSOLE_VERSION + "; firmware=" + Launcher.firmwareVersion.get() + "@" + consoleUI.port + " " + signature);
+        frame.getFrame().setTitle(disconnected + "Console " + Launcher.CONSOLE_VERSION + "; firmware=" + Launcher.firmwareVersion.get() + "@" + consoleUI.getPort() + " " + signature);
     }
 
     private void windowClosedHandler() {