just kidding on the last commit

pid1 · Apr 28, 2015 · 1ca3736 · 1ca3736
1 parent a7c1a94
commit 1ca3736
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/InputOutput/UserLogin.java b/src/InputOutput/UserLogin.java
@@ -61,7 +61,7 @@ public void handle(ActionEvent e) {
 				String queriedPassword = null;
 				try {
 					queriedEmail = _server.getUserFromEmail(enteredEmail).get("email");
-					queriedPassword = _server.getUserFromEmail(enteredPassword).get("password");
+					queriedPassword = _server.getUserFromEmail(enteredEmail).get("password");
 				} catch(Exception e1){
 					e1.printStackTrace();
 					System.out.println("ERROR: user and password does not exist");
@@ -73,7 +73,7 @@ public void handle(ActionEvent e) {
 				if (enteredEmail.equals(queriedEmail) && enteredPassword.equals(queriedPassword)){
         				_loggedin = true;
         				try{//opens new window when login true
-        					Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/SetupThermo.fxml"));
+        					Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/Thermocontroller.fxml"));
         					Stage stage = new Stage();
         					stage.setScene(new Scene(root));
         					stage.show();

diff --git a/src/server/server.java b/src/server/server.java
@@ -65,7 +65,6 @@ public boolean createThermostat(String serialnumber, String name, String ip, Str
 	}
 
 	public Hashtable<String, String> getUserFromEmail(String email) {
-        dataStorage.printStruct();
 		return dataStorage.getObjectFromTableAndKey("UserTable", email);
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	public Hashtable<String, String> getUserFromEmail(String email) {
-            dataStorage.printStruct();
     		return dataStorage.getObjectFromTableAndKey("UserTable", email);
     	}
@@ Expand Down @@