only: using same trimmed value both in condition and access, also nicer error message

This commit is contained in:
rusefillc 2024-04-20 13:36:12 -04:00
parent a74eeba2df
commit 61f6aa0b20
1 changed files with 6 additions and 6 deletions

View File

@ -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<String> elements = iniFileModel.defines.get(firstValue.substring(1));
String trimmed = firstValue.trim();
if (trimmed.startsWith("$")) {
String key = trimmed.substring(1);
List<String> 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));
}