From 3a99b00920a56bbb6798e6fc7efbe6ce12e26d6c Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 1 Jun 2017 17:11:54 +1200 Subject: [PATCH] changed session to a singleton method. --- src/main/java/controllers/Main.java | 2 +- src/main/java/model/Session.java | 2 ++ target/classes/controllers/Main.class | Bin 6704 -> 6700 bytes target/classes/model/Session.class | Bin 841 -> 942 bytes 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/controllers/Main.java b/src/main/java/controllers/Main.java index bf27182..0ec5459 100644 --- a/src/main/java/controllers/Main.java +++ b/src/main/java/controllers/Main.java @@ -40,7 +40,7 @@ public class Main extends Application { base = root; baseController = (BaseController) loader.getController(); baseController.setParent(this); - this.session = new Session(); + this.session = Session.session; try{ DataManagerSerialiser dataManagerSerialiser = new DataManagerSerialiser(); DataManager dataManager = dataManagerSerialiser.load(); diff --git a/src/main/java/model/Session.java b/src/main/java/model/Session.java index ce67d7f..5f55214 100644 --- a/src/main/java/model/Session.java +++ b/src/main/java/model/Session.java @@ -7,8 +7,10 @@ public class Session { private String userCode;//this is like fwy13 DataManager dataManager; + public static Session session = new Session(); public Session(){ + session = this; dataManager = new DataManager(); } diff --git a/target/classes/controllers/Main.class b/target/classes/controllers/Main.class index f5d19055b75be2564fa3234eb119a74ec19b9820..a0db3cc755d57d25367007349687bf75b9a5fdc6 100644 GIT binary patch delta 2525 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 diff --git a/target/classes/model/Session.class b/target/classes/model/Session.class index a2b3295374f990836c26bfbc51cf3b3367b8638f..dfcedef7bef5137f316d5990d66b69ecb9725043 100644 GIT binary patch literal 942 zcmZ`&%Wl(95Ir{!J8_((c>)DmLV37GA{%y8-GEr20E<8+mN%&tT)B>9JA4-is!CMi z1NbP!8QV$%HJcgVnKNh3%*elf|M&^u85|3BjOs9P-^781a`t#2k%uN8S@a_lj}>aG z*o$5)Pd$b17?7=KrWWb`0uG%5oKV(|=0QHAHC?Wvx%bMKiR^p{ zPi3n%cF?iWLR+D8t)C4WO&b;(3e7B=7c1;+j`D7H=FJm~c)U8#Tt-Ps_ywt_txE%X z1FS=bw#(ORA{Bk#y@YbVq2ykn{P7Z%3sk={UP6zyiwdnx+eD2#Ju>yvNLq_Q%B(QN zjhuH(FS)Aw9mW@aWJJGo&B6%dfb_`@&{eX^#jxY+Wphgwak+%XCi};`PQogW}8O+NLG0 zC!?;gZ+UmP|W$1%s2?A#ab-Q3)2y%A~834==YWsG!` zC8>~Qh7zeoO_C+KU%+xb0w*O?o$D$S@R^^bMqtHjqG)A>)4y zcntZ)>TkLO(Q{FwThi$YWAqS(PLOyV#5@>~uD1VJqB8{wLBg#l<7rv1#GE)7=h}^L> JvgwV!^#duTkURhY