refactoring

java_tools/configuration_definition/build.gradle

@@ -10,6 +10,7 @@ defaultTasks 'shadowJar'
 
 dependencies {
     implementation project(':logging')
+    api project(':config_definition_base')
     implementation project(':models')
     implementation project(':enum_to_string')
     antlr global_libs.antlr

java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java

@@ -14,7 +14,7 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer {
 
     private final StringBuilder content = new StringBuilder();
     protected final StringBuffer allFields = new StringBuffer("\tpublic static final Field[] VALUES = {" + EOL);
-    protected final ReaderStateImpl state;
+    protected final ReaderState state;
     private final int baseOffset;
 
     public JavaFieldsConsumer(ReaderStateImpl state, int baseOffset) {

java_tools/configuration_definition_base/build.gradle

@@ -0,0 +1,14 @@
+plugins {
+    id 'java-library'
+    id 'antlr'
+}
+
+apply from: '../../java_tools/dependencies.gradle'
+
+dependencies {
+    implementation project(':logging')
+    api project(':inifile')
+    api global_libs.snakeyaml
+    implementation project(':enum_to_string')
+    antlr global_libs.antlr
+}

java_tools/configuration_definition_base/src/main/java/com/rusefi/TypesHelper.java

@@ -17,7 +17,7 @@ public class TypesHelper {
     private static final String UINT_32_T = "uint32_t";
     private static final String BOOLEAN_T = "boolean";
 
-    public static int getElementSize(ReaderStateImpl state, String type) {
+    public static int getElementSize(ReaderState state, String type) {
         Objects.requireNonNull(state);
         if (type == null)
             return 0;

java_tools/settings.gradle

@@ -16,6 +16,8 @@ include ':version2header'
 project(':version2header').projectDir = new File('version2header')
 include ':bin2header'
 project(':bin2header').projectDir = new File('bin2header')
+include ':config_definition_base'
+project(':config_definition_base').projectDir = new File('configuration_definition_base')
 include ':config_definition'
 project(':config_definition').projectDir = new File('configuration_definition')
 include ':ts_plugin_launcher'