diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar index 1b0424acd3..18c97639b9 100644 Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java index a084d330d3..c88d8d0c27 100644 --- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java +++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java @@ -279,7 +279,6 @@ public class ConfigDefinition { public static int getSize(String s) { if (VariableRegistry.INSTANCE.intValues.containsKey(s)) { - VariableRegistry.INSTANCE.usedValues.add(s); return VariableRegistry.INSTANCE.intValues.get(s); } return Integer.parseInt(s); diff --git a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java index 235136713d..b11b93aa34 100644 --- a/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java +++ b/java_tools/configuration_definition/src/com/rusefi/VariableRegistry.java @@ -19,7 +19,6 @@ public class VariableRegistry extends TreeMap { private final Pattern VAR = Pattern.compile("(@@(.*?)@@)"); public Map intValues = new HashMap<>(); - public Set usedValues = new TreeSet<>(String.CASE_INSENSITIVE_ORDER); private final Map cAllDefinitions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); private final Map javaDefinitions = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); @@ -49,6 +48,10 @@ public class VariableRegistry extends TreeMap { } public void register(String var, String value) { + if (containsKey(var)) { + System.out.println("Not redefining " + var); + return; + } System.out.println("Registering " + var + " as " + value); put(var, value); @@ -61,8 +64,6 @@ public class VariableRegistry extends TreeMap { try { int intValue = Integer.parseInt(value); System.out.println("key [" + var + "] value: " + intValue); - if (usedValues.contains(var)) - throw new IllegalStateException("Not allowed to redefine after value was used: " + var); intValues.put(var, intValue); javaDefinitions.put(var, "\tpublic static final int " + var + " = " + intValue + ";" + EOL); } catch (NumberFormatException e) {