From 108f0417dad6cdd1f559c5ac9c9b30386b5d25b1 Mon Sep 17 00:00:00 2001 From: rusefi Date: Thu, 20 Dec 2018 01:01:59 -0500 Subject: [PATCH] refactoring --- java_tools/ConfigDefinition.jar | Bin 42199 -> 42223 bytes .../src/com/rusefi/ConfigDefinition.java | 6 +----- .../src/com/rusefi/TSProjectConsumer.java | 15 +++++++-------- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index b3284edd419a3ca286d20c90b94e3648a75b5ac6..203296bceb9f7cc71b214e278b5e7068ac3b4490 100644 GIT binary patch delta 11831 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 P|8=u}5%)>^&)I(f;A9?z delta 11784 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 diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java index 87450d6672..67c13c01e7 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java @@ -22,7 +22,6 @@ public class ConfigDefinition { private static final String ROM_RAIDER_XML_TEMPLATE = "rusefi_template.xml"; private static final String ROM_RAIDER_XML_OUTPUT = "rusefi.xml"; private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h"; - public static int totalTsSize; public static StringBuilder settingContextHelp = new StringBuilder(); @@ -59,10 +58,6 @@ public class ConfigDefinition { processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConsumer); - - - TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString()); - state.ensureEmptyAfterProcessing(); cHeader.close(); @@ -135,6 +130,7 @@ public class ConfigDefinition { } } cHeaderConsumer.endFile(); + tsProjectConsumer.endFile(); javaFieldsConcumer.endFile(); } diff --git a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java index 3140e6bb7d..cb74b0c2d0 100644 --- a/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java +++ b/java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java @@ -12,7 +12,7 @@ public class TSProjectConsumer implements ConfigurationConsumer { private final CharArrayWriter tsWriter; private final String tsPath; private final ReaderState state; - // private int totalTsSize; + private int totalTsSize; public TSProjectConsumer(CharArrayWriter tsWriter, String tsPath, ReaderState state) { this.tsWriter = tsWriter; @@ -20,7 +20,7 @@ public class TSProjectConsumer implements ConfigurationConsumer { this.state = state; } - static void writeTunerStudioFile(String tsPath, String fieldsSection) throws IOException { + private void writeTunerStudioFile(String tsPath, String fieldsSection) throws IOException { TsFileContent tsContent = readTsFile(tsPath); System.out.println("Got " + tsContent.getPrefix().length() + "/" + tsContent.getPostfix().length() + " of " + ConfigDefinition.TS_FILE_INPUT_NAME); @@ -29,7 +29,7 @@ public class TSProjectConsumer implements ConfigurationConsumer { tsHeader.write("; " + CONFIG_DEFINITION_START + ConfigDefinition.EOL); tsHeader.write("; this section " + ConfigDefinition.MESSAGE + ConfigDefinition.EOL + ConfigDefinition.EOL); - tsHeader.write("pageSize = " + ConfigDefinition.totalTsSize + ConfigDefinition.EOL); + tsHeader.write("pageSize = " + totalTsSize + ConfigDefinition.EOL); tsHeader.write("page = 1" + ConfigDefinition.EOL); tsHeader.write(fieldsSection); if (ConfigDefinition.settingContextHelp.length() > 0) { @@ -77,16 +77,15 @@ public class TSProjectConsumer implements ConfigurationConsumer { @Override public void endFile() throws IOException { - + writeTunerStudioFile(tsPath, tsWriter.toString()); } @Override public void handleEndStruct(ConfigStructure structure) throws IOException { if (state.stack.isEmpty()) { - ConfigDefinition.totalTsSize = structure.writeTunerStudio("", tsWriter, 0); - tsWriter.write("; total TS size = " + ConfigDefinition.totalTsSize + EOL); - VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", ConfigDefinition.totalTsSize); - // TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString()); + totalTsSize = structure.writeTunerStudio("", tsWriter, 0); + tsWriter.write("; total TS size = " + totalTsSize + EOL); + VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize); } } }