rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor code refactoring, same exact logic

This commit is contained in:
rusefillc 2021-05-20 20:02:25 -04:00
parent 68ad12da53
commit 50636dbe17
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
View File

@ -361,20 +361,21 @@ public class ConfigDefinition {
SystemOut.println(data); SystemOut.println(data);
Objects.requireNonNull(data, "data"); Objects.requireNonNull(data, "data");
for (Map<String, Object> pin : data) { for (Map<String, Object> pin : data) {
if (pin.get("id") instanceof ArrayList) { Object idObject = pin.get("id");
ArrayList IDs = (ArrayList) pin.get("id"); if (idObject instanceof ArrayList) {
for (int i = 0; i < IDs.size(); i++) { ArrayList IDs = (ArrayList) idObject;
String id = (String) IDs.get(i);
Object classes = pin.get("class"); Object classes = pin.get("class");
if (!(classes instanceof ArrayList)) if (!(classes instanceof ArrayList))
throw new IllegalStateException("Expected multiple classes for " + IDs); throw new IllegalStateException("Expected multiple classes for " + IDs);
for (int i = 0; i < IDs.size(); i++) {
String id = (String) IDs.get(i);
findMatchingEnum(id, findMatchingEnum(id,
(String) pin.get("ts_name"), (String) pin.get("ts_name"),
(String) ((ArrayList) classes).get(i), (String) ((ArrayList) classes).get(i),
state, listOutputs, listAnalogInputs, listEventInputs, listSwitchInputs); state, listOutputs, listAnalogInputs, listEventInputs, listSwitchInputs);
} }
} else if (pin.get("id") instanceof String ) { } else if (idObject instanceof String ) {
findMatchingEnum((String) pin.get("id"), (String) pin.get("ts_name"), (String) pin.get("class"), state, listOutputs, listAnalogInputs, listEventInputs, listSwitchInputs); findMatchingEnum((String) idObject, (String) pin.get("ts_name"), (String) pin.get("class"), state, listOutputs, listAnalogInputs, listEventInputs, listSwitchInputs);
} }
} }
} }