From f3ef48b6d2a4b6f10b35017f967af28f131f228a Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 31 Mar 2024 22:31:16 -0400 Subject: [PATCH] only: code duplication or bugfix? --- .../java/com/rusefi/maintenance/ProgramSelector.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java index 741e0001a8..e0b934f659 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java @@ -12,6 +12,7 @@ import com.rusefi.io.UpdateOperationCallbacks; import com.rusefi.core.ui.AutoupdateUtil; import com.rusefi.ui.util.URLLabel; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; @@ -139,12 +140,12 @@ public class ProgramSelector { OpenbltJni.OpenbltCallbacks cb = makeOpenbltCallbacks(callbacks); try { - OpenbltJni.flashCan("../../rusefi_update.srec", cb); + OpenbltJni.flashCan(findSrecFile(), cb); callbacks.log("Update completed successfully!"); callbacks.done(); } catch (Throwable e) { - callbacks.log("Error: " + e.toString()); + callbacks.log("Error: " + e); callbacks.error(); } finally { OpenbltJni.stop(cb); @@ -224,7 +225,7 @@ public class ProgramSelector { OpenbltJni.OpenbltCallbacks cb = makeOpenbltCallbacks(callbacks); try { - String fileName = IniFileModel.findFile("..", "rusefi", "srec"); + String fileName = findSrecFile(); callbacks.log("flashSerial " + fileName); OpenbltJni.flashSerial(fileName, port, cb); @@ -238,6 +239,11 @@ public class ProgramSelector { } } + @Nullable + private static String findSrecFile() { + return IniFileModel.findFile("..", "rusefi", "srec"); + } + @NotNull public static JComponent createHelpButton() { return new URLLabel("HOWTO Update Firmware", HELP);