From 8007f1958e0a96ff74cfb541e2cd5015b8cf6d86 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Sun, 24 Feb 2019 17:00:17 +0800 Subject: [PATCH] Rename isDependentsSucceeded to isDependentSucceeded --- .../hmcl/ui/account/AddAuthlibInjectorServerPane.java | 2 +- .../org/jackhuang/hmcl/ui/download/VersionsPage.java | 2 +- .../java/org/jackhuang/hmcl/ui/versions/ModListPage.java | 2 +- .../org/jackhuang/hmcl/ui/versions/WorldListPage.java | 2 +- .../org/jackhuang/hmcl/download/DefaultGameBuilder.java | 4 ++-- HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java | 9 +++++---- .../main/java/org/jackhuang/hmcl/task/TaskResult.java | 4 ++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java index 18b3b2970..8f6b0100d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAuthlibInjectorServerPane.java @@ -106,7 +106,7 @@ public class AddAuthlibInjectorServerPane extends StackPane implements DialogAwa Task.of(() -> { serverBeingAdded = AuthlibInjectorServer.locateServer(url); - }).whenComplete(Schedulers.javafx(), (isDependentsSucceeded, exception) -> { + }).whenComplete(Schedulers.javafx(), (isDependentSucceeded, exception) -> { addServerPane.setDisable(false); nextPane.hideSpinner(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java index dfe82d5d4..5ba8cff00 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java @@ -128,7 +128,7 @@ public final class VersionsPage extends BorderPane implements WizardPage, Refres @Override public void refresh() { transitionHandler.setContent(spinner, ContainerAnimations.FADE.getAnimationProducer()); - executor = versionList.refreshAsync(gameVersion, downloadProvider).whenComplete((isDependentsSucceeded, exception) -> { + executor = versionList.refreshAsync(gameVersion, downloadProvider).whenComplete((isDependentSucceeded, exception) -> { if (isDependentsSucceeded) { List items = loadVersions(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java index 39e3d269e..a7542c330 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java @@ -91,7 +91,7 @@ public final class ModListPage extends Control { modManager.refreshMods(); return new LinkedList<>(modManager.getMods()); } - }).whenComplete(Schedulers.javafx(), (list, isDependentsSucceeded, exception) -> { + }).whenComplete(Schedulers.javafx(), (list, isDependentSucceeded, exception) -> { loadingProperty().set(false); if (isDependentsSucceeded) FXUtils.onWeakChangeAndOperate(parentTab.getSelectionModel().selectedItemProperty(), newValue -> { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java index cf7b62a8f..3dd32f6bb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java @@ -51,7 +51,7 @@ public class WorldListPage extends ListPage { setLoading(true); Task.ofResult(() -> World.getWorlds(savesDir).parallel().collect(Collectors.toList())) - .whenComplete(Schedulers.javafx(), (result, isDependentsSucceeded, exception) -> { + .whenComplete(Schedulers.javafx(), (result, isDependentSucceeded, exception) -> { setLoading(false); if (isDependentsSucceeded) itemsProperty().setAll(result.stream().map(WorldListItem::new).collect(Collectors.toList())); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java index 4791266f7..60b8f01d6 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DefaultGameBuilder.java @@ -70,8 +70,8 @@ public class DefaultGameBuilder extends GameBuilder { libraryTask = libraryTask.thenCompose(dependencyManager.installLibraryAsync(remoteVersion)); return libraryTask; - }).whenComplete((isDependentsSucceeded, exception) -> { - if (!isDependentsSucceeded) + }).whenComplete((isDependentSucceeded, exception) -> { + if (!isDependentSucceeded) dependencyManager.getGameRepository().getVersionRoot(name).delete(); }); } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java index 31bb6a5c2..358184f8a 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/Task.java @@ -354,7 +354,8 @@ public abstract class Task { * *

When this task is complete, the given action is invoked, a boolean * value represents the execution status of this task, and the exception - * (or {@code null} if none) of this task as arguments. The returned task + * (or {@code null} if none, which means when isDependentSucceeded is false, + * exception may be null) of this task as arguments. The returned task * is completed when the action returns. If the supplied action itself * encounters an exception, then the returned task exceptionally completes * with this exception unless this task also completed exceptionally. @@ -415,8 +416,8 @@ public abstract class Task { * @return the new Task */ public final Task whenComplete(Scheduler scheduler, ExceptionalRunnable success, ExceptionalConsumer failure) { - return whenComplete(scheduler, (isDependentsSucceeded, exception) -> { - if (isDependentsSucceeded) { + return whenComplete(scheduler, (isDependentSucceeded, exception) -> { + if (isDependentSucceeded) { if (success != null) try { success.run(); @@ -497,7 +498,7 @@ public abstract class Task { } public interface FinalizedCallback { - void execute(boolean isDependentsSucceeded, Exception exception) throws Exception; + void execute(boolean isDependentSucceeded, Exception exception) throws Exception; } static String getCaller() { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskResult.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskResult.java index 342a1ab2e..cc8a3485c 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskResult.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/task/TaskResult.java @@ -211,7 +211,7 @@ public abstract class TaskResult extends Task { * @return the new Task */ public Task whenComplete(Scheduler scheduler, FinalizedCallback action) { - return whenComplete(scheduler, ((isDependentsSucceeded, exception) -> action.execute(getResult(), isDependentsSucceeded, exception))); + return whenComplete(scheduler, ((isDependentSucceeded, exception) -> action.execute(getResult(), isDependentSucceeded, exception))); } private class Subtask extends TaskResult { @@ -242,6 +242,6 @@ public abstract class TaskResult extends Task { } public interface FinalizedCallback { - void execute(V result, boolean isDependentsSucceeded, Exception exception) throws Exception; + void execute(V result, boolean isDependentSucceeded, Exception exception) throws Exception; } }