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

refactoring

This commit is contained in:
rusefi 2018-12-20 00:49:27 -05:00
parent 9ec1166085
commit c03ed75433
3 changed files with 46 additions and 8 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.

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

@ -56,8 +56,9 @@ public class ConfigDefinition {
ConfigurationConsumer cHeaderConsumer = new CHeaderConsumer(cHeader);
ConfigurationConsumer tsProjectConsumer = new TSProjectConsumer(tsWriter, tsPath, state);
ConfigurationConsumer javaFieldsConcumer = new JavaFieldsConsumer(javaFieldsWriter, state);
processFile(state, br, cHeaderConsumer, javaFieldsWriter, tsProjectConsumer);
processFile(state, br, cHeaderConsumer, tsProjectConsumer, javaFieldsConcumer);
BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA));
javaFields.write("package com.rusefi.config;" + EOL + EOL);
@ -103,8 +104,10 @@ public class ConfigDefinition {
fw.close();
}
private static void processFile(ReaderState state, BufferedReader br, ConfigurationConsumer cHeaderConsumer,
CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException {
private static void processFile(ReaderState state, BufferedReader br,
ConfigurationConsumer cHeaderConsumer,
ConfigurationConsumer tsProjectConsumer,
ConfigurationConsumer javaFieldsConcumer) throws IOException {
String line;
cHeaderConsumer.startFile();
@ -123,7 +126,7 @@ public class ConfigDefinition {
} else if (line.startsWith(STRUCT_NO_PREFIX)) {
handleStartStructure(state, line.substring(STRUCT_NO_PREFIX.length()), false);
} else if (line.startsWith(END_STRUCT)) {
handleEndStruct(state, cHeaderConsumer, javaFieldsWriter, tsProjectConsumer);
handleEndStruct(state, cHeaderConsumer, tsProjectConsumer, javaFieldsConcumer);
} else if (line.startsWith(BIT)) {
handleBitLine(state, line);
@ -202,7 +205,8 @@ public class ConfigDefinition {
}
private static void handleEndStruct(ReaderState state, ConfigurationConsumer cHeaderConsumer,
CharArrayWriter javaFieldsWriter, ConfigurationConsumer tsProjectConsumer) throws IOException {
ConfigurationConsumer tsProjectConsumer,
ConfigurationConsumer javaFieldsConcumer) throws IOException {
if (state.stack.isEmpty())
throw new IllegalStateException("Unexpected end_struct");
ConfigStructure structure = state.stack.pop();
@ -213,10 +217,8 @@ public class ConfigDefinition {
cHeaderConsumer.handleEndStruct(structure);
tsProjectConsumer.handleEndStruct(structure);
javaFieldsConcumer.handleEndStruct(structure);
if (state.stack.isEmpty()) {
structure.writeJavaFields(state,"", javaFieldsWriter, 0);
}
}
private static void processField(ReaderState state, String line) {

36
java_tools/configuration_definition/src/com/rusefi/JavaFieldsConsumer.java Normal file
View File

@ -0,0 +1,36 @@
package com.rusefi;
import java.io.CharArrayWriter;
import java.io.IOException;
public class JavaFieldsConsumer implements ConfigurationConsumer {
private final CharArrayWriter javaFieldsWriter;
private final ReaderState state;
public JavaFieldsConsumer(CharArrayWriter javaFieldsWriter, ReaderState state) {
this.javaFieldsWriter = javaFieldsWriter;
this.state = state;
}
@Override
public void startFile() throws IOException {
}
@Override
public void endFile() throws IOException {
}
@Override
public void handleEndStruct(ConfigStructure structure) throws IOException {
if (state.stack.isEmpty()) {
structure.writeJavaFields(state,"", javaFieldsWriter, 0);
}
}
@Override
public void onTotalEnd() {
}
}