From 4c394df0fd6afeff29d28fd85366c1bb782bc30f Mon Sep 17 00:00:00 2001
From: Viktoria Pundy <viktoria.pundy@aon.at>
Date: Sun, 17 Jun 2018 15:57:07 +0200
Subject: Removed not needed FXMLLoader [#25963]
---
.../controller/CreateOperationController.java | 48 +---------------------
1 file changed, 1 insertion(+), 47 deletions(-)
(limited to 'src/main/java')
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 0f2b4f5..81437f5 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
@@ -9,7 +9,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.Vehicle
import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException;
import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
-import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
import java.io.IOException;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
@@ -21,8 +20,6 @@ import java.util.Set;
import javafx.collections.FXCollections;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
import javafx.scene.control.Alert;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
@@ -38,7 +35,6 @@ import javafx.scene.input.MouseButton;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane;
-import javafx.stage.Stage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
@@ -69,15 +65,11 @@ public class CreateOperationController {
private final OperationService operationService;
private final VehicleService vehicleService;
- private final SpringFXMLLoader fxmlLoader;
public CreateOperationController(
- OperationService operationService,
- VehicleService vehicleService,
- SpringFXMLLoader fxmlLoader) {
+ OperationService operationService, VehicleService vehicleService) {
this.operationService = operationService;
this.vehicleService = vehicleService;
- this.fxmlLoader = fxmlLoader;
}
@FXML
@@ -328,48 +320,10 @@ public class CreateOperationController {
}
private void openArchivWindow() {
- /*Stage stage = new Stage();
- try {
- stage.setScene(
- new Scene(
- (Parent)
- fxmlLoader.load(
- getClass()
- .getResourceAsStream(
- "/fxml/ArchiveOperation.fxml"))));
- } catch (IOException e) {
- LOG.error("IOException in openArchivWindow(). ", e);
- }
- stage.setTitle("Einsatz erstellen");
- stage.centerOnScreen();
- stage.show();
- */
archiveOperationController.setVisible(true);
this.setVisible(false);
}
- private void openNewWindow(String fxmlFileName) {
-
- Stage stage = new Stage();
- try {
- stage.setScene(
- new Scene(
- (Parent)
- fxmlLoader.load(
- getClass()
- .getResourceAsStream(
- "/fxml/" + fxmlFileName))));
- } catch (IOException e) {
- LOG.error("IOException in openNewWindow(). ", e);
- }
-
- stage.setTitle("Ressourcenverwaltung");
- stage.centerOnScreen();
- stage.showAndWait(); // important to call wait so that updateList is executed afterwards
-
- updateList();
- }
-
void setVisible(boolean b) {
apInvisible.setVisible(!b);
grdWindowContainer.setVisible(!b);
--
cgit v1.2.3-70-g09d2