[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 55615b06772a515dbd85f3b55f1b9bd352fa5b0a..fd6b1b5d420a879ba9b0ef93c7f6ce4b75f9e150 100644 (file)
--- 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 10da828b38c6d1dcefcc6b17818c3fd44d3193c8..1f12dc80951d5ce5086fde3e3dd2b293053603b6 100644 (file)
--- 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() {