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

Fields.java is a mess #6711 

extracting methods
This commit is contained in:
Andrey 2024-07-13 17:32:39 -04:00
parent f59c4cffe0
commit ebeed4e9ea
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java_tools/configuration_definition_base/src/main/java/com/rusefi/ReaderStateImpl.java
View File

@ -287,12 +287,12 @@ public class ReaderStateImpl implements ReaderState {
} else if (ToolUtil.startsWithToken(line, CUSTOM)) {
handleCustomLine(line);
} else if (ToolUtil.startsWithToken(line, VariableRegistry.DEFINE)) {
} else if (VariableRegistry.looksLikeDefineLine(line)) {
/**
* for example
* #define CLT_CURVE_SIZE 16
*/
variableRegistry.processDefine(line.substring(VariableRegistry.DEFINE.length()).trim());
variableRegistry.processLine(line);
} else {
if (isStackEmpty())
throw new IllegalStateException("Expected to be within structure at line " + lineIndex + ": " + line);

3
java_tools/configuration_definition_base/src/main/java/com/rusefi/ldmp/LiveDataProcessor.java
View File

@ -25,6 +25,7 @@ public class LiveDataProcessor {
public static final String STATE_DICTIONARY_FACTORY_JAVA = "../java_console/io/src/main/java/com/rusefi/enums/StateDictionaryFactory.java";
public static final String FANCY_CONTENT_INI = "console/binary/generated/fancy_content.ini";
public static final String FANCY_MENU_INI = "console/binary/generated/fancy_menu.ini";
public static final String JAVA_DESTINATION = "../java_console/models/src/main/java/com/rusefi/config/generated/";
private final ReaderProvider readerProvider;
private final LazyFile.LazyFileFactory fileFactory;
@ -161,7 +162,7 @@ public class LiveDataProcessor {
state.addCHeaderDestination(folder + File.separator + name + "_generated.h");
int baseOffset = outputsSections.getBaseOffset();
state.addDestination(new FileJavaFieldsConsumer(state, "../java_console/models/src/main/java/com/rusefi/config/generated/" + javaName, baseOffset, fileFactory));
state.addDestination(new FileJavaFieldsConsumer(state, JAVA_DESTINATION + javaName, baseOffset, fileFactory));
if (constexpr != null) {
sdCardFieldsConsumer.home = constexpr;

12
java_tools/configuration_definition_base/src/main/java/com/rusefi/output/FileJavaFieldsConsumer.java
View File

@ -33,11 +33,19 @@ public class FileJavaFieldsConsumer extends JavaFieldsConsumer {
@Override
public void startFile() {
javaFields.write("package " + JAVA_PACKAGE + ";" + ToolUtil.EOL + ToolUtil.EOL);
writePackageLine(javaFields);
javaFields.write("// this file " + state.getHeader() + ToolUtil.EOL + EOL);
javaFields.write("// by " + getClass() + EOL);
javaFields.write("import com.rusefi.config.*;" + EOL + EOL);
javaFields.write("public class " + className + " {" + ToolUtil.EOL);
writeClassOpenLine(javaFields, className);
}
public static void writeClassOpenLine(LazyFile lazyFile, String className1) {
lazyFile.write("public class " + className1 + " {" + ToolUtil.EOL);
}
public static void writePackageLine(LazyFile lazyFile) {
lazyFile.write("package " + JAVA_PACKAGE + ";" + ToolUtil.EOL + ToolUtil.EOL);
}
@Override

8
java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java
View File

@ -56,6 +56,10 @@ public class VariableRegistry {
return token;
}
static boolean looksLikeDefineLine(String line) {
return ToolUtil.startsWithToken(line, DEFINE);
}
public void readPrependValues(String prependFile, boolean ignoreUnexpectedLined) {
File file = new File(RootHolder.ROOT + prependFile);
try {
@ -83,6 +87,10 @@ public class VariableRegistry {
}
}
void processLine(String line) {
processDefine(line.substring(VariableRegistry.DEFINE.length()).trim());
}
void processDefine(String line) {
int index = line.indexOf(' ');
String name;