public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>
This commit is contained in:
mlobstein 2021-01-02 08:02:55 -06:00 committed by GitHub
parent 572da80fd9
commit 14a4a50582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/StatefulHandlerCallback.java
View File

@ -17,7 +17,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.lang.StringUtils;
import org.openhab.core.thing.ThingStatus; import org.openhab.core.thing.ThingStatus;
import org.openhab.core.thing.ThingStatusDetail; import org.openhab.core.thing.ThingStatusDetail;
import org.openhab.core.types.State; import org.openhab.core.types.State;
@ -88,7 +87,7 @@ public class StatefulHandlerCallback implements AtlonaHandlerCallback {
*/ */
@Override @Override
public void stateChanged(String channelId, State state) { public void stateChanged(String channelId, State state) {
if (StringUtils.isEmpty(channelId)) { if (channelId == null || "".equals(channelId)) {
return; return;
} }
@ -116,7 +115,7 @@ public class StatefulHandlerCallback implements AtlonaHandlerCallback {
* @param channelId the channel id to remove state * @param channelId the channel id to remove state
*/ */
public void removeState(String channelId) { public void removeState(String channelId) {
if (StringUtils.isEmpty(channelId)) { if (channelId == null || "".equals(channelId)) {
return; return;
} }
state.remove(channelId); state.remove(channelId);

2
bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3Handler.java
View File

@ -323,7 +323,7 @@ public class AtlonaPro3Handler extends AtlonaHandler<AtlonaPro3Capabilities> {
break; break;
case AtlonaPro3Constants.CHANNEL_VOLUME: case AtlonaPro3Constants.CHANNEL_VOLUME:
if (command instanceof DecimalType) { if (command instanceof DecimalType) {
final double level = ((DecimalType) command).doubleValue(); final int level = ((DecimalType) command).intValue();
atlonaHandler.setVolume(portNbr, level); atlonaHandler.setVolume(portNbr, level);
} else { } else {
logger.debug("Received a VOLUME channel command with a non DecimalType: {}", command); logger.debug("Received a VOLUME channel command with a non DecimalType: {}", command);

5
bundles/org.openhab.binding.atlona/src/main/java/org/openhab/binding/atlona/internal/pro3/AtlonaPro3PortocolHandler.java
View File

@ -19,7 +19,6 @@ import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang.StringUtils;
import org.openhab.binding.atlona.internal.AtlonaHandlerCallback; import org.openhab.binding.atlona.internal.AtlonaHandlerCallback;
import org.openhab.binding.atlona.internal.net.SocketSession; import org.openhab.binding.atlona.internal.net.SocketSession;
import org.openhab.binding.atlona.internal.net.SocketSessionListener; import org.openhab.binding.atlona.internal.net.SocketSessionListener;
@ -599,7 +598,7 @@ class AtlonaPro3PortocolHandler {
* @param portNbr a greater than zero port number * @param portNbr a greater than zero port number
* @param level a volume level in decibels (must range from -79 to +15) * @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) { if (portNbr <= 0) {
throw new IllegalArgumentException("portNbr must be greater than 0"); throw new IllegalArgumentException("portNbr must be greater than 0");
} }
@ -906,7 +905,7 @@ class AtlonaPro3PortocolHandler {
int hdmiPortNbr = Integer.parseInt(m.group(1)); int hdmiPortNbr = Integer.parseInt(m.group(1));
// could be "off" (if mirror off), "on"/"Out" (with 3rd group representing out) // 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")) { if (oper.equals("off")) {
callback.stateChanged(AtlonaPro3Utilities.createChannelID(AtlonaPro3Constants.GROUP_MIRROR, callback.stateChanged(AtlonaPro3Utilities.createChannelID(AtlonaPro3Constants.GROUP_MIRROR,