From 8461b0418cd7d974933435b20586ad0f8a598569 Mon Sep 17 00:00:00 2001 From: Glavo Date: Thu, 15 Sep 2022 21:28:02 +0800 Subject: [PATCH] close #1534: open 'java.com' when need to download Java 8 (#1716) --- .../main/java/org/jackhuang/hmcl/game/LauncherHelper.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java index dbe7a180f..67a08145d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java @@ -560,7 +560,11 @@ public final class LauncherHelper { JFXHyperlink link = new JFXHyperlink(i18n("download.external_link")); link.setOnAction(e -> { - FXUtils.openLink(OPENJDK_DOWNLOAD_LINK); + if (javaVersion.getMajorVersion() == JavaVersion.JAVA_8) { + FXUtils.openLink(ORACLEJDK_DOWNLOAD_LINK); + } else { + FXUtils.openLink(OPENJDK_DOWNLOAD_LINK); + } future.completeExceptionally(new CancellationException()); }); @@ -848,6 +852,7 @@ public final class LauncherHelper { } + private static final String ORACLEJDK_DOWNLOAD_LINK = "https://www.java.com/download"; private static final String OPENJDK_DOWNLOAD_LINK = "https://docs.microsoft.com/java/openjdk/download"; public static final Queue PROCESSES = new ConcurrentLinkedQueue<>();