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

Now update mode combo box displays `displayText` field values instead of enumeration value names 

Closes #6936
This commit is contained in:
kifir23917 2024-09-20 21:31:19 +03:00 committed by rusefillc
parent a5dfc3fc37
commit 5fafa3b121
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java_console/ui/src/main/java/com/rusefi/maintenance/JobType.java
View File

@ -16,25 +16,33 @@ public enum JobType {
UPDATE_CALIBRATIONS("Update calibrations");
final String jobName;
final String persistedValue;
/***
* Text to display in the corresponding combo box item
*/
final String displayText;
JobType(final String jobName, final String persistedValue) {
JobType(final String jobName, final String displayText) {
this.jobName = jobName;
this.persistedValue = persistedValue;
this.displayText = displayText;
}
JobType(final String jobName) {
this.jobName = jobName;
this.persistedValue = null;
this.displayText = null;
}
static Optional<JobType> parsePersistedValue(final String persistedValue) {
for (final JobType value: values()) {
final String valuePersistedValue = value.persistedValue;
final String valuePersistedValue = value.displayText;
if ((valuePersistedValue != null) && valuePersistedValue.equals(persistedValue)) {
return Optional.of(value);
}
}
return Optional.empty();
}
@Override
public String toString() {
return displayText;
}
}

2
java_console/ui/src/main/java/com/rusefi/maintenance/ProgramSelector.java
View File

@ -65,7 +65,7 @@ public class ProgramSelector {
final JobType selectedMode = (JobType) updateModeComboBox.getSelectedItem();
final PortResult selectedPort = ((PortResult) comboPorts.getSelectedItem());
final String persistedValue = (selectedMode != null ? selectedMode.persistedValue : null);
final String persistedValue = (selectedMode != null ? selectedMode.displayText : null);
getConfig().getRoot().setProperty(getClass().getSimpleName(), persistedValue);
executeJob(comboPorts, selectedMode, selectedPort);
}