From 1243cb27f0239d4dc17fa519a0b0c51881723644 Mon Sep 17 00:00:00 2001 From: Felix Kehrer Date: Mon, 7 May 2018 15:56:33 +0200 Subject: Fix NullPointerException occurring when empty area clicked in table --- .../einsatzverwaltung/controller/RegistrationWindowController.java | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src') diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java index 152d3f0..0683c77 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/RegistrationWindowController.java @@ -109,6 +109,9 @@ public class RegistrationWindowController { mouseEvent -> { if (mouseEvent.isPrimaryButtonDown() && mouseEvent.getClickCount() == 2) { chosenVehicle = tvVehicles.getSelectionModel().getSelectedItem(); + if (chosenVehicle == null) { + return; + } lVehicles.setText(chosenVehicle.name()); } }); @@ -116,6 +119,9 @@ public class RegistrationWindowController { mouseEvent -> { if (mouseEvent.isPrimaryButtonDown() && mouseEvent.getClickCount() == 2) { chosenEmployees.add(tvEmployees.getSelectionModel().getSelectedItem()); + if (chosenEmployees == null) { + return; + } StringBuilder text = new StringBuilder(); for (Employee employee : chosenEmployees) { text.append(employee.name()).append("\n"); -- cgit v1.2.3-70-g09d2