Added log capability to server/datastruct

pid1 · Apr 17, 2015 · 15ecf25 · 15ecf25
1 parent 64a0764
commit 15ecf25
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/src/InputOutput/DataStructure.java b/src/InputOutput/DataStructure.java
@@ -18,16 +18,18 @@ public class DataStructure extends Hashtable<String, Hashtable<String, Hashtable
 	private static final long serialVersionUID = 1105146094425728795L;
 	//private Hashtable<String, Hashtable<String, String>> internalStructure;
 	private final String FILE_NAME = "datastruct.txt";
-
-	public DataStructure(){
+	private Thermostatable owner;
+
+	public DataStructure(Thermostatable owner){
+        this.owner = owner;
 		File f = new File(FILE_NAME);
 		if(f.exists() && !f.isDirectory()) {
 			System.out.println("Previous Settings/Data Found!");
 			this.restoreFromDisk(); 
 		}	
 	}
 
-	public String updateTable(String tableName, String key, String subKey, String value){
+	public void updateTable(String tableName, String key, String subKey, String value){
 
         String query = "Inserting Value: "+value + " FOR KEY: "+subKey+" FOR Object: "+key+" INTO: "+tableName;
 
@@ -61,7 +63,7 @@ public String updateTable(String tableName, String key, String subKey, String va
 		this.put(tableName, tempTable);
 		this.writeToDisk();
 
-        return query;
+        this.owner.datastructureLogEvent(query);
 	}
 
 	public String queryForValue(String tableName, String key, String subKey){

diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java
@@ -6,7 +6,8 @@
 
 public class Database extends DataStructure implements Thermostatable{
 
-	public Database(){
+	public Database(Thermostatable owner){
+        super(owner);
 		this.updateTable("UserTable", null, null, null);
 
 		this.updateTable("Thermostat", null, null, null);
@@ -59,11 +60,9 @@ public String getDevicesFromEmail(String email){
 	}
 
 
-
 	@Override
-	public String datastructureLogEvent() {
-		// TODO Auto-generated method stub
-		return null;
+	public void datastructureLogEvent(String query) {
+		// don't use this here
 	}
 
 }

diff --git a/src/InputOutput/Thermostatable.java b/src/InputOutput/Thermostatable.java
@@ -21,5 +21,5 @@ public interface Thermostatable {
 
 	public String getDevicesFromEmail(String email);
 
-	public String datastructureLogEvent();
+	public void datastructureLogEvent(String query);
 }
diff --git a/src/server/server.java b/src/server/server.java
@@ -23,7 +23,7 @@ public server() {
 		String adminpassword = "admin";
 		String ip = "127.0.0.1";
 		String email = "admin@uconn.edu";
-		Database dataStorage = new Database();
+		Database dataStorage = new Database(this);
 		dataStorage.createUser(admin, adminpassword, ip, email);
 	}
 
@@ -82,9 +82,11 @@ public String getDevicesFromEmail(String email) {
 		// TODO Auto-generated method stub
 		return null;
 	}
-
-
 
-
-
+    @Override
+    public void datastructureLogEvent(String query) {
+        // take this query string and pass it to the UI to display in the Log in the server text field
+    }
+
+
 }