external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

use Java Consumer

Browse Source
This commit is contained in:
Anthony Calosa
2025-08-26 06:34:59 +08:00
parent f27472d9bd
commit b24f536190
42 changed files with 298 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/GuiDesktop.java
View File

@@ -15,6 +15,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import javax.swing.ImageIcon;
@@ -53,7 +54,6 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
import forge.util.BuildInfo;
import forge.util.Callback;
import forge.util.FileUtil;
import forge.util.ImageFetcher;
import forge.util.OperatingSystem;
@@ -264,7 +264,7 @@ public class GuiDesktop implements IGuiBase {
}
@Override
public void download(final GuiDownloadService service, final Callback<Boolean> callback) {
public void download(final GuiDownloadService service, final Consumer<Boolean> callback) {
new GuiDownloader(service, callback).show();
}

9
forge-gui-desktop/src/main/java/forge/download/GuiDownloader.java
View File

@@ -37,9 +37,10 @@ import forge.toolbox.FRadioButton;
import forge.toolbox.FSkin;
import forge.toolbox.FTextField;
import forge.toolbox.JXButtonPanel;
import forge.util.Callback;
import net.miginfocom.swing.MigLayout;
import java.util.function.Consumer;
@SuppressWarnings("serial")
public class GuiDownloader extends DefaultBoundedRangeModel {
// Swing components
@@ -57,7 +58,7 @@ public class GuiDownloader extends DefaultBoundedRangeModel {
SOverlayUtils.hideOverlay();
if (callback != null) {
callback.run(btnStart.getText() == "OK"); //determine result based on whether download finished
callback.accept(btnStart.getText() == "OK"); //determine result based on whether download finished
}
}
};
@@ -70,12 +71,12 @@ public class GuiDownloader extends DefaultBoundedRangeModel {
private final FRadioButton radProxyHTTP = new FRadioButton("HTTP Proxy");
private final GuiDownloadService service;
private final Callback<Boolean> callback;
private final Consumer<Boolean> callback;
public GuiDownloader(final GuiDownloadService service0) {
this(service0, null);
}
public GuiDownloader(final GuiDownloadService service0, final Callback<Boolean> callback0) {
public GuiDownloader(final GuiDownloadService service0, final Consumer<Boolean> callback0) {
service = service0;
callback = callback0;