[haywardomnilogic] Update unit formating (#10781)

* Update unit formating

Signed-off-by: Matt Myers <mmyers75@icloud.com>
* Updates per last review

Signed-off-by: Matt Myers <mmyers75@icloud.com>
* Updated units to decimal

Signed-off-by: Matt Myers <mmyers75@icloud.com>

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java
index 0419770ea47be1c765d0ac12d8559f83289a6849..20d6c305ff10b7de82b3bbf49c4b96b256f2323b 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBackyardHandler.java
@@ -101,7 +101,7 @@ public class HaywardBackyardHandler extends HaywardThingHandler {
                             .evaluateXPath("/Response/Parameters//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.trace("Hayward getAlarm XML response: {}", xmlResponse);
                         return false;
                     }

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
index 8e3d1d9919ad6dd48cce75ebcf8f8a74cb407af1..13792f3e9892ff9e0e9c9a46aa490e0eae2d5986 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardBridgeHandler.java
@@ -186,7 +186,7 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
 
         status = evaluateXPath("/Response/Parameters//Parameter[@name='Status']/text()", xmlResponse).get(0);
 
-        if (!(status.equals("0"))) {
+        if (!("0".equals(status))) {
             logger.debug("Hayward Connection thing: Login XML response: {}", xmlResponse);
             return false;
         }
@@ -234,7 +234,7 @@ public class HaywardBridgeHandler extends BaseBridgeHandler {
 
         status = evaluateXPath("/Response/Parameters//Parameter[@name='Status']/text()", xmlResponse).get(0);
 
-        if (!(status.equals("0"))) {
+        if (!("0".equals(status))) {
             logger.debug("Hayward Connection thing: getSiteList XML response: {}", xmlResponse);
             return false;
         }

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java
index 0d1e12f7aa32ea574ee32dbccc87a686c0d78218..8743f10728332bc203eaaea2a8d78cee452710e0 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardChlorinatorHandler.java
@@ -128,7 +128,7 @@ public class HaywardChlorinatorHandler extends HaywardThingHandler {
                 try {
                     switch (channelUID.getId()) {
                         case HaywardBindingConstants.CHANNEL_CHLORINATOR_ENABLE:
-                            if (cmdString.equals("1")) {
+                            if ("1".equals(cmdString)) {
                                 chlorCfgState = "3";
                                 chlorTimedPercent = this.chlorTimedPercent;
                             } else {
@@ -168,7 +168,7 @@ public class HaywardChlorinatorHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java
index bb42b06eb97c16196f0612dccef88e1c2af9d455..ed98a1be63fa0ecac27a7446fc331edacc8c9d8a 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardColorLogicHandler.java
@@ -135,7 +135,7 @@ public class HaywardColorLogicHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java
index b39740cd8d38d891e02fb2ff0a3616b8cb4d6af4..edf7a96d33b055cae64e748e053724e56cd4307f 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardFilterHandler.java
@@ -140,7 +140,7 @@ public class HaywardFilterHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java
index f890cd8e708c2908cc15a5c9317aecdd6b1d6e4c..c002d5acc12b0ea483dcac5889eb441a8979b171 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardRelayHandler.java
@@ -104,7 +104,7 @@ public class HaywardRelayHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java
index 6ee8246a85628884a71a36e542de2dba739f833b..b06a7e96b290ab96fcf6f1a0d1e6b502788e870a 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/java/org/openhab/binding/haywardomnilogic/internal/handler/HaywardVirtualHeaterHandler.java
@@ -131,7 +131,7 @@ public class HaywardVirtualHeaterHandler extends HaywardThingHandler {
                     String status = bridgehandler.evaluateXPath("//Parameter[@name='Status']/text()", xmlResponse)
                             .get(0);
 
-                    if (!(status.equals("0"))) {
+                    if (!("0".equals(status))) {
                         logger.debug("haywardCommand XML response: {}", xmlResponse);
                         return;
                     }

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml
index c947bc30776339ca50861568d7d903c50f8ed214..16983ad5157ae4479a581498939ec27a6593f8de 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/backyard.xml
@@ -33,7 +33,7 @@
                <item-type>Number:Temperature</item-type>
                <label>Air Temp</label>
                <description>Air Temp</description>
-               <state pattern="%1f %unit%" readOnly="true"/>
+               <state pattern="%d %unit%" readOnly="true"/>
        </channel-type>
 
        <channel-type id="backyardstatus">

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml
index aa594741bb4c3ea67bad5340310779b01850c0d5..ca07c5cf92b3b9cdaf6cb1db936806c0cf26ef0a 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/bow.xml
@@ -34,7 +34,7 @@
                <item-type>Number:Temperature</item-type>
                <label>Water Temp</label>
                <description>Water Temp</description>
-               <state pattern="%1f %unit%" readOnly="true"/>
+               <state pattern="%d %unit%" readOnly="true"/>
        </channel-type>
 
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml
index 4b77e92ca29a38f3356a3c8e6fd258e8a52eaf9b..a0e6bd8849ad06b226e561f54879a7669be930a2 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/chlorinator.xml
@@ -47,7 +47,7 @@
                <item-type>Number:Dimensionless</item-type>
                <label>Salt Output (%)</label>
                <description>Current salt output setting for the chlorinator (%).</description>
-               <state min="0" max="100" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+               <state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
        </channel-type>
 
        <channel-type id="scMode">
@@ -84,20 +84,20 @@
                <item-type>Number:Dimensionless</item-type>
                <label>Average Salt Level</label>
                <description>Average Salt Level</description>
-               <state pattern="%1f %unit%" readOnly="true"/>
+               <state pattern="%d %unit%" readOnly="true"/>
        </channel-type>
 
        <channel-type id="instantSaltLevel">
                <item-type>Number:Dimensionless</item-type>
                <label>Instant Salt Level</label>
                <description>Instant Salt Level</description>
-               <state pattern="%1f %unit%" readOnly="true"/>
+               <state pattern="%d %unit%" readOnly="true"/>
        </channel-type>
 
        <channel-type id="status">
                <item-type>Number</item-type>
                <label>Status</label>
                <description>Status</description>
-               <state pattern="%1f" readOnly="true"/>
+               <state pattern="%d" readOnly="true"/>
        </channel-type>
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml
index 00529184bb7f983c9cb410b8b34d2ac863373a09..886904432da7f06ebd25651166747ade74bddd3c 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/filter.xml
@@ -48,7 +48,7 @@
                <item-type>Number:Dimensionless</item-type>
                <label>Filter Speed</label>
                <description>Filter Speed in %</description>
-               <state min="0" max="100" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+               <state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
        </channel-type>
 
        <channel-type id="filterState">
@@ -77,7 +77,7 @@
                <item-type>Number:Dimensionless</item-type>
                <label>Last Speed</label>
                <description>Last Speed</description>
-               <state pattern="%1f %unit%" readOnly="true"/>
+               <state pattern="%d %unit%" readOnly="true"/>
        </channel-type>
 
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml
index 16f1a094b6e205da997f2dfaf8148838f419a76a..d9e43f45e446eb5be64b3420832c971972fe459c 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/pump.xml
@@ -31,7 +31,7 @@
                <item-type>Number:Dimensionless</item-type>
                <label>Pump Speed in %</label>
                <description>Pump Speed</description>
-               <state min="0" max="100" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+               <state min="0" max="100" step="1.0" pattern="%d %unit%" readOnly="false"/>
        </channel-type>
 
 </thing:thing-descriptions>

diff --git a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml
index 89d7d410c17ed81aac5c7164f20ec2260319428c..65c502e39d8704b520189ed29f59e57aaa19c99d 100644 (file)
--- a/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml
+++ b/bundles/org.openhab.binding.haywardomnilogic/src/main/resources/OH-INF/thing/virtualHeater.xml
@@ -28,7 +28,7 @@
                <label>Current Setpoint</label>
                <description>Current Setpoint</description>
                <category>Temperature</category>
-               <state min="65" max="90" step="1.0" pattern="%1f %unit%" readOnly="false"/>
+               <state min="65" max="90" step="1.0" pattern="%d %unit%" readOnly="false"/>
        </channel-type>
 
 </thing:thing-descriptions>