From 61f6aa0b2037eac7c02177a631d07c0289f0a1d3 Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sat, 20 Apr 2024 13:36:12 -0400 Subject: [PATCH] only: using same trimmed value both in condition and access, also nicer error message --- .../java/com/opensr5/ini/field/EnumIniField.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java b/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java index cde1805568..e2eb4b5ce5 100644 --- a/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java +++ b/java_console/inifile/src/main/java/com/opensr5/ini/field/EnumIniField.java @@ -10,10 +10,7 @@ import org.jetbrains.annotations.NotNull; import javax.management.ObjectName; import java.nio.ByteBuffer; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; +import java.util.*; import java.util.regex.Pattern; public class EnumIniField extends IniField { @@ -182,8 +179,11 @@ public class EnumIniField extends IniField { } else { String firstValue = tokens[offset]; - if (firstValue.trim().startsWith("$")) { - List elements = iniFileModel.defines.get(firstValue.substring(1)); + String trimmed = firstValue.trim(); + if (trimmed.startsWith("$")) { + String key = trimmed.substring(1); + List elements = iniFileModel.defines.get(key); + Objects.requireNonNull(elements, "Elements for " + key); for (int i = 0; i < elements.size(); i++) { keyValues.put(i, elements.get(i)); }