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

Fixed Dataset Changing Error and Selected Table Item Indices Error

Browse Source
This commit is contained in:
YaFedImYaEatIm
2016-10-02 00:52:53 +13:00
parent 236b93ed85
commit 1e65e8ef37
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng202/group9/Controller/App.java
+7
View File
@@ -93,6 +93,13 @@ public class App extends Application
} catch (Exception e){
e.printStackTrace();
}
if (session.getCurrentDataset() != null){
for (int i = 0; i < datasets.size(); i ++) {
if (datasets.get(i).getName().equals(session.getCurrentDataset())) {
currentDataset = datasets.get(i);
}
}
}
//after all loading then load the previous session
if (session.getSceneDisplayed() != null) {
menuController.replaceSceneContent(session.getSceneDisplayed());
src/main/java/seng202/group9/GUI/AirlineSummaryController.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class AirlineSummaryController extends Controller{
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= currentData.getAirlines().get(tableView.getSelectionModel().getSelectedIndices().get(0));
Airline selectedAirline= tableView.getSelectionModel().getSelectedItems().get(0);
for (int i = 0 ; i < currentData.getAirports().size(); i ++){
if (currentData.getAirports().get(i).getCountryName().equals(selectedAirline.getCountryName())){
map.displayAirport(new RoutePath(new Position(currentData.getAirports().get(i).getLatitude(), currentData.getAirports().get(i).getLongitude())));
src/main/java/seng202/group9/GUI/AirportSummaryController.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class AirportSummaryController extends Controller{
tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Airport>() {
public void changed(ObservableValue<? extends Airport> observable, Airport oldValue, Airport newValue) {
System.out.println("loading");
Airport selectedAirport= currentData.getAirports().get(tableView.getSelectionModel().getSelectedIndices().get(0));
Airport selectedAirport= tableView.getSelectionModel().getSelectedItems().get(0);
map.displayAirport(new RoutePath( new Position(selectedAirport.getLatitude(), selectedAirport.getLongitude())));
}
});
src/main/java/seng202/group9/GUI/RouteSummaryController.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class RouteSummaryController extends Controller{
tableView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener<Route>() {
public void changed(ObservableValue<? extends Route> observable, Route oldValue, Route newValue) {
System.out.println("loading");
Route selectedRoute= currentData.getRoutes().get(tableView.getSelectionModel().getSelectedIndices().get(0));
Route selectedRoute= tableView.getSelectionModel().getSelectedItems().get(0);
if (selectedRoute.getSourceAirport() != null && selectedRoute.getDestinationAirport() != null) {
map.displayRoute(new RoutePath(
new Position(selectedRoute.getSourceAirport().getLatitude(), selectedRoute.getSourceAirport().getLongitude()),