From f2a26b71453db2293d57fee265ca781a680559a4 Mon Sep 17 00:00:00 2001 From: Vladimir ELazar Tokarev Date: Sat, 4 Jun 2016 15:11:18 +0300 Subject: [PATCH] Created the status log update interface in order to reduce coupling between polling station dashboard and all other elements it produces and uses i have created status log update interface, which expose the functuality of update the state of status log panel. the idea behind this is status log does not have to know polling station dashboard. all other objects that polling station dashboard will use will have their own interfaces (for the same reason too). --- .../pictures/[Originals]/blacktriangle.png | Bin 0 -> 8107 bytes .../src/pictures/blacktriangle.png | Bin 0 -> 371 bytes .../StatusLog/fxml/status_log.fxml | 16 +++++-- .../StatusLog/java/StatusLogController.java | 12 +++++ .../StatusLog/java/StatusLogLoader.java | 9 ++-- .../StatusLog/java/StatusLogUpdate.java | 11 +++++ .../fxml/polling_station_dashboard.fxml | 2 +- .../PollingStationDashboardController.java | 41 +++++++++++++++--- .../java/PollingStationDashboardLoader.java | 6 ++- 9 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 voting-station-gui/src/pictures/[Originals]/blacktriangle.png create mode 100644 voting-station-gui/src/pictures/blacktriangle.png create mode 100644 voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java diff --git a/voting-station-gui/src/pictures/[Originals]/blacktriangle.png b/voting-station-gui/src/pictures/[Originals]/blacktriangle.png new file mode 100644 index 0000000000000000000000000000000000000000..ec7453797997c4c1c5456b3aa206e7b6070ae646 GIT binary patch literal 8107 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 - + - + - +
+ + + + + + + + + + diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java index f62cd82..625e432 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogController.java @@ -1,5 +1,6 @@ package polling_station_dashboard.StatusLog.java; +import javafx.fxml.FXML; import javafx.stage.Stage; /** @@ -9,10 +10,21 @@ import javafx.stage.Stage; public class StatusLogController { private Stage primaryStage; + private StatusLogUpdate statusLogUpdater; + public void SetStatusLogUpdater(StatusLogUpdate updater){ + statusLogUpdater = updater; + } public void SetStage(Stage stage){ primaryStage = stage; } + @FXML + private void CloseStatusLog(){ + // UpdateStatusLog is called from open status log object which means that + // the current UpdateStatusLog will close it + statusLogUpdater.UpdateStatusLog(); + } + } diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java index d8ffa31..12d403a 100644 --- a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogLoader.java @@ -16,17 +16,20 @@ public class StatusLogLoader { private Stage currentStage; private FXMLLoader fxmlLoader; + private StatusLogUpdate statusLogUpdater; - public StatusLogLoader (Stage primaryStage) throws IOException + public StatusLogLoader (Stage primaryStage, StatusLogUpdate updater) throws IOException { currentStage = primaryStage; + statusLogUpdater = updater; fxmlLoader = new FXMLLoader(getClass().getResource(POLLING_STATION_DASHBOARD_FXML_PATH)); } - private GridPane GetStatusLogInstance() throws IOException { - GridPane StatusLog = (GridPane) fxmlLoader.load(); + public GridPane GetStatusLogInstance() throws IOException { + GridPane StatusLog = fxmlLoader.load(); StatusLogController controller = fxmlLoader.getController(); controller.SetStage(currentStage); + controller.SetStatusLogUpdater(statusLogUpdater); return StatusLog; } diff --git a/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java new file mode 100644 index 0000000..e032d72 --- /dev/null +++ b/voting-station-gui/src/polling_station_dashboard/StatusLog/java/StatusLogUpdate.java @@ -0,0 +1,11 @@ +package polling_station_dashboard.StatusLog.java; + +/** + * Created by Vladimir Eliezer Tokarev on 04/06/2016. + * StatusLogUpdate gives the ability to update the status log object + * decouple status log from polling station dashboard + */ +public interface StatusLogUpdate { + + void UpdateStatusLog(); +} diff --git a/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml b/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml index a83d831..f755ce7 100644 --- a/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml +++ b/voting-station-gui/src/polling_station_dashboard/fxml/polling_station_dashboard.fxml @@ -69,7 +69,7 @@ -