review changes

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

Author: mlobstein

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/discovery/OppoDiscoveryService.java

@@ -150,7 +150,8 @@ protected void startScan() {
                             try {
                                 multiSocket.receive(packet);
 
-                                final String message = new String(packet.getData(), StandardCharsets.US_ASCII).trim();
+                                final String message = new String(packet.getData(), 0, packet.getLength(),
+                                        StandardCharsets.US_ASCII).trim();
                                 if (message.length() > 0) {
                                     messageReceive(message);
                                 }
@@ -195,7 +196,7 @@ private void messageReceive(String message) {
         String displayName = null;
 
         for (final String msg : message.split("\n")) {
-            final String[] line = msg.split(":");
+            final String[] line = msg.split(":", 2);
 
             if (line.length == 2) {
                 if (line[0].contains("Server IP")) {
@@ -225,7 +226,7 @@ private void messageReceive(String message) {
                 // The older models do not have the "Server Name" in the discovery packet
                 // for the 10x we need to get the DLNA service list page and find modelNumber there
                 // in order to determine if this is a BDP-103 or BDP-105
-                // It is not known if the BDP-9x has this page so a failure to will default to THING_TYPE_BDP93
+                // It is not known if the BDP-9x has this page so a failure will default to THING_TYPE_BDP93
                 try {
                     final String result = HttpUtil.executeUrl("GET", "http://" + host + ":2870/dmr.xml", 5000);
 

bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java

@@ -146,7 +146,7 @@ public void initialize() {
             }
             model = config.model;
         } else {
-            model = Integer.parseInt(thing.getThingTypeUID().getAsString().replaceAll("[^\\d.]", ""));
+            model = Integer.parseInt(thing.getThingTypeUID().getId().replaceAll("\\D", ""));
         }
         this.isUDP20X = (model == MODEL203 || model == MODEL205);
 
@@ -1037,10 +1037,10 @@ private void buildStateOptionLists(int model) {
 
         if (model == MODEL103 || model == MODEL105) {
             inputSourceOptions.add(new StateOption("0", getString("blu_ray", "Blu-ray Player")));
-            inputSourceOptions.add(new StateOption("1", getString("hdmi_in_front", "HDMI/MHL In-Front")));
+            inputSourceOptions.add(new StateOption("1", getString("hdmi_in_front", "HDMI In-Front")));
             inputSourceOptions.add(new StateOption("2", getString("hdmi_in_back", "HDMI In-Back")));
-            inputSourceOptions.add(new StateOption("3", getString("arc1", "ARC on HDMI Out 1")));
-            inputSourceOptions.add(new StateOption("4", getString("arc2", "ARC on HDMI Out 2")));
+            inputSourceOptions.add(new StateOption("3", getString("arc1", "ARC HDMI Out 1")));
+            inputSourceOptions.add(new StateOption("4", getString("arc2", "ARC HDMI Out 2")));
 
             if (model == MODEL105) {
                 inputSourceOptions.add(new StateOption("5", getString("optical", "Optical In")));
@@ -1071,7 +1071,7 @@ private void buildStateOptionLists(int model) {
 
             inputSourceOptions.add(new StateOption("0", getString("blu_ray", "Blu-ray Player")));
             inputSourceOptions.add(new StateOption("1", getString("hdmi_in", "HDMI In")));
-            inputSourceOptions.add(new StateOption("2", getString("arc", "ARC")));
+            inputSourceOptions.add(new StateOption("2", getString("arc", "ARC HDMI Out")));
 
             if (model == MODEL205) {
                 inputSourceOptions.add(new StateOption("3", getString("optical", "Optical In")));

bundles/org.openhab.binding.oppo/src/main/resources/OH-INF/config/config.xml

@@ -24,8 +24,7 @@
 		</parameter>
 		<parameter name="verboseMode" type="boolean" required="false">
 			<label>Verbose Mode</label>
-			<description>If true, the player will send time updates every second. If false, the binding polls the player every
-				10
+			<description>If true, the player will send time updates every second. If false, the binding polls the player every 10
 				seconds</description>
 			<default>false</default>
 			<advanced>true</advanced>

bundles/org.openhab.binding.oppo/src/main/resources/OH-INF/i18n/oppo.properties

@@ -425,9 +425,9 @@ channel-type.oppo.zoom_mode.state.option.12 = 1/4
 
 # selectable player option descriptions
 
-option.arc = ARC
-option.arc1 = ARC on HDMI Out 1
-option.arc2 = ARC on HDMI Out 2
+option.arc = ARC HDMI Out
+option.arc1 = ARC HDMI Out 1
+option.arc2 = ARC HDMI Out 2
 option.auto = Auto
 option.auto_1080p = 1080P Auto
 option.auto_uhd = UHD Auto
@@ -436,7 +436,7 @@ option.coaxial = Coaxial In
 option.direct = Source Direct
 option.hdmi_in = HDMI In
 option.hdmi_in_back = HDMI In-Back
-option.hdmi_in_front = HDMI/MHL In-Front
+option.hdmi_in_front = HDMI In-Front
 option.optical = Optical In
 option.usb = USB Audio In