diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java index 8d075b55c4..58fe6d1a7b 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java @@ -134,7 +134,7 @@ public class ConfigDefinition { break; case KEY_SIGNATURE: signaturePrependFile = args[i + 1]; - state.getPrependFiles().add(args[i + 1]); + state.addPrependNotInput(signaturePrependFile); // don't add this file to the 'inputFiles' break; case KEY_SIGNATURE_DESTINATION: diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderState.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderState.java index 835419095f..e44b9a543b 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderState.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderState.java @@ -22,6 +22,8 @@ public interface ReaderState { void addPrepend(String fileName); + void addPrependNotInput(String fileName); + void addDestination(ConfigurationConsumer... consumers); VariableRegistry getVariableRegistry(); @@ -38,8 +40,6 @@ public interface ReaderState { void setTsFileOutputName(String tsFileOutputName); - List getPrependFiles(); - boolean isStackEmpty(); ConfigStructure peek(); diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java index c888dd3e26..1029ebd6ba 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java @@ -414,8 +414,13 @@ public class ReaderStateImpl implements ReaderState { // see LiveDataProcessor use-case with dynamic prepend usage return; } - prependFiles.add(fileName); inputFiles.add(fileName); + addPrependNotInput(fileName); + } + + @Override + public void addPrependNotInput(String fileName) { + prependFiles.add(fileName); } @Override @@ -462,11 +467,6 @@ public class ReaderStateImpl implements ReaderState { this.tsFileOutputName = tsFileOutputName; } - @Override - public List getPrependFiles() { - return prependFiles; - } - @Override public boolean isStackEmpty() { return stack.isEmpty();