From a7c1a94047a7aff54820edbf3098699446692c4a Mon Sep 17 00:00:00 2001 From: David Paquette Date: Mon, 27 Apr 2015 20:10:12 -0400 Subject: [PATCH] instance variables... --- bin/thermostat/ThermostatDevice.class | Bin 4511 -> 4676 bytes src/InputOutput/UserLogin.java | 1 + src/server/server.java | 6 ++++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/thermostat/ThermostatDevice.class b/bin/thermostat/ThermostatDevice.class index eacbdc3a4d8d11365fc410891d80e976ec070c51..7bef7be5909c7a4f142b43b6c722369f8099f47a 100644 GIT binary patch delta 1856 zcmY+E30PEB6vuyW7`VgZktl+i@;Qn+3QS}YDlSVmlh)c_4rIjsa z&obMz)Mzyo9Yk`eY_rU?eb36YvQ@J(KkeKBQRn;S-22YC=bZofpL6eu!isDtB za;M@ow@DvfSG-}8#hV(#TY9%fu}kr`;+@)f!{ab(6}zQkDYkY_bs~U6(P~Vi<$%9;#C?k1rHoT71RV1}&%is(o|Pt7ey$PfIT- zo#C$(R2JW`-y)B1ErxTs#dj>QxJ`@iIbbo85f-IPSNxzg2MywMnDjEA1j!FnN-T>2 zvkc{;7(6OMz?=JQQeC|rWuUL+|t9@m&{O;1KEO*ypw|P#$QAN}J zQvw!;_|e{_vRps$v&MF%ZMix}1sRd7k<^s-zYocskP8l;Z?pG7XCYWKQk zIn1b;Qf6SPL4SLHbbRXxIcF+u1l+HOy(79!?XZ|!W3orCfrCpJgpzw9-N0ao>>Lag zDUE6V&K8|e9=1t~WrdukRcH@?3kF%0_y`LkN83lNl}5h3G&Xx|fml*-k}Cf(jFo7; z!n<*@gCOH6495s^6%)jFqI|U>;*>Z!6q6KJV<;wPE3R>h*+)@0LC^C%!F)M-9uXol zC3znb=!;J04(k$|LnktYV)0UPb^T10#M9)I)vPHIjYE%*$kAe1N0dMWZ%S&2jyrIt zh3Hg+J9h)lR>{t-bSaDwOR!^ph_2(bvRepqy~NW|ThLj&HMa954h#_8V9^dDj!Wqx zWTy$$r)i0!gV1tq7_qk*v6nKzspEO|Y@dZ#Ysx4Q+r*%l6^>Dg86BFMS57n)%oMAx zV~j-AB)4e5Q|Q`E_d0sy)QAExXnqyUXrf%lK%*b}mgvby*Yfc@= ziW1vJ?V`3zs932dRs0(PH8NH#+7jAJKRO9B-KE}CsY)|8P#A45)@o+s42oGXhq>}x z>$m;%BxNv9DAVL+G?5o8FW&XsAW8IeSvXD*tGH2y>n52%qy$4=d4rpoFH)Cvi>!JC zJSiJ#Sx+y6k!kg07%V4IHWwT6!Ui*Qz4i1qs5y0Ty_{_3kYnjK*dvZapq_8v2E60yIg&>Ru)_(5En^j=ni5{syuNQ|sur ziT(n!e~1AZh9lhCMi}#D9#+Y{SS?ew=ByScH6@RxH4C|2ayYmn?0cuos2&VM?o;^p EKhxr1^8f$< delta 1735 zcmY+Ec~sO@6vscmVc-qFdAKt{go%)214!n$R%VN$C7`)dnT|RkE?~oGX3H2YwwL`{ zv@8uRDzj8{5J|MMOtaPY-O6m=Pk(eg(S0LuY|fc`-@EJge&3zhleZ=}w*TK9EkKaJ zY|dc0%`M!TN*=eRayxe@?zBl}xre)qzT1dCAGI`=Ajk z6{~Ez^N^Q^S*>`)=26zz_*iS)kC{`Q9h2iaF9TR_jE~zQp0KIsNySs<^0Z=uhi4QU zP5QIO^qgXohs`#AwkR5m-f9zIn~8{tS%Z; zHgd_V@WNqZO^8M+t12{C5OH>?45zDS zi03Q5Hswm4@t)qZOZetEl;b2iIwevW4M#MG`PRf8(R|1EW}Y83Kbp2b@v~x|<`;g| z{AN0)N9Tki3#x0Pp=i;Ba8*rpBs6n=So6CXG}|fgWaZ`cH^u(=AG(QiBH_?%WB*fg zA!8eSsf%0<2fd}%^gP*87iV%7O4e2w!r~k`xj0v(kkxTNUu?ol!Y2axjI8Brj#F)h7M2#3zm@2vDayx;f zR!MRxE>>KErMR?MG0iRR%b1>M(9+2t8z-TiND?_nnhznJp_q2P5;k8)X&*BPNtTjd z)=Xwej=DCymglg}}~2Ul*Y>Lx^l2zY882e@+5fW(TrNDg}=zmT4C4IAq3BNmzV_5QVEu zG1t@fM)OEzKCuPjHFzgURYPXyX7b8C+c~9?K4a^}fH({|JK-KB;EEG~e8o(QyYn$TG~vYyf99_yODxn?)>c( z4oc2+rzgkhSKoSgSc>?HGE;U*sWb{@1=<0fNQ#_iiM4_(nKOsE^ktqzR3!io7k`#` zYluqY9BI9X#R-Ok9oz+DTq%?p@`7#TrO6-G60VYY3~3tIQPLDkrzx)H8nKuK^2+yG zt`lkIsugXX+8@|T*CtMr4K8S+zr`wiayZ>$Hv>uwn+RIew;tInp~ooghC3#gC1gv# zT$a*DdbBTJw!k+lXI9hS0oX4K5R-leo7Z5o70dpSIW6;d(*|goz%g%`-ORx9KqG_3 z2AUaMp5MrjZ44EZL*ooHFkF}VZ Onc<>su?!R~pZ@?<7c$fU diff --git a/src/InputOutput/UserLogin.java b/src/InputOutput/UserLogin.java index 75168e9..31fec46 100644 --- 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() { @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 index 96ebc41..b800323 100644 --- 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 getUserFromEmail(String email) { + dataStorage.printStruct(); return dataStorage.getObjectFromTableAndKey("UserTable", email); }