diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java index 33f2422240..e80db45871 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/LineSelectButton.java @@ -20,10 +20,7 @@ package org.jackhuang.hmcl.ui.construct; import com.jfoenix.controls.JFXPopup; import javafx.beans.InvalidationListener; import javafx.beans.binding.Bindings; -import javafx.beans.property.ListProperty; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleListProperty; -import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.property.*; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.css.PseudoClass; @@ -36,6 +33,8 @@ import javafx.scene.layout.VBox; import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; import org.jackhuang.hmcl.util.javafx.MappedObservableList; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.UnknownNullability; import java.util.Collection; import java.util.Objects; @@ -44,7 +43,7 @@ import java.util.function.Function; import static org.jackhuang.hmcl.ui.FXUtils.determineOptimalPopupPosition; /// @author Glavo -public class LineSelectButton extends LineButton { +public class LineSelectButton extends LineButton { private static final String DEFAULT_STYLE_CLASS = "line-select-button"; private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected"); @@ -57,13 +56,9 @@ public class LineSelectButton extends LineButton { this.getStyleClass().add(DEFAULT_STYLE_CLASS); InvalidationListener updateTrailingText = observable -> { + Function converter = getConverter(); T value = getValue(); - if (value != null) { - Function converter = getConverter(); - setTrailingText(converter != null ? converter.apply(value) : value.toString()); - } else { - setTrailingText(null); - } + setTrailingText(converter != null ? converter.apply(value) : Objects.toString(value, "")); }; converterProperty().addListener(updateTrailingText); valueProperty().addListener(updateTrailingText); @@ -96,9 +91,6 @@ public class LineSelectButton extends LineButton { var itemTitleLabel = new Label(); itemTitleLabel.getStyleClass().add("title-label"); itemTitleLabel.textProperty().bind(Bindings.createStringBinding(() -> { - if (item == null) - return ""; - Function converter = getConverter(); return converter != null ? converter.apply(item) : Objects.toString(item, ""); }, converterProperty())); @@ -173,10 +165,14 @@ public class LineSelectButton extends LineButton { return converterProperty().get(); } - public void setConverter(Function value) { + public void setConverter(Function value) { // TODO: rename converterProperty().set(value); } + public void setNullSafeConverter(Function<@NotNull T, String> value) { + converterProperty().set(it -> it != null ? value.apply(it) : ""); + } + private ObjectProperty> descriptionConverter; public ObjectProperty> descriptionConverterProperty() { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java index ede02a8e7a..65aff682c0 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ModpackInfoPage.java @@ -316,7 +316,7 @@ public final class ModpackInfoPage extends Control implements WizardPage { if (skinnable.options.isRequireAuthlibInjectorServer()) { var serversSelectButton = new LineSelectButton(); serversSelectButton.setTitle(i18n("account.injector.server")); - serversSelectButton.setConverter(AuthlibInjectorServer::getName); + serversSelectButton.setNullSafeConverter(AuthlibInjectorServer::getName); serversSelectButton.setDescriptionConverter(AuthlibInjectorServer::getUrl); serversSelectButton.itemsProperty().set(config().getAuthlibInjectorServers()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/DownloadSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/DownloadSettingsPage.java index 18524b3306..8eae1669bc 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/DownloadSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/DownloadSettingsPage.java @@ -78,7 +78,7 @@ public class DownloadSettingsPage extends StackPane { var versionListSourcePane = new LineSelectButton(); versionListSourcePane.disableProperty().bind(autoChooseDownloadSource.selectedProperty().not()); versionListSourcePane.setTitle(i18n("settings.launcher.version_list_source")); - versionListSourcePane.setConverter(converter); + versionListSourcePane.setNullSafeConverter(converter); versionListSourcePane.setDescriptionConverter(descriptionConverter); versionListSourcePane.setItems(DownloadProviders.AUTO_PROVIDERS.keySet()); versionListSourcePane.valueProperty().bindBidirectional(config().versionListSourceProperty()); @@ -86,14 +86,14 @@ public class DownloadSettingsPage extends StackPane { var downloadSourcePane = new LineSelectButton(); downloadSourcePane.disableProperty().bind(autoChooseDownloadSource.selectedProperty()); downloadSourcePane.setTitle(i18n("settings.launcher.download_source")); - downloadSourcePane.setConverter(converter); + downloadSourcePane.setNullSafeConverter(converter); downloadSourcePane.setDescriptionConverter(descriptionConverter); downloadSourcePane.setItems(DownloadProviders.DIRECT_PROVIDERS.keySet()); downloadSourcePane.valueProperty().bindBidirectional(config().downloadTypeProperty()); var defaultAddonSourcePane = new LineSelectButton(); defaultAddonSourcePane.setTitle(i18n("settings.launcher.default_addon_source")); - defaultAddonSourcePane.setConverter(key -> I18n.i18n("mods." + key)); + defaultAddonSourcePane.setNullSafeConverter(key -> I18n.i18n("mods." + key)); defaultAddonSourcePane.setItems("modrinth", "curseforge"); defaultAddonSourcePane.valueProperty().bindBidirectional(config().defaultAddonSourceProperty()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/PersonalizationPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/PersonalizationPage.java index 40f241121d..598b8a6bed 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/PersonalizationPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/PersonalizationPage.java @@ -79,7 +79,7 @@ public class PersonalizationPage extends StackPane { { var brightnessPane = new LineSelectButton(); brightnessPane.setTitle(i18n("settings.launcher.brightness")); - brightnessPane.setConverter(name -> i18n("settings.launcher.brightness." + name)); + brightnessPane.setNullSafeConverter(name -> i18n("settings.launcher.brightness." + name)); brightnessPane.setItems("auto", "light", "dark"); brightnessPane.valueProperty().bindBidirectional(config().themeBrightnessProperty()); @@ -295,7 +295,7 @@ public class PersonalizationPage extends StackPane { var fontAntiAliasingPane = new LineSelectButton>(); fontAntiAliasingPane.setTitle(i18n("settings.launcher.font.anti_aliasing")); fontAntiAliasingPane.setSubtitle(i18n("settings.take_effect_after_restart")); - fontAntiAliasingPane.setConverter(value -> + fontAntiAliasingPane.setNullSafeConverter(value -> value.isPresent() ? i18n("settings.launcher.font.anti_aliasing." + value.get().name().toLowerCase(Locale.ROOT)) : i18n("settings.launcher.font.anti_aliasing.auto") diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java index 89913b23df..ceff5dc8fb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java @@ -108,7 +108,7 @@ public final class SettingsPage extends ScrollPane { updatePane.setTitle(i18n("update")); updatePane.setValue(UpdateChannel.getChannel()); - updatePane.setConverter(channel -> i18n("update.channel." + channel.channelName)); + updatePane.setNullSafeConverter(channel -> i18n("update.channel." + channel.channelName)); updatePane.setItems(List.of(UpdateChannel.STABLE, UpdateChannel.DEVELOPMENT)); updatePane.setDescriptionConverter(channel -> i18n("update.note." + channel.channelName)); @@ -174,7 +174,7 @@ public final class SettingsPage extends ScrollPane { chooseLanguagePane.setSubtitle(i18n("settings.take_effect_after_restart")); SupportedLocale currentLocale = I18n.getLocale(); - chooseLanguagePane.setConverter(locale -> { + chooseLanguagePane.setNullSafeConverter(locale -> { if (locale.isDefault()) return locale.getDisplayName(currentLocale); else if (locale.isSameLanguage(currentLocale)) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java index ff157d96f1..e3e00e73e2 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java @@ -191,7 +191,7 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor graphicsBackendPane = new LineSelectButton<>(); graphicsBackendPane.setTitle(i18n("settings.advanced.graphics_backend")); - graphicsBackendPane.setConverter(backend -> i18n("settings.advanced.graphics_backend." + backend.name().toLowerCase(Locale.ROOT))); + graphicsBackendPane.setNullSafeConverter(backend -> i18n("settings.advanced.graphics_backend." + backend.name().toLowerCase(Locale.ROOT))); graphicsBackendPane.setDescriptionConverter(backend -> switch (backend) { case DEFAULT -> i18n("settings.advanced.graphics_backend.default.desc"); case OPENGL -> i18n("settings.advanced.graphics_backend.opengl.desc"); @@ -210,7 +210,7 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor rendererPane = new LineSelectButton<>(); rendererPane.setTitle(i18n("settings.advanced.renderer")); - rendererPane.setConverter(e -> i18n("settings.advanced.renderer." + e.name().toLowerCase(Locale.ROOT))); + rendererPane.setNullSafeConverter(e -> i18n("settings.advanced.renderer." + e.name().toLowerCase(Locale.ROOT))); rendererPane.setDescriptionConverter(e -> { String bundleKey = "settings.advanced.renderer." + e.name().toLowerCase(Locale.ROOT) + ".desc"; return I18n.hasKey(bundleKey) ? i18n(bundleKey) : null; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java index 82342c2ebc..a070e815da 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionSettingsPage.java @@ -336,7 +336,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag launcherVisibilityPane = new LineSelectButton<>(); launcherVisibilityPane.setTitle(i18n("settings.advanced.launcher_visible")); launcherVisibilityPane.setItems(LauncherVisibility.values()); - launcherVisibilityPane.setConverter(e -> i18n("settings.advanced.launcher_visibility." + e.name().toLowerCase(Locale.ROOT))); + launcherVisibilityPane.setNullSafeConverter(e -> i18n("settings.advanced.launcher_visibility." + e.name().toLowerCase(Locale.ROOT))); BorderPane dimensionPane = new BorderPane(); { @@ -372,7 +372,7 @@ public final class VersionSettingsPage extends StackPane implements DecoratorPag enableDebugLogOutputPane.setTitle(i18n("settings.enable_debug_log_output")); processPriorityPane = new LineSelectButton<>(); processPriorityPane.setTitle(i18n("settings.advanced.process_priority")); - processPriorityPane.setConverter(e -> i18n("settings.advanced.process_priority." + e.name().toLowerCase(Locale.ROOT))); + processPriorityPane.setNullSafeConverter(e -> i18n("settings.advanced.process_priority." + e.name().toLowerCase(Locale.ROOT))); processPriorityPane.setDescriptionConverter(e -> { String bundleKey = "settings.advanced.process_priority." + e.name().toLowerCase(Locale.ROOT) + ".desc"; return I18n.hasKey(bundleKey) ? i18n(bundleKey) : null;