instance variables...

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

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class
diff --git a/src/InputOutput/UserLogin.java b/src/InputOutput/UserLogin.java
@@ -44,6 +44,7 @@ public class UserLogin implements Initializable {
 	@Override
 	public void initialize(URL arg0, ResourceBundle arg1) {
 		_server = server.getInstance();
+		System.out.println(_server);
 		this.loginButton.setOnAction(new EventHandler<ActionEvent>() {
             @Override
             //checks user name and pass word when login button pressed. If not true nothing happens. 

diff --git a/src/server/server.java b/src/server/server.java
@@ -13,7 +13,7 @@
 
 public class server extends ServerNetworking implements Thermostatable, Serializable {
 	private static server instance = null;
-	
+
 	public static server getInstance() {
 		if (instance == null){
 			try {
@@ -42,9 +42,10 @@ public server() throws Exception {
 		String ip = "127.0.0.1";
 		String email = "admin@uconn.edu";
 		String serialNumber = "1.1";
-		Database dataStorage = new Database(this);
+        dataStorage = new Database(this);
 		dataStorage.createUser(email, adminPassword, ip, serialNumber);
 		this.startServerListenerThreadCurrentTemp();
+        dataStorage.printStruct();
         instance = this;
 	}
 
@@ -64,6 +65,7 @@ public boolean createThermostat(String serialnumber, String name, String ip, Str
 	}
 
 	public Hashtable<String, String> getUserFromEmail(String email) {
+        dataStorage.printStruct();
 		return dataStorage.getObjectFromTableAndKey("UserTable", email);
 	}