mirror of https://github.com/rusefi/rusefi.git
only: using same trimmed value both in condition and access, also nicer error message
This commit is contained in:
parent
a74eeba2df
commit
61f6aa0b20
|
@ -10,10 +10,7 @@ import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import javax.management.ObjectName;
|
import javax.management.ObjectName;
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.util.LinkedList;
|
import java.util.*;
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.TreeMap;
|
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
public class EnumIniField extends IniField {
|
public class EnumIniField extends IniField {
|
||||||
|
@ -182,8 +179,11 @@ public class EnumIniField extends IniField {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
String firstValue = tokens[offset];
|
String firstValue = tokens[offset];
|
||||||
if (firstValue.trim().startsWith("$")) {
|
String trimmed = firstValue.trim();
|
||||||
List<String> elements = iniFileModel.defines.get(firstValue.substring(1));
|
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++) {
|
for (int i = 0; i < elements.size(); i++) {
|
||||||
keyValues.put(i, elements.get(i));
|
keyValues.put(i, elements.get(i));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue