From fc4fe6e5a26b162a6f568c7ad6a08abc62a4f7a6 Mon Sep 17 00:00:00 2001
From: Martin Weick <e1627760@student.tuwien.ac.at>
Date: Fri, 4 May 2018 20:49:13 +0200
Subject: Move CreateCarController to package 'controller'
---
.../controller/CreateCarController.java | 116 +++++++++++++++++++++
.../uicontroller/CreateCarController.java | 116 ---------------------
src/main/resources/controller/createCar.fxml | 2 +-
3 files changed, 117 insertions(+), 117 deletions(-)
create mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
delete mode 100644 src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java
(limited to 'src/main')
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
new file mode 100644
index 0000000..5a450c3
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
@@ -0,0 +1,116 @@
+package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
+
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
+import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
+import java.lang.invoke.MethodHandles;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class CreateCarController {
+
+ @FXML private ChoiceBox<String> cmb_Ctyp;
+ @FXML private ChoiceBox<String> cmb_typ;
+ @FXML private Button btn_cancel;
+ @FXML private CheckBox cbx_NEF;
+
+ private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private final VehicleService vehicleService;
+
+ public CreateCarController(VehicleService vehicleService) {
+ this.vehicleService = vehicleService;
+ }
+
+ @FXML
+ public void initialize() {
+ cmb_Ctyp.setItems(
+ FXCollections.observableArrayList(
+ Stream.of(
+ ConstructionType.NORMAL,
+ ConstructionType.MITTELHOCHDACH,
+ ConstructionType.HOCHDACH)
+ .map(Enum::toString)
+ .collect(Collectors.toList())));
+ cmb_Ctyp.setValue(ConstructionType.NORMAL.toString());
+ cmb_typ.setItems(
+ FXCollections.observableArrayList(
+ Stream.of(
+ VehicleType.BKTW,
+ VehicleType.KTW_B,
+ VehicleType.KTW,
+ VehicleType.RTW,
+ VehicleType.NEF,
+ VehicleType.NAH)
+ .map(Enum::toString)
+ .collect(Collectors.toList())));
+ cmb_typ.setValue(VehicleType.BKTW.toString());
+ }
+
+ @FXML
+ public void onCancelClicked() {
+ ((Stage) btn_cancel.getScene().getWindow()).close();
+ }
+
+ @FXML
+ public void createCar(ActionEvent actionEvent) {
+ Vehicle vehicle =
+ Vehicle.builder()
+ .constructionType(parseConstructionType())
+ .type(parseType())
+ .name("")
+ .status(Status.ABGEMELDET)
+ .hasNef(cbx_NEF.isSelected())
+ .build();
+ try {
+ vehicleService.add(vehicle);
+ } catch (InvalidVehicleException e) {
+ LOG.error("Invalid Vehicle: {}", e);
+ createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
+ return;
+ } catch (ServiceException e) {
+ LOG.error("Exception: {}", e);
+ createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
+ return;
+ }
+ createComplete(
+ AlertType.CONFIRMATION, "Speichern Erfolgreich", "Auto wurde erfolgreich angelegt");
+ }
+
+ private ConstructionType parseConstructionType() {
+ if (cmb_Ctyp.getSelectionModel().getSelectedItem() == null) {
+ return ConstructionType.NORMAL;
+ }
+ return ConstructionType.valueOf(cmb_Ctyp.getSelectionModel().getSelectedItem().toString());
+ }
+
+ private VehicleType parseType() {
+ if (cmb_typ.getSelectionModel().getSelectedItem() == null) {
+ return VehicleType.BKTW;
+ }
+ return VehicleType.valueOf(cmb_typ.getSelectionModel().getSelectedItem().toString());
+ }
+
+ private void createComplete(AlertType alertType, String headerText, String contentText) {
+ Alert alert = new Alert(alertType, contentText, ButtonType.OK);
+ alert.setHeaderText(headerText);
+ alert.showAndWait();
+ }
+}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java
deleted file mode 100644
index f826837..0000000
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.uicontroller;
-
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
-import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import java.lang.invoke.MethodHandles;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javafx.collections.FXCollections;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.Button;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ChoiceBox;
-import javafx.stage.Stage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-
-@Controller
-public class CreateCarController {
-
- @FXML private ChoiceBox<String> cmb_Ctyp;
- @FXML private ChoiceBox<String> cmb_typ;
- @FXML private Button btn_cancel;
- @FXML private CheckBox cbx_NEF;
-
- private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private final VehicleService vehicleService;
-
- public CreateCarController(VehicleService vehicleService) {
- this.vehicleService = vehicleService;
- }
-
- @FXML
- public void initialize() {
- cmb_Ctyp.setItems(
- FXCollections.observableArrayList(
- Stream.of(
- ConstructionType.NORMAL,
- ConstructionType.MITTELHOCHDACH,
- ConstructionType.HOCHDACH)
- .map(Enum::toString)
- .collect(Collectors.toList())));
- cmb_Ctyp.setValue(ConstructionType.NORMAL.toString());
- cmb_typ.setItems(
- FXCollections.observableArrayList(
- Stream.of(
- VehicleType.BKTW,
- VehicleType.KTW_B,
- VehicleType.KTW,
- VehicleType.RTW,
- VehicleType.NEF,
- VehicleType.NAH)
- .map(Enum::toString)
- .collect(Collectors.toList())));
- cmb_typ.setValue(VehicleType.BKTW.toString());
- }
-
- @FXML
- public void onCancelClicked() {
- ((Stage) btn_cancel.getScene().getWindow()).close();
- }
-
- @FXML
- public void createCar(ActionEvent actionEvent) {
- Vehicle vehicle =
- Vehicle.builder()
- .constructionType(parseConstructionType())
- .type(parseType())
- .name("")
- .status(Status.ABGEMELDET)
- .hasNef(cbx_NEF.isSelected())
- .build();
- try {
- vehicleService.add(vehicle);
- } catch (InvalidVehicleException e) {
- LOG.error("Invalid Vehicle: {}", e);
- createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
- return;
- } catch (ServiceException e) {
- LOG.error("Exception: {}", e);
- createComplete(AlertType.ERROR, "Ungültige Eingabe", e.getMessage());
- return;
- }
- createComplete(
- AlertType.CONFIRMATION, "Speichern Erfolgreich", "Auto wurde erfolgreich angelegt");
- }
-
- private ConstructionType parseConstructionType() {
- if (cmb_Ctyp.getSelectionModel().getSelectedItem() == null) {
- return ConstructionType.NORMAL;
- }
- return ConstructionType.valueOf(cmb_Ctyp.getSelectionModel().getSelectedItem().toString());
- }
-
- private VehicleType parseType() {
- if (cmb_typ.getSelectionModel().getSelectedItem() == null) {
- return VehicleType.BKTW;
- }
- return VehicleType.valueOf(cmb_typ.getSelectionModel().getSelectedItem().toString());
- }
-
- private void createComplete(AlertType alertType, String headerText, String contentText) {
- Alert alert = new Alert(alertType, contentText, ButtonType.OK);
- alert.setHeaderText(headerText);
- alert.showAndWait();
- }
-}
diff --git a/src/main/resources/controller/createCar.fxml b/src/main/resources/controller/createCar.fxml
index 2daac67..b0898da 100644
--- a/src/main/resources/controller/createCar.fxml
+++ b/src/main/resources/controller/createCar.fxml
@@ -6,7 +6,7 @@
<?import javafx.scene.layout.AnchorPane?>
-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.uicontroller.CreateCarController">
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateCarController">
<children>
<ChoiceBox fx:id="cmb_Ctyp" layoutX="14.0" layoutY="14.0" prefWidth="150.0" />
<ChoiceBox fx:id="cmb_typ" layoutX="191.0" layoutY="14.0" prefWidth="150.0" />
--
cgit v1.2.3-70-g09d2