diff options
| author | Martin Weick <e1627760@student.tuwien.ac.at> | 2018-06-20 19:45:56 +0200 |
|---|---|---|
| committer | Martin Weick <e1627760@student.tuwien.ac.at> | 2018-06-20 19:45:56 +0200 |
| commit | 6ff241570af0dd5014acd760e3248f0fa8be4984 (patch) | |
| tree | 7c5b4d9224a887d63dc7409810d2a4a53d897a4d /src | |
| parent | 73b6ecdc5196cae45c8ecbf9860f1c8284448d1a (diff) | |
| parent | 91e1248d777635a34e7d62c288c0aa38eba74205 (diff) | |
| download | sepm-groupproject-6ff241570af0dd5014acd760e3248f0fa8be4984.tar.gz sepm-groupproject-6ff241570af0dd5014acd760e3248f0fa8be4984.tar.xz sepm-groupproject-6ff241570af0dd5014acd760e3248f0fa8be4984.zip | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'src')
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java index 2334803..f06b43f 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/CreateOperationController.java @@ -94,6 +94,8 @@ public class CreateOperationController { setVisible(true); createCarController.setVisible(false); registrationWindowController.setVisible(false); + + updateList(); } public void updateList() { @@ -311,7 +313,7 @@ public class CreateOperationController { apInvisible.setVisible(!b); grdWindowContainer.setVisible(!b); - if (b) updateList(); + // if (b) updateList(); } private void openDetailsWindow(Operation operation) { diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java index 4a8bc06..c445a12 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/missioncontrol/controller/RegistrationWindowController.java @@ -259,6 +259,7 @@ public class RegistrationWindowController { // ((Stage) lVehicles.getScene().getWindow()).close(); this.setVisible(false); createOperationController.setVisible(true); + createOperationController.updateList(); // reset(); } catch (InvalidVehicleException e) { LOG.debug("Validation of Vehicle in Registration failed."); |