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

sorting sensor selection menu items

This commit is contained in:
rusEfi 2017-12-13 18:36:22 -05:00
parent d41e2fecb7
commit 6382a26b2c
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java_console/models/src/com/rusefi/core/Sensor.java
View File

@ -4,7 +4,10 @@ import com.rusefi.config.FieldType;
import com.rusefi.config.Fields;
import eu.hansolo.steelseries.tools.BackgroundColor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.Set;
import java.util.TreeSet;
import static com.rusefi.config.Fields.*;
@ -209,8 +212,8 @@ public enum Sensor {
offset = -1;
}
public static ArrayList<Sensor> getSensorsForCategory(String category) {
final ArrayList<Sensor> sensors = new ArrayList<>();
public static Collection<Sensor> getSensorsForCategory(String category) {
final Set<Sensor> sensors = new TreeSet<>(Comparator.comparing(o -> o.getName().toLowerCase()));
for (final Sensor sensor : values()) {
if (sensor.category.getName().equals(category)) {

2
java_console/models/src/com/rusefi/core/SensorCategory.java
View File

@ -9,7 +9,7 @@ public enum SensorCategory {
private final String name;
private SensorCategory(String name) {
SensorCategory(String name) {
this.name = name;
}

2
java_console/ui/src/com/rusefi/Launcher.java
View File

@ -45,7 +45,7 @@ import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
* @see EngineSnifferPanel
*/
public class Launcher {
public static final int CONSOLE_VERSION = 20171203;
public static final int CONSOLE_VERSION = 20171213;
public static final boolean SHOW_STIMULATOR = false;
private static final String TAB_INDEX = "main_tab";
protected static final String PORT_KEY = "port";