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

Fix #3508: Java 下载对话框中切换包类型时不应重置版本字段 (#3594)

Browse Source 
* Fix #3508: Java 下载对话框中切换包类型时不应重置版本字段

* fix checkstyle
This commit is contained in:
Glavo 2025-02-08 18:02:46 +08:00 committed by GitHub
parent 5e60eaf595
commit 2f36506099
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java
View File

@ -216,6 +216,7 @@ public final class JavaDownloadDialog extends StackPane {
distributionBox.setItems(FXCollections.observableList(new ArrayList<>(distributions))); distributionBox.setItems(FXCollections.observableList(new ArrayList<>(distributions)));
FXUtils.onChange(packageTypeBox.getSelectionModel().selectedItemProperty(), packageType -> { FXUtils.onChange(packageTypeBox.getSelectionModel().selectedItemProperty(), packageType -> {
ObservableList<DiscoJavaRemoteVersion> versions; ObservableList<DiscoJavaRemoteVersion> versions;
if (packageType == null if (packageType == null
|| currentJavaVersionList.get() == null || currentJavaVersionList.get() == null
@ -224,8 +225,26 @@ public final class JavaDownloadDialog extends StackPane {
return; return;
} }
DiscoJavaRemoteVersion oldVersion = remoteVersionBox.getSelectionModel().getSelectedItem();
remoteVersionBox.setItems(versions); remoteVersionBox.setItems(versions);
if (oldVersion != null) {
for (int i = 0; i < versions.size(); i++) {
DiscoJavaRemoteVersion version = versions.get(i);
if (Objects.equals(version.getDistributionVersion(), oldVersion.getDistributionVersion())) {
remoteVersionBox.getSelectionModel().select(i);
return;
}
}
for (int i = 0; i < versions.size(); i++) {
DiscoJavaRemoteVersion version = versions.get(i);
if (version.getJdkVersion() == oldVersion.getJdkVersion()) {
remoteVersionBox.getSelectionModel().select(i);
return;
}
}
}
for (int i = 0; i < versions.size(); i++) { for (int i = 0; i < versions.size(); i++) {
DiscoJavaRemoteVersion version = versions.get(i); DiscoJavaRemoteVersion version = versions.get(i);
if (version.getJdkVersion() == GameJavaVersion.LATEST.getMajorVersion()) { if (version.getJdkVersion() == GameJavaVersion.LATEST.getMajorVersion()) {