AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-16 23:37:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #547

Browse Source
This commit is contained in:
huanghongxun 2019-04-25 11:16:59 +08:00
parent 9ed14b227b
commit 7e8cc5fe6c
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HMCL/src/main/java/org/jackhuang/hmcl/ui/download/UpdateInstallerWizardProvider.java
View File

@ -85,4 +85,11 @@ public final class UpdateInstallerWizardProvider implements WizardProvider {
public boolean cancel() { public boolean cancel() {
return true; return true;
} }
@Override
public boolean cancelIfCannotGoBack() {
// VersionsPage will call wizardController.onPrev(cleanUp = true) when list is empty.
// So we cancel this wizard when VersionPage calls the method.
return true;
}
} }

7
HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/WizardController.java
View File

@ -83,7 +83,12 @@ public class WizardController implements Navigation {
@Override @Override
public void onPrev(boolean cleanUp) { public void onPrev(boolean cleanUp) {
if (!canPrev()) { if (!canPrev()) {
throw new IllegalStateException("Cannot go backward since this is the back page. Pages: " + pages); if (provider.cancelIfCannotGoBack()) {
onCancel();
return;
} else {
throw new IllegalStateException("Cannot go backward since this is the back page. Pages: " + pages);
}
} }
Node page = pages.pop(); Node page = pages.pop();

3
HMCL/src/main/java/org/jackhuang/hmcl/ui/wizard/WizardProvider.java
View File

@ -26,6 +26,9 @@ public interface WizardProvider {
Object finish(Map<String, Object> settings); Object finish(Map<String, Object> settings);
Node createPage(WizardController controller, int step, Map<String, Object> settings); Node createPage(WizardController controller, int step, Map<String, Object> settings);
boolean cancel(); boolean cancel();
default boolean cancelIfCannotGoBack() {
return false;
}
interface FailureCallback { interface FailureCallback {
void onFail(Map<String, Object> settings, Exception exception, Runnable next); void onFail(Map<String, Object> settings, Exception exception, Runnable next);