diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 6d3ee0340f3..d9d58f695d2 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java index 8776b5091e0..7d985762149 100644 --- a/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java +++ b/java_tools/enum_to_string/src/main/java/com/rusefi/VariableRegistry.java @@ -40,6 +40,7 @@ public class VariableRegistry { public Map intValues = new HashMap<>(); private final Map cAllDefinitions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + // todo: move thid logic to JavaFieldsConsumer since that's the consumer? private final Map javaDefinitions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); public void readPrependValues(String prependFile) throws IOException { @@ -219,7 +220,8 @@ private void tryToRegisterAsInteger(String var, String value) { } catch (NumberFormatException e) { //SystemOut.println("Not an integer: " + value); - if (!var.trim().endsWith(ENUM_SUFFIX)) { + if (!var.trim().endsWith(ENUM_SUFFIX) && + !var.trim().endsWith(FULL_JAVA_ENUM)) { if (isQuoted(value, '"')) { // quoted and not with enum suffix means plain string define statement javaDefinitions.put(var, "\tpublic static final String " + var + " = " + value + ";" + ToolUtil.EOL);