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

[dscalarm] Fix checkstyle and warning (#15424) 

Signed-off-by: lsiepel <leosiepel@gmail.com>
This commit is contained in:
lsiepel 2023-08-14 22:08:22 +02:00 committed by GitHub
parent c465344c01
commit c47e833ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/DSCAlarmMessage.java
View File

@ -219,13 +219,13 @@ public class DSCAlarmMessage {
case PartitionArmed: /* 652 */ case PartitionArmed: /* 652 */
mode = message.substring(4); mode = message.substring(4);
if (mode.equals("0")) { if ("0".equals(mode)) {
name += " (Away)"; name += " (Away)";
} else if (mode.equals("1")) { } else if ("1".equals(mode)) {
name += " (Stay)"; name += " (Stay)";
} else if (mode.equals("2")) { } else if ("2".equals(mode)) {
name += " (ZEA)"; name += " (ZEA)";
} else if (mode.equals("3")) { } else if ("3".equals(mode)) {
name += " (ZES)"; name += " (ZES)";
} }
messageType = DSCAlarmMessageType.PARTITION_EVENT; messageType = DSCAlarmMessageType.PARTITION_EVENT;
@ -343,37 +343,37 @@ public class DSCAlarmMessage {
sb.append(description); sb.append(description);
sb.append("\""); sb.append("\"");
if (!timeStamp.equals("")) { if (!"".equals(timeStamp)) {
sb.append(", Time Stamp: "); sb.append(", Time Stamp: ");
sb.append(timeStamp); sb.append(timeStamp);
} }
if (!partition.equals("0")) { if (!"0".equals(partition)) {
sb.append(", Partition: "); sb.append(", Partition: ");
sb.append(partition); sb.append(partition);
} }
if (!zone.equals("0")) { if (!"0".equals(zone)) {
sb.append(", Zone: "); sb.append(", Zone: ");
sb.append(zone); sb.append(zone);
} }
if (!data.equals("")) { if (!"".equals(data)) {
sb.append(", Data: "); sb.append(", Data: ");
sb.append(data); sb.append(data);
} }
if (!mode.equals("")) { if (!"".equals(mode)) {
sb.append(", Mode: "); sb.append(", Mode: ");
sb.append(mode); sb.append(mode);
} }
if (!user.equals("")) { if (!"".equals(user)) {
sb.append(", user: "); sb.append(", user: ");
sb.append(user); sb.append(user);
} }
if (!error.equals("")) { if (!"".equals(error)) {
sb.append(", error: "); sb.append(", error: ");
sb.append(error); sb.append(error);
} }

2
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/factory/DSCAlarmHandlerFactory.java
View File

@ -306,7 +306,9 @@ public class DSCAlarmHandlerFactory extends BaseThingHandlerFactory {
if (discoveryServiceRegistration != null) { if (discoveryServiceRegistration != null) {
DSCAlarmDiscoveryService discoveryService = (DSCAlarmDiscoveryService) bundleContext DSCAlarmDiscoveryService discoveryService = (DSCAlarmDiscoveryService) bundleContext
.getService(discoveryServiceRegistration.getReference()); .getService(discoveryServiceRegistration.getReference());
if (discoveryService != null) {
discoveryService.deactivate(); discoveryService.deactivate();
}
discoveryServiceRegistration.unregister(); discoveryServiceRegistration.unregister();
discoveryServiceRegistration = null; discoveryServiceRegistration = null;
discoveryServiceRegistrations.remove(thingHandler.getThing().getUID()); discoveryServiceRegistrations.remove(thingHandler.getThing().getUID());

8
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/DSCAlarmBaseBridgeHandler.java
View File

@ -477,16 +477,16 @@ public abstract class DSCAlarmBaseBridgeHandler extends BaseBridgeHandler {
if (dscAlarmCode == DSCAlarmCode.LoginResponse) { if (dscAlarmCode == DSCAlarmCode.LoginResponse) {
String dscAlarmMessageData = dscAlarmMessage.getMessageInfo(DSCAlarmMessageInfoType.DATA); String dscAlarmMessageData = dscAlarmMessage.getMessageInfo(DSCAlarmMessageInfoType.DATA);
if (dscAlarmMessageData.equals("3")) { if ("3".equals(dscAlarmMessageData)) {
sendCommand(DSCAlarmCode.NetworkLogin); sendCommand(DSCAlarmCode.NetworkLogin);
// onConnected(); // onConnected();
} else if (dscAlarmMessageData.equals("1")) { } else if ("1".equals(dscAlarmMessageData)) {
onConnected(); onConnected();
} }
return; return;
} else if (dscAlarmCode == DSCAlarmCode.CommandAcknowledge) { } else if (dscAlarmCode == DSCAlarmCode.CommandAcknowledge) {
String dscAlarmMessageData = dscAlarmMessage.getMessageInfo(DSCAlarmMessageInfoType.DATA); String dscAlarmMessageData = dscAlarmMessage.getMessageInfo(DSCAlarmMessageInfoType.DATA);
if (dscAlarmMessageData.equals("000")) { if ("000".equals(dscAlarmMessageData)) {
setBridgeStatus(true); setBridgeStatus(true);
} }
} }
@ -764,7 +764,7 @@ public abstract class DSCAlarmBaseBridgeHandler extends BaseBridgeHandler {
"sendCommand(): \'keystroke\' must be a single character string from 0 to 9, *, #, F, A, P, a to e, <, >, =, or ^, it was: {}", "sendCommand(): \'keystroke\' must be a single character string from 0 to 9, *, #, F, A, P, a to e, <, >, =, or ^, it was: {}",
dscAlarmData[0]); dscAlarmData[0]);
break; break;
} else if (dscAlarmData[0].equals("L")) { /* Long Key Press */ } else if ("L".equals(dscAlarmData[0])) { /* Long Key Press */
try { try {
Thread.sleep(1500); Thread.sleep(1500);
data = "^"; data = "^";

6
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/DSCAlarmBaseThingHandler.java
View File

@ -106,7 +106,7 @@ public abstract class DSCAlarmBaseThingHandler extends BaseThingHandler {
logger.debug("initializeThingHandler(): Initialize Thing Handler - {}", thing.getUID()); logger.debug("initializeThingHandler(): Initialize Thing Handler - {}", thing.getUID());
for (Channel channel : channels) { for (Channel channel : channels) {
if (channel.getAcceptedItemType().equals("DateTime")) { if ("DateTime".equals(channel.getAcceptedItemType())) {
updateChannel(channel.getUID(), 0, "0000010100"); updateChannel(channel.getUID(), 0, "0000010100");
} else { } else {
updateChannel(channel.getUID(), 0, ""); updateChannel(channel.getUID(), 0, "");
@ -150,8 +150,8 @@ public abstract class DSCAlarmBaseThingHandler extends BaseThingHandler {
ThingHandler handler = bridge.getHandler(); ThingHandler handler = bridge.getHandler();
if (handler instanceof DSCAlarmBaseBridgeHandler) { if (handler instanceof DSCAlarmBaseBridgeHandler dscAlarmBridgeHandler) {
this.dscAlarmBridgeHandler = (DSCAlarmBaseBridgeHandler) handler; this.dscAlarmBridgeHandler = dscAlarmBridgeHandler;
} else { } else {
logger.debug("getDSCAlarmBridgeHandler(): Unable to get bridge handler!"); logger.debug("getDSCAlarmBridgeHandler(): Unable to get bridge handler!");
} }

12
bundles/org.openhab.binding.dscalarm/src/main/java/org/openhab/binding/dscalarm/internal/handler/PartitionThingHandler.java
View File

@ -106,22 +106,22 @@ public class PartitionThingHandler extends DSCAlarmBaseThingHandler {
switch (channelUID.getId()) { switch (channelUID.getId()) {
case PARTITION_ARM_MODE: case PARTITION_ARM_MODE:
int partitionNumber = getPartitionNumber(); int partitionNumber = getPartitionNumber();
if (command.toString().equals("0")) { if ("0".equals(command.toString())) {
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionDisarmControl, dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionDisarmControl,
String.valueOf(partitionNumber)); String.valueOf(partitionNumber));
} else if (command.toString().equals("1")) { } else if ("1".equals(command.toString())) {
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlAway, dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlAway,
String.valueOf(partitionNumber)); String.valueOf(partitionNumber));
} else if (command.toString().equals("2")) { } else if ("2".equals(command.toString())) {
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlStay, dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlStay,
String.valueOf(partitionNumber)); String.valueOf(partitionNumber));
} else if (command.toString().equals("3")) { } else if ("3".equals(command.toString())) {
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlZeroEntryDelay, dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlZeroEntryDelay,
String.valueOf(partitionNumber)); String.valueOf(partitionNumber));
} else if (command.toString().equals("4")) { } else if ("4".equals(command.toString())) {
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlZeroEntryDelay, dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlZeroEntryDelay,
String.valueOf(partitionNumber)); String.valueOf(partitionNumber));
} else if (command.toString().equals("5")) { } else if ("5".equals(command.toString())) {
dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlWithUserCode, dscAlarmBridgeHandler.sendCommand(DSCAlarmCode.PartitionArmControlWithUserCode,
String.valueOf(partitionNumber)); String.valueOf(partitionNumber));
} }