From 9e58387ef7813460a80533b57640039bf6495783 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Sat, 28 Aug 2021 16:58:03 +0200 Subject: [PATCH] Fixed recursive issue with dummy event and reduce update time for gui selections --- hal-core/src/se/hal/util/ConfigEventValueProvider.java | 2 +- .../src/se/hal/plugin/dummy/device/DummySwitchEvent.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hal-core/src/se/hal/util/ConfigEventValueProvider.java b/hal-core/src/se/hal/util/ConfigEventValueProvider.java index 5af86891..2f0d2d28 100644 --- a/hal-core/src/se/hal/util/ConfigEventValueProvider.java +++ b/hal-core/src/se/hal/util/ConfigEventValueProvider.java @@ -21,7 +21,7 @@ import java.util.logging.Logger; public class ConfigEventValueProvider implements Configurator.ConfigValueProvider { private static final Logger logger = LogUtil.getLogger(); - protected static int DEVICE_REFRESH_TIME_IN_SECONDS = 30; + protected static int DEVICE_REFRESH_TIME_IN_SECONDS = 3; private Map events = new HashMap<>(); private Timer updateTimer = new Timer(DEVICE_REFRESH_TIME_IN_SECONDS * 1000); diff --git a/plugins/hal-dummy/src/se/hal/plugin/dummy/device/DummySwitchEvent.java b/plugins/hal-dummy/src/se/hal/plugin/dummy/device/DummySwitchEvent.java index 48109116..a926a9cd 100644 --- a/plugins/hal-dummy/src/se/hal/plugin/dummy/device/DummySwitchEvent.java +++ b/plugins/hal-dummy/src/se/hal/plugin/dummy/device/DummySwitchEvent.java @@ -8,6 +8,8 @@ import se.hal.plugin.dummy.DummyController; import se.hal.plugin.dummy.DummyDevice; import se.hal.struct.devicedata.OnOffEventData; +import java.util.Objects; + public class DummySwitchEvent implements DummyDevice, HalEventConfig { @@ -32,6 +34,6 @@ public class DummySwitchEvent implements DummyDevice, HalEventConfig { @Override public boolean equals(Object obj) { - return this.equals(obj); + return super.equals(obj); } }