From 53e44ed32227a6f6842f3a8828dcb4171dd9a17d Mon Sep 17 00:00:00 2001 From: rusefi Date: Sat, 11 Sep 2021 17:33:21 -0400 Subject: [PATCH] bundle name into DFU window title --- .../ui/src/main/java/com/rusefi/StartupFrame.java | 9 +++++++-- .../src/main/java/com/rusefi/maintenance/DfuFlasher.java | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java index a4aa069c13..12fa8fa993 100644 --- a/java_console/ui/src/main/java/com/rusefi/StartupFrame.java +++ b/java_console/ui/src/main/java/com/rusefi/StartupFrame.java @@ -69,8 +69,7 @@ public class StartupFrame { public StartupFrame() { // AudioPlayback.start(); String title = "rusEFI console version " + Launcher.CONSOLE_VERSION; - String bundleName = Autoupdate.readBundleFullName(); - frame = new JFrame(title + " " + (bundleName != null ? bundleName : "Unknown bundle")); + frame = new JFrame(appendBundleName(title)); frame.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); frame.addWindowListener(new WindowAdapter() { @Override @@ -85,6 +84,12 @@ public class StartupFrame { SerialPortScanner.INSTANCE.startTimer(); } + @NotNull + public static String appendBundleName(String title) { + String bundleName = Autoupdate.readBundleFullName(); + return title + " " + (bundleName != null ? bundleName : "Unknown bundle"); + } + public void chooseSerialPort() { realHardwarePanel.setBorder(new TitledBorder(BorderFactory.createLineBorder(Color.darkGray), "Real stm32")); miscPanel.setBorder(new TitledBorder(BorderFactory.createLineBorder(Color.darkGray), "Miscellaneous")); diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java index 79c2291758..611b1c570d 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/DfuFlasher.java @@ -18,6 +18,8 @@ import java.awt.event.ActionListener; import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; +import static com.rusefi.StartupFrame.appendBundleName; + /** * @see FirmwareFlasher */ @@ -69,14 +71,14 @@ public class DfuFlasher { } } StatusWindow wnd = new StatusWindow(); - wnd.showFrame("DFU status " + Launcher.CONSOLE_VERSION); + wnd.showFrame(appendBundleName("DFU status " + Launcher.CONSOLE_VERSION)); wnd.appendMsg(messages.toString()); ExecHelper.submitAction(() -> executeDFU(wnd), DfuFlasher.class + " thread"); } public static void runDfuProgramming() { StatusWindow wnd = new StatusWindow(); - wnd.showFrame("DFU status " + Launcher.CONSOLE_VERSION); + wnd.showFrame(appendBundleName("DFU status " + Launcher.CONSOLE_VERSION)); ExecHelper.submitAction(() -> executeDFU(wnd), DfuFlasher.class + " thread"); }