From 126b52a44a4405127b1d8cfbb42b9ba5a5087fcb Mon Sep 17 00:00:00 2001 From: kifir23917 Date: Sat, 15 Feb 2025 08:50:50 +0300 Subject: [PATCH] Now we use `CompatibilitySet.of` method instead of Java 9 `Set.of` method #7357 --- .../ui/src/main/java/com/rusefi/CompatibilitySet.java | 8 ++++++++ .../java/com/rusefi/maintenance/IniFieldsAnalizer.java | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/java_console/ui/src/main/java/com/rusefi/CompatibilitySet.java b/java_console/ui/src/main/java/com/rusefi/CompatibilitySet.java index b56b3fa8b4..738cac7713 100644 --- a/java_console/ui/src/main/java/com/rusefi/CompatibilitySet.java +++ b/java_console/ui/src/main/java/com/rusefi/CompatibilitySet.java @@ -11,4 +11,12 @@ public class CompatibilitySet { result.add(e2); return result; } + + public static Set of(E e1, E e2, E e3) { + Set result = new HashSet<>(); + result.add(e1); + result.add(e2); + result.add(e3); + return result; + } } diff --git a/java_console/ui/src/main/java/com/rusefi/maintenance/IniFieldsAnalizer.java b/java_console/ui/src/main/java/com/rusefi/maintenance/IniFieldsAnalizer.java index 3797a42fa1..6bc64deb84 100644 --- a/java_console/ui/src/main/java/com/rusefi/maintenance/IniFieldsAnalizer.java +++ b/java_console/ui/src/main/java/com/rusefi/maintenance/IniFieldsAnalizer.java @@ -3,6 +3,7 @@ package com.rusefi.maintenance; import com.devexperts.logging.Logging; import com.opensr5.ini.IniFileModel; import com.opensr5.ini.field.*; +import com.rusefi.CompatibilitySet; import com.rusefi.core.Pair; import com.rusefi.io.UpdateOperationCallbacks; import com.rusefi.tune.xml.Constant; @@ -14,7 +15,11 @@ import static com.devexperts.logging.Logging.getLogging; public class IniFieldsAnalizer { private static final Logging log = getLogging(IniFieldsAnalizer.class); - private static final Set INI_FIELDS_TO_IGNORE = Set.of("byFirmwareVersion", "hash3", "signature"); + private static final Set INI_FIELDS_TO_IGNORE = CompatibilitySet.of( + "byFirmwareVersion", + "hash3", + "signature" + ); public static List> findValuesToUpdate( final IniFileModel prevIni,