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

[infrastructure] add external null-annotations (#8848)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K
2020-10-31 00:29:03 +01:00
committed by GitHub
parent 47d05055db
commit bd664ff0c8
162 changed files with 933 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bundles/org.openhab.binding.zway/src/main/java/org/openhab/binding/zway/internal/handler/ZWayDeviceHandler.java
View File

@@ -319,9 +319,9 @@ public abstract class ZWayDeviceHandler extends BaseThingHandler {
// Channel thermostat mode
if (channel.getUID().equals(new ChannelUID(getThing().getUID(), THERMOSTAT_MODE_CC_CHANNEL))) {
// Load physical device
Integer nodeId = Integer.parseInt(channel.getProperties().get("nodeId"));
ZWaveDevice physicalDevice = zwayBridgeHandler.getZWayApi().getZWaveDevice(nodeId);
String nodeIdString = channel.getProperties().get("nodeId");
ZWaveDevice physicalDevice = nodeIdString == null ? null
: zwayBridgeHandler.getZWayApi().getZWaveDevice(Integer.parseInt(nodeIdString));
if (physicalDevice != null) {
updateState(channel.getUID(), new DecimalType(physicalDevice.getInstances().get0()
.getCommandClasses().get64().getData().getMode().getValue()));
@@ -507,15 +507,15 @@ public abstract class ZWayDeviceHandler extends BaseThingHandler {
}
} else if (channel.getUID().equals(new ChannelUID(getThing().getUID(), THERMOSTAT_MODE_CC_CHANNEL))) {
// Load physical device
Integer nodeId = Integer.parseInt(channel.getProperties().get("nodeId"));
if (command instanceof DecimalType) {
String nodeIdString = channel.getProperties().get("nodeId");
logger.debug("Handle command: DecimalType");
zwayBridgeHandler.getZWayApi().getZWaveDeviceThermostatModeSet(nodeId,
Integer.parseInt(command.toString()));
if (nodeIdString != null) {
zwayBridgeHandler.getZWayApi().getZWaveDeviceThermostatModeSet(Integer.parseInt(nodeIdString),
Integer.parseInt(command.toString()));
}
} else if (command instanceof RefreshType) {
logger.debug("Handle command: RefreshType");
refreshChannel(channel);
}
}