rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
rusefi 2018-12-20 01:01:59 -05:00
parent 843f759941
commit 108f0417da
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
java_tools/ConfigDefinition.jar
View File

Binary file not shown.

6
java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
View File

@ -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_TEMPLATE = "rusefi_template.xml";
private static final String ROM_RAIDER_XML_OUTPUT = "rusefi.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"; private static final String ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H = "engine_configuration_generated_structures.h";
public static int totalTsSize;
public static StringBuilder settingContextHelp = new StringBuilder(); public static StringBuilder settingContextHelp = new StringBuilder();
@ -59,10 +58,6 @@ public class ConfigDefinition {
processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConsumer); processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConsumer);
TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString());
state.ensureEmptyAfterProcessing(); state.ensureEmptyAfterProcessing();
cHeader.close(); cHeader.close();
@ -135,6 +130,7 @@ public class ConfigDefinition {
} }
} }
cHeaderConsumer.endFile(); cHeaderConsumer.endFile();
tsProjectConsumer.endFile();
javaFieldsConcumer.endFile(); javaFieldsConcumer.endFile();
} }

15
java_tools/configuration_definition/src/com/rusefi/TSProjectConsumer.java
View File

@ -12,7 +12,7 @@ public class TSProjectConsumer implements ConfigurationConsumer {
private final CharArrayWriter tsWriter; private final CharArrayWriter tsWriter;
private final String tsPath; private final String tsPath;
private final ReaderState state; private final ReaderState state;
// private int totalTsSize; private int totalTsSize;
public TSProjectConsumer(CharArrayWriter tsWriter, String tsPath, ReaderState state) { public TSProjectConsumer(CharArrayWriter tsWriter, String tsPath, ReaderState state) {
this.tsWriter = tsWriter; this.tsWriter = tsWriter;
@ -20,7 +20,7 @@ public class TSProjectConsumer implements ConfigurationConsumer {
this.state = state; 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); TsFileContent tsContent = readTsFile(tsPath);
System.out.println("Got " + tsContent.getPrefix().length() + "/" + tsContent.getPostfix().length() + " of " + ConfigDefinition.TS_FILE_INPUT_NAME); 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("; " + CONFIG_DEFINITION_START + ConfigDefinition.EOL);
tsHeader.write("; this section " + ConfigDefinition.MESSAGE + ConfigDefinition.EOL + 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("page = 1" + ConfigDefinition.EOL);
tsHeader.write(fieldsSection); tsHeader.write(fieldsSection);
if (ConfigDefinition.settingContextHelp.length() > 0) { if (ConfigDefinition.settingContextHelp.length() > 0) {
@ -77,16 +77,15 @@ public class TSProjectConsumer implements ConfigurationConsumer {
@Override @Override
public void endFile() throws IOException { public void endFile() throws IOException {
writeTunerStudioFile(tsPath, tsWriter.toString());
} }
@Override @Override
public void handleEndStruct(ConfigStructure structure) throws IOException { public void handleEndStruct(ConfigStructure structure) throws IOException {
if (state.stack.isEmpty()) { if (state.stack.isEmpty()) {
ConfigDefinition.totalTsSize = structure.writeTunerStudio("", tsWriter, 0); totalTsSize = structure.writeTunerStudio("", tsWriter, 0);
tsWriter.write("; total TS size = " + ConfigDefinition.totalTsSize + EOL); tsWriter.write("; total TS size = " + totalTsSize + EOL);
VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", ConfigDefinition.totalTsSize); VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize);
// TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString());
} }
} }
} }