From f07fc76a6dbfe02f76571262050eba2f967f19a5 Mon Sep 17 00:00:00 2001 From: YaFedImYaEatIm Date: Mon, 3 Oct 2016 08:03:30 +1300 Subject: [PATCH] Added Warning messages for no internet when loading maps --- .../group9/GUI/AirportRouteMapController.java | 9 +++++++++ .../group9/GUI/EquipByRouteController.java | 9 +++++++++ .../group9/GUI/PopUpAirportMapController.java | 17 +++++++++-------- .../group9/GUI/PopUpRouteMapController.java | 9 +++++++++ 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/main/java/seng202/group9/GUI/AirportRouteMapController.java b/src/main/java/seng202/group9/GUI/AirportRouteMapController.java index cafd34f..540e2ba 100644 --- a/src/main/java/seng202/group9/GUI/AirportRouteMapController.java +++ b/src/main/java/seng202/group9/GUI/AirportRouteMapController.java @@ -7,6 +7,7 @@ import javafx.collections.FXCollections; import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.fxml.FXML; +import javafx.scene.control.Alert; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; @@ -38,6 +39,14 @@ public class AirportRouteMapController extends Controller{ if (!checkDataset()){ return; } + //check if there is internet connectivity + if (!getParent().testInet("maps.google.com")){ + Alert alert = new Alert(Alert.AlertType.WARNING); + alert.setTitle("No Internet Connection."); + alert.setHeaderText("Unable to Connect to Google Maps"); + alert.setContentText("As we are unable to connect to Google Maps all applications which are supposed to display maps may not work as intended."); + alert.showAndWait(); + } currentDataset = getParent().getCurrentDataset(); //Sets up map. map = new Map(mapView, new RoutePath(), airportsTable); diff --git a/src/main/java/seng202/group9/GUI/EquipByRouteController.java b/src/main/java/seng202/group9/GUI/EquipByRouteController.java index 36c871c..85fb46c 100644 --- a/src/main/java/seng202/group9/GUI/EquipByRouteController.java +++ b/src/main/java/seng202/group9/GUI/EquipByRouteController.java @@ -5,6 +5,7 @@ import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; +import javafx.scene.control.Alert; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; @@ -41,6 +42,14 @@ public class EquipByRouteController extends Controller{ if (!checkDataset()){ return; } + //check if there is internet connectivity + if (!getParent().testInet("maps.google.com")){ + Alert alert = new Alert(Alert.AlertType.WARNING); + alert.setTitle("No Internet Connection."); + alert.setHeaderText("Unable to Connect to Google Maps"); + alert.setContentText("As we are unable to connect to Google Maps all applications which are supposed to display maps may not work as intended."); + alert.showAndWait(); + } currentDataset = getParent().getCurrentDataset(); //Sets up map. map = new Map(mapView, new RoutePath(), equipTable); diff --git a/src/main/java/seng202/group9/GUI/PopUpAirportMapController.java b/src/main/java/seng202/group9/GUI/PopUpAirportMapController.java index 57857fd..22a7f2c 100644 --- a/src/main/java/seng202/group9/GUI/PopUpAirportMapController.java +++ b/src/main/java/seng202/group9/GUI/PopUpAirportMapController.java @@ -1,6 +1,7 @@ package seng202.group9.GUI; import javafx.fxml.FXML; +import javafx.scene.control.Alert; import javafx.scene.control.TableView; import javafx.scene.web.WebView; import seng202.group9.Controller.Dataset; @@ -24,6 +25,14 @@ public class PopUpAirportMapController extends Controller { @Override public void load() { + //check if there is internet connectivity + if (!getParent().testInet("maps.google.com")){ + Alert alert = new Alert(Alert.AlertType.WARNING); + alert.setTitle("No Internet Connection."); + alert.setHeaderText("Unable to Connect to Google Maps"); + alert.setContentText("As we are unable to connect to Google Maps all applications which are supposed to display maps may not work as intended."); + alert.showAndWait(); + } dataset = getParent().getCurrentDataset(); loadAirports(); } @@ -36,12 +45,4 @@ public class PopUpAirportMapController extends Controller { } map = new Map(mapView, routePaths, Map.loadAirports); } - - public void loadRoutes(ArrayList routes){ - ArrayList routePaths = new ArrayList<>(); - for (Route route: routes){ - routePaths.add(route.getRoutePath()); - } - map.displayRoutes(routePaths); - } } diff --git a/src/main/java/seng202/group9/GUI/PopUpRouteMapController.java b/src/main/java/seng202/group9/GUI/PopUpRouteMapController.java index 1a5cc6e..8ea0aa8 100644 --- a/src/main/java/seng202/group9/GUI/PopUpRouteMapController.java +++ b/src/main/java/seng202/group9/GUI/PopUpRouteMapController.java @@ -1,6 +1,7 @@ package seng202.group9.GUI; import javafx.fxml.FXML; +import javafx.scene.control.Alert; import javafx.scene.web.WebView; import seng202.group9.Controller.Dataset; import seng202.group9.Core.Route; @@ -21,6 +22,14 @@ public class PopUpRouteMapController extends Controller{ @Override public void load() { + //check if there is internet connectivity + if (!getParent().testInet("maps.google.com")){ + Alert alert = new Alert(Alert.AlertType.WARNING); + alert.setTitle("No Internet Connection."); + alert.setHeaderText("Unable to Connect to Google Maps"); + alert.setContentText("As we are unable to connect to Google Maps all applications which are supposed to display maps may not work as intended."); + alert.showAndWait(); + } dataset = getParent().getCurrentDataset(); loadRoutes(); }