Linked Raw Data GUI together and tables have some data in them from the database.

This commit is contained in:
Sunguin Peng
2016-09-14 11:38:59 +12:00
parent dff71615cb
commit 6806c0d099
14 changed files with 248 additions and 152 deletions
@@ -9,11 +9,11 @@ import java.util.ArrayList;
public class AirlineParser extends Parser {
String filePath = "";
ObservableList<Airline> parsedAirline;
ArrayList<Airline> parsedAirline;
public AirlineParser(String filePath){
this.filePath = filePath;
parsedAirline = FXCollections.observableArrayList();
parsedAirline = new ArrayList<Airline>();
}
public String parse() throws DataException{
@@ -122,7 +122,7 @@ public class AirlineParser extends Parser {
"Entries With Errors: %2$d", successful, error);
}
public ObservableList<Airline> getResult(){
public ArrayList<Airline> getResult(){
return parsedAirline;
}
@@ -1,10 +1,14 @@
package seng202.group9.Controller;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import seng202.group9.Core.Airport;
import seng202.group9.Core.City;
import seng202.group9.Core.Country;
import javax.jws.Oneway;
import java.io.*;
import java.lang.reflect.Array;
import java.util.ArrayList;
public class AirportParser extends Parser {
@@ -54,13 +54,13 @@ public class App extends Application
e.printStackTrace();
}
primaryStage.show();
/*
//testing out dataset
try {
currentDataset = new Dataset("test's", Dataset.getExisting);
}catch (DataException e){
e.printStackTrace();
}
}/*
//testing out airport parser
try {
System.out.println(currentDataset.importAirport("res/Samples/Airports.txt"));
@@ -1,6 +1,8 @@
package seng202.group9.Controller;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import seng202.group9.Core.*;
import java.sql.Connection;
@@ -13,7 +15,7 @@ import java.util.LinkedHashMap;
public class Dataset {
String name;
static boolean getExisting = true;//constructor variables for action
public static boolean getExisting = true;//constructor variables for action
static boolean createNew = false;//constructor variables for action
ArrayList<Airline> airlines;
ArrayList<Airport> airports;