From cc6da8fccfc207c6d8c962a7c160e5b793bc366c Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 15 Jan 2016 10:15:10 +0100 Subject: [PATCH] Rename HalEvent and HalSensor to HalEventData and HalSensorData Former-commit-id: 2dac97a3080245639b43d290aa4e94127cb1bdd4 --- src/se/hal/ControllerManager.java | 16 ++++++++-------- src/se/hal/HalSpeechClient.java | 16 ++++++++-------- .../hal/deamon/SensorDataAggregatorDaemon.java | 5 ++--- src/se/hal/deamon/SensorDataCleanupDaemon.java | 3 +-- src/se/hal/intf/HalEventController.java | 6 +++--- .../intf/{HalEvent.java => HalEventData.java} | 2 +- src/se/hal/intf/HalEventReportListener.java | 2 +- src/se/hal/intf/HalSensorController.java | 4 ++-- .../{HalSensor.java => HalSensorData.java} | 2 +- src/se/hal/intf/HalSensorReportListener.java | 2 +- .../hal/plugin/localsensor/RPiController.java | 6 +++--- src/se/hal/plugin/localsensor/RPiSensor.java | 5 ++--- src/se/hal/plugin/localsensor/plugin.json | 2 +- .../plugin/tellstick/TellstickSerialComm.java | 18 +++++++++--------- src/se/hal/plugin/tellstick/plugin.json | 4 ++-- .../tellstick/protocols/NexaSelfLearning.java | 4 ++-- .../tellstick/protocols/Oregon0x1A2D.java | 4 ++-- src/se/hal/struct/AbstractDevice.java | 2 -- .../{DimmerEvent.java => DimmerEventData.java} | 4 ++-- src/se/hal/struct/Event.java | 14 ++------------ src/se/hal/struct/PowerConsumptionSensor.java | 9 --------- .../hal/struct/PowerConsumptionSensorData.java | 9 +++++++++ src/se/hal/struct/Sensor.java | 15 +++------------ .../{SwitchEvent.java => SwitchEventData.java} | 4 ++-- ...eSensor.java => TemperatureSensorData.java} | 4 ++-- .../tellstick/TelstickSerialCommTest.java | 4 ++-- 26 files changed, 71 insertions(+), 95 deletions(-) rename src/se/hal/intf/{HalEvent.java => HalEventData.java} (92%) rename src/se/hal/intf/{HalSensor.java => HalSensorData.java} (93%) rename src/se/hal/struct/{DimmerEvent.java => DimmerEventData.java} (92%) delete mode 100755 src/se/hal/struct/PowerConsumptionSensor.java create mode 100755 src/se/hal/struct/PowerConsumptionSensorData.java rename src/se/hal/struct/{SwitchEvent.java => SwitchEventData.java} (93%) rename src/se/hal/struct/{TemperatureSensor.java => TemperatureSensorData.java} (56%) diff --git a/src/se/hal/ControllerManager.java b/src/se/hal/ControllerManager.java index e57fa9bc..565dc6e8 100755 --- a/src/se/hal/ControllerManager.java +++ b/src/se/hal/ControllerManager.java @@ -30,7 +30,7 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor /** List of all registered sensors **/ private ArrayList registeredSensors = new ArrayList<>(); /** List of auto detected sensors **/ - private ArrayList detectedSensors = new ArrayList<>(); + private ArrayList detectedSensors = new ArrayList<>(); /** All available event plugins **/ @@ -38,7 +38,7 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor /** List of all registered events **/ private ArrayList registeredEvents = new ArrayList<>(); /** List of auto detected events **/ - private ArrayList detectedEvents = new ArrayList<>(); + private ArrayList detectedEvents = new ArrayList<>(); /** A map of all instantiated controllers **/ @@ -87,12 +87,12 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor return availableSensors; } - public List getDetectedSensors(){ + public List getDetectedSensors(){ return detectedSensors; } @Override - public void reportReceived(HalSensor sensorData) { + public void reportReceived(HalSensorData sensorData) { try{ DBConnection db = HalContext.getDB(); Sensor sensor = null; @@ -165,12 +165,12 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor return availableEvents; } - public List getDetectedEvents(){ + public List getDetectedEvents(){ return detectedEvents; } @Override - public void reportReceived(HalEvent eventData) { + public void reportReceived(HalEventData eventData) { try { DBConnection db = HalContext.getDB(); Event event = null; @@ -259,12 +259,12 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor Iterator it = pluginManager.iterator(); while (it.hasNext()){ PluginData plugin = it.next(); - Iterator> pluginIt = plugin.getClassIterator(HalSensor.class); + Iterator> pluginIt = plugin.getClassIterator(HalSensorData.class); while (pluginIt.hasNext()){ manager.availableSensors.add(pluginIt.next()); } - pluginIt = plugin.getClassIterator(HalEvent.class); + pluginIt = plugin.getClassIterator(HalEventData.class); while (pluginIt.hasNext()){ manager.availableEvents.add(pluginIt.next()); } diff --git a/src/se/hal/HalSpeechClient.java b/src/se/hal/HalSpeechClient.java index aad48173..e09b3466 100755 --- a/src/se/hal/HalSpeechClient.java +++ b/src/se/hal/HalSpeechClient.java @@ -4,7 +4,7 @@ import se.hal.bot.AliceBot; import se.hal.intf.HalBot; import se.hal.intf.HalSpeachToText; import se.hal.intf.HalTextToSpeach; -import se.hal.struct.SwitchEvent; +import se.hal.struct.SwitchEventData; import se.hal.stt.ManualSTTClient; import se.hal.tts.MaryRemoteTTSClient; @@ -20,7 +20,7 @@ import java.util.regex.Pattern; * Time: 10:59 */ public class HalSpeechClient { - private static HashMap switches = new HashMap(); + private static HashMap switches = new HashMap(); public static void main(String[] args){ @@ -53,22 +53,22 @@ public class HalSpeechClient { /* NexaSelfLearning nexa1 = new NexaSelfLearning(); nexa1.setHouse(15087918); nexa1.setUnit(0); - switches.put("livingroom", new SwitchEvent("livingroom", nexa1)); + switches.put("livingroom", new SwitchEventData("livingroom", nexa1)); NexaSelfLearning nexa2 = new NexaSelfLearning(); nexa2.setHouse(15087918); nexa2.setUnit(1); - switches.put("bedroom", new SwitchEvent("bedroom", nexa2)); + switches.put("bedroom", new SwitchEventData("bedroom", nexa2)); NexaSelfLearning nexa3 = new NexaSelfLearning(); nexa3.setHouse(15087918); nexa3.setUnit(3); - switches.put("kitchen", new SwitchEvent("kitchen", nexa3)); + switches.put("kitchen", new SwitchEventData("kitchen", nexa3)); TellstickSerialComm.getInstance().setListener(new TellstickChangeListener() { @Override public void stateChange(TellstickProtocol protocol) { - for(SwitchEvent s : switches.values()) { + for(SwitchEventData s : switches.values()) { if(s.equals(protocol)) { String response = s.getName()+" window is "+(((NexaSelfLearning)protocol).isEnabled() ? "open": "closed"); System.out.println(">>> " + response); @@ -118,7 +118,7 @@ public class HalSpeechClient { if(m.find()){ String name = m.group(1); if(name.equals("all")){ - for(SwitchEvent s : switches.values()) + for(SwitchEventData s : switches.values()) s.turnOn(); return "I've turned everything on for you"; } @@ -132,7 +132,7 @@ public class HalSpeechClient { if(m.find()){ String name = m.group(1); if(name.equals("all")){ - for(SwitchEvent s : switches.values()) + for(SwitchEventData s : switches.values()) s.turnOff(); return "I turned everything off"; } diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java index 329d195d..f37aff17 100755 --- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java +++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java @@ -3,8 +3,7 @@ package se.hal.deamon; import se.hal.HalContext; import se.hal.intf.HalDaemon; import se.hal.struct.Sensor; -import se.hal.intf.HalSensor.AggregationMethod; -import se.hal.struct.PowerConsumptionSensor; +import se.hal.intf.HalSensorData.AggregationMethod; import se.hal.util.TimeUtility; import zutil.db.DBConnection; import zutil.db.SQLResultHandler; @@ -43,7 +42,7 @@ public class SensorDataAggregatorDaemon implements HalDaemon { } public void aggregateSensor(Sensor sensor) { - //if(sensor.getSensorData() instanceof PowerConsumptionSensor){ + //if(sensor.getSensorData() instanceof PowerConsumptionSensorData){ logger.fine("The sensor is of type: " + sensor.getDeviceData().getClass().getName()); logger.fine("aggregating raw data to five minute periods"); aggregateRawData(sensor, TimeUtility.FIVE_MINUTES_IN_MS, 5); diff --git a/src/se/hal/deamon/SensorDataCleanupDaemon.java b/src/se/hal/deamon/SensorDataCleanupDaemon.java index dd99b902..d415764a 100755 --- a/src/se/hal/deamon/SensorDataCleanupDaemon.java +++ b/src/se/hal/deamon/SensorDataCleanupDaemon.java @@ -3,7 +3,6 @@ package se.hal.deamon; import se.hal.HalContext; import se.hal.intf.HalDaemon; import se.hal.struct.Sensor; -import se.hal.struct.PowerConsumptionSensor; import se.hal.util.TimeUtility; import zutil.db.DBConnection; import zutil.db.SQLResultHandler; @@ -42,7 +41,7 @@ public class SensorDataCleanupDaemon implements HalDaemon { } public void cleanupSensor(Sensor sensor) { - //if(sensor instanceof PowerConsumptionSensor){ + //if(sensor instanceof PowerConsumptionSensorData){ logger.fine("The sensor is of type: " + sensor.getDeviceData().getClass().getName()); if(sensor.getUser().isExternal()){ cleanupExternalSensorData(sensor.getId(), TimeUtility.FIVE_MINUTES_IN_MS, TimeUtility.DAY_IN_MS); diff --git a/src/se/hal/intf/HalEventController.java b/src/se/hal/intf/HalEventController.java index 1dd1f551..1625fa6f 100755 --- a/src/se/hal/intf/HalEventController.java +++ b/src/se/hal/intf/HalEventController.java @@ -10,18 +10,18 @@ public interface HalEventController { /** * Will register an event type to be handled by this controller */ - public void register(HalEvent event); + public void register(HalEventData event); /** * Deregisters an event from this controller, the controller * will no longer handle that type of event */ - public void deregister(HalEvent event); + public void deregister(HalEventData event); /** * @param event transmit this event if possible. */ - public void send(HalEvent event); // TODO: where to put data? + public void send(HalEventData event); // TODO: where to put data? /** * @return the number of registered objects diff --git a/src/se/hal/intf/HalEvent.java b/src/se/hal/intf/HalEventData.java similarity index 92% rename from src/se/hal/intf/HalEvent.java rename to src/se/hal/intf/HalEventData.java index a1289d76..dc0c068a 100755 --- a/src/se/hal/intf/HalEvent.java +++ b/src/se/hal/intf/HalEventData.java @@ -3,7 +3,7 @@ package se.hal.intf; /** * Created by Ziver on 2015-12-23. */ -public interface HalEvent { +public interface HalEventData { long getTimestamp(); diff --git a/src/se/hal/intf/HalEventReportListener.java b/src/se/hal/intf/HalEventReportListener.java index 869fa8de..338ecf77 100755 --- a/src/se/hal/intf/HalEventReportListener.java +++ b/src/se/hal/intf/HalEventReportListener.java @@ -2,6 +2,6 @@ package se.hal.intf; public interface HalEventReportListener { - void reportReceived(HalEvent e); + void reportReceived(HalEventData e); } \ No newline at end of file diff --git a/src/se/hal/intf/HalSensorController.java b/src/se/hal/intf/HalSensorController.java index d74363fe..09328cc5 100755 --- a/src/se/hal/intf/HalSensorController.java +++ b/src/se/hal/intf/HalSensorController.java @@ -10,13 +10,13 @@ public interface HalSensorController { /** * Will register a sensor type to be handled by this controller */ - void register(HalSensor sensor); + void register(HalSensorData sensor); /** * Deregisters a sensor from this controller, the controller * will no longer handle that type of sensor */ - void deregister(HalSensor sensor); + void deregister(HalSensorData sensor); /** * @return the number of registered objects diff --git a/src/se/hal/intf/HalSensor.java b/src/se/hal/intf/HalSensorData.java similarity index 93% rename from src/se/hal/intf/HalSensor.java rename to src/se/hal/intf/HalSensorData.java index 0dbed5be..cc276096 100755 --- a/src/se/hal/intf/HalSensor.java +++ b/src/se/hal/intf/HalSensorData.java @@ -3,7 +3,7 @@ package se.hal.intf; /** * Created by Ziver on 2015-12-23. */ -public interface HalSensor { +public interface HalSensorData { enum AggregationMethod{ SUM, AVERAGE diff --git a/src/se/hal/intf/HalSensorReportListener.java b/src/se/hal/intf/HalSensorReportListener.java index 9c4a73cb..4f843168 100755 --- a/src/se/hal/intf/HalSensorReportListener.java +++ b/src/se/hal/intf/HalSensorReportListener.java @@ -2,6 +2,6 @@ package se.hal.intf; public interface HalSensorReportListener { - void reportReceived(HalSensor s); + void reportReceived(HalSensorData s); } \ No newline at end of file diff --git a/src/se/hal/plugin/localsensor/RPiController.java b/src/se/hal/plugin/localsensor/RPiController.java index 52780965..7f869d57 100755 --- a/src/se/hal/plugin/localsensor/RPiController.java +++ b/src/se/hal/plugin/localsensor/RPiController.java @@ -1,6 +1,6 @@ package se.hal.plugin.localsensor; -import se.hal.intf.HalSensor; +import se.hal.intf.HalSensorData; import se.hal.intf.HalSensorController; import se.hal.intf.HalSensorReportListener; @@ -14,12 +14,12 @@ public class RPiController implements HalSensorController { } @Override - public void register(HalSensor sensor) { + public void register(HalSensorData sensor) { } @Override - public void deregister(HalSensor sensor) { + public void deregister(HalSensorData sensor) { } diff --git a/src/se/hal/plugin/localsensor/RPiSensor.java b/src/se/hal/plugin/localsensor/RPiSensor.java index 3600b479..ec8a864d 100755 --- a/src/se/hal/plugin/localsensor/RPiSensor.java +++ b/src/se/hal/plugin/localsensor/RPiSensor.java @@ -1,13 +1,12 @@ package se.hal.plugin.localsensor; -import se.hal.intf.HalSensor; import se.hal.intf.HalSensorController; -import se.hal.struct.PowerConsumptionSensor; +import se.hal.struct.PowerConsumptionSensorData; /** * Created by ezivkoc on 2016-01-14. */ -public class RPiSensor implements PowerConsumptionSensor { +public class RPiSensor implements PowerConsumptionSensorData { @Override public long getTimestamp() { diff --git a/src/se/hal/plugin/localsensor/plugin.json b/src/se/hal/plugin/localsensor/plugin.json index 8d18e028..36a3af47 100755 --- a/src/se/hal/plugin/localsensor/plugin.json +++ b/src/se/hal/plugin/localsensor/plugin.json @@ -2,6 +2,6 @@ "version": 1.0, "name": "RPiImpulsCountSensor", "interfaces": [ - {"se.hal.intf.HalSensor": "se.hal.plugin.localsensor.RPiSensor"} + {"se.hal.intf.HalSensorData": "se.hal.plugin.localsensor.RPiSensor"} ] } \ No newline at end of file diff --git a/src/se/hal/plugin/tellstick/TellstickSerialComm.java b/src/se/hal/plugin/tellstick/TellstickSerialComm.java index 5545571d..d9c5f8e9 100755 --- a/src/se/hal/plugin/tellstick/TellstickSerialComm.java +++ b/src/se/hal/plugin/tellstick/TellstickSerialComm.java @@ -122,10 +122,10 @@ public class TellstickSerialComm implements Runnable, HalSensorController, HalEv protocol.setTimestamp(System.currentTimeMillis()); set.add(data); - if (sensorListener != null && protocol instanceof HalSensor) - sensorListener.reportReceived((HalSensor) protocol); - else if (eventListener != null && protocol instanceof HalEvent) - eventListener.reportReceived((HalEvent) protocol); + if (sensorListener != null && protocol instanceof HalSensorData) + sensorListener.reportReceived((HalSensorData) protocol); + else if (eventListener != null && protocol instanceof HalEventData) + eventListener.reportReceived((HalEventData) protocol); } } } @@ -157,7 +157,7 @@ public class TellstickSerialComm implements Runnable, HalSensorController, HalEv @Override - public void send(HalEvent event) { + public void send(HalEventData event) { if(event instanceof TellstickProtocol) write((TellstickProtocol) event); } @@ -182,14 +182,14 @@ public class TellstickSerialComm implements Runnable, HalSensorController, HalEv @Override - public void register(HalEvent event) {++registeredObjects;} + public void register(HalEventData event) {++registeredObjects;} @Override - public void register(HalSensor sensor) {++registeredObjects;} + public void register(HalSensorData sensor) {++registeredObjects;} @Override - public void deregister(HalSensor sensor) {--registeredObjects;} + public void deregister(HalSensorData sensor) {--registeredObjects;} @Override - public void deregister(HalEvent event) {--registeredObjects;} + public void deregister(HalEventData event) {--registeredObjects;} @Override public int size() { diff --git a/src/se/hal/plugin/tellstick/plugin.json b/src/se/hal/plugin/tellstick/plugin.json index 77051c2e..610caa4d 100755 --- a/src/se/hal/plugin/tellstick/plugin.json +++ b/src/se/hal/plugin/tellstick/plugin.json @@ -2,7 +2,7 @@ "version": 1.0, "name": "Tellstick", "interfaces": [ - {"se.hal.intf.HalSensor": "se.hal.plugin.tellstick.protocols.Oregon0x1A2D"}, - {"se.hal.intf.HalEvent": "se.hal.plugin.tellstick.protocols.NexaSelfLearning"} + {"se.hal.intf.HalSensorData": "se.hal.plugin.tellstick.protocols.Oregon0x1A2D"}, + {"se.hal.intf.HalEventData": "se.hal.plugin.tellstick.protocols.NexaSelfLearning"} ] } \ No newline at end of file diff --git a/src/se/hal/plugin/tellstick/protocols/NexaSelfLearning.java b/src/se/hal/plugin/tellstick/protocols/NexaSelfLearning.java index c7dc4b23..6b755827 100755 --- a/src/se/hal/plugin/tellstick/protocols/NexaSelfLearning.java +++ b/src/se/hal/plugin/tellstick/protocols/NexaSelfLearning.java @@ -23,13 +23,13 @@ package se.hal.plugin.tellstick.protocols; import se.hal.plugin.tellstick.TellstickProtocol; -import se.hal.struct.SwitchEvent; +import se.hal.struct.SwitchEventData; import zutil.ui.Configurator; /** * Created by Ziver on 2015-02-18. */ -public class NexaSelfLearning extends TellstickProtocol implements SwitchEvent { +public class NexaSelfLearning extends TellstickProtocol implements SwitchEventData { @Configurator.Configurable("House code") private int house = 0; diff --git a/src/se/hal/plugin/tellstick/protocols/Oregon0x1A2D.java b/src/se/hal/plugin/tellstick/protocols/Oregon0x1A2D.java index ea0233f5..affbd0b4 100755 --- a/src/se/hal/plugin/tellstick/protocols/Oregon0x1A2D.java +++ b/src/se/hal/plugin/tellstick/protocols/Oregon0x1A2D.java @@ -1,13 +1,13 @@ package se.hal.plugin.tellstick.protocols; import se.hal.plugin.tellstick.TellstickProtocol; -import se.hal.struct.PowerConsumptionSensor; +import se.hal.struct.PowerConsumptionSensorData; import zutil.ui.Configurator; /** * Created by Ziver on 2015-11-19. */ -public class Oregon0x1A2D extends TellstickProtocol implements PowerConsumptionSensor { +public class Oregon0x1A2D extends TellstickProtocol implements PowerConsumptionSensorData { @Configurator.Configurable("Address") private int address = 0; diff --git a/src/se/hal/struct/AbstractDevice.java b/src/se/hal/struct/AbstractDevice.java index d6b0f73a..e8dbb989 100755 --- a/src/se/hal/struct/AbstractDevice.java +++ b/src/se/hal/struct/AbstractDevice.java @@ -1,7 +1,5 @@ package se.hal.struct; -import se.hal.intf.HalSensor; -import se.hal.intf.HalSensorController; import zutil.db.DBConnection; import zutil.db.bean.DBBean; import zutil.log.LogUtil; diff --git a/src/se/hal/struct/DimmerEvent.java b/src/se/hal/struct/DimmerEventData.java similarity index 92% rename from src/se/hal/struct/DimmerEvent.java rename to src/se/hal/struct/DimmerEventData.java index 8881c41c..28667ba3 100755 --- a/src/se/hal/struct/DimmerEvent.java +++ b/src/se/hal/struct/DimmerEventData.java @@ -22,11 +22,11 @@ package se.hal.struct; -import se.hal.intf.HalEvent; +import se.hal.intf.HalEventData; /** * Created by Ziver on 2015-05-07. */ -public abstract class DimmerEvent implements HalEvent { +public abstract class DimmerEventData implements HalEventData { } diff --git a/src/se/hal/struct/Event.java b/src/se/hal/struct/Event.java index 08cc4ff2..69765cc7 100755 --- a/src/se/hal/struct/Event.java +++ b/src/se/hal/struct/Event.java @@ -1,32 +1,22 @@ package se.hal.struct; -import se.hal.intf.HalEvent; +import se.hal.intf.HalEventData; import se.hal.intf.HalEventController; -import se.hal.intf.HalSensor; import zutil.db.DBConnection; import zutil.db.bean.DBBean; import zutil.db.bean.DBBeanSQLResultHandler; -import zutil.io.StringInputStream; -import zutil.io.StringOutputStream; import zutil.log.LogUtil; -import zutil.parser.json.JSONObjectInputStream; -import zutil.parser.json.JSONObjectOutputStream; -import zutil.parser.json.JSONParser; -import zutil.parser.json.JSONWriter; -import zutil.ui.Configurator; -import java.io.IOException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import java.util.logging.Level; import java.util.logging.Logger; /** * Created by Ziver on 2015-12-15. */ @DBBean.DBTable("event") -public class Event extends AbstractDevice{ +public class Event extends AbstractDevice{ private static final Logger logger = LogUtil.getLogger(); diff --git a/src/se/hal/struct/PowerConsumptionSensor.java b/src/se/hal/struct/PowerConsumptionSensor.java deleted file mode 100755 index 991d1af8..00000000 --- a/src/se/hal/struct/PowerConsumptionSensor.java +++ /dev/null @@ -1,9 +0,0 @@ -package se.hal.struct; - -import se.hal.intf.HalSensor; - -/** - * Created by Ziver on 2015-12-03. - */ -public interface PowerConsumptionSensor extends HalSensor { -} diff --git a/src/se/hal/struct/PowerConsumptionSensorData.java b/src/se/hal/struct/PowerConsumptionSensorData.java new file mode 100755 index 00000000..c2a993fb --- /dev/null +++ b/src/se/hal/struct/PowerConsumptionSensorData.java @@ -0,0 +1,9 @@ +package se.hal.struct; + +import se.hal.intf.HalSensorData; + +/** + * Created by Ziver on 2015-12-03. + */ +public interface PowerConsumptionSensorData extends HalSensorData { +} diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java index 884283dd..766a51ef 100755 --- a/src/se/hal/struct/Sensor.java +++ b/src/se/hal/struct/Sensor.java @@ -1,31 +1,22 @@ package se.hal.struct; import se.hal.HalContext; -import se.hal.intf.HalSensor; +import se.hal.intf.HalSensorData; import se.hal.intf.HalSensorController; import zutil.db.DBConnection; import zutil.db.bean.DBBean; import zutil.db.bean.DBBeanSQLResultHandler; import zutil.db.handler.SimpleSQLResult; -import zutil.io.StringInputStream; -import zutil.io.StringOutputStream; import zutil.log.LogUtil; -import zutil.parser.json.JSONObjectInputStream; -import zutil.parser.json.JSONObjectOutputStream; -import zutil.parser.json.JSONParser; -import zutil.parser.json.JSONWriter; -import zutil.ui.Configurator; -import java.io.IOException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.List; -import java.util.logging.Level; import java.util.logging.Logger; @DBBean.DBTable(value="sensor", superBean=true) -public class Sensor extends AbstractDevice{ +public class Sensor extends AbstractDevice{ private static final Logger logger = LogUtil.getLogger(); private long external_id = -1; @@ -88,7 +79,7 @@ public class Sensor extends AbstractDevice{ } - public HalSensor.AggregationMethod getAggregationMethod(){ + public HalSensorData.AggregationMethod getAggregationMethod(){ return getDeviceData().getAggregationMethod(); } diff --git a/src/se/hal/struct/SwitchEvent.java b/src/se/hal/struct/SwitchEventData.java similarity index 93% rename from src/se/hal/struct/SwitchEvent.java rename to src/se/hal/struct/SwitchEventData.java index 1a0b214d..d7cba84a 100755 --- a/src/se/hal/struct/SwitchEvent.java +++ b/src/se/hal/struct/SwitchEventData.java @@ -22,12 +22,12 @@ package se.hal.struct; -import se.hal.intf.HalEvent; +import se.hal.intf.HalEventData; /** * Created by Ziver on 2015-05-07. */ -public interface SwitchEvent extends HalEvent { +public interface SwitchEventData extends HalEventData { boolean isOn(); diff --git a/src/se/hal/struct/TemperatureSensor.java b/src/se/hal/struct/TemperatureSensorData.java similarity index 56% rename from src/se/hal/struct/TemperatureSensor.java rename to src/se/hal/struct/TemperatureSensorData.java index 352b50cd..d9c05ea1 100755 --- a/src/se/hal/struct/TemperatureSensor.java +++ b/src/se/hal/struct/TemperatureSensorData.java @@ -1,11 +1,11 @@ package se.hal.struct; -import se.hal.intf.HalSensor; +import se.hal.intf.HalSensorData; /** * Created by Ziver on 2015-12-03. */ -public interface TemperatureSensor extends HalSensor { +public interface TemperatureSensorData extends HalSensorData { double getTemperature(); diff --git a/test/se/hal/plugin/tellstick/TelstickSerialCommTest.java b/test/se/hal/plugin/tellstick/TelstickSerialCommTest.java index 88011f16..c3b57e7b 100755 --- a/test/se/hal/plugin/tellstick/TelstickSerialCommTest.java +++ b/test/se/hal/plugin/tellstick/TelstickSerialCommTest.java @@ -1,7 +1,7 @@ package se.hal.plugin.tellstick; import se.hal.HalContext; -import se.hal.intf.HalSensor; +import se.hal.intf.HalSensorData; import se.hal.intf.HalSensorReportListener; import se.hal.plugin.tellstick.protocols.Oregon0x1A2D; import zutil.db.DBConnection; @@ -32,7 +32,7 @@ public class TelstickSerialCommTest { TellstickSerialComm comm = new TellstickSerialComm(); comm.setListener(new HalSensorReportListener() { @Override - public void reportReceived(HalSensor s) { + public void reportReceived(HalSensorData s) { if(s instanceof Oregon0x1A2D){ logger.info("Power used: "+ ((Oregon0x1A2D)s).getTemperature() +" pulses"); try {