From 48a0032848badf7736a931a4b29fff68dbcf1008 Mon Sep 17 00:00:00 2001 From: ericek111 Date: Fri, 25 Sep 2026 10:55:31 +0000 Subject: [PATCH] Parse every enum setting with the one generic parser Co-Authored-By: Claude Opus 5.5 --- .../java/com/ts3client/config/Settings.java | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/ts3-client/core/src/main/java/com/ts3client/config/Settings.java b/ts3-client/core/src/main/java/com/ts3client/config/Settings.java index 42e2742..dae6979 100644 --- a/ts3-client/core/src/main/java/com/ts3client/config/Settings.java +++ b/ts3-client/core/src/main/java/com/ts3client/config/Settings.java @@ -237,8 +237,8 @@ public final class Settings { clientVersionSign = props.getProperty("clientVersionSign", clientVersionSign); inputDevice = props.getProperty("inputDevice", inputDevice); outputDevice = props.getProperty("outputDevice", outputDevice); - inputMode = parseMode(props.getProperty("inputMode"), inputMode); - vadMode = parseVadMode(props.getProperty("vadMode"), vadMode); + inputMode = parseEnum(InputMode.class, props.getProperty("inputMode"), inputMode); + vadMode = parseEnum(VadMode.class, props.getProperty("vadMode"), vadMode); vadThresholdDb = parseD(props.getProperty("vadLevelDb"), migrateThreshold(props.getProperty("vadThresholdDb"), vadThresholdDb)); speechThreshold = parseD(props.getProperty("speechThreshold"), speechThreshold); @@ -262,7 +262,7 @@ public final class Settings { soundPackDir = props.getProperty("soundPackDir", soundPackDir); iconPack = props.getProperty("iconPack", iconPack); iconPackDir = props.getProperty("iconPackDir", iconPackDir); - appearance = parseAppearance(props.getProperty("appearance"), appearance); + appearance = parseEnum(Appearance.class, props.getProperty("appearance"), appearance); uiScale = parseD(props.getProperty("uiScale"), uiScale); showStatusBar = parseB(props.getProperty("showStatusBar"), showStatusBar); showMasterVolumeSlider = parseB(props.getProperty("showMasterVolumeSlider"), showMasterVolumeSlider); @@ -338,33 +338,6 @@ public final class Settings { } } - private static InputMode parseMode(String v, InputMode def) { - if (v == null) return def; - try { - return InputMode.valueOf(v); - } catch (IllegalArgumentException e) { - return def; - } - } - - private static Appearance parseAppearance(String v, Appearance def) { - if (v == null) return def; - try { - return Appearance.valueOf(v); - } catch (IllegalArgumentException e) { - return def; - } - } - - private static VadMode parseVadMode(String v, VadMode def) { - if (v == null) return def; - try { - return VadMode.valueOf(v); - } catch (IllegalArgumentException e) { - return def; - } - } - /** * Converts a threshold saved under the old {@code vadThresholdDb} key, which was in * dBFS ({@code 20*log10(rms)}), to {@link com.ts3client.audio.InputLevel}'s scale, so