From a27671560d9e7ab013dc76d4703952fa355eeaef Mon Sep 17 00:00:00 2001 From: Glavo Date: Sat, 19 Oct 2024 22:59:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8B=E8=BD=BD=20OpenJ9?= =?UTF-8?q?=20(#3363)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 支持下载 OpenJ9 * update --- .../jackhuang/hmcl/ui/main/JavaDownloadDialog.java | 11 +++++++++-- .../download/java/disco/DiscoJavaDistribution.java | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java index 7e4e80f66..cb1977547 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java @@ -312,8 +312,15 @@ public final class JavaDownloadDialog extends StackPane { getIntegrityCheck = Task.completed(new FileDownloadTask.IntegrityCheck(fileInfo.getChecksumType(), fileInfo.getChecksum())); else if (StringUtils.isNotBlank(fileInfo.getChecksumUri())) getIntegrityCheck = new GetTask(downloadProvider.injectURLWithCandidates(fileInfo.getChecksumUri())) - .thenApplyAsync(checksum -> - new FileDownloadTask.IntegrityCheck(fileInfo.getChecksumType(), checksum.trim())); + .thenApplyAsync(checksum -> { + checksum = checksum.trim(); + + int idx = checksum.indexOf(' '); + if (idx > 0) + checksum = checksum.substring(0, idx); + + return new FileDownloadTask.IntegrityCheck(fileInfo.getChecksumType(), checksum); + }); else throw new IOException("Unable to get checksum for file"); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java index 7cc6c3e20..52d013bf1 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java @@ -35,6 +35,7 @@ import static org.jackhuang.hmcl.util.platform.OperatingSystem.*; /** * @author Glavo + * @see discoapi */ public enum DiscoJavaDistribution implements JavaDistribution { TEMURIN("Eclipse Temurin", "temurin", "Adoptium", @@ -65,7 +66,13 @@ public enum DiscoJavaDistribution implements JavaDistribution