Skip to content

refactor: 在 JavaDownloadDialog 中将 版本 与 包类型 的 ComboBox 监听 distributionBox #6889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KSSJW wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: 在 JavaDownloadDialog 中将 版本 与 包类型 的 ComboBox 监听 distributionBox #6889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaDownloadDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,11 @@ private final class DownloadDiscoJava extends JFXDialogLayout {

this.remoteVersionBox = new JFXComboBox<>();
this.remoteVersionBox.setConverter(FXUtils.stringConverter(JavaRemoteVersion::getDistributionVersion));
this.remoteVersionBox.disableProperty().bind(Bindings.isNull(distributionBox.getSelectionModel().selectedItemProperty()));

this.packageTypeBox = new JFXComboBox<>(FXCollections.observableArrayList());
this.packageTypeBox.setConverter(FXUtils.stringConverter(JavaPackageType::getDisplayName));
this.packageTypeBox.disableProperty().bind(Bindings.isNull(distributionBox.getSelectionModel().selectedItemProperty()));

this.downloadButton = new JFXButton(i18n("download"));
downloadButton.setOnAction(e -> onDownload());
Expand Down Expand Up @@ -312,8 +314,6 @@ private final class DownloadDiscoJava extends JFXDialogLayout {
Consumer<DiscoJavaVersionList> updateListStatus = list -> {
remoteVersionBox.setItems(null);
packageTypeBox.getItems().clear();
remoteVersionBox.setDisable(true);
packageTypeBox.setDisable(true);
warningLabel.setText(null);

if (list == null || (list.versions != null && list.versions.isEmpty()))
Expand All @@ -326,9 +326,6 @@ else if (list.status == DiscoJavaVersionList.Status.LOADING)
if (list.status == DiscoJavaVersionList.Status.SUCCESS) {
packageTypeBox.getItems().setAll(list.versions.keySet());
packageTypeBox.getSelectionModel().selectFirst();

remoteVersionBox.setDisable(false);
packageTypeBox.setDisable(false);
} else
warningLabel.setText(i18n("java.download.load_list.failed"));
}
Expand Down
Loading