diff --git a/bin/.gitignore b/bin/.gitignore index 1efcc2d..7038338 100644 --- a/bin/.gitignore +++ b/bin/.gitignore @@ -1,10 +1,6 @@ -/InputOutput/ -/UML.cld -/Use_Cases.ucd -/interface_xml_files/ -/main/ /networking/ /server/ -/testing/ /thermostat/ /user_interface/ +/InputOutput/ +/testing/ diff --git a/bin/InputOutput/InputOutput.class b/bin/InputOutput/InputOutput.class index aab2499..a41adec 100644 Binary files a/bin/InputOutput/InputOutput.class and b/bin/InputOutput/InputOutput.class differ diff --git a/bin/testing/Networking_Test.class b/bin/testing/Networking_Test.class index 7263198..c8e8db6 100644 Binary files a/bin/testing/Networking_Test.class and b/bin/testing/Networking_Test.class differ diff --git a/bin/testing/TestforIO.class b/bin/testing/TestforIO.class index 6e069f9..e26a3a5 100644 Binary files a/bin/testing/TestforIO.class and b/bin/testing/TestforIO.class differ diff --git a/bin/testing/ThermostatTest.class b/bin/testing/ThermostatTest.class index 4e6ea8b..d941866 100644 Binary files a/bin/testing/ThermostatTest.class and b/bin/testing/ThermostatTest.class differ diff --git a/bin/thermostat/Sensorable.class b/bin/thermostat/Sensorable.class index 73d5001..23d63f9 100644 Binary files a/bin/thermostat/Sensorable.class and b/bin/thermostat/Sensorable.class differ diff --git a/bin/thermostat/TemperatureSensor.class b/bin/thermostat/TemperatureSensor.class index bdb0ed8..bc2781e 100644 Binary files a/bin/thermostat/TemperatureSensor.class and b/bin/thermostat/TemperatureSensor.class differ diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class index 9c8c7d7..a603d5f 100644 Binary files a/bin/thermostat/ThermostatDevice.class and b/bin/thermostat/ThermostatDevice.class differ diff --git a/src/InputOutput/Database.java b/src/InputOutput/Database.java index ea7c60e..8ad7575 100644 --- a/src/InputOutput/Database.java +++ b/src/InputOutput/Database.java @@ -12,10 +12,11 @@ public Database(Thermostatable owner){ } - public boolean createUser(String email, String password, String ip){ + public boolean createUser(String email, String password, String ip, String serialpermission){ this.updateTable("UserTable", email, "email", email); this.updateTable("UserTable", email, "password", password); this.updateTable("UserTable", email, "ipaddress", ip); + this.updateTable("UserTable", email, "devices", serialpermission); return true; } diff --git a/src/InputOutput/Thermostatable.java b/src/InputOutput/Thermostatable.java index e4717af..3a555d4 100644 --- a/src/InputOutput/Thermostatable.java +++ b/src/InputOutput/Thermostatable.java @@ -5,7 +5,7 @@ //Methods for calling thermostat information public interface Thermostatable { - public boolean createUser(String email, String password, String ip); + public boolean createUser(String email, String password, String ip, String serialpermission); public boolean createThermostat(String serial, String name, String desiredTemp); diff --git a/src/server/server.java b/src/server/server.java index 67ca602..d9d89bf 100644 --- a/src/server/server.java +++ b/src/server/server.java @@ -25,15 +25,15 @@ public server() { String ip = "127.0.0.1"; String email = "admin@uconn.edu"; Database dataStorage = new Database(this); - dataStorage.createUser(email, adminpassword, ip); + dataStorage.createUser(email, adminpassword, ip, null); } public void receiveCurrentTemp() throws Exception { super.receiveCurrentTemp(receiveCurrentTempPORT); } - public boolean createUser(String email, String password, String ip) { - dataStorage.createUser(email, password, ip); + public boolean createUser(String email, String password, String ip, String serialpermission) { + dataStorage.createUser(email, password, ip, null); return true; } diff --git a/src/testing/DataStructureTest.java b/src/testing/DataStructureTest.java index 2cb7b55..0386299 100644 --- a/src/testing/DataStructureTest.java +++ b/src/testing/DataStructureTest.java @@ -64,7 +64,7 @@ public static void main(String[] args){ } @Override - public boolean createUser(String email, String password, String ip) { + public boolean createUser(String email, String password, String ip, String serialpermission) { // TODO Auto-generated method stub return false; } diff --git a/src/testing/DatabaseTest.java b/src/testing/DatabaseTest.java index faa7066..df4af24 100644 --- a/src/testing/DatabaseTest.java +++ b/src/testing/DatabaseTest.java @@ -19,7 +19,7 @@ public class DatabaseTest implements Thermostatable, Serializable{ public DatabaseTest(){ Database testbase =new Database(this); - testbase.createUser("herp@derp.com", "herpderp", "123456789.0"); + testbase.createUser("herp@derp.com", "herpderp", "123456789.0", null); Hashtable testuser = testbase.getUserFromEmail("herp@derp.com"); if(testuser.get("email").equals("herp@derp.com")){ @@ -29,10 +29,11 @@ public DatabaseTest(){ System.out.println("ip pass"); } + if(testuser.get())) } @Override - public boolean createUser(String email, String password, String ip) { + public boolean createUser(String email, String password, String ip, String serialpermission) { // TODO Auto-generated method stub return false; }