diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigFieldImpl.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigFieldImpl.java index 73d4664cc0..ab85a93fde 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigFieldImpl.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigFieldImpl.java @@ -15,6 +15,7 @@ import java.util.regex.Pattern; import static com.devexperts.logging.Logging.getLogging; import static com.rusefi.output.JavaSensorsConsumer.quote; +import com.rusefi.parse.TypesHelper; import org.jetbrains.annotations.Nullable; /** @@ -278,7 +279,7 @@ public class ConfigFieldImpl implements ConfigField { } /** - * @see com.rusefi.newparse.parsing.Type + * @see TypesHelper */ @Override public String getType() { diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderStateImpl.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderStateImpl.java index ca842a8e36..3097673a81 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderStateImpl.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ReaderStateImpl.java @@ -5,6 +5,7 @@ import com.opensr5.ini.RawIniFile; import com.opensr5.ini.field.EnumIniField; import com.rusefi.enum_reader.Value; import com.rusefi.output.*; +import com.rusefi.parse.TypesHelper; import com.rusefi.util.IoUtils; import com.rusefi.util.SystemOut; import org.jetbrains.annotations.NotNull; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java index 6fa82bc57c..a16656f4eb 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java @@ -1,6 +1,7 @@ package com.rusefi.output; import com.rusefi.*; +import com.rusefi.parse.TypesHelper; import static com.rusefi.ToolUtil.EOL; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java index a963a18573..081c569359 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/ConfigStructureImpl.java @@ -1,6 +1,7 @@ package com.rusefi.output; import com.rusefi.*; +import com.rusefi.parse.TypesHelper; import java.util.ArrayList; import java.util.HashSet; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java index 162d389175..7ecf3debec 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/DataLogConsumer.java @@ -3,7 +3,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; import com.rusefi.ConfigFieldImpl; import com.rusefi.ReaderState; -import com.rusefi.TypesHelper; +import com.rusefi.parse.TypesHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java index a292ba31c1..d455400f5d 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java @@ -2,7 +2,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; import com.rusefi.ReaderState; -import com.rusefi.TypesHelper; +import com.rusefi.parse.TypesHelper; import com.rusefi.output.variables.VariableRecord; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java index f006ee30d2..c9f71fc23c 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetOutputValueConsumer.java @@ -2,7 +2,7 @@ package com.rusefi.output; import com.rusefi.ConfigField; import com.rusefi.ReaderState; -import com.rusefi.TypesHelper; +import com.rusefi.parse.TypesHelper; import com.rusefi.output.variables.VariableRecord; import org.jetbrains.annotations.NotNull; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java index 38b1baf5fb..149752b2ca 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java +++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/TsOutput.java @@ -4,8 +4,8 @@ import com.opensr5.ini.field.IniField; import com.rusefi.ConfigField; import com.rusefi.ConfigFieldImpl; import com.rusefi.ReaderState; -import com.rusefi.TypesHelper; -import com.rusefi.newparse.parsing.Type; +import com.rusefi.parse.Type; +import com.rusefi.parse.TypesHelper; import java.util.TreeSet; diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java index 0b58165795..ba8f97b215 100644 --- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java +++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/ConfigFieldParserTest.java @@ -2,6 +2,7 @@ package com.rusefi.test; import com.rusefi.*; import com.rusefi.output.*; +import com.rusefi.parse.TypesHelper; import org.junit.Test; import static org.junit.Assert.*; diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java index d09dbe6165..ae75f430d8 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/output/JavaFieldsConsumer.java @@ -2,6 +2,7 @@ package com.rusefi.output; import com.opensr5.ini.IniFileModel; import com.rusefi.*; +import com.rusefi.parse.TypesHelper; import java.io.IOException; import java.util.HashSet; diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Type.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/parse/Type.java similarity index 87% rename from java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Type.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/parse/Type.java index 5350fcd636..a2427feece 100644 --- a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/parsing/Type.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/parse/Type.java @@ -1,5 +1,8 @@ -package com.rusefi.newparse.parsing; +package com.rusefi.parse; +/** + * todo: migrate from TypesHelper to this class? + */ public enum Type { U08("uint8_t", "U08", 1), S08("int8_t", "S08", 1), diff --git a/java_tools/configuration_definition_base/src/main/java/com/rusefi/TypesHelper.java b/java_tools/configuration_definition_base/src/main/java/com/rusefi/parse/TypesHelper.java similarity index 97% rename from java_tools/configuration_definition_base/src/main/java/com/rusefi/TypesHelper.java rename to java_tools/configuration_definition_base/src/main/java/com/rusefi/parse/TypesHelper.java index d00dae02e8..81658e645e 100644 --- a/java_tools/configuration_definition_base/src/main/java/com/rusefi/TypesHelper.java +++ b/java_tools/configuration_definition_base/src/main/java/com/rusefi/parse/TypesHelper.java @@ -1,10 +1,12 @@ -package com.rusefi; +package com.rusefi.parse; +import com.rusefi.ReaderState; import com.rusefi.util.SystemOut; import java.util.Objects; /** + * TODO: migrate to Type? * 1/22/15 */ public class TypesHelper {