only:refactoring: now we reuse `JobHelper.doJob` method #7395

This commit is contained in:
kifir23917 2025-02-07 17:32:58 +03:00 committed by rusefillc
parent 08625e8aa2
commit 6a0f551184
2 changed files with 21 additions and 22 deletions

View File

@ -39,8 +39,7 @@ public class DfuFlasher {
return new File(BOOTLOADER_BIN_FILE).exists();
}
public static void doAutoDfu(JComponent parent, String port, UpdateOperationCallbacks callbacks, final Runnable onJobFinished) {
try {
public static void doAutoDfu(JComponent parent, String port, UpdateOperationCallbacks callbacks) {
if (port == null) {
JOptionPane.showMessageDialog(parent, "Failed to locate serial ports");
return;
@ -61,9 +60,6 @@ public class DfuFlasher {
} else {
callbacks.logLine("Please use manual DFU to change bundle type.");
}
} finally {
onJobFinished.run();
}
}
private static void submitAction(Runnable r) {

View File

@ -13,6 +13,9 @@ public class DfuAutoJob extends AsyncJobWithContext<SerialPortWithParentComponen
@Override
public void doJob(final UpdateOperationCallbacks callbacks, final Runnable onJobFinished) {
DfuFlasher.doAutoDfu(context.getParent(), context.getPort().port, callbacks, onJobFinished);
JobHelper.doJob(
() -> DfuFlasher.doAutoDfu(context.getParent(), context.getPort().port, callbacks),
onJobFinished
);
}
}