From dff71615cb4e385996405fe9ea8378980cae46eb Mon Sep 17 00:00:00 2001 From: Sunguin Peng Date: Wed, 14 Sep 2016 08:35:32 +1200 Subject: [PATCH] Trialing branch for own work --- res/userdb.db | Bin 4353024 -> 4385792 bytes .../group9/Controller/AirlineParser.java | 8 +- .../group9/GUI/AirlineRDController.java | 110 +++++++++++ .../group9/GUI/AirportRDController.java | 12 ++ src/main/resources/airline_raw_data.fxml | 177 ++++++++---------- src/main/resources/airport_raw_data.fxml | 51 ++--- 6 files changed, 223 insertions(+), 135 deletions(-) create mode 100644 src/main/java/seng202/group9/GUI/AirlineRDController.java create mode 100644 src/main/java/seng202/group9/GUI/AirportRDController.java diff --git a/res/userdb.db b/res/userdb.db index 5d9b977331a3de685a8b5aa40b644c534d7a2646..cc838b93dc6f159bbb276fe4d6d7dc4726dfe64b 100644 GIT binary patch delta 4818 zcmaLZTWl4_0S4f6c8|d}w(;foc=1_`?{^#D0NeP&9&B?lHUKUNmKnP7jAdrTg*@TrEB&1eRBwEA+m8j@Ls=ibdsi+TCTXlBlpQlRYVOa1# zXLY`RJTvEBoY&61_^CD-O*j<@q(8ct-x)mhmq!D8#G17^VL5xgdWHBQgYD+vA+$G+Zpz)N!@IUnAp1^o8#ru!* zbkd3B(aML~4?Jx{xK&FJjNTd&KluDsw-`UW)kuei!>jc0&vGxNWDk;&Fd4~aBN1&R znFKb=&-l0Z869-_^VBCi?d!ReerR`zamsEG<2AcLjK8pF(mUTo zrXmUVZtWFsx%0no{D`;_;^q+7Anq*U<`OqbT$8x7iJM2S(oizV1EeKFfV3o~i#l zkvk!tFZj=Sxq0IGy!Slo$*d=QcPw@#n+Lq*uQ4R9jjln3+TnTRjJwebh5$_ zf6t+vm#u}GokuU+w5l|FHhuhs)v4Jg-Tc5R)$Ay}P-%2)b}l`1->T>I&M4RH2t8A1h!4u9Ry?a-ueQVVZ-qvUW@pihPcxhKZab5{xoY)jb_Ts! zWK?T*I)D1eN)7Ut#b&uqL&e^wG+Yv%71Qhz`gqFw>c#Xw zQ&xj!7t!}`Se9lN(%K56FNOX;4jCgGs9~X_e|?0IVw&Yd=`~z`8=Q_JVae zSeGf*rHXY4SbM_LxfVQt6#Y??8GxO4tV2t$-Z`>=wXo2J9xljsSKT zup0rp0kA`WUGKqm#V>ospFnm3*>{mWj_fg%a1@?L;CWbi9)jmVc)p`N$KiQEdG3ej zK6vg`o_pZA+w*LVKet};mv#Pnzh<>+ELqNDNpc=b#5^`#&STSL4=e$)ECgAmOIfB# zSthm;Z+Wu-WY0qO3}jD3_7r5_gX~F9wjw1#>`bfW{`AP(pbuX<7jD2FRrhVE>TLQq zj@aVUzjhkM=s1O9WKM<{ZGKja5Bazlzv3fe{1xvN;{)Cz#{0Znj9>7G81M0r81J$p zV*H$K72{`YK#ZTVPBDJMYQ*?UW{UA+mMq4P>=R6wp<)6EEfmMl8b|7%EiGlodg0lsj&EQ-B&iUY+ z2hJvNHiEMOob}+W1Ls_D*7}_B2iAzj29RBeY(KJn$gWWIz0h0^&1Fh+DKwWT%^qlW zL$gb1E{0|dnwHXB=yO0n^j4h06zlwVZd($yx7ou_#wcr2mCs~uLb-d;MV|t zHQ-ly@E!hP&yFB_7}-O}9z^yXlr#?b1AyNT_c*AnMVHw`A6mM99>Uz*ZH(KaYEr`pY-$D#6SgM6ZXhGZt zWeXi>p&c!>sTLNZg;uYH*7!AXM(`1YhY{YW!W$4CLS^e!3F}k|Yf-`=N?3yuR-**5 zDflG}poEnup&upmp@bD)2^Ic9%EysCfb4!`_aVC%h3x_7Zg7r)a~C*wf^!Erw}W$= z;uKdvpK}zPTNLMJaEd#i;PektE^ak`_zc3QRrnOb;#wo^PlEFVI42b6yWl(y&SQ%6 zsNy^V&con51kQut6#J$+NSzFsb<$0iQEI6#FjCT;Ls0=6rFZ6MyLMSkivpwZWVW z((hSPBJCPBo5VdVkWWtyn+3Fc%p9V($IM|`x4}%E(PFmvvzyIk|5SDg@!|r!I3F*b zgBRzaM@L*QylNa%R^vobjgu>@al{qOuf{QCHBOGK#)+UBCtFtIgk?2O7OHVF{c7S5 z#kJmPM5qCwdKIcef6iQVQj1P%&`C8q5qpZ?NhLa|Kquwsqzs*uqLUJIQjAWDyiVj9 z>vSXAh3sNvW5` S6x*hcxD<#>fY{?9HvSil-k8(? delta 696 zcmW-dO-NKx6vyA!=o_7>H{;Bk`<_qJNmKinEGsKD^}$3%#4Lo226NFO0-;4|ki-!6 z2PsfTPMslm$dTmTMDf zX7vXQOa@cHR4@(92UZ4F4yJ?o!79Ki!2)1Guw7ug!3?kvSQxA-&mvlRCRJDj%Hs8L8z9ACz7mTn)Bs$`b{iekIbQ7`{l>7Gxl+3p_kI z!UsN?&&$Ml?AdvwBS=T{X;Vp8%t-f2Pa3m4qlF*x?}Pqk-l~N!2v*R4J^iDZk>kF_ z+)Yuw&h?9YlS_(Oxb(|~TwHWs=0e_5)=kMp!@tEC$OMUGAPZ!JszDB@22=~$1F8en zgW{mQpaxJQXdkEv)C_6??FStI9RwW$B|wKkt)L^Iqo6j>G0<_)2~a!eBunMJm&06EXSM;RURquW=x%SyD z@YOB7oJy};obTX>X5m}Y10@ln(Ty~5X@M~x@;|bH(d8=l*n{6FiMU parsedAirline; + ObservableList parsedAirline; public AirlineParser(String filePath){ this.filePath = filePath; - parsedAirline = new ArrayList(); + parsedAirline = FXCollections.observableArrayList(); } public String parse() throws DataException{ @@ -120,7 +122,7 @@ public class AirlineParser extends Parser { "Entries With Errors: %2$d", successful, error); } - public ArrayList getResult(){ + public ObservableList getResult(){ return parsedAirline; } diff --git a/src/main/java/seng202/group9/GUI/AirlineRDController.java b/src/main/java/seng202/group9/GUI/AirlineRDController.java new file mode 100644 index 0000000..4baa7b1 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/AirlineRDController.java @@ -0,0 +1,110 @@ +package seng202.group9.GUI; + +import javafx.fxml.FXML; +import javafx.fxml.Initializable; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.TextField; +import javafx.scene.control.cell.PropertyValueFactory; +import seng202.group9.Controller.DataException; +import seng202.group9.Controller.Dataset; +import seng202.group9.Core.Airline; + +import java.net.URL; +import java.util.ResourceBundle; + + +/** + * Created by Sunguin on 2016/09/13. + */ +public class AirlineRDController extends MenuController implements Initializable{ + + @FXML + private TableView tableView; + @FXML + private TableColumn airlIDcol; + @FXML + private TableColumn airlNamecol; + @FXML + private TableColumn airlAliascol; + @FXML + private TableColumn airlIATAcol; + @FXML + private TableColumn airlICAOcol; + @FXML + private TableColumn airlCallsigncol; + @FXML + private TableColumn airlCountrycol; + @FXML + private TableColumn airlActivecol; + @FXML + private TextField airlNameBox; + @FXML + private TextField airlAliasBox; + @FXML + private TextField airlIATABox; + @FXML + private TextField airlICAOBox; + @FXML + private TextField airlCallsignBox; + @FXML + private TextField airlCountryBox; + @FXML + private TextField airlActiveBox; + @FXML + private TextField airlIDBox; + + + private Dataset theDataSet = null; + + public AirlineRDController(){ + } + + //Initializes the table. + //Uses dummy data since I have no idea how the data is connected together. + @Override + public void initialize(URL url, ResourceBundle rb) { + airlIDcol.setCellValueFactory(new PropertyValueFactory("ID")); + airlNamecol.setCellValueFactory(new PropertyValueFactory("Name")); + airlAliascol.setCellValueFactory(new PropertyValueFactory("Alias")); + airlIATAcol.setCellValueFactory(new PropertyValueFactory("IATA")); + airlICAOcol.setCellValueFactory(new PropertyValueFactory("ICAO")); + airlCallsigncol.setCellValueFactory(new PropertyValueFactory("CallSign")); + airlCountrycol.setCellValueFactory(new PropertyValueFactory("Country")); + airlActivecol.setCellValueFactory(new PropertyValueFactory("Active")); + + try { + theDataSet = new Dataset("test's", Dataset.getExisting); + }catch (DataException e){ + e.printStackTrace(); + } + try{ + System.out.println(theDataSet.importAirline("res/Samples/Airlines.txt")); + } catch (DataException e){ + e.printStackTrace(); + } + tableView.setItems(theDataSet.getAirlines()); + } + + //Dummy function to test the add button. + //Will edit when ID is added automatically. + public void addAirlineSingle() { + theDataSet.getAirlines().add(new Airline( + Integer.parseInt(airlIDBox.getText()), + airlNameBox.getText(), + airlAliasBox.getText(), + airlIATABox.getText(), + airlICAOBox.getText(), + airlCallsignBox.getText(), + airlCountryBox.getText(), + airlActiveBox.getText())); + airlIDBox.clear(); + airlNameBox.clear(); + airlAliasBox.clear(); + airlIATABox.clear(); + airlICAOBox.clear(); + airlCallsignBox.clear(); + airlCountryBox.clear(); + airlActiveBox.clear(); + } +} diff --git a/src/main/java/seng202/group9/GUI/AirportRDController.java b/src/main/java/seng202/group9/GUI/AirportRDController.java new file mode 100644 index 0000000..60e6ec7 --- /dev/null +++ b/src/main/java/seng202/group9/GUI/AirportRDController.java @@ -0,0 +1,12 @@ +package seng202.group9.GUI; + +import javafx.fxml.Initializable; + +/** + * Created by Sunguin on 2016/09/13. + */ +public class AirportRDController extends MenuController implements Initializable { + + public AirportRDController(){ + } +} diff --git a/src/main/resources/airline_raw_data.fxml b/src/main/resources/airline_raw_data.fxml index a3937a7..13e3f9f 100644 --- a/src/main/resources/airline_raw_data.fxml +++ b/src/main/resources/airline_raw_data.fxml @@ -1,127 +1,104 @@ - - - - - - + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - + +