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 f5d1905..a0db3cc 100644 Binary files a/target/classes/controllers/Main.class and b/target/classes/controllers/Main.class differ diff --git a/target/classes/model/Session.class b/target/classes/model/Session.class index a2b3295..dfcedef 100644 Binary files a/target/classes/model/Session.class and b/target/classes/model/Session.class differ