From 56bb347936509de408df2f3959b71d882362d337 Mon Sep 17 00:00:00 2001 From: Viktoria Pundy Date: Thu, 17 May 2018 16:06:42 +0200 Subject: Fixed a bug [#24990] Fixed a bug where exception would be thrown if main window is closed for archive window --- .../einsatzverwaltung/userInterface/ArchivOperationController.java | 7 ------- .../einsatzverwaltung/userInterface/CreateOperationController.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src') diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java index 5136090..177dd4d 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java @@ -64,7 +64,6 @@ public class ArchivOperationController { Operation detailOperation; public void buttonClicked(Button button) { - // TODO: Problem wenn identischer Code, eventuell am Index erkennen int size = archiveOperationFlowPane.getChildren().size(); int index = 0; for (int i = 0; i < size; i++) { @@ -75,12 +74,6 @@ public class ArchivOperationController { } detailOperation = list.get(index); - /*for (int i = 0; i < list.size(); i++) { - if (list.get(i).opCode().equals(opCode)) { - detailOperation = list.get(i); - break; - } - }*/ setOperation(); setDetailsVisible(true); } diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java index f17878a..5bf2c81 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java @@ -263,7 +263,7 @@ public class CreateOperationController { } stage.setTitle("Einsatz erstellen"); stage.centerOnScreen(); - stage.showAndWait(); // important to call wait so that updateList is executed afterwards + stage.show(); updateList(); } -- cgit v1.2.3-70-g09d2