only:Split ConfigGenerator around trigger_defines.txt #5051
This commit is contained in:
parent
d4588d91e8
commit
fed67637d3
|
@ -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 java.io.FileWriter;
|
||||
import java.io.IOException;
|
||||
|
@ -10,7 +11,6 @@ import java.util.LinkedHashMap;
|
|||
import java.util.Map;
|
||||
|
||||
import static com.rusefi.output.DataLogConsumer.getHumanGaugeName;
|
||||
import static org.abego.treelayout.internal.util.java.lang.string.StringUtil.quote;
|
||||
|
||||
public class GaugeConsumer implements ConfigurationConsumer {
|
||||
private final String fileName;
|
||||
|
@ -44,7 +44,7 @@ public class GaugeConsumer implements ConfigurationConsumer {
|
|||
if (!prefix.isEmpty()) {
|
||||
comment = prefix + " " + comment;
|
||||
}
|
||||
comment = quote(comment);
|
||||
comment = VariableRegistry.quote(comment);
|
||||
|
||||
|
||||
double min = configField.getMin();
|
||||
|
@ -58,7 +58,7 @@ public class GaugeConsumer implements ConfigurationConsumer {
|
|||
|
||||
String fullName = prefix + configField.getName();
|
||||
String gaugeEntry = fullName + "Gauge = " + fullName + "," + comment +
|
||||
", " + quote(configField.getUnits()) +
|
||||
", " + VariableRegistry.quote(configField.getUnits()) +
|
||||
", " + min + "," + max +
|
||||
", " + min + "," + max +
|
||||
", " + min + "," + max +
|
|
@ -133,7 +133,7 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
|
|||
|
||||
StringBuilder getterBody = GetOutputValueConsumer.getGetters(switchBody, variables);
|
||||
|
||||
String fullSwitch = wrapSwitchStatement(switchBody);
|
||||
String fullSwitch = GetOutputValueConsumer.wrapSwitchStatement(switchBody);
|
||||
|
||||
return GET_METHOD_HEADER +
|
||||
fullSwitch +
|
||||
|
@ -144,7 +144,7 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
|
|||
StringBuilder switchBody = new StringBuilder();
|
||||
|
||||
StringBuilder setterBody = new StringBuilder();
|
||||
HashMap<Integer, AtomicInteger> hashConflicts = getHashConflicts(variables);
|
||||
HashMap<Integer, AtomicInteger> hashConflicts = GetOutputValueConsumer.getHashConflicts(variables);
|
||||
|
||||
for (VariableRecord pair : variables) {
|
||||
|
||||
|
@ -164,7 +164,7 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
|
|||
}
|
||||
}
|
||||
|
||||
String fullSwitch = wrapSwitchStatement(switchBody);
|
||||
String fullSwitch = GetOutputValueConsumer.wrapSwitchStatement(switchBody);
|
||||
|
||||
return fullSwitch + setterBody;
|
||||
}
|
Loading…
Reference in New Issue