refactoring

This commit is contained in:
rusefillc 2022-04-17 13:12:58 -04:00
parent 1f25891d31
commit b8bb95f636
3 changed files with 4 additions and 4 deletions

View File

@ -148,7 +148,7 @@ public class ConfigDefinition {
enumInputFiles.add(args[i + 1]); enumInputFiles.add(args[i + 1]);
break; break;
case "-ts_output_name": case "-ts_output_name":
TSProjectConsumer.TS_FILE_OUTPUT_NAME = args[i + 1]; state.tsFileOutputName = args[i + 1];
break; break;
case KEY_ROMRAIDER_INPUT: case KEY_ROMRAIDER_INPUT:
String inputFilePath = args[i + 1]; String inputFilePath = args[i + 1];

View File

@ -37,6 +37,7 @@ public class ReaderState {
public final Map<String, ConfigStructure> structures = new HashMap<>(); public final Map<String, ConfigStructure> structures = new HashMap<>();
public String headerMessage; public String headerMessage;
// well, technically those should be a builder for state, not this state class itself // well, technically those should be a builder for state, not this state class itself
public String tsFileOutputName = "rusefi.ini";
String definitionInputFile = null; String definitionInputFile = null;
public boolean withC_Defines = true; public boolean withC_Defines = true;
List<String> prependFiles = new ArrayList<>(); List<String> prependFiles = new ArrayList<>();

View File

@ -20,7 +20,6 @@ public class TSProjectConsumer implements ConfigurationConsumer {
private static final String TS_CONDITION = "@@if_"; private static final String TS_CONDITION = "@@if_";
public static final String SETTING_CONTEXT_HELP_END = "SettingContextHelpEnd"; public static final String SETTING_CONTEXT_HELP_END = "SettingContextHelpEnd";
public static final String SETTING_CONTEXT_HELP = "SettingContextHelp"; public static final String SETTING_CONTEXT_HELP = "SettingContextHelp";
public static String TS_FILE_OUTPUT_NAME = "rusefi.ini";
private final CharArrayWriter tsWriter; private final CharArrayWriter tsWriter;
private final String tsPath; private final String tsPath;
@ -133,8 +132,8 @@ public class TSProjectConsumer implements ConfigurationConsumer {
return token; return token;
} }
public static String getTsFileOutputName(String tsPath) { private String getTsFileOutputName(String tsPath) {
return tsPath + File.separator + TS_FILE_OUTPUT_NAME; return tsPath + File.separator + state.tsFileOutputName;
} }
public static String getTsFileInputName(String tsPath) { public static String getTsFileInputName(String tsPath) {