From 73c19c81aec6f89e698da983f640d7eef4d0d30e Mon Sep 17 00:00:00 2001 From: Jon Huang Date: Fri, 24 Apr 2015 13:50:49 -0400 Subject: [PATCH 1/2] added functionality to getDevicesFromEmail method --- src/InputOutput/Database.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java index 8ad7575..61ad98a 100644 --- a/src/InputOutput/Database.java +++ b/src/InputOutput/Database.java @@ -56,7 +56,8 @@ public void setDesiredTempForSerialNumber(String serialnumber, String desiredtem } public String getDevicesFromEmail(String email){ - return null; + Hashtable user= this.getDevicesFromEmail(email); + return user.get(devices) } From 97f4a95ffdaeae19e6f9ccf36e76bfa8a020dc66 Mon Sep 17 00:00:00 2001 From: Jon Huang Date: Fri, 24 Apr 2015 13:52:18 -0400 Subject: [PATCH 2/2] quick changes to getDevicesFromEmail method again --- src/InputOutput/Database.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java index 61ad98a..3357796 100644 --- a/src/InputOutput/Database.java +++ b/src/InputOutput/Database.java @@ -56,8 +56,7 @@ public void setDesiredTempForSerialNumber(String serialnumber, String desiredtem } public String getDevicesFromEmail(String email){ - Hashtable user= this.getDevicesFromEmail(email); - return user.get(devices) + return this.getUserFromEmail(email).get("devices"); }