From 9e88ba791f0655a7f35cff7d31af7132e78327a5 Mon Sep 17 00:00:00 2001
From: David Paquette <david@clearstak.com>
Date: Mon, 27 Apr 2015 16:32:28 -0400
Subject: [PATCH] Moved from sending ints to strings

---
 src/thermostat/Sensorable.java        |  2 +-
 src/thermostat/TemperatureSensor.java |  6 +++---
 src/thermostat/ThermostatDevice.java  | 12 ++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/thermostat/Sensorable.java b/src/thermostat/Sensorable.java
index a1ddf97..969295c 100644
--- a/src/thermostat/Sensorable.java
+++ b/src/thermostat/Sensorable.java
@@ -1,7 +1,7 @@
 package thermostat;
 
 public interface Sensorable {
-	public DataObject<Integer> getValue();
+	public DataObject<String> getValue();
 	public void newDataEvent();
 	public void requestNewDataPointReading();
 }
diff --git a/src/thermostat/TemperatureSensor.java b/src/thermostat/TemperatureSensor.java
index 4980e7c..11a1670 100644
--- a/src/thermostat/TemperatureSensor.java
+++ b/src/thermostat/TemperatureSensor.java
@@ -8,7 +8,7 @@ public TemperatureSensor(Deviceable owner){
 		this.owner = owner;
 	}
 	
-	public DataObject<Integer> getValue(){
+	public DataObject<String> getValue(){
 		return this.generateFakeTemperature();
 	}
 	
@@ -20,9 +20,9 @@ public void newDataEvent(){
 		this.owner.sensorUpdateEvent(this);
 	}
 	
-	public DataObject<Integer> generateFakeTemperature(){
+	public DataObject<String> generateFakeTemperature(){
 		int minRandomTemp = 50;
 		int maxRandomTemp = 78;
-		return new DataObject<Integer>(minRandomTemp + (int)(Math.random() * ((maxRandomTemp - minRandomTemp) + 1)));
+		return new DataObject<String>(String.valueOf(minRandomTemp + (int)(Math.random() * ((maxRandomTemp - minRandomTemp) + 1))));
 	}
 }
diff --git a/src/thermostat/ThermostatDevice.java b/src/thermostat/ThermostatDevice.java
index 2818de1..b4f7046 100644
--- a/src/thermostat/ThermostatDevice.java
+++ b/src/thermostat/ThermostatDevice.java
@@ -47,14 +47,18 @@ public ThermostatDevice(Integer updateIntervalInSeconds){
 	}
 	
 	public void sensorUpdateEvent(Sensorable sensor) {
-		DataObject <Integer> value = sensor.getValue();
-		System.out.println("New Sensor Event: "+ String.valueOf(value.getValue().intValue()));
+		DataObject <String> value = sensor.getValue();
+		//System.out.println("New Sensor Event: "+ String.valueOf(value.getValue().intValue()));
 		this.updateServer(sensor.getValue());
 	}
 	
-	private void updateServer(DataObject<Integer> dataReading){
+	private void updateServer(DataObject<String> dataReading){
 		//this.sendIP("192.168.1.2");
-		this.sendCurrentTemp(dataReading.getValue());
+		try {
+			this.sendCurrentTemp(dataReading.getValue());
+		} catch(Exception e){
+			System.out.println("Error sending to server");
+		}
 		//this.sendSerialNumber(this.serialNumber);
 	}