still null pointer

pid1 · Apr 28, 2015 · ae4b431 · ae4b431
1 parent c439607
commit ae4b431
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/InputOutput/UserLogin.java b/src/InputOutput/UserLogin.java
@@ -60,16 +60,16 @@ public void handle(ActionEvent e) {
 				String queriedPassword = null;
 				try {
 					queriedEmail = _server.getUserFromEmail(enteredEmail).get("email");
-					queriedPassword = _server.getUserFromEmail(queriedPassword).get("password");
+					queriedPassword = _server.getUserFromEmail(enteredPassword).get("password");
 				} catch(Exception e1){
-					System.out.println("user and password does not exist");
-
+					e1.printStackTrace();
+					System.out.println("ERROR: user and password does not exist");
 				}
 
-				if(queriedEmail ==null || queriedPassword==null){
+				if(queriedEmail == null || queriedPassword == null){
 					System.out.println("user and password does not exist");
 				} else {
-				if (queriedEmail.equals(enteredEmail) && queriedPassword.equals(enteredPassword)){
+				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"));

diff --git a/src/main/Main.java b/src/main/Main.java
@@ -11,7 +11,7 @@ public class Main extends Application {
 	@Override
 	public void start(Stage primaryStage) {
 		try {
-			Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/login.fxml"));
+			Parent root = FXMLLoader.load(getClass().getResource("/interface_xml_files/ServerThermo.fxml"));
 			Scene scene = new Scene(root);
 			primaryStage.setScene(scene);
 			primaryStage.show();

diff --git a/src/server/server.java b/src/server/server.java
@@ -45,6 +45,7 @@ public server() throws Exception {
 		Database dataStorage = new Database(this);
 		dataStorage.createUser(email, adminPassword, ip, serialNumber);
 		this.startServerListenerThreadCurrentTemp();
+        instance = this;
 	}
 
 	public boolean createUser(String email, String password, String ip, String serialpermission) {

diff --git a/src/user_interface/MainApp.java b/src/user_interface/MainApp.java
@@ -74,6 +74,5 @@ public static void closeAllWindows(){
             stage.hide();
         }
     }
-// MainApp.openWindow(MainApp.class.getResource("WohlerWindow.fxml"), "Wohler Device Manager", false);   using it
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,5 @@ public static void closeAllWindows(){ @@
                 stage.hide();
             }
         }
-    // MainApp.openWindow(MainApp.class.getResource("WohlerWindow.fxml"), "Wohler Device Manager", false);   using it
     }