only:pure renaming
This commit is contained in:
parent
4bb1986089
commit
3a38f1ebdd
|
@ -5,12 +5,15 @@ import com.rusefi.ReaderState;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @see PerFieldWithStructuresIterator#strategy
|
||||
*/
|
||||
public abstract class FieldsStrategy {
|
||||
public int run(ReaderState state, ConfigStructure structure, int sensorTsPosition) {
|
||||
public int run(ReaderState state, ConfigStructure structure, int structureStartingTsPosition) {
|
||||
if (state.isStackEmpty()) {
|
||||
return writeFields(structure.getTsFields(), "", sensorTsPosition);
|
||||
return writeFields(structure.getTsFields(), "", structureStartingTsPosition);
|
||||
}
|
||||
return sensorTsPosition;
|
||||
return structureStartingTsPosition;
|
||||
}
|
||||
|
||||
protected int writeFields(List<ConfigField> tsFields, String prefix, int tsPosition) {
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
package com.rusefi.output;
|
||||
|
||||
import com.opensr5.ini.IniFileModel;
|
||||
import com.opensr5.ini.IniFileModelImpl;
|
||||
import com.rusefi.*;
|
||||
import com.rusefi.parse.TypesHelper;
|
||||
|
@ -17,11 +16,11 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer {
|
|||
private final StringBuilder content = new StringBuilder();
|
||||
protected final StringBuffer allFields = new StringBuffer();
|
||||
protected final ReaderState state;
|
||||
private final int baseOffset;
|
||||
private final int structureStartingTsPosition;
|
||||
|
||||
public JavaFieldsConsumer(ReaderState state, int baseOffset) {
|
||||
public JavaFieldsConsumer(ReaderState state, int structureStartingTsPosition) {
|
||||
this.state = state;
|
||||
this.baseOffset = baseOffset;
|
||||
this.structureStartingTsPosition = structureStartingTsPosition;
|
||||
}
|
||||
|
||||
public String getContent() {
|
||||
|
@ -129,7 +128,7 @@ public abstract class JavaFieldsConsumer implements ConfigurationConsumer {
|
|||
}
|
||||
|
||||
private String terminateField() {
|
||||
return ".setBaseOffset(" + baseOffset + ")" +
|
||||
return ".setBaseOffset(" + structureStartingTsPosition + ")" +
|
||||
";" + EOL;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ public class TsOutput {
|
|||
return settingContextHelp.toString();
|
||||
}
|
||||
|
||||
public int run(ReaderState state, ConfigStructure structure, int sensorTsPosition, String temporaryLineComment, String variableNameSuffix) {
|
||||
public int run(ReaderState state, ConfigStructure structure, int structureStartingTsPosition, String temporaryLineComment, String variableNameSuffix) {
|
||||
FieldsStrategy strategy = new FieldsStrategy() {
|
||||
@Override
|
||||
public int writeOneField(FieldIterator it, String prefix, int tsPosition) {
|
||||
|
@ -146,12 +146,12 @@ public class TsOutput {
|
|||
return tsPosition;
|
||||
}
|
||||
};
|
||||
sensorTsPosition = strategy.run(state, structure, sensorTsPosition);
|
||||
structureStartingTsPosition = strategy.run(state, structure, structureStartingTsPosition);
|
||||
|
||||
if (state.isStackEmpty()) {
|
||||
tsHeader.append("; total TS size = " + sensorTsPosition + EOL);
|
||||
tsHeader.append("; total TS size = " + structureStartingTsPosition + EOL);
|
||||
}
|
||||
return sensorTsPosition;
|
||||
return structureStartingTsPosition;
|
||||
}
|
||||
|
||||
private String handleTsInfo(ConfigField configField, String tsInfo, int multiplierIndex) {
|
||||
|
|
Loading…
Reference in New Issue