From 63489992731e8c5c950728f417d75ed5f1a50304 Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Sun, 17 Jun 2018 12:21:18 +0200 Subject: Remove duplicate code by creating method generateOpCodeListItem [#25963] --- .../controller/CreateOperationController.java | 31 ++++++++++++---------- .../controller/OperationDetailsController.java | 14 +--------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java index 6e29ea5..06b4bbd 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateOperationController.java @@ -75,20 +75,8 @@ public class CreateOperationController { private void initialize() { lblChosenVehicles.setText("keine ausgewählt"); - lvActiveOperations.setCellFactory( - param -> - new ListCell<>() { - @Override - protected void updateItem(Operation item, boolean empty) { - super.updateItem(item, empty); - - if (empty || item == null || item.opCode() == null) { - setText(null); - } else { - setText(item.opCode()); - } - } - }); + lvActiveOperations.setCellFactory(param -> generateOpCodeListItem()); + lvActiveOperations.setOnMouseClicked( event -> { if (event.getClickCount() == 2) { @@ -364,4 +352,19 @@ public class CreateOperationController { updateList(); } } + + static ListCell generateOpCodeListItem() { + return new ListCell<>() { + @Override + protected void updateItem(Operation item, boolean empty) { + super.updateItem(item, empty); + + if (empty || item == null || item.opCode() == null) { + setText(null); + } else { + setText(item.opCode()); + } + } + }; + } } diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java index c3d4947..ab348e1 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationDetailsController.java @@ -53,19 +53,7 @@ public class OperationDetailsController { @FXML private void initialize() { lvActiveOperations.setCellFactory( - param -> - new ListCell<>() { - @Override - protected void updateItem(Operation item, boolean empty) { - super.updateItem(item, empty); - - if (empty || item == null || item.opCode() == null) { - setText(null); - } else { - setText(item.opCode()); - } - } - }); + param -> CreateOperationController.generateOpCodeListItem()); lvActiveOperations.setOnMouseClicked( event -> { if (event.getClickCount() == 2) { -- cgit v1.2.3-70-g09d2