From 8027b701a077fda3101a6bcbe964f93e4088a241 Mon Sep 17 00:00:00 2001
From: YaFedImYaEatIm <gondra2000@hotmail.com>
Date: Sat, 17 Sep 2016 14:39:52 +1200
Subject: [PATCH] Added Import UI

---
 res/userdb.db                                 | Bin 4365312 -> 4368384 bytes
 .../java/seng202/group9/Controller/App.java   |  43 ++---------
 .../java/seng202/group9/GUI/Importer.java     |  73 ++++++++++++++++++
 .../seng202/group9/GUI/MenuController.java    |   9 ++-
 4 files changed, 86 insertions(+), 39 deletions(-)
 create mode 100644 src/main/java/seng202/group9/GUI/Importer.java

diff --git a/res/userdb.db b/res/userdb.db
index ed5ac185092a47a5197b56ba566f20f6e4e28c96..f4fd46339aa358e5e4eb86ca9b0d54280489929e 100644
GIT binary patch
delta 2029
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
K47u)3!T$p2jz}v2

delta 1195
zcmYjQYfM~46rP#0?1Nn{3*22Um!(}$V3krHWkFhAUF1iLF-;_xrfb6rg!0%$d59(r
zplJ_<9}4BiG`^^5P@^Gj)$FZ06|6s`fQFccVA7^kYaj--X)wVi8VA(iBy;A>Ip243
z9y5cBBW&=>2pdg}=_kbb-k7(N_Fr!3OS0(e8i1dUR~4z__mdJG3^oWMF&E(hY;b3t
z`rzYO*ImYceOfg;q&@jUo0RUe`YRf06g7q#pk_iX1~oHk7Syb$*-(o`&5oJ_wYaFJ
zuuB84lQJ?w0O2HrAp~_W3s>Pon4pvN4LV9s(HCi$K1=KAVOl{h(_ESiH8hs|MSdf9
z$OZBp?1Aqg4IJz~y8~lvfn8;n*gI^Doo0Qo%G%j8><}wsg)D=qWSW`iCjFV-CL?r?
zenBrnMv3Ky100ab;vt>Ywsv*C(Am-zYI09O39;2iI@{a%=$xXac7$4bBdsYU5wf>n
z?H!>=llO^Gd$VTeFV87%J~^l4@gL`uY_82K&-1BSC7=H?tN6M9y3)ueuPbdlZBD86
z#X_<S5NYa#CD~D>w$uAmDBRm>Z&P5mbaZrtx+2XlrJDIy^GZb=q-}v)8au<yx|t8p
zEBmwmwKaF22#4JMt<)u=yQeea5^_L}+SZ<y-mq%`7nJBiyvYfLw2WJB#)r(TiPh6%
zJaRMsGk&|?sScIhiZ{w`IcI-Jv9oFd%Mg`wXoM<I*j+ZwhS_n()19^q<GGcDy_8G2
zG*o>pLGDDO`dZSLW7YvGXHQ~O!%?UH4tA;c|6`fr$B$SV#@E$d{QXbZK^}J_uH3L5
zRjU|(@^kk`W=R^JID|nJgRW@MO@ljJ=j0A|sln#s`KH8r!}_UvkQ%SP8|b22<Ugm9
zQMge^si8<gp`%De;X#pxVi$_tD7+}rQDmTa2*txFGEroq$VTBq@d%1XQRJZ5gCZBj
zUKDvK@=+9^C`7RjMG*==ieeNcC>}#mief*C11QQ+l%uFXQHi1|Dh`@XnnGlgaBnat
zg{PmQALOpVIkG~QWhdma0Aspe_ivv?dXe-U(F^s$?R$Y<!0)YFYmD;Jz}IGLCVN~m
zoNsZ*hV?Mdn6dn??dRQ2zRfwKpOKi?w)HGM%LoPnlP-(oZD*m+#14&52t98T?!g+Y
z(0uBnUOCrA`KxB&3e~8SS}7r$Y>ln3WwyALBq4m!ZOi1Ry8}KR<FaW+`O&~J#z&KF
zaeOM-qw$|qkB?`%JR0=rebHcmsupmPCRrs926GPZfj0xL@rLu2JUy6GYSq8}FKV$Z
zY}90WMk)WM*k<K5*`9q?>9gvx3_kOAU@h7cFnOG2wn|_cdY}aC><_kTgjN#D>CU4&
LVXU4Fq}cujO<r>D

diff --git a/src/main/java/seng202/group9/Controller/App.java b/src/main/java/seng202/group9/Controller/App.java
index a2a547b..1a8ffd3 100644
--- a/src/main/java/seng202/group9/Controller/App.java
+++ b/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();/*
-			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();
-			}*/
+			controller.loadOnce();
 			objectIn.close();
 			fileIn.close();
 		}catch(IOException e){
diff --git a/src/main/java/seng202/group9/GUI/Importer.java b/src/main/java/seng202/group9/GUI/Importer.java
new file mode 100644
index 0000000..a16a9f4
--- /dev/null
+++ b/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();
+    }
+
+}
diff --git a/src/main/java/seng202/group9/GUI/MenuController.java b/src/main/java/seng202/group9/GUI/MenuController.java
index 1f359ec..580a3c1 100644
--- a/src/main/java/seng202/group9/GUI/MenuController.java
+++ b/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());
 	}
 
 	/**