From b8bb95f636924410a5361324658c43471f40036d Mon Sep 17 00:00:00 2001 From: rusefillc Date: Sun, 17 Apr 2022 13:12:58 -0400 Subject: [PATCH] refactoring --- .../src/main/java/com/rusefi/ConfigDefinition.java | 2 +- .../src/main/java/com/rusefi/ReaderState.java | 1 + .../src/main/java/com/rusefi/output/TSProjectConsumer.java | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) 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 01916cc585..645cc4b9ea 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 @@ -148,7 +148,7 @@ public class ConfigDefinition { enumInputFiles.add(args[i + 1]); break; case "-ts_output_name": - TSProjectConsumer.TS_FILE_OUTPUT_NAME = args[i + 1]; + state.tsFileOutputName = args[i + 1]; break; case KEY_ROMRAIDER_INPUT: String inputFilePath = args[i + 1]; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java index 9302e1cb85..5c7effaa0e 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderState.java @@ -37,6 +37,7 @@ public class ReaderState { public final Map structures = new HashMap<>(); public String headerMessage; // well, technically those should be a builder for state, not this state class itself + public String tsFileOutputName = "rusefi.ini"; String definitionInputFile = null; public boolean withC_Defines = true; List prependFiles = new ArrayList<>(); diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java index 844a59e2da..18c7c62080 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TSProjectConsumer.java @@ -20,7 +20,6 @@ public class TSProjectConsumer implements ConfigurationConsumer { private static final String TS_CONDITION = "@@if_"; public static final String SETTING_CONTEXT_HELP_END = "SettingContextHelpEnd"; public static final String SETTING_CONTEXT_HELP = "SettingContextHelp"; - public static String TS_FILE_OUTPUT_NAME = "rusefi.ini"; private final CharArrayWriter tsWriter; private final String tsPath; @@ -133,8 +132,8 @@ public class TSProjectConsumer implements ConfigurationConsumer { return token; } - public static String getTsFileOutputName(String tsPath) { - return tsPath + File.separator + TS_FILE_OUTPUT_NAME; + private String getTsFileOutputName(String tsPath) { + return tsPath + File.separator + state.tsFileOutputName; } public static String getTsFileInputName(String tsPath) {