From 6218fc434a3c6d5ec0820c133cec2068113abcf3 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Wed, 14 Aug 2024 15:06:04 +0200 Subject: [PATCH] Fix typos (#17256) Signed-off-by: Jacob Laursen --- .../tapocontrol/internal/TapoControlHandlerFactory.java | 6 +++--- .../internal/constants/TapoThingConstants.java | 6 +++--- .../TapoWeatherSensorHandler.java} | 6 +++--- .../tapocontrol/internal/helpers/utils/TapoUtils.java | 2 +- .../src/main/resources/OH-INF/config/deviceconfig.xml | 4 ++-- .../src/main/resources/OH-INF/config/hubconfig.xml | 4 ++-- .../src/main/resources/OH-INF/i18n/tapocontrol.properties | 8 ++++---- .../src/main/resources/OH-INF/thing/channelgroups.xml | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) rename bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/rf/{wheatersensor/TapoWheaterSensorHandler.java => weathersensor/TapoWeatherSensorHandler.java} (89%) diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoControlHandlerFactory.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoControlHandlerFactory.java index 0238678c34922..fdb357bed3825 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoControlHandlerFactory.java +++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/TapoControlHandlerFactory.java @@ -24,7 +24,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import org.openhab.binding.tapocontrol.internal.devices.bridge.TapoBridgeHandler; import org.openhab.binding.tapocontrol.internal.devices.rf.smartcontact.TapoSmartContactHandler; -import org.openhab.binding.tapocontrol.internal.devices.rf.wheatersensor.TapoWheaterSensorHandler; +import org.openhab.binding.tapocontrol.internal.devices.rf.weathersensor.TapoWeatherSensorHandler; import org.openhab.binding.tapocontrol.internal.devices.wifi.TapoUniversalDeviceHandler; import org.openhab.binding.tapocontrol.internal.devices.wifi.bulb.TapoBulbHandler; import org.openhab.binding.tapocontrol.internal.devices.wifi.hub.TapoHubHandler; @@ -125,8 +125,8 @@ public boolean supportsThingType(ThingTypeUID thingTypeUID) { return new TapoLightStripHandler(thing); } else if (SUPPORTED_SMART_CONTACTS.contains(thingTypeUID)) { return new TapoSmartContactHandler(thing); - } else if (SUPPORTED_WHEATHER_SENSORS.contains(thingTypeUID)) { - return new TapoWheaterSensorHandler(thing); + } else if (SUPPORTED_WEATHER_SENSORS.contains(thingTypeUID)) { + return new TapoWeatherSensorHandler(thing); } else if (thingTypeUID.equals(UNIVERSAL_THING_TYPE)) { return new TapoUniversalDeviceHandler(thing); } diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java index 0286783a64c84..9bc5e1288f6d4 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java +++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/constants/TapoThingConstants.java @@ -100,13 +100,13 @@ public class TapoThingConstants { T315_THING_TYPE); public static final Set SUPPORTED_SMART_CONTACTS = Set.of(T110_THING_TYPE); public static final Set SUPPORTED_MOTION_SENSORS = Set.of(); - public static final Set SUPPORTED_WHEATHER_SENSORS = Set.of(T310_THING_TYPE, T315_THING_TYPE); + public static final Set SUPPORTED_WEATHER_SENSORS = Set.of(T310_THING_TYPE, T315_THING_TYPE); /*** SET OF ALL SUPPORTED THINGS ***/ public static final Set SUPPORTED_THING_TYPES_UIDS = Collections.unmodifiableSet(Stream .of(SUPPORTED_BRIDGE_UIDS, SUPPORTED_HUB_UIDS, SUPPORTED_SOCKET_UIDS, SUPPORTED_SOCKET_STRIP_UIDS, SUPPORTED_WHITE_BULB_UIDS, SUPPORTED_COLOR_BULB_UIDS, SUPPORTED_LIGHT_STRIP_UIDS, - SUPPORTED_SMART_CONTACTS, SUPPORTED_MOTION_SENSORS, SUPPORTED_WHEATHER_SENSORS) + SUPPORTED_SMART_CONTACTS, SUPPORTED_MOTION_SENSORS, SUPPORTED_WEATHER_SENSORS) .flatMap(Set::stream).collect(Collectors.toSet())); /*** THINGS WITH ENERGY DATA ***/ @@ -116,7 +116,7 @@ public class TapoThingConstants { public static final Set CHANNEL_GROUP_THING_SET = Collections.unmodifiableSet(Stream .of(SUPPORTED_BRIDGE_UIDS, SUPPORTED_HUB_UIDS, SUPPORTED_SOCKET_UIDS, SUPPORTED_SOCKET_STRIP_UIDS, SUPPORTED_WHITE_BULB_UIDS, SUPPORTED_COLOR_BULB_UIDS, SUPPORTED_LIGHT_STRIP_UIDS, - SUPPORTED_SMART_CONTACTS, SUPPORTED_MOTION_SENSORS, SUPPORTED_WHEATHER_SENSORS) + SUPPORTED_SMART_CONTACTS, SUPPORTED_MOTION_SENSORS, SUPPORTED_WEATHER_SENSORS) .flatMap(Set::stream).collect(Collectors.toSet())); public static final String CHILD_REPRESENTATION_PROPERTY = "serialNumber"; diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/rf/wheatersensor/TapoWheaterSensorHandler.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/rf/weathersensor/TapoWeatherSensorHandler.java similarity index 89% rename from bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/rf/wheatersensor/TapoWheaterSensorHandler.java rename to bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/rf/weathersensor/TapoWeatherSensorHandler.java index 2616b84eaae3e..3f53e15c79e86 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/rf/wheatersensor/TapoWheaterSensorHandler.java +++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/devices/rf/weathersensor/TapoWeatherSensorHandler.java @@ -10,7 +10,7 @@ * * SPDX-License-Identifier: EPL-2.0 */ -package org.openhab.binding.tapocontrol.internal.devices.rf.wheatersensor; +package org.openhab.binding.tapocontrol.internal.devices.rf.weathersensor; import static org.openhab.binding.tapocontrol.internal.constants.TapoThingConstants.*; import static org.openhab.binding.tapocontrol.internal.helpers.utils.TypeUtils.*; @@ -27,13 +27,13 @@ * @author Christian Wild - Initial contribution */ @NonNullByDefault -public class TapoWheaterSensorHandler extends TapoChildDeviceHandler { +public class TapoWeatherSensorHandler extends TapoChildDeviceHandler { /** * Constructor * * @param thing Thing object representing device */ - public TapoWheaterSensorHandler(Thing thing) { + public TapoWeatherSensorHandler(Thing thing) { super(thing); } diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/utils/TapoUtils.java b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/utils/TapoUtils.java index 604c175325607..d008c53047d7f 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/utils/TapoUtils.java +++ b/bundles/org.openhab.binding.tapocontrol/src/main/java/org/openhab/binding/tapocontrol/internal/helpers/utils/TapoUtils.java @@ -172,7 +172,7 @@ public static String getDeviceLabel(TapoDiscoveryResult device) { deviceLabel = DEVICE_DESCRIPTION_SMART_CONTACT; } else if (SUPPORTED_MOTION_SENSORS.contains(deviceUID)) { deviceLabel = DEVICE_DESCRIPTION_MOTION_SENSOR; - } else if (SUPPORTED_WHEATHER_SENSORS.contains(deviceUID)) { + } else if (SUPPORTED_WEATHER_SENSORS.contains(deviceUID)) { deviceLabel = DEVICE_DESCRIPTION_TEMP_SENSOR; } if (alias.length() > 0) { diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/deviceconfig.xml b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/deviceconfig.xml index 97a5ed26dae98..55e6af3fbb93a 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/deviceconfig.xml +++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/deviceconfig.xml @@ -29,8 +29,8 @@ - Refresh interval for refreshing the data in seconds (0=disabled). Set it below 10 seconds may cause - communication issues (not recommed). + Refresh interval for refreshing the data in seconds (0=disabled). Setting it below 10 seconds may cause + communication issues (not recommended). 30 true diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/hubconfig.xml b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/hubconfig.xml index 48fd34801ca7d..2647d7c6b049d 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/hubconfig.xml +++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/config/hubconfig.xml @@ -29,8 +29,8 @@ - Refresh interval for refreshing hub informations in seconds (0=disabled). Set it below 10 seconds may - cause communication issues (not recommed). + Refresh interval for refreshing hub informations in seconds (0=disabled). Setting it below 10 seconds + may cause communication issues (not recommended). 10 true diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties index 2feb90018f7b6..7ca6c81a2ea63 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties +++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/i18n/tapocontrol.properties @@ -62,7 +62,7 @@ bridge-type.config.tapo.hub.httpPort.label = Port bridge-type.config.tapo.hub.httpPort.description = HTTP-Communication Port (default 80) bridge-type.config.tapo.hub.ipAddress.label = IP Address bridge-type.config.tapo.hub.pollingInterval.label = Refresh Interval -bridge-type.config.tapo.hub.pollingInterval.description = Refresh interval for refreshing hub informations in seconds (0=disabled). Set it below 10 seconds may cause communication issues (not recommed). +bridge-type.config.tapo.hub.pollingInterval.description = Refresh interval for refreshing hub informations in seconds (0=disabled). Setting it below 10 seconds may cause communication issues (not recommended). bridge-type.config.tapo.hub.protocol.label = Protocol bridge-type.config.tapo.hub.protocol.description = Communication Protocol bridge-type.config.tapo.hub.protocol.option. = Direct HTTP @@ -72,7 +72,7 @@ thing-type.config.tapo.device.httpPort.label = Port thing-type.config.tapo.device.httpPort.description = HTTP-Communication Port (default 80) thing-type.config.tapo.device.ipAddress.label = IP Address thing-type.config.tapo.device.pollingInterval.label = Refresh Interval -thing-type.config.tapo.device.pollingInterval.description = Refresh interval for refreshing the data in seconds (0=disabled). Set it below 10 seconds may cause communication issues (not recommed). +thing-type.config.tapo.device.pollingInterval.description = Refresh interval for refreshing the data in seconds (0=disabled). Setting it below 10 seconds may cause communication issues (not recommended). thing-type.config.tapo.device.protocol.label = Protocol thing-type.config.tapo.device.protocol.description = Communication Protocol thing-type.config.tapo.device.protocol.option. = Direct HTTP @@ -117,7 +117,7 @@ channel-group-type.tapocontrol.smartHubAlarms.label = Smart Hub Alarms channel-group-type.tapocontrol.smartHubAlarms.description = Tapo Smart Hub Alarms channel-group-type.tapocontrol.smartPlug.label = SmartPlug channel-group-type.tapocontrol.smartPlug.description = Tapo Smart Plug Power Outlet -channel-group-type.tapocontrol.temperatureSensor.label = Wheater Sensor +channel-group-type.tapocontrol.temperatureSensor.label = Weather Sensor channel-group-type.tapocontrol.temperatureSensor.description = Temperature and Humidity Sensor Channels # channel types @@ -282,7 +282,7 @@ channel-type.tapocontrol.effectOn.description = Switches the lightning effect on # error messages -error-api-unknown-com-error = recieived unknown com error(9999) +error-api-unknown-com-error = received unknown com error (9999) error-api-account = received account error (-2101) error-api-aes-decode-fail = aes decode failed (-1005) error-api-antitheft-conflict = device antitheft conflict (-2002) diff --git a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channelgroups.xml b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channelgroups.xml index 624be0bf2ac4f..6a6c79a2e49d4 100644 --- a/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channelgroups.xml +++ b/bundles/org.openhab.binding.tapocontrol/src/main/resources/OH-INF/thing/channelgroups.xml @@ -137,7 +137,7 @@ - + Temperature and Humidity Sensor Channels