Fix discoveryMethods (#16425)

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>

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 9fbbeaf1d019913be435c1abd1727da7e5dc7d89..9a4bd6b881b4305be2657663516687796b70b0d4 100644 (file)
--- 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 a9a21714a4608949d2594112c5d30ee3426e336e..90c3a6b3225dedd71193ae77ae6fc1a750322e5e 100644 (file)
--- 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 7d618716f2ae587fa8dd087e1e5cbbfbd86c90c9..2735c2cd3885847bd6feef602c3545e8136c64f1 100644 (file)
--- 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.