[atlona] Make volume a whole number & remove StringUtils (#9631)

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

diff --git a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/StatefulHandlerCallback.java b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/StatefulHandlerCallback.java
index 79a78d03ae2c8dc0d922c91fbf0f97afa68b437e..733a670ab3f2d8cd9473d288593d3b814c1b3abe 100644 (file)
--- a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/StatefulHandlerCallback.java
+++ b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/StatefulHandlerCallback.java
@@ -17,7 +17,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.apache.commons.lang.StringUtils;
 import org.openhab.core.thing.ThingStatus;
 import org.openhab.core.thing.ThingStatusDetail;
 import org.openhab.core.types.State;
@@ -88,7 +87,7 @@ public class StatefulHandlerCallback implements AtlonaHandlerCallback {
      */
     @Override
     public void stateChanged(String channelId, State state) {
-        if (StringUtils.isEmpty(channelId)) {
+        if (channelId == null || "".equals(channelId)) {
             return;
         }
 
@@ -116,7 +115,7 @@ public class StatefulHandlerCallback implements AtlonaHandlerCallback {
      * @param channelId the channel id to remove state
      */
     public void removeState(String channelId) {
-        if (StringUtils.isEmpty(channelId)) {
+        if (channelId == null || "".equals(channelId)) {
             return;
         }
         state.remove(channelId);

diff --git a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3Handler.java b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3Handler.java
index a5172b87d68a07fe1d485d2528a7b177e4048d52..f0bd0212902c48187b829a30519c30c4664336d1 100644 (file)
--- a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3Handler.java
+++ b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3Handler.java
@@ -323,7 +323,7 @@ public class AtlonaPro3Handler extends AtlonaHandler<AtlonaPro3Capabilities> {
                             break;
                         case AtlonaPro3Constants.CHANNEL_VOLUME:
                             if (command instanceof DecimalType) {
-                                final double level = ((DecimalType) command).doubleValue();
+                                final int level = ((DecimalType) command).intValue();
                                 atlonaHandler.setVolume(portNbr, level);
                             } else {
                                 logger.debug("Received a VOLUME channel command with a non DecimalType: {}", command);

diff --git a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java
index 0f65e9fc185439fc9e3376327f7c3a0031af5373..9d90fa3b701905199346b4078dc3291ef341c02c 100644 (file)
--- a/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java
+++ b/bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java
@@ -19,7 +19,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
 import org.openhab.binding.atlona.internal.AtlonaHandlerCallback;
 import org.openhab.binding.atlona.internal.net.SocketSession;
 import org.openhab.binding.atlona.internal.net.SocketSessionListener;
@@ -599,7 +598,7 @@ class AtlonaPro3PortocolHandler {
      * @param portNbr a greater than zero port number
      * @param level a volume level in decibels (must range from -79 to +15)
      */
-    void setVolume(int portNbr, double level) {
+    void setVolume(int portNbr, int level) {
         if (portNbr <= 0) {
             throw new IllegalArgumentException("portNbr must be greater than 0");
         }
@@ -906,7 +905,7 @@ class AtlonaPro3PortocolHandler {
                 int hdmiPortNbr = Integer.parseInt(m.group(1));
 
                 // could be "off" (if mirror off), "on"/"Out" (with 3rd group representing out)
-                String oper = StringUtils.trimToEmpty(m.group(2)).toLowerCase();
+                String oper = (m.group(2) == null ? "" : m.group(2).trim()).toLowerCase();
 
                 if (oper.equals("off")) {
                     callback.stateChanged(AtlonaPro3Utilities.createChannelID(AtlonaPro3Constants.GROUP_MIRROR,