only:Split ConfigGenerator around trigger_defines.txt #5051

java_tools/configuration_definition_base/build.gradle

@@ -6,6 +6,5 @@ apply from: '../../java_tools/dependencies.gradle'
 
 dependencies {
     api project(':inifile')
-    api global_libs.snakeyaml
     api project(':enum_to_string')
 }

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

@@ -16,7 +16,6 @@ import java.util.*;
 import static com.devexperts.logging.Logging.getLogging;
 import static com.rusefi.ConfigFieldImpl.BOOLEAN_T;
 import static com.rusefi.VariableRegistry.unquote;
-import static com.rusefi.output.JavaSensorsConsumer.quote;
 
 /**
  * We keep state here as we read configuration definition
@@ -343,7 +342,7 @@ public class ReaderStateImpl implements ReaderState {
     private static String getCommentWithIndex(ConfigFieldImpl cf, int i) {
         String unquoted = unquote(cf.getCommentOrName());
         String string = unquoted + " " + i;
-        return quote(string);
+        return VariableRegistry.quote(string);
     }
 
     @Override

java_tools/configuration_definition_base/src/main/java/com/rusefi/output/ConfigStructureImpl.java

@@ -114,7 +114,7 @@ public class ConfigStructureImpl implements ConfigStructure {
         return tsFieldsMap.get(name);
     }
 
-    public void addBitPadding(ReaderStateImpl readerState) {
+    public void addBitPadding(ReaderState readerState) {
         if (readingBitState.get() == 0)
             return;
         int sizeAtStartOfPadding = cFields.size();

java_tools/configuration_definition_base/src/main/java/com/rusefi/output/DataLogConsumer.java

@@ -3,6 +3,7 @@ package com.rusefi.output;
 import com.rusefi.ConfigField;
 import com.rusefi.ConfigFieldImpl;
 import com.rusefi.ReaderState;
+import com.rusefi.VariableRegistry;
 import com.rusefi.parse.TypesHelper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -12,7 +13,6 @@ import java.io.IOException;
 import java.util.TreeSet;
 
 import static com.rusefi.VariableRegistry.unquote;
-import static org.abego.treelayout.internal.util.java.lang.string.StringUtil.quote;
 
 /**
  * here we generate [Datalog] section of TS .ini file
@@ -99,7 +99,7 @@ public class DataLogConsumer implements ConfigurationConsumer {
             throw new IllegalStateException("[" + comment + "] is too long for log files at " + comment.length());
 
         if (comment.charAt(0) != '"')
-            comment = quote(comment);
+            comment = VariableRegistry.quote(comment);
         return comment;
     }
 

java_tools/configuration_definition_base/src/main/java/com/rusefi/output/SdCardFieldsContent.java

@@ -1,7 +1,5 @@
 package com.rusefi.output;
 
-import com.rusefi.core.SensorCategory;
-
 import com.rusefi.ConfigField;
 import com.rusefi.ReaderState;
 

java_tools/configuration_definition_base/src/main/java/com/rusefi/output/variables/VariableRecord.java

@@ -1,7 +1,5 @@
 package com.rusefi.output.variables;
 
-import com.rusefi.core.Pair;
-
 public class VariableRecord {
     public final String type;
     private final String humanName;