diff --git a/res/userdb.db b/res/userdb.db index b84830c..478b2fe 100644 Binary files a/res/userdb.db and b/res/userdb.db differ diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java index 57264a2..48b44ce 100644 --- a/src/main/java/seng202/group9/Controller/App.java +++ b/src/main/java/seng202/group9/Controller/App.java @@ -39,6 +39,8 @@ public class App extends Application public void start(Stage primaryStage) { this.primaryStage = primaryStage; try { + MenuController menuController = new MenuController(); + menuController.setApp(this); replaceSceneContent("menu.fxml");//replace this to check your fxml file } catch (Exception e) { e.printStackTrace(); @@ -76,7 +78,7 @@ public class App extends Application * @return * @throws Exception */ - private Initializable replaceSceneContent(String fxml) throws Exception { + public Initializable replaceSceneContent(String fxml) throws Exception { FXMLLoader loader = new FXMLLoader(); InputStream in = getClass().getClassLoader().getResourceAsStream(fxml); InputStream menuIn = getClass().getClassLoader().getResourceAsStream("menu.fxml"); diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java index 96c7d5a..a31e214 100644 --- a/src/main/java/seng202/group9/GUI/MenuController.java +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -7,10 +7,11 @@ import javax.swing.JOptionPane; import javafx.application.Application; import javafx.fxml.Initializable; +import seng202.group9.Controller.App; public class MenuController implements Initializable{ - Application parent; + App parent; public void importAirports(){ JOptionPane.showMessageDialog(null, "This is not Implemented yet"); @@ -28,13 +29,24 @@ public class MenuController implements Initializable{ JOptionPane.showMessageDialog(null, "This is not Implemented yet"); } + /** + * Load Airline Raw Data Function. + */ + public void loadAirlineRaw(){ + try { + parent.replaceSceneContent("airline_raw_data.fxml"); + } catch (Exception e) { + e.printStackTrace(); + } + } + public void initialize(URL arg0, ResourceBundle arg1) { // TODO Auto-generated method stub } - public void setApp(Application parent){ + public void setApp(App parent){ this.parent = parent; } - + }