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

Use StringUtils.isASCII to check if a string contains non-ASCII characters (#3931)

Browse Source
This commit is contained in:
Glavo
2025-05-23 00:25:28 +08:00
committed by GitHub
parent 942f7b703e
commit bb37e3fafa
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallersPage.java
View File

@@ -27,8 +27,8 @@ import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
import org.jackhuang.hmcl.ui.construct.RequiredValidator; import org.jackhuang.hmcl.ui.construct.RequiredValidator;
import org.jackhuang.hmcl.ui.construct.Validator; import org.jackhuang.hmcl.ui.construct.Validator;
import org.jackhuang.hmcl.ui.wizard.WizardController; import org.jackhuang.hmcl.ui.wizard.WizardController;
import org.jackhuang.hmcl.util.StringUtils;
import java.nio.charset.StandardCharsets;
import java.util.Map; import java.util.Map;
import static javafx.beans.binding.Bindings.createBooleanBinding; import static javafx.beans.binding.Bindings.createBooleanBinding;
@@ -81,7 +81,7 @@ public class InstallersPage extends AbstractInstallersPage {
String name = txtName.getText(); String name = txtName.getText();
// Check for non-ASCII characters. // Check for non-ASCII characters.
if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) { if (!StringUtils.isASCII(name)) {
Controllers.dialog(new MessageDialogPane.Builder( Controllers.dialog(new MessageDialogPane.Builder(
i18n("install.name.invalid"), i18n("install.name.invalid"),
i18n("message.warning"), i18n("message.warning"),

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

@@ -42,7 +42,6 @@ import org.jackhuang.hmcl.util.io.FileUtils;
import java.io.File; import java.io.File;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@@ -153,7 +152,7 @@ public final class LocalModpackPage extends ModpackPage {
String name = txtModpackName.getText(); String name = txtModpackName.getText();
// Check for non-ASCII characters. // Check for non-ASCII characters.
if (!StandardCharsets.US_ASCII.newEncoder().canEncode(name)) { if (!StringUtils.isASCII(name)) {
Controllers.dialog(new MessageDialogPane.Builder( Controllers.dialog(new MessageDialogPane.Builder(
i18n("install.name.invalid"), i18n("install.name.invalid"),
i18n("message.warning"), i18n("message.warning"),