From e1d72c318dd67614c8df9e2e5740e28e4c2f4ccf Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Fri, 12 Aug 2016 12:54:16 +1200 Subject: [PATCH] Partial Skeleton of the project --- .gitignore | 3 + src/main/java/seng202/group9/App.java | 13 ---- .../java/seng202/group9/Controller/App.java | 41 +++++++++++ .../group9/Controller/DatasetController.java | 5 ++ .../java/seng202/group9/Core/Airline.java | 68 +++++++++++++++++++ .../java/seng202/group9/Core/Airport.java | 5 ++ src/main/java/seng202/group9/Core/City.java | 5 ++ .../java/seng202/group9/Core/Country.java | 29 ++++++++ .../java/seng202/group9/Core/FlightPath.java | 5 ++ .../java/seng202/group9/Core/FlightPoint.java | 5 ++ src/main/java/seng202/group9/Core/Route.java | 5 ++ .../java/seng202/group9/GUI/MainMenuBar.java | 25 +++++++ .../seng202/group9/GUI/MenuController.java | 33 +++++++++ src/main/java/seng202/group9/GUI/menu.fxml | 31 +++++++++ 14 files changed, 260 insertions(+), 13 deletions(-) delete mode 100644 src/main/java/seng202/group9/App.java create mode 100644 src/main/java/seng202/group9/Controller/App.java create mode 100644 src/main/java/seng202/group9/Controller/DatasetController.java create mode 100644 src/main/java/seng202/group9/Core/Airline.java create mode 100644 src/main/java/seng202/group9/Core/Airport.java create mode 100644 src/main/java/seng202/group9/Core/City.java create mode 100644 src/main/java/seng202/group9/Core/Country.java create mode 100644 src/main/java/seng202/group9/Core/FlightPath.java create mode 100644 src/main/java/seng202/group9/Core/FlightPoint.java create mode 100644 src/main/java/seng202/group9/Core/Route.java create mode 100644 src/main/java/seng202/group9/GUI/MainMenuBar.java create mode 100644 src/main/java/seng202/group9/GUI/MenuController.java create mode 100644 src/main/java/seng202/group9/GUI/menu.fxml diff --git a/.gitignore b/.gitignore index 0338434..f13a63f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ target/ .idea/ SENG202.iml +.classpath +.project +.settings/ \ No newline at end of file diff --git a/src/main/java/seng202/group9/App.java b/src/main/java/seng202/group9/App.java deleted file mode 100644 index 2a29905..0000000 --- a/src/main/java/seng202/group9/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package seng202.group9; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java new file mode 100644 index 0000000..e12e8d4 --- /dev/null +++ b/src/main/java/seng202/group9/Controller/App.java @@ -0,0 +1,41 @@ +package seng202.group9.Controller; + +import java.util.ArrayList; + +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.layout.BorderPane; +import javafx.stage.Stage; +import seng202.group9.GUI.MainMenuBar; + +/** + * Main Application frame of the Flight Data Analyser. + * + */ +public class App extends Application +{ + ArrayList Datasets = new ArrayList(); + + public static void main( String[] args ) + { + launch(args); + } + + /** + * Starts the application + * @param primaryStage main "stage" of the program + * @see The last sessions menu or the getting started page. + */ + @Override + public void start(Stage primaryStage) { + BorderPane root = new BorderPane(); //root panel + Scene scene = new Scene(root,400,400); + //create the menu + MainMenuBar menuBar = new MainMenuBar(); + root.setTop(menuBar.getmenuBar()); + //TODO add the getting started page here. + + primaryStage.setScene(scene); + primaryStage.show(); + } +} diff --git a/src/main/java/seng202/group9/Controller/DatasetController.java b/src/main/java/seng202/group9/Controller/DatasetController.java new file mode 100644 index 0000000..25d1e5d --- /dev/null +++ b/src/main/java/seng202/group9/Controller/DatasetController.java @@ -0,0 +1,5 @@ +package seng202.group9.Controller; + +public class DatasetController { + +} diff --git a/src/main/java/seng202/group9/Core/Airline.java b/src/main/java/seng202/group9/Core/Airline.java new file mode 100644 index 0000000..517c8f8 --- /dev/null +++ b/src/main/java/seng202/group9/Core/Airline.java @@ -0,0 +1,68 @@ +package seng202.group9.Core; + +import java.util.ArrayList; + +public class Airline { + private int ID; + private String IATA; + private String ICAO; + private String name; + private String alias; + private String callSign; + private String active; + private Country country; + private ArrayList routes; + + public Airline(int ID, String IATA, String ICAO, String name, String alias, String callSign, String active, Country country){ + this.ID = ID; + this.IATA = IATA; + this.ICAO = ICAO; + this.name = name; + this.alias = alias; + this.callSign = callSign; + this.active = active; + this.country = country; + routes = new ArrayList(); + } + + public int getID(){ + return ID; + } + + public String getIATA(){ + return IATA; + } + + public String getICAO(){ + return ICAO; + } + + public String getName(){ + return name; + } + + public String getAlias(){ + return alias; + } + + public String getCallSign(){ + return callSign; + } + + public String getActive(){ + return active; + } + + public Country getCountry(){ + return country; + } + + public ArrayList getRoutes(){ + return routes; + } + + public void addRoutes(Route route){ + routes.add(route); + } + +} diff --git a/src/main/java/seng202/group9/Core/Airport.java b/src/main/java/seng202/group9/Core/Airport.java new file mode 100644 index 0000000..db6f6da --- /dev/null +++ b/src/main/java/seng202/group9/Core/Airport.java @@ -0,0 +1,5 @@ +package seng202.group9.Core; + +public class Airport { + +} diff --git a/src/main/java/seng202/group9/Core/City.java b/src/main/java/seng202/group9/Core/City.java new file mode 100644 index 0000000..1a22ec1 --- /dev/null +++ b/src/main/java/seng202/group9/Core/City.java @@ -0,0 +1,5 @@ +package seng202.group9.Core; + +public class City { + +} diff --git a/src/main/java/seng202/group9/Core/Country.java b/src/main/java/seng202/group9/Core/Country.java new file mode 100644 index 0000000..8d91ef7 --- /dev/null +++ b/src/main/java/seng202/group9/Core/Country.java @@ -0,0 +1,29 @@ +package seng202.group9.Core; + +import java.util.ArrayList; + +public class Country { + private String DST, name; + private ArrayList airlines = new ArrayList(); + + public Country(String DST, String name){ + this.DST = DST; + this.name = name; + } + + public String getDST(){ + return this.DST; + } + + public String getName(){ + return this.name; + } + + public ArrayList getAirlines(){ + return airlines; + } + + public void addAirline(Airline airline){ + this.airlines.add(airline); + } +} diff --git a/src/main/java/seng202/group9/Core/FlightPath.java b/src/main/java/seng202/group9/Core/FlightPath.java new file mode 100644 index 0000000..f7536f9 --- /dev/null +++ b/src/main/java/seng202/group9/Core/FlightPath.java @@ -0,0 +1,5 @@ +package seng202.group9.Core; + +public class FlightPath { + +} diff --git a/src/main/java/seng202/group9/Core/FlightPoint.java b/src/main/java/seng202/group9/Core/FlightPoint.java new file mode 100644 index 0000000..08f027a --- /dev/null +++ b/src/main/java/seng202/group9/Core/FlightPoint.java @@ -0,0 +1,5 @@ +package seng202.group9.Core; + +public class FlightPoint { + +} diff --git a/src/main/java/seng202/group9/Core/Route.java b/src/main/java/seng202/group9/Core/Route.java new file mode 100644 index 0000000..4bad2ac --- /dev/null +++ b/src/main/java/seng202/group9/Core/Route.java @@ -0,0 +1,5 @@ +package seng202.group9.Core; + +public class Route { + +} diff --git a/src/main/java/seng202/group9/GUI/MainMenuBar.java b/src/main/java/seng202/group9/GUI/MainMenuBar.java new file mode 100644 index 0000000..0fc953f --- /dev/null +++ b/src/main/java/seng202/group9/GUI/MainMenuBar.java @@ -0,0 +1,25 @@ +package seng202.group9.GUI; + +import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; + +/** + * Main Menu Bar for the program + * @author YaFedImYaEatIm + * + */ +public class MainMenuBar{ + + final private String menuFXML = "menu.fxml"; + + public Parent getmenuBar(){ + try{ + Parent menuPane = FXMLLoader.load(getClass().getResource(menuFXML)); + return menuPane; + }catch (Exception e){ + e.printStackTrace(); + } + return null; + } + +} diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java new file mode 100644 index 0000000..2d8037e --- /dev/null +++ b/src/main/java/seng202/group9/GUI/MenuController.java @@ -0,0 +1,33 @@ +package seng202.group9.GUI; + +import java.net.URL; +import java.util.ResourceBundle; + +import javax.swing.JOptionPane; + +import javafx.fxml.Initializable; + +public class MenuController implements Initializable{ + + public void importAirports(){ + JOptionPane.showMessageDialog(null, "This is not Implemented yet"); + } + + public void importAirlines(){ + JOptionPane.showMessageDialog(null, "This is not Implemented yet"); + } + + public void importRoutes(){ + JOptionPane.showMessageDialog(null, "This is not Implemented yet"); + } + + public void importFlightData(){ + JOptionPane.showMessageDialog(null, "This is not Implemented yet"); + } + + public void initialize(URL arg0, ResourceBundle arg1) { + // TODO Auto-generated method stub + + } + +} diff --git a/src/main/java/seng202/group9/GUI/menu.fxml b/src/main/java/seng202/group9/GUI/menu.fxml new file mode 100644 index 0000000..daba531 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/menu.fxml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +