diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/DriverInstall.java b/java_console/ui/src/main/java/com/rusefi/maintenance/DriverInstall.java index 1b6a15c1a4..7370b79b7c 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/DriverInstall.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/DriverInstall.java @@ -38,7 +38,7 @@ public class DriverInstall { if (dialogResult != JOptionPane.YES_OPTION) return; - final UpdateOperationCallbacks wnd = StatusWindow.createAndShowFrame("Windows rusEFI ST Drivers").getContent(); + final UpdateOperationCallbacks wnd = StatusWindow.createAndShowFrame("Windows rusEFI ST Drivers"); ExecHelper.submitAction(() -> installDrivers(wnd), getClass() + " thread"); diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/jobs/AsyncJobExecutor.java b/java_console/ui/src/main/java/com/rusefi/maintenance/jobs/AsyncJobExecutor.java index 46c6b8e446..86d62da1df 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/jobs/AsyncJobExecutor.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/jobs/AsyncJobExecutor.java @@ -16,7 +16,7 @@ public enum AsyncJobExecutor { } public void executeJob(final AsyncJob job, UpdateOperationCallbacks secondary) { - final UpdateOperationCallbacks callbacks = StatusWindow.createAndShowFrame(appendBundleName(job.getName() + " " + Launcher.CONSOLE_VERSION)).getContent(); + final UpdateOperationCallbacks callbacks = StatusWindow.createAndShowFrame(appendBundleName(job.getName() + " " + Launcher.CONSOLE_VERSION)); final UpdateOperationCallbacks doubleCallbacks = new DoubleCallbacks(callbacks, secondary); final Runnable jobWithSuspendedPortScanning = () -> job.doJob(doubleCallbacks); ExecHelper.submitAction(jobWithSuspendedPortScanning, "mx"); diff --git a/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java b/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java index 92398a3cd7..4b50051469 100644 --- a/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java +++ b/java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java @@ -1,6 +1,7 @@ package com.rusefi.ui; import com.rusefi.core.ui.FrameHelper; +import com.rusefi.io.UpdateOperationCallbacks; import com.rusefi.ui.util.UiUtils; import com.rusefi.ui.widgets.StatusPanel; import org.jetbrains.annotations.NotNull; @@ -15,10 +16,10 @@ public class StatusWindow { // todo: extract driver from console bundle? find a separate driver bundle? StatusPanel content = new StatusPanel(); - public static StatusWindow createAndShowFrame(final String frameTitle) { - final StatusWindow result = new StatusWindow(); - result.showFrame(frameTitle); - return result; + public static UpdateOperationCallbacks createAndShowFrame(final String frameTitle) { + final StatusWindow statusWindow = new StatusWindow(); + statusWindow.showFrame(frameTitle); + return statusWindow.getContent(); } @NotNull