Merge remote-tracking branch 'origin/master'

src/main/java/seng202/group9/Controller/App.java

@@ -32,7 +32,12 @@ public class App extends Application
     {
         launch(args);
     }
-    /**
+
+	public Stage getPrimaryStage() {
+		return primaryStage;
+	}
+
+	/**
      * Starts the application
      * @param primaryStage main "stage" of the program
      */
@@ -62,6 +67,7 @@ public class App extends Application
 			e.printStackTrace();
 
 		}
+
 /*
 		AirlineFilter filter = new AirlineFilter(currentDataset.getAirlines());
 		filter.filterName("NZ");
@@ -119,40 +125,7 @@ public class App extends Application
 			Controller controller = (Controller) replaceSceneContent(session.getSceneDisplayed());
 			controller.setApp(this);
 			controller.load();
-			controller.loadOnce();/*
+			controller.loadOnce();
-			if (session.getSceneDisplayed() == SceneCode.AIRLINE_RAW_DATA){
-				Controller controller = (Controller) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.load();
-			}else if (session.getSceneDisplayed() == SceneCode.AIRLINE_SUMMARY){
-				Controller controller = (Controller) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.load();
-			}else if (session.getSceneDisplayed() == SceneCode.AIRPORT_RAW_DATA){
-				AirportRDController controller = (AirportRDController) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.loadTables();
-			}else if (session.getSceneDisplayed() == SceneCode.AIRPORT_SUMMARY){
-				AirportSummaryController controller = (AirportSummaryController) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.loadTables();
-			}else if (session.getSceneDisplayed() == SceneCode.ROUTE_RAW_DATA){
-				RouteRDController controller = (RouteRDController) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.loadTables();
-			}else if (session.getSceneDisplayed() == SceneCode.ROUTE_RAW_DATA){
-				RouteSummaryController controller = (RouteSummaryController) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.loadTables();
-			}else if (session.getSceneDisplayed() == SceneCode.FLIGHT_RAW_DATA){
-				FlightRawDataController controller = (FlightRawDataController) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.loadTables();
-			}else if (session.getSceneDisplayed() == SceneCode.FLIGHT_SUMMARY){
-				FlightSummaryController controller = (FlightSummaryController) replaceSceneContent(session.getSceneDisplayed());
-				controller.setApp(this);
-				controller.flightPathListView();
-			}*/
 			objectIn.close();
 			fileIn.close();
 		}catch(IOException e){

src/main/java/seng202/group9/GUI/Importer.java

@@ -0,0 +1,73 @@
+package seng202.group9.GUI;
+
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Alert;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import seng202.group9.Controller.App;
+import seng202.group9.Controller.DataException;
+import seng202.group9.Controller.SceneCode;
+
+import javax.swing.*;
+import java.awt.*;
+import java.io.File;
+
+/**
+ * Created by fwy13 on 17/09/16.
+ */
+public class Importer{
+    /**
+     * importer GUI for importing files.
+     */
+    public Importer(SceneCode scene, App parent, Stage primaryStage){
+        FileChooser chooser = new FileChooser();
+        FileChooser.ExtensionFilter filter = new FileChooser.ExtensionFilter(
+                "Text & .csv", "*.txt", "*.csv");
+        chooser.getExtensionFilters().add(filter);
+        File file = chooser.showOpenDialog(primaryStage);
+        if (scene == SceneCode.AIRLINE_RAW_DATA){
+            try {
+                showSuccessAlert(parent.getCurrentDataset().importAirline(file.getPath()));
+            } catch (DataException e) {
+                e.printStackTrace();
+            }
+        }else if (scene == SceneCode.AIRPORT_RAW_DATA){
+            try {
+                showSuccessAlert(parent.getCurrentDataset().importAirport(file.getPath()));
+            } catch (DataException e) {
+                e.printStackTrace();
+            }
+        }else if (scene == SceneCode.ROUTE_RAW_DATA){
+            try {
+                showSuccessAlert(parent.getCurrentDataset().importRoute(file.getPath()));
+            } catch (DataException e) {
+                e.printStackTrace();
+            }
+        }else if (scene == SceneCode.FLIGHT_RAW_DATA){
+            try {
+                showSuccessAlert(parent.getCurrentDataset().importFlight(file.getPath()));
+            } catch (DataException e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+    public void showSuccessAlert(String message){
+        Alert alert = new Alert(Alert.AlertType.INFORMATION);
+        alert.setTitle("Import File Success!");
+        alert.setHeaderText("Your File has been Parsed.");
+        alert.setContentText(message);
+        alert.showAndWait();
+    }
+
+    public void showErrorAlert(String message){
+        Alert alert = new Alert(Alert.AlertType.ERROR);
+        alert.setTitle("Import File Error");
+        alert.setHeaderText("Your File has resulted in an error. This may be because of an invalid file format or a corrupted file.");
+        alert.setContentText(message);
+        alert.showAndWait();
+    }
+
+}

src/main/java/seng202/group9/GUI/MenuController.java

@@ -7,25 +7,26 @@ import javax.swing.JOptionPane;
 
 import javafx.fxml.Initializable;
 
+import javafx.scene.control.Alert;
 import seng202.group9.Controller.App;
 import seng202.group9.Controller.SceneCode;
 
 public class MenuController extends Controller{
 
 	public void importAirports(){
-		JOptionPane.showMessageDialog(null, "This is not Implemented yet");
+		Importer importer = new Importer(SceneCode.AIRPORT_RAW_DATA, getParent(), getParent().getPrimaryStage());
 	}
 	
 	public void importAirlines(){
-		JOptionPane.showMessageDialog(null, "This is not Implemented yet");
+		Importer importer = new Importer(SceneCode.AIRLINE_RAW_DATA, getParent(), getParent().getPrimaryStage());
 	}
 
 	public void importRoutes(){
-		JOptionPane.showMessageDialog(null, "This is not Implemented yet");
+		Importer importer = new Importer(SceneCode.ROUTE_RAW_DATA, getParent(), getParent().getPrimaryStage());
 	}
 	
 	public void importFlightData(){
-		JOptionPane.showMessageDialog(null, "This is not Implemented yet");
+		Importer importer = new Importer(SceneCode.FLIGHT_RAW_DATA, getParent(), getParent().getPrimaryStage());
 	}
 
 	/**