rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
rusefi 2018-12-20 00:52:18 -05:00
parent c03ed75433
commit 56fbc21b71
3 changed files with 15 additions and 11 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.

10
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";
private static final String FIELDS_JAVA = "models/src/com/rusefi/config/Fields.java";
public static int totalTsSize; public static int totalTsSize;
public static StringBuilder settingContextHelp = new StringBuilder(); public static StringBuilder settingContextHelp = new StringBuilder();
@ -60,14 +59,7 @@ public class ConfigDefinition {
processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConcumer); processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConcumer);
BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA)); JavaFieldsConsumer.writeFields(javaConsolePath, javaFieldsWriter);
javaFields.write("package com.rusefi.config;" + EOL + EOL);
javaFields.write("// this file " + MESSAGE + EOL);
javaFields.write("public class Fields {" + EOL);
javaFields.write(VariableRegistry.INSTANCE.getJavaConstants());
javaFields.write(javaFieldsWriter.toString());
javaFields.write("}" + EOL);
javaFields.close();
TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString()); TSProjectConsumer.writeTunerStudioFile(tsPath, tsWriter.toString());

16
java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java
View File

@ -1,9 +1,10 @@
package com.rusefi; package com.rusefi;
import java.io.CharArrayWriter; import java.io.*;
import java.io.IOException;
public class JavaFieldsConsumer implements ConfigurationConsumer { public class JavaFieldsConsumer implements ConfigurationConsumer {
private static final String FIELDS_JAVA = "models/src/com/rusefi/config/Fields.java";
private final CharArrayWriter javaFieldsWriter; private final CharArrayWriter javaFieldsWriter;
private final ReaderState state; private final ReaderState state;
@ -12,6 +13,17 @@ public class JavaFieldsConsumer implements ConfigurationConsumer {
this.state = state; this.state = state;
} }
static void writeFields(String javaConsolePath, CharArrayWriter javaFieldsWriter) throws IOException {
BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA));
javaFields.write("package com.rusefi.config;" + ConfigDefinition.EOL + ConfigDefinition.EOL);
javaFields.write("// this file " + ConfigDefinition.MESSAGE + ConfigDefinition.EOL);
javaFields.write("public class Fields {" + ConfigDefinition.EOL);
javaFields.write(VariableRegistry.INSTANCE.getJavaConstants());
javaFields.write(javaFieldsWriter.toString());
javaFields.write("}" + ConfigDefinition.EOL);
javaFields.close();
}
@Override @Override
public void startFile() throws IOException { public void startFile() throws IOException {