From 6b7baaaecc5dc34312f24deceba5ff1f7515bbeb Mon Sep 17 00:00:00 2001 From: rusefi Date: Tue, 11 Jun 2019 21:43:46 -0400 Subject: [PATCH] template substitution for tsInfo part of the definition --- java_tools/ConfigDefinition.jar | Bin 87543 -> 87699 bytes .../src/com/rusefi/ConfigField.java | 2 +- .../src/com/rusefi/VariableRegistry.java | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 0ca66111a5a8f8b0ee807a6097540425a0b58195..6996ca58b17e09dbcddfc5180bee0f4331e87d6c 100644 GIT binary patch delta 9810 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 delta 9622 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 EA9+~JiU0rr diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigField.java b/java_tools/configuration_definition/src/com/rusefi/ConfigField.java index 1ae9936856..68fcf8baab 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigField.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigField.java @@ -59,7 +59,7 @@ public class ConfigField { this.type = type; this.arraySizeVariableName = arraySizeAsText; this.arraySize = arraySize; - this.tsInfo = tsInfo; + this.tsInfo = VariableRegistry.INSTANCE.applyVariables(tsInfo); this.isIterate = isIterate; } diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java index 3ec4f9a027..92dbc80c6c 100644 --- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java +++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java @@ -32,6 +32,8 @@ public class VariableRegistry extends TreeMap { * @return string with variable values inlined */ public String applyVariables(String line) { + if (line == null) + return null; Matcher m; while ((m = VAR.matcher(line)).find()) { String key = m.group(2);