From 754751c19bc02a28badb3e29632ab134df8b8195 Mon Sep 17 00:00:00 2001 From: Georgios Moutsos <50378548+jossuar@users.noreply.github.com> Date: Tue, 16 Mar 2021 21:53:50 +0200 Subject: [PATCH] [caddx] Corrected wrong casing on enum members to uppercase (#10344) Signed-off-by: Georgios Moutsos --- .../internal/handler/LogEventMessage.java | 8 +- .../caddx/internal/handler/LogEventType.java | 122 +++++++++--------- .../internal/handler/ZoneUserDevice.java | 8 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventMessage.java b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventMessage.java index 967f440c57..f6e8d66662 100644 --- a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventMessage.java +++ b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventMessage.java @@ -72,15 +72,15 @@ public class LogEventMessage { } switch (logEventType.zud) { - case None: + case NONE: break; - case Zone: + case ZONE: sb.append(" Zone ").append(Integer.parseInt(zud) + 1); break; - case User: + case USER: sb.append(" User ").append(Integer.parseInt(zud) + 1); break; - case Device: + case DEVICE: sb.append(" Device ").append(zud); break; } diff --git a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventType.java b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventType.java index dd6e1205b0..2e429b9f01 100644 --- a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventType.java +++ b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/LogEventType.java @@ -25,67 +25,67 @@ import org.eclipse.jdt.annotation.Nullable; */ @NonNullByDefault public enum LogEventType { - ALARM(0, ZoneUserDevice.Zone, true, "Alarm"), - ALARM_RESTORE(1, ZoneUserDevice.Zone, true, "Alarm restore"), - BYPASS(2, ZoneUserDevice.Zone, true, "Bypass"), - BYPASS_RESTORE(3, ZoneUserDevice.Zone, true, "Bypass restore"), - TAMPER(4, ZoneUserDevice.Zone, true, "Tamper"), - TAMPER_RESTORE(5, ZoneUserDevice.Zone, true, "Tamper restore"), - TROUBLE(6, ZoneUserDevice.Zone, true, "Trouble"), - TROUBLE_RESTORE(7, ZoneUserDevice.Zone, true, "Trouble restore"), - TX_LOW_BATTERY(8, ZoneUserDevice.Zone, true, "TX low battery"), - TX_LOW_BATTERY_RESTORE(9, ZoneUserDevice.Zone, true, "TX low battery restore"), - ZONE_LOST(10, ZoneUserDevice.Zone, true, "Zone lost"), - ZONE_LOST_RESTORE(11, ZoneUserDevice.Zone, true, "Zone lost restore"), - START_OF_CROSS_TIME(12, ZoneUserDevice.Zone, true, "Start of cross time"), - SPECIAL_EXPANSION_EVENT(17, ZoneUserDevice.None, false, "Special expansion event"), - DURESS(18, ZoneUserDevice.None, true, "Duress"), - MANUAL_FIRE(19, ZoneUserDevice.None, true, "Manual fire"), - AUXILIARY2_PANIC(20, ZoneUserDevice.None, true, "Auxiliary 2 panic"), - PANIC(22, ZoneUserDevice.None, true, "Panic"), - KEYPAD_TAMPER(23, ZoneUserDevice.None, true, "Keypad tamper"), - CONTROL_BOX_TAMPER(24, ZoneUserDevice.Device, false, "Control box tamper"), - CONTROL_BOX_TAMPER_RESTORE(25, ZoneUserDevice.Device, false, "Control box tamper restore"), - AC_FAIL(26, ZoneUserDevice.Device, false, "AC fail"), - AC_FAIL_RESTORE(27, ZoneUserDevice.Device, false, "AC fail restore"), - LOW_BATTERY(28, ZoneUserDevice.Device, false, "Low battery"), - LOW_BATTERY_RESTORE(29, ZoneUserDevice.Device, false, "Low battery restore"), - OVER_CURRENT(30, ZoneUserDevice.Device, false, "Over-current"), - OVER_CURRENT_RESTORE(31, ZoneUserDevice.Device, false, "Over-current restore"), - SIREN_TAMPER(32, ZoneUserDevice.Device, false, "Siren tamper"), - SIREN_TAMPER_RESTORE(33, ZoneUserDevice.Device, false, "Siren tamper restore"), - TELEPHONE_FAULT(34, ZoneUserDevice.None, false, "Telephone fault"), - TELEPHONE_FAULT_RESTORE(35, ZoneUserDevice.None, false, "Telephone fault restore"), - EXPANDER_TROUBLE(36, ZoneUserDevice.Device, false, "Expander trouble"), - EXPANDER_TROUBLE_RESTORE(37, ZoneUserDevice.Device, false, "Expander trouble restore"), - FAIL_TO_COMMUNICATE(38, ZoneUserDevice.None, false, "Fail to communicate"), - LOG_FULL(39, ZoneUserDevice.None, false, "Log full"), - OPENING(40, ZoneUserDevice.User, true, "Opening"), - CLOSING(41, ZoneUserDevice.User, true, "Closing"), - EXIT_ERROR(42, ZoneUserDevice.User, true, "Exit error"), - RECENT_CLOSING(43, ZoneUserDevice.User, true, "Recent closing"), - AUTO_TEST(44, ZoneUserDevice.None, false, "Auto-test"), - START_PROGRAM(45, ZoneUserDevice.None, false, "Start program"), - END_PROGRAM(46, ZoneUserDevice.None, false, "End program"), - START_DOWNLOAD(47, ZoneUserDevice.None, false, "Start download"), - END_DOWNLOAD(48, ZoneUserDevice.None, false, "End download"), - CANCEL(49, ZoneUserDevice.User, true, "Cancel"), - GROUND_FAULT(50, ZoneUserDevice.None, false, "Ground fault"), - GROUND_FAULT_RESTORE(51, ZoneUserDevice.None, false, "Ground fault restore"), - MANUAL_TEST(52, ZoneUserDevice.None, false, "Manual test"), - CLOSED_WITH_ZONES_BYPASSED(53, ZoneUserDevice.User, true, "Closed with zones bypassed"), - START_OF_LISTEN_IN(54, ZoneUserDevice.None, false, "Start of listen in"), - TECHNICIAN_ON_SITE(55, ZoneUserDevice.None, false, "Technician on site"), - TECHNICIAN_LEFT(56, ZoneUserDevice.None, false, "Technician left"), - CONTROL_POWER_UP(57, ZoneUserDevice.None, false, "Control power up"), - FIRST_TO_OPEN(120, ZoneUserDevice.User, true, "First to open"), - LAST_TO_CLOSE(121, ZoneUserDevice.User, true, "Last toC close"), - PIN_ENTERED_WITH_BIT7_SET(122, ZoneUserDevice.User, true, "PIN entered with bit 7 set"), - BEGIN_WALK_TEST(123, ZoneUserDevice.None, false, "Begin walk-test"), - END_WALK_TEST(124, ZoneUserDevice.None, false, "End walk-test"), - RE_EXIT(125, ZoneUserDevice.None, true, "Re-exit"), - OUTPUT_TRIP(126, ZoneUserDevice.User, false, "Output trip"), - DATA_LOST(127, ZoneUserDevice.None, false, "Data Lost"); + ALARM(0, ZoneUserDevice.ZONE, true, "Alarm"), + ALARM_RESTORE(1, ZoneUserDevice.ZONE, true, "Alarm restore"), + BYPASS(2, ZoneUserDevice.ZONE, true, "Bypass"), + BYPASS_RESTORE(3, ZoneUserDevice.ZONE, true, "Bypass restore"), + TAMPER(4, ZoneUserDevice.ZONE, true, "Tamper"), + TAMPER_RESTORE(5, ZoneUserDevice.ZONE, true, "Tamper restore"), + TROUBLE(6, ZoneUserDevice.ZONE, true, "Trouble"), + TROUBLE_RESTORE(7, ZoneUserDevice.ZONE, true, "Trouble restore"), + TX_LOW_BATTERY(8, ZoneUserDevice.ZONE, true, "TX low battery"), + TX_LOW_BATTERY_RESTORE(9, ZoneUserDevice.ZONE, true, "TX low battery restore"), + ZONE_LOST(10, ZoneUserDevice.ZONE, true, "Zone lost"), + ZONE_LOST_RESTORE(11, ZoneUserDevice.ZONE, true, "Zone lost restore"), + START_OF_CROSS_TIME(12, ZoneUserDevice.ZONE, true, "Start of cross time"), + SPECIAL_EXPANSION_EVENT(17, ZoneUserDevice.NONE, false, "Special expansion event"), + DURESS(18, ZoneUserDevice.NONE, true, "Duress"), + MANUAL_FIRE(19, ZoneUserDevice.NONE, true, "Manual fire"), + AUXILIARY2_PANIC(20, ZoneUserDevice.NONE, true, "Auxiliary 2 panic"), + PANIC(22, ZoneUserDevice.NONE, true, "Panic"), + KEYPAD_TAMPER(23, ZoneUserDevice.NONE, true, "Keypad tamper"), + CONTROL_BOX_TAMPER(24, ZoneUserDevice.DEVICE, false, "Control box tamper"), + CONTROL_BOX_TAMPER_RESTORE(25, ZoneUserDevice.DEVICE, false, "Control box tamper restore"), + AC_FAIL(26, ZoneUserDevice.DEVICE, false, "AC fail"), + AC_FAIL_RESTORE(27, ZoneUserDevice.DEVICE, false, "AC fail restore"), + LOW_BATTERY(28, ZoneUserDevice.DEVICE, false, "Low battery"), + LOW_BATTERY_RESTORE(29, ZoneUserDevice.DEVICE, false, "Low battery restore"), + OVER_CURRENT(30, ZoneUserDevice.DEVICE, false, "Over-current"), + OVER_CURRENT_RESTORE(31, ZoneUserDevice.DEVICE, false, "Over-current restore"), + SIREN_TAMPER(32, ZoneUserDevice.DEVICE, false, "Siren tamper"), + SIREN_TAMPER_RESTORE(33, ZoneUserDevice.DEVICE, false, "Siren tamper restore"), + TELEPHONE_FAULT(34, ZoneUserDevice.NONE, false, "Telephone fault"), + TELEPHONE_FAULT_RESTORE(35, ZoneUserDevice.NONE, false, "Telephone fault restore"), + EXPANDER_TROUBLE(36, ZoneUserDevice.DEVICE, false, "Expander trouble"), + EXPANDER_TROUBLE_RESTORE(37, ZoneUserDevice.DEVICE, false, "Expander trouble restore"), + FAIL_TO_COMMUNICATE(38, ZoneUserDevice.NONE, false, "Fail to communicate"), + LOG_FULL(39, ZoneUserDevice.NONE, false, "Log full"), + OPENING(40, ZoneUserDevice.USER, true, "Opening"), + CLOSING(41, ZoneUserDevice.USER, true, "Closing"), + EXIT_ERROR(42, ZoneUserDevice.USER, true, "Exit error"), + RECENT_CLOSING(43, ZoneUserDevice.USER, true, "Recent closing"), + AUTO_TEST(44, ZoneUserDevice.NONE, false, "Auto-test"), + START_PROGRAM(45, ZoneUserDevice.NONE, false, "Start program"), + END_PROGRAM(46, ZoneUserDevice.NONE, false, "End program"), + START_DOWNLOAD(47, ZoneUserDevice.NONE, false, "Start download"), + END_DOWNLOAD(48, ZoneUserDevice.NONE, false, "End download"), + CANCEL(49, ZoneUserDevice.USER, true, "Cancel"), + GROUND_FAULT(50, ZoneUserDevice.NONE, false, "Ground fault"), + GROUND_FAULT_RESTORE(51, ZoneUserDevice.NONE, false, "Ground fault restore"), + MANUAL_TEST(52, ZoneUserDevice.NONE, false, "Manual test"), + CLOSED_WITH_ZONES_BYPASSED(53, ZoneUserDevice.USER, true, "Closed with zones bypassed"), + START_OF_LISTEN_IN(54, ZoneUserDevice.NONE, false, "Start of listen in"), + TECHNICIAN_ON_SITE(55, ZoneUserDevice.NONE, false, "Technician on site"), + TECHNICIAN_LEFT(56, ZoneUserDevice.NONE, false, "Technician left"), + CONTROL_POWER_UP(57, ZoneUserDevice.NONE, false, "Control power up"), + FIRST_TO_OPEN(120, ZoneUserDevice.USER, true, "First to open"), + LAST_TO_CLOSE(121, ZoneUserDevice.USER, true, "Last toC close"), + PIN_ENTERED_WITH_BIT7_SET(122, ZoneUserDevice.USER, true, "PIN entered with bit 7 set"), + BEGIN_WALK_TEST(123, ZoneUserDevice.NONE, false, "Begin walk-test"), + END_WALK_TEST(124, ZoneUserDevice.NONE, false, "End walk-test"), + RE_EXIT(125, ZoneUserDevice.NONE, true, "Re-exit"), + OUTPUT_TRIP(126, ZoneUserDevice.USER, false, "Output trip"), + DATA_LOST(127, ZoneUserDevice.NONE, false, "Data Lost"); private static final Map BY_LOG_EVENT_TYPE = new HashMap<>(); public final int eventType; diff --git a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ZoneUserDevice.java b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ZoneUserDevice.java index 0efca7c5a7..7257e6c9f4 100644 --- a/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ZoneUserDevice.java +++ b/bundles/org.openhab.binding.caddx/src/main/java/org/openhab/binding/caddx/internal/handler/ZoneUserDevice.java @@ -21,8 +21,8 @@ import org.eclipse.jdt.annotation.NonNullByDefault; */ @NonNullByDefault enum ZoneUserDevice { - None, - Zone, - User, - Device + NONE, + ZONE, + USER, + DEVICE } -- 2.47.3