From ed3d2bf854baf673373e31330010265ef33d7e74 Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Wed, 6 Jun 2018 21:03:33 +0200 Subject: Extract code into CustomListItemController [#25963] Code of VehiclePaneController and EmployeeListItemController --- .../controller/CustomListItemController.java | 24 ++++++++++++++++++++++ .../controller/EmployeeListItemController.java | 7 +------ .../controller/VehiclePaneController.java | 19 +---------------- 3 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java new file mode 100644 index 0000000..79cf243 --- /dev/null +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CustomListItemController.java @@ -0,0 +1,24 @@ +package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller; + +import javafx.scene.Node; + +public abstract class CustomListItemController { + + protected Node rootElement; + + public Node getRootElement() { + return rootElement; + } + + public void setSelected(boolean selected) { + rootElement.getStyleClass().clear(); + + if (selected) { + rootElement.getStyleClass().add("bg-yellow"); + rootElement.getStyleClass().add("shadowed"); + } else { + rootElement.getStyleClass().add("bg-white"); + rootElement.getStyleClass().add("shadowed"); + } + } +} diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java index 11b5626..47fbe80 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Controller; @Controller @Scope("prototype") -public class EmployeeListItemController { +public class EmployeeListItemController extends CustomListItemController { @FXML private Label lblName; @FXML private Label lblQualification; @@ -25,7 +25,6 @@ public class EmployeeListItemController { @FXML private ImageView imgDriver; @FXML private ImageView imgQualification; - private Node rootElement; private Employee employee; private Consumer consumerEditEmployeeClicked; @@ -69,10 +68,6 @@ public class EmployeeListItemController { return controller; } - public Node getRootElement() { - return rootElement; - } - public Employee getEmployee() { return employee; } diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java index 8a0bba3..0981f3f 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/VehiclePaneController.java @@ -18,7 +18,7 @@ import javafx.scene.text.Text; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VehiclePaneController { +public class VehiclePaneController extends CustomListItemController { private static Logger LOG = LoggerFactory.getLogger(VehiclePaneController.class); @@ -41,13 +41,8 @@ public class VehiclePaneController { @FXML private Text txtQualification; @FXML private Text txtRooftype; - private Node rootElement; private Vehicle data; - public Node getRootElement() { - return rootElement; - } - public Vehicle getData() { return data; } @@ -110,16 +105,4 @@ public class VehiclePaneController { this.data = vehicle; } - - public void setSelected(boolean selected) { - rootElement.getStyleClass().clear(); - - if (selected) { - rootElement.getStyleClass().add("bg-yellow"); - rootElement.getStyleClass().add("shadowed"); - } else { - rootElement.getStyleClass().add("bg-white"); - rootElement.getStyleClass().add("shadowed"); - } - } } -- cgit v1.2.3-70-g09d2