From e7a866def411a73ac92ba1579539e186f2332d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20L=27hopital?= Date: Fri, 22 Nov 2024 14:44:06 +0100 Subject: [PATCH 1/2] Distinguish thing action scope across the binding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël L'hopital --- .../openwebnet/internal/actions/OpenWebNetBridgeActions.java | 2 +- .../openwebnet/internal/actions/OpenWebNetCENActions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java index e841621e16e0c..fa265b76d0008 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java @@ -44,7 +44,7 @@ * @author Massimo Valla - Initial contribution */ -@ThingActionsScope(name = "openwebnet") +@ThingActionsScope(name = "openwebnet-bridge") @NonNullByDefault public class OpenWebNetBridgeActions implements ThingActions { diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetCENActions.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetCENActions.java index 1282ae71a7f09..8e4abeea94058 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetCENActions.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetCENActions.java @@ -37,7 +37,7 @@ */ @Component(scope = ServiceScope.PROTOTYPE, service = OpenWebNetCENActions.class) -@ThingActionsScope(name = "openwebnet") +@ThingActionsScope(name = "openwebnet-cen") @NonNullByDefault public class OpenWebNetCENActions implements ThingActions { From 7f963e3f2146447d6877f98058795814bdd16e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20L=27hopital?= Date: Tue, 26 Nov 2024 12:17:59 +0100 Subject: [PATCH 2/2] Minimize breaking changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gaël L'hopital --- bundles/org.openhab.binding.openwebnet/README.md | 2 +- .../openwebnet/internal/actions/OpenWebNetBridgeActions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.openwebnet/README.md b/bundles/org.openhab.binding.openwebnet/README.md index 01789c3befab7..bd1c01974ca9d 100644 --- a/bundles/org.openhab.binding.openwebnet/README.md +++ b/bundles/org.openhab.binding.openwebnet/README.md @@ -584,7 +584,7 @@ When activated it sends a "virtual short press" event (where=212, button=5) on t when Item iCENPlusProxyItem received command then - val actions = getActions("openwebnet","openwebnet:bus_cenplus_scenario_control:mybridge:212") + val actions = getActions("openwebnet-cen","openwebnet:bus_cenplus_scenario_control:mybridge:212") actions.virtualPress("SHORT_PRESS", 5) end diff --git a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java index fa265b76d0008..e841621e16e0c 100644 --- a/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java +++ b/bundles/org.openhab.binding.openwebnet/src/main/java/org/openhab/binding/openwebnet/internal/actions/OpenWebNetBridgeActions.java @@ -44,7 +44,7 @@ * @author Massimo Valla - Initial contribution */ -@ThingActionsScope(name = "openwebnet-bridge") +@ThingActionsScope(name = "openwebnet") @NonNullByDefault public class OpenWebNetBridgeActions implements ThingActions {