From 6382a26b2c3b05bce861e49a0d3186bcdc61eb5b Mon Sep 17 00:00:00 2001 From: rusEfi Date: Wed, 13 Dec 2017 18:36:22 -0500 Subject: [PATCH] sorting sensor selection menu items --- java_console/models/src/com/rusefi/core/Sensor.java | 9 ++++++--- .../models/src/com/rusefi/core/SensorCategory.java | 2 +- java_console/ui/src/com/rusefi/Launcher.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/java_console/models/src/com/rusefi/core/Sensor.java b/java_console/models/src/com/rusefi/core/Sensor.java index cabf75c499..94501ea590 100644 --- a/java_console/models/src/com/rusefi/core/Sensor.java +++ b/java_console/models/src/com/rusefi/core/Sensor.java @@ -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 getSensorsForCategory(String category) { - final ArrayList sensors = new ArrayList<>(); + public static Collection getSensorsForCategory(String category) { + final Set sensors = new TreeSet<>(Comparator.comparing(o -> o.getName().toLowerCase())); for (final Sensor sensor : values()) { if (sensor.category.getName().equals(category)) { diff --git a/java_console/models/src/com/rusefi/core/SensorCategory.java b/java_console/models/src/com/rusefi/core/SensorCategory.java index 75d1986566..9719a72f74 100644 --- a/java_console/models/src/com/rusefi/core/SensorCategory.java +++ b/java_console/models/src/com/rusefi/core/SensorCategory.java @@ -9,7 +9,7 @@ public enum SensorCategory { private final String name; - private SensorCategory(String name) { + SensorCategory(String name) { this.name = name; } diff --git a/java_console/ui/src/com/rusefi/Launcher.java b/java_console/ui/src/com/rusefi/Launcher.java index 96eba9d7a9..c022eceba0 100644 --- a/java_console/ui/src/com/rusefi/Launcher.java +++ b/java_console/ui/src/com/rusefi/Launcher.java @@ -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";