From 8ac466e73a6e753afc035757c97e3195fbe91315 Mon Sep 17 00:00:00 2001 From: Vladimir Eliezer Tokarev Date: Sat, 2 Jul 2016 16:11:22 +0300 Subject: [PATCH] Fixed the status log panel bug The issue was the name of the panel not in capital latter --- .../polling_station_dashboard/EventHandlerMap.java | 10 +++++++++- .../polling_station_dashboard/EventHandlerMapper.java | 2 +- .../statusLog/StatusLogVisualUpdater.java | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMap.java b/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMap.java index a971a7b..56bf4c3 100644 --- a/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMap.java +++ b/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMap.java @@ -5,6 +5,8 @@ import javafx.event.EventHandler; import javafx.scene.Parent; import java.util.HashMap; +// TODO: add logging to the process + /** * Created by Vladimir Eliezer Tokarev on 12/06/2016. * EventHandlerMap maps events ids (that are part of polling station dashboard) @@ -27,6 +29,12 @@ public class EventHandlerMap { public void Handle(Event event) { - this.eventIdToHandler.get(((Parent)event.getSource()).getId()).handle(event); + try { + this.eventIdToHandler.get(((Parent) event.getSource()).getId()).handle(event); + } + catch (RuntimeException e) { + System.out.println("The event map doesn't have this kind of event handler : " + e); + throw e; + } } } diff --git a/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMapper.java b/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMapper.java index de50597..0dd245f 100644 --- a/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMapper.java +++ b/polling-station-gui/src/main/java/polling_station_dashboard/EventHandlerMapper.java @@ -35,7 +35,7 @@ public class EventHandlerMapper { StatusLogVisualUpdater statusLogVisualUpdater = new StatusLogVisualUpdater(statusLogLoader.GetStatusLogInstance(), primaryStage); map.Add("StatusLogButton", statusLogVisualUpdater); - map.Add("statusLog", statusLogVisualUpdater); + map.Add("StatusLog", statusLogVisualUpdater); // map add voter to search button triggered SearchHandler searchHandler = new SearchHandler(primaryStage, new DummyVotersFetcher()); diff --git a/polling-station-gui/src/main/java/polling_station_dashboard/statusLog/StatusLogVisualUpdater.java b/polling-station-gui/src/main/java/polling_station_dashboard/statusLog/StatusLogVisualUpdater.java index 556616b..49cf32e 100644 --- a/polling-station-gui/src/main/java/polling_station_dashboard/statusLog/StatusLogVisualUpdater.java +++ b/polling-station-gui/src/main/java/polling_station_dashboard/statusLog/StatusLogVisualUpdater.java @@ -45,18 +45,18 @@ public class StatusLogVisualUpdater implements EventHandler { } private void addStatusLog() { - Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog"); + Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog"); statusLog.getChildren().add(this.statusLog); } private void removeStatusLog(){ - Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog"); + Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog"); statusLog.getChildren().remove(this.statusLog); } private void SetStatusLogSize(int expansionWidth) { currentStage.setWidth(currentStage.getWidth() + expansionWidth); - Pane statusLog = (Pane) currentStage.getScene().lookup("#statusLog"); + Pane statusLog = (Pane) currentStage.getScene().lookup("#StatusLog"); statusLog.setPrefWidth(expansionWidth); }