andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring: now `StatusWindow.createAndShowFrame` method returns `UpdateOperationCallbacks` - we don't need created `StatusWindow` instance #7199

This commit is contained in:
kifir23917 2025-01-21 11:52:01 +03:00 committed by kifir23917
parent 84ee8728e9
commit b83d8abe2d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java_console/ui/src/main/java/com/rusefi/maintenance/DriverInstall.java
View File

@ -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");

2
java_console/ui/src/main/java/com/rusefi/maintenance/jobs/AsyncJobExecutor.java
View File

@ -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");

9
java_console/ui/src/main/java/com/rusefi/ui/StatusWindow.java
View File

@ -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