From 73a36dfcca304f1b52e0b54a7b1c3100d1e67751 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 25 Aug 2016 16:53:47 +0200 Subject: [PATCH] Adde toString methods to all SensorData types --- src/se/hal/struct/devicedata/DimmerEventData.java | 5 +++++ src/se/hal/struct/devicedata/HumiditySensorData.java | 5 +++++ src/se/hal/struct/devicedata/LightSensorData.java | 4 ++++ src/se/hal/struct/devicedata/PowerConsumptionSensorData.java | 4 ++++ src/se/hal/struct/devicedata/SwitchEventData.java | 5 +++++ src/se/hal/struct/devicedata/TemperatureSensorData.java | 5 +++++ 6 files changed, 28 insertions(+) diff --git a/src/se/hal/struct/devicedata/DimmerEventData.java b/src/se/hal/struct/devicedata/DimmerEventData.java index 2c996169..f658f712 100755 --- a/src/se/hal/struct/devicedata/DimmerEventData.java +++ b/src/se/hal/struct/devicedata/DimmerEventData.java @@ -46,4 +46,9 @@ public class DimmerEventData extends HalEventData { public void setData(double dimmValue) { this.dimmValue = dimmValue; } + + @Override + public String toString(){ + return dimmValue+"%"; + } } diff --git a/src/se/hal/struct/devicedata/HumiditySensorData.java b/src/se/hal/struct/devicedata/HumiditySensorData.java index d5c9f55b..22230fa2 100755 --- a/src/se/hal/struct/devicedata/HumiditySensorData.java +++ b/src/se/hal/struct/devicedata/HumiditySensorData.java @@ -25,4 +25,9 @@ public class HumiditySensorData extends HalSensorData { public void setData(double humidity) { this.humidity = humidity; } + + @Override + public String toString(){ + return humidity+"%"; + } } diff --git a/src/se/hal/struct/devicedata/LightSensorData.java b/src/se/hal/struct/devicedata/LightSensorData.java index 845e091b..369c2e44 100755 --- a/src/se/hal/struct/devicedata/LightSensorData.java +++ b/src/se/hal/struct/devicedata/LightSensorData.java @@ -31,4 +31,8 @@ public class LightSensorData extends HalSensorData { this.lux = lux; } + @Override + public String toString(){ + return lux+" lux"; + } } diff --git a/src/se/hal/struct/devicedata/PowerConsumptionSensorData.java b/src/se/hal/struct/devicedata/PowerConsumptionSensorData.java index 814a2f04..27ff787b 100755 --- a/src/se/hal/struct/devicedata/PowerConsumptionSensorData.java +++ b/src/se/hal/struct/devicedata/PowerConsumptionSensorData.java @@ -33,4 +33,8 @@ public class PowerConsumptionSensorData extends HalSensorData { this.wattHours = wattHours; } + @Override + public String toString(){ + return wattHours+" Wh"; + } } diff --git a/src/se/hal/struct/devicedata/SwitchEventData.java b/src/se/hal/struct/devicedata/SwitchEventData.java index 64db9eab..01dcf588 100755 --- a/src/se/hal/struct/devicedata/SwitchEventData.java +++ b/src/se/hal/struct/devicedata/SwitchEventData.java @@ -56,4 +56,9 @@ public class SwitchEventData extends HalEventData { public void setData(double enabled) { this.enabled = enabled > 0; } + + @Override + public String toString(){ + return enabled ? "ON" : "OFF"; + } } diff --git a/src/se/hal/struct/devicedata/TemperatureSensorData.java b/src/se/hal/struct/devicedata/TemperatureSensorData.java index ac071616..8404c585 100755 --- a/src/se/hal/struct/devicedata/TemperatureSensorData.java +++ b/src/se/hal/struct/devicedata/TemperatureSensorData.java @@ -35,4 +35,9 @@ public class TemperatureSensorData extends HalSensorData { this.temperature = temperature; } + + @Override + public String toString(){ + return temperature+" \\u00b0C"; + } }