lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: not validating modpack name at first

Browse Source
This commit is contained in:
huanghongxun
2021-01-26 12:23:26 +08:00
parent 7efd9607e5
commit 94cd33af5c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HMCL/src/main/java/org/jackhuang/hmcl/ui/download/LocalModpackPage.java
View File

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui.download;
import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXTextField; import com.jfoenix.controls.JFXTextField;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.beans.binding.Bindings;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.layout.Region; import javafx.scene.layout.Region;
@@ -90,8 +91,17 @@ public final class LocalModpackPage extends StackPane implements WizardPage {
if (name.isPresent()) { if (name.isPresent()) {
txtModpackName.setText(name.get()); txtModpackName.setText(name.get());
txtModpackName.setDisable(true); txtModpackName.setDisable(true);
} else {
txtModpackName.getValidators().addAll(
new Validator(i18n("install.new_game.already_exists"), str -> !profile.getRepository().hasVersion(str) && StringUtils.isNotBlank(str)),
new Validator(i18n("version.forbidden_name"), str -> !profile.getRepository().forbidsVersion(str))
);
} }
btnInstall.disableProperty().bind(Bindings.createBooleanBinding(
() -> !txtModpackName.validate(),
txtModpackName.textProperty()));
Optional<File> filePath = tryCast(controller.getSettings().get(MODPACK_FILE), File.class); Optional<File> filePath = tryCast(controller.getSettings().get(MODPACK_FILE), File.class);
if (filePath.isPresent()) { if (filePath.isPresent()) {
selectedFile = filePath.get(); selectedFile = filePath.get();
@@ -122,11 +132,6 @@ public final class LocalModpackPage extends StackPane implements WizardPage {
if (!name.isPresent()) { if (!name.isPresent()) {
txtModpackName.setText(manifest.getName()); txtModpackName.setText(manifest.getName());
txtModpackName.getValidators().addAll(
new Validator(i18n("install.new_game.already_exists"), str -> !profile.getRepository().hasVersion(str) && StringUtils.isNotBlank(str)),
new Validator(i18n("version.forbidden_name"), str -> !profile.getRepository().forbidsVersion(str))
);
txtModpackName.textProperty().addListener(e -> btnInstall.setDisable(!txtModpackName.validate()));
} }
}, e -> { }, e -> {
Controllers.dialog(i18n("modpack.task.install.error"), i18n("message.error"), MessageType.ERROR); Controllers.dialog(i18n("modpack.task.install.error"), i18n("message.error"), MessageType.ERROR);