andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactoring

This commit is contained in:
rusefillc 2022-04-17 14:03:58 -04:00
parent dc1c6c035d
commit fca9f998ea
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java_tools/configuration_definition/src/main/java/com/rusefi/output/FieldsStrategy.java
View File

@ -17,15 +17,13 @@ public abstract class FieldsStrategy {
FieldIterator iterator = new FieldIterator(tsFields); FieldIterator iterator = new FieldIterator(tsFields);
for (int i = 0; i < tsFields.size(); i++) { for (int i = 0; i < tsFields.size(); i++) {
iterator.start(i); iterator.start(i);
tsPosition = writeOneField(iterator, iterator.cf, prefix, tsPosition, iterator.next, tsPosition = writeOneField(iterator, prefix, tsPosition);
iterator.bitState.get(),
iterator.getPrev());
iterator.end(); iterator.end();
} }
return tsPosition; return tsPosition;
} }
abstract int writeOneField(FieldIterator iterator, ConfigField configField, String prefix, int tsPosition, ConfigField next, int bitIndex, ConfigField prev) throws IOException; abstract int writeOneField(FieldIterator iterator, String prefix, int tsPosition) throws IOException;
} }

4
java_tools/configuration_definition/src/main/java/com/rusefi/output/FragmentDialogConsumer.java
View File

@ -32,10 +32,8 @@ public class FragmentDialogConsumer implements ConfigurationConsumer {
public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException {
FieldsStrategy fieldsStrategy = new FieldsStrategy() { FieldsStrategy fieldsStrategy = new FieldsStrategy() {
@Override @Override
int writeOneField(FieldIterator iterator, ConfigField _configField, String prefix, int tsPosition, ConfigField _next, int _bitIndex, ConfigField prev) { int writeOneField(FieldIterator iterator, String prefix, int tsPosition) {
ConfigField configField = iterator.cf; ConfigField configField = iterator.cf;
ConfigField next = iterator.next;
int bitIndex = iterator.bitState.get();
if (configField.getName().startsWith(ConfigStructure.UNUSED_BIT_PREFIX)) if (configField.getName().startsWith(ConfigStructure.UNUSED_BIT_PREFIX))
return 0; return 0;

3
java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaFieldsConsumer.java
View File

@ -51,7 +51,8 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer {
public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException {
FieldsStrategy fieldsStrategy = new FieldsStrategy() { FieldsStrategy fieldsStrategy = new FieldsStrategy() {
protected int writeOneField(FieldIterator iterator, ConfigField _configField, String prefix, int tsPosition, ConfigField _next, int _bitIndex, ConfigField prev) throws IOException { protected int writeOneField(FieldIterator iterator, String prefix, int tsPosition) throws IOException {
ConfigField prev = iterator.getPrev();
ConfigField configField = iterator.cf; ConfigField configField = iterator.cf;
ConfigField next = iterator.next; ConfigField next = iterator.next;
int bitIndex = iterator.bitState.get(); int bitIndex = iterator.bitState.get();

2
java_tools/configuration_definition/src/main/java/com/rusefi/output/JavaSensorsConsumer.java
View File

@ -25,7 +25,7 @@ public class JavaSensorsConsumer implements ConfigurationConsumer {
@Override @Override
public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException { public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException {
FieldsStrategy fieldsStrategy = new FieldsStrategy() { FieldsStrategy fieldsStrategy = new FieldsStrategy() {
public int writeOneField(FieldIterator iterator, ConfigField _configField, String prefix, int tsPosition, ConfigField _next, int i, ConfigField prev) { public int writeOneField(FieldIterator iterator, String prefix, int tsPosition) {
ConfigField configField = iterator.cf; ConfigField configField = iterator.cf;
ConfigField next = iterator.next; ConfigField next = iterator.next;