From 7c54f1f957dec11e137f25101b0c81bca5d0e526 Mon Sep 17 00:00:00 2001
From: mlobstein <michael.lobstein@gmail.com>
Date: Mon, 19 Feb 2024 07:11:56 -0600
Subject: [PATCH] Fix discoveryMethods (#16425)

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
---
 .../panasonicbdp/internal/handler/PanaBlurayHandler.java      | 4 ++--
 .../src/main/resources/OH-INF/addon/addon.xml                 | 4 ++--
 .../src/main/resources/OH-INF/i18n/panasonicbdp.properties    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bundles/org.openhab.binding.panasonicbdp/src/main/java/org/openhab/binding/panasonicbdp/internal/handler/PanaBlurayHandler.java b/bundles/org.openhab.binding.panasonicbdp/src/main/java/org/openhab/binding/panasonicbdp/internal/handler/PanaBlurayHandler.java
index 9fbbeaf1d01..9a4bd6b881b 100644
--- a/bundles/org.openhab.binding.panasonicbdp/src/main/java/org/openhab/binding/panasonicbdp/internal/handler/PanaBlurayHandler.java
+++ b/bundles/org.openhab.binding.panasonicbdp/src/main/java/org/openhab/binding/panasonicbdp/internal/handler/PanaBlurayHandler.java
@@ -241,8 +241,8 @@ public class PanaBlurayHandler extends BaseThingHandler {
         synchronized (sequenceLock) {
             if (command instanceof RefreshType) {
                 logger.debug("Unsupported refresh command: {}", command);
-            } else if (BUTTON.equals(channelUID.getId()) || POWER.equals(channelUID.getId())
-                    || CONTROL.equals(channelUID.getId())) {
+            } else if (POWER.equals(channelUID.getId()) || CONTROL.equals(channelUID.getId())
+                    || BUTTON.equals(channelUID.getId())) {
                 final String commandStr;
                 if (command instanceof OnOffType) {
                     commandStr = CMD_POWER + command; // e.g. POWERON or POWEROFF
diff --git a/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/addon/addon.xml b/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/addon/addon.xml
index a9a21714a46..90c3a6b3225 100644
--- a/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/addon/addon.xml
+++ b/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/addon/addon.xml
@@ -17,8 +17,8 @@
 					<regex>(?i)Panasonic</regex>
 				</match-property>
 				<match-property>
-					<name>modelName</name>
-					<regex>(?i)BDT[1-3][1-2]0|BBT01|BDT500|UB[4|8]2[0|4]|UB900[0|4]</regex>
+					<name>modelNumber</name>
+					<regex>(?i).*(BDT[1-3][1-2]0|BBT01|BDT500|UB[4|8]2[0|4]|UB900[0|4]).*</regex>
 				</match-property>
 			</match-properties>
 		</discovery-method>
diff --git a/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/i18n/panasonicbdp.properties b/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/i18n/panasonicbdp.properties
index 7d618716f2a..2735c2cd388 100644
--- a/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/i18n/panasonicbdp.properties
+++ b/bundles/org.openhab.binding.panasonicbdp/src/main/resources/OH-INF/i18n/panasonicbdp.properties
@@ -169,7 +169,7 @@ status.unknown = Unknown
 error.hostname = Host Name must be specified.
 error.exception = Error communicating with the player.
 error.polling = Invalid status response received from player.
-error.keyerror = Error sending command to the player. Invalid playerKey length, should be 32 characters.
+error.keyerror = Invalid playerKey length, should be 32 characters.
 error.nonce = Error sending command to the player. Nonce retrieval failure.
 error.authkey = Error sending command to the player. Error creating auth key.
 error.invalid = Error sending command to the player. See README for player configuration instructions.