From 6b4b565a62a56e2b41928b8fd231a868595e0f1a Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Fri, 19 Aug 2016 16:38:03 +0200
Subject: [PATCH] updated some log traces and plugin files

---
 src/se/hal/ControllerManager.java       | 10 +++++-----
 src/se/hal/plugin/tellstick/plugin.json |  4 ++--
 src/se/hal/struct/AbstractDevice.java   | 19 ++++++++++++++-----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/se/hal/ControllerManager.java b/src/se/hal/ControllerManager.java
index 8ccac549..0165d562 100755
--- a/src/se/hal/ControllerManager.java
+++ b/src/se/hal/ControllerManager.java
@@ -57,7 +57,7 @@ public class ControllerManager implements HalSensorReportListener,
 
     public void register(Sensor sensor) {
         if(sensor.getDeviceConfig() == null) {
-            logger.warning("Sensor data is null: "+ sensor);
+            logger.warning("Sensor config is null: "+ sensor);
             return;
         }
         if(!availableSensors.contains(sensor.getDeviceConfig().getClass())) {
@@ -77,7 +77,7 @@ public class ControllerManager implements HalSensorReportListener,
 
     public void deregister(Sensor sensor){
         if(sensor.getDeviceConfig() == null) {
-            logger.warning("Sensor data is null: "+ sensor);
+            logger.warning("Sensor config is null: "+ sensor);
             return;
         }
 
@@ -147,7 +147,7 @@ public class ControllerManager implements HalSensorReportListener,
 
     public void register(Event event) {
         if(event.getDeviceConfig() == null) {
-            logger.warning("Event data is null: "+ event);
+            logger.warning("Event config is null: "+ event);
             return;
         }
         if(!availableEvents.contains(event.getDeviceConfig().getClass())) {
@@ -167,7 +167,7 @@ public class ControllerManager implements HalSensorReportListener,
 
     public void deregister(Event event){
         if(event.getDeviceConfig() == null) {
-            logger.warning("Event data is null: "+ event);
+            logger.warning("Event config is null: "+ event);
             return;
         }
 
@@ -291,7 +291,7 @@ public class ControllerManager implements HalSensorReportListener,
                 controller = c.newInstance();
                 if (controller instanceof HalAutoScannableController &&
                         ! ((HalAutoScannableController)controller).isAvailable()) {
-                    logger.warning("Controller not available: "+c.getName());
+                    logger.warning("Controller is not available: "+c.getName());
                     return null;
                 }
                 logger.info("Instantiating new controller: " + c.getName());
diff --git a/src/se/hal/plugin/tellstick/plugin.json b/src/se/hal/plugin/tellstick/plugin.json
index 65ef031c..0d6ad43f 100755
--- a/src/se/hal/plugin/tellstick/plugin.json
+++ b/src/se/hal/plugin/tellstick/plugin.json
@@ -4,7 +4,7 @@
 	"interfaces": [
 		{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.tellstick.TellstickSerialComm"},
 
-		{"se.hal.intf.HalSensorData": "se.hal.plugin.tellstick.protocols.Oregon0x1A2D"},
-		{"se.hal.intf.HalEventData":  "se.hal.plugin.tellstick.protocols.NexaSelfLearning"}
+		{"se.hal.intf.HalSensorData": "se.hal.plugin.tellstick.device.Oregon0x1A2D"},
+		{"se.hal.intf.HalEventData":  "se.hal.plugin.tellstick.device.NexaSelfLearning"}
 	]
 }
\ No newline at end of file
diff --git a/src/se/hal/struct/AbstractDevice.java b/src/se/hal/struct/AbstractDevice.java
index 8dcfc574..3be520a8 100755
--- a/src/se/hal/struct/AbstractDevice.java
+++ b/src/se/hal/struct/AbstractDevice.java
@@ -26,7 +26,7 @@ public abstract class AbstractDevice<T,D> extends DBBean {
     /** Sensor specific configuration **/
     private transient T deviceConfig;
     /** latest device data received **/
-    private transient D latestDeviceData;
+    private transient D deviceData;
 
     // User configuration
     @DBColumn("user_id")
@@ -72,10 +72,12 @@ public abstract class AbstractDevice<T,D> extends DBBean {
      */
     public void setDeviceConfig(T data) {
         if(data != null) {
-            deviceConfig = data;
             type = data.getClass().getName();
+            deviceConfig = data;
+            deviceData = readDeviceData();
         } else {
             deviceConfig = null;
+            deviceData = null;
             type = null;
             config = null;
         }
@@ -115,14 +117,21 @@ public abstract class AbstractDevice<T,D> extends DBBean {
      * @return the latest known data from the device
      */
     public D getDeviceData(){
-        return latestDeviceData;
+        return deviceData;
     }
 
     public void setDeviceData(D latest){
-        this.latestDeviceData = latest;
+        this.deviceData = latest;
     }
 
-    /**************** OTHER VALUES ******************/
+    /**
+     * Reads latest device data from DB
+     */
+    private D readDeviceData(){
+        return null; // TODO: how to do this in a good way?
+    }
+
+    /**************** OTHER ******************/
 
     public String getName() {
         return name;