fanwuyang/SENG202
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made the first one of each Airline, Airport and Route tables load each load

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-10-02 00:58:00 +13:00
parent 1e65e8ef37
commit f930f7664e
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/GUI/AirlineSummaryController.java
+1 -1
View File
@@ -60,7 +60,6 @@ public class AirlineSummaryController extends Controller{
currentData = getParent().getCurrentDataset();
tableView.setItems(FXCollections.observableArrayList(currentData.getAirlines()));
//Sets up map.
map = new Map(mapView, new RoutePath());
tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Airline>() {
public void changed(ObservableValue<? extends Airline> observable, Airline oldValue, Airline newValue) {
Airline selectedAirline= tableView.getSelectionModel().getSelectedItems().get(0);
@@ -72,6 +71,7 @@ public class AirlineSummaryController extends Controller{
}
}
});
map = new Map(mapView, new RoutePath(), tableView);
}
/**
src/main/java/seng202/group9/GUI/AirportSummaryController.java
+1 -2
View File
@@ -82,14 +82,13 @@ public class AirportSummaryController extends Controller{
columnTotalRoutes.setCellValueFactory(new PropertyValueFactory<Airport, String>("TotalRoutes"));
currentData = getParent().getCurrentDataset();
tableView.setItems(FXCollections.observableArrayList(currentData.getAirports()));
map = new Map(mapView, new RoutePath());
tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Airport>() {
public void changed(ObservableValue<? extends Airport> observable, Airport oldValue, Airport newValue) {
System.out.println("loading");
Airport selectedAirport= tableView.getSelectionModel().getSelectedItems().get(0);
map.displayAirport(new RoutePath( new Position(selectedAirport.getLatitude(), selectedAirport.getLongitude())));
}
});
map = new Map(mapView, new RoutePath(), tableView);
}
src/main/java/seng202/group9/GUI/RouteSummaryController.java
+1 -2
View File
@@ -53,10 +53,8 @@ public class RouteSummaryController extends Controller{
columnEquipment.setCellValueFactory(new PropertyValueFactory<Route, String>("Equipment"));
currentData = getParent().getCurrentDataset();
tableView.setItems(FXCollections.observableArrayList(currentData.getRoutes()));
map = new Map(mapView, new RoutePath());
tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Route>() {
public void changed(ObservableValue<? extends Route> observable, Route oldValue, Route newValue) {
System.out.println("loading");
Route selectedRoute= tableView.getSelectionModel().getSelectedItems().get(0);
if (selectedRoute.getSourceAirport() != null && selectedRoute.getDestinationAirport() != null) {
map.displayRoute(new RoutePath(
@@ -74,6 +72,7 @@ public class RouteSummaryController extends Controller{
}
}
});
map = new Map(mapView, new RoutePath(), tableView);
}
/**