Changed create user method to include permissions

pid1 · Apr 24, 2015 · be5bf78 · be5bf78
1 parent bb69314
commit be5bf78
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 14 deletions.
diff --git 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
diff --git a/bin/testing/Networking_Test.class b/bin/testing/Networking_Test.class
diff --git a/bin/testing/TestforIO.class b/bin/testing/TestforIO.class
diff --git a/bin/testing/ThermostatTest.class b/bin/testing/ThermostatTest.class
diff --git a/bin/thermostat/Sensorable.class b/bin/thermostat/Sensorable.class
diff --git a/bin/thermostat/TemperatureSensor.class b/bin/thermostat/TemperatureSensor.class
diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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<String, String> 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;
 	}