From 4759e4957c897fd7fd6d691bd5fbb1e22e65f838 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Wed, 13 Feb 2019 17:46:11 +0800 Subject: [PATCH] refactor --- .../hmcl/ui/versions/VersionSettingsPage.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java index a16ca63d4..5ec170322 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java @@ -108,15 +108,15 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag FXUtils.smoothScrolling(scroll); - Task.of(variables -> variables.set("list", JavaVersion.getJavas())) - .subscribe(Schedulers.javafx(), variables -> { - javaItem.loadChildren( - (variables.>get("list")).stream() - .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion() + i18n("settings.game.java_directory.bit", javaVersion.getPlatform().getBit()), javaVersion.getBinary().toString(), javaVersion)) - .collect(Collectors.toList())); - javaItemsLoaded = true; - initializeSelectedJava(); - }); + Task.ofResult(JavaVersion::getJavas).thenResult(Schedulers.javafx(), list -> { + javaItem.loadChildren(list.stream() + .map(javaVersion -> javaItem.createChildren(javaVersion.getVersion() + i18n("settings.game.java_directory.bit", + javaVersion.getPlatform().getBit()), javaVersion.getBinary().toString(), javaVersion)) + .collect(Collectors.toList())); + javaItemsLoaded = true; + initializeSelectedJava(); + return null; + }).start(); javaItem.setSelectedData(null); javaItem.setFallbackData(JavaVersion.fromCurrentEnvironment());