From: Ondrej Pecta <opecta@gmail.com>
Date: Wed, 23 Sep 2020 17:43:22 +0000 (+0200)
Subject: [somfytahoma] fixed detection of roller shutters (#8557)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=cafa8fdcff63f6efd9301a413f800d21e98ca66a;p=openhab-addons.git

[somfytahoma] fixed detection of roller shutters (#8557)

* [somfytahoma] fixed detection of roller shutters
* [somfytahoma] got rid of compile warning

Signed-off-by: Ondrej Pecta <opecta@gmail.com>
---

diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java
index 55615b0677..fd6b1b5d42 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/discovery/SomfyTahomaItemDiscoveryService.java
@@ -343,11 +343,11 @@ public class SomfyTahomaItemDiscoveryService extends AbstractDiscoveryService
     }
 
     private boolean isSilentRollerShutter(SomfyTahomaDevice device) {
-        return hasCommmand(device, COMMAND_SET_CLOSURESPEED);
+        return "PositionableRollerShutterWithLowSpeedManagement".equals(device.getWidget());
     }
 
     private boolean isUnoRollerShutter(SomfyTahomaDevice device) {
-        return hasState(device, TARGET_CLOSURE_STATE);
+        return "PositionableRollerShutterUno".equals(device.getWidget());
     }
 
     private boolean isOnOffHeatingSystem(SomfyTahomaDevice device) {
diff --git a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBaseThingHandler.java b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBaseThingHandler.java
index 10da828b38..1f12dc8095 100644
--- a/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBaseThingHandler.java
+++ b/bundles/org.openhab.binding.somfytahoma/src/main/java/org/openhab/binding/somfytahoma/internal/handler/SomfyTahomaBaseThingHandler.java
@@ -96,7 +96,8 @@ public abstract class SomfyTahomaBaseThingHandler extends BaseThingHandler {
     }
 
     protected @Nullable SomfyTahomaBridgeHandler getBridgeHandler() {
-        return this.getBridge() != null ? (SomfyTahomaBridgeHandler) this.getBridge().getHandler() : null;
+        Bridge localBridge = this.getBridge();
+        return localBridge != null ? (SomfyTahomaBridgeHandler) localBridge.getHandler() : null;
     }
 
     private String getURL() {