From 7dc0cc2cf760eff99e1d021a8b0119b889b7808f Mon Sep 17 00:00:00 2001 From: Dan Cunningham Date: Tue, 13 Jun 2017 08:19:55 -0700 Subject: [PATCH] Updated to use new command function Signed-off-by: Dan Cunningham --- .../org/openhab/binding/omnilink/handler/AreaHandler.java | 5 ++--- .../org/openhab/binding/omnilink/handler/ZoneHandler.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/AreaHandler.java b/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/AreaHandler.java index 7e970bd26611b..390aaa54ff143 100644 --- a/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/AreaHandler.java +++ b/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/AreaHandler.java @@ -92,8 +92,7 @@ public void handleCommand(ChannelUID channelUID, Command command) { */ if ((codeValidation.getCodeNumber() > 0 && codeValidation.getCodeNumber() <= 99) && codeValidation.getAuthorityLevel() > 0) { - getOmnilinkBridgeHander().sendOmnilinkCommandNew(mode, codeValidation.getCodeNumber(), - areaNumber); + getOmnilinkBridgeHander().sendOmnilinkCommand(mode, codeValidation.getCodeNumber(), areaNumber); } else { logger.error("System reported an invalid code"); } @@ -142,7 +141,7 @@ public void channelLinked(ChannelUID channelUID) { int areaId = Integer.parseInt(channelParts[2]); ObjectStatus objStatus; try { - objStatus = getOmnilinkBridgeHander().requestObjectStatusNew(Message.OBJ_TYPE_AREA, areaId, areaId, false); + objStatus = getOmnilinkBridgeHander().requestObjectStatus(Message.OBJ_TYPE_AREA, areaId, areaId, false); handleAreaEvent((AreaStatus) objStatus.getStatuses()[0]); } catch (OmniInvalidResponseException | OmniUnknownMessageTypeException | BridgeOfflineException e) { logger.debug("Unexpected exception refreshing area:", e); diff --git a/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/ZoneHandler.java b/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/ZoneHandler.java index a1307c01e1be8..4af6bf54427bc 100644 --- a/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/ZoneHandler.java +++ b/addons/binding/org.openhab.binding.omnilink/src/main/java/org/openhab/binding/omnilink/handler/ZoneHandler.java @@ -70,8 +70,7 @@ public void handleCommand(ChannelUID channelUID, Command command) { */ if ((codeValidation.getCodeNumber() > 0 && codeValidation.getCodeNumber() <= 99) && codeValidation.getAuthorityLevel() > 0) { - getOmnilinkBridgeHander().sendOmnilinkCommandNew(mode, codeValidation.getCodeNumber(), - zoneNumber); + getOmnilinkBridgeHander().sendOmnilinkCommand(mode, codeValidation.getCodeNumber(), zoneNumber); } else { logger.error("System reported an invalid code"); } @@ -108,7 +107,7 @@ public void channelLinked(ChannelUID channelUID) { int zoneId = Integer.parseInt(channelParts[2]); ObjectStatus objStatus; try { - objStatus = getOmnilinkBridgeHander().requestObjectStatusNew(Message.OBJ_TYPE_ZONE, zoneId, zoneId, false); + objStatus = getOmnilinkBridgeHander().requestObjectStatus(Message.OBJ_TYPE_ZONE, zoneId, zoneId, false); handleZoneStatus((ZoneStatus) objStatus.getStatuses()[0]); } catch (OmniInvalidResponseException | OmniUnknownMessageTypeException | BridgeOfflineException e) { logger.debug("Unexpected exception refreshing zone:", e);