diff options
| author | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-17 16:57:03 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-22 15:53:23 +0200 |
| commit | be76439c6e0a53a0b70e63daf99de8317dd8e9e4 (patch) | |
| tree | 4198583dc7903213b96b5db0ddca0b8f782f23e3 /src/main | |
| parent | 81996499f2536ce0c5e4d4a128df73753a14f65c (diff) | |
| download | sepm-groupproject-be76439c6e0a53a0b70e63daf99de8317dd8e9e4.tar.gz sepm-groupproject-be76439c6e0a53a0b70e63daf99de8317dd8e9e4.tar.xz sepm-groupproject-be76439c6e0a53a0b70e63daf99de8317dd8e9e4.zip | |
Renamed ArchivOperation to ArchiveOperation [#24990]
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java (renamed from src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java) | 5 | ||||
| -rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java | 8 | ||||
| -rw-r--r-- | src/main/resources/fxml/ArchiveOperation.fxml (renamed from src/main/resources/fxml/ArchivOperation.fxml) | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java index c22b398..d3698e3 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchivOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java @@ -20,7 +20,7 @@ import javafx.scene.layout.FlowPane; import org.springframework.stereotype.Controller; @Controller -public class ArchivOperationController { +public class ArchiveOperationController { public AnchorPane apDetails; public Label lblCodeHeader; @@ -35,7 +35,7 @@ public class ArchivOperationController { public CreateOperationController createOperationController; LinkedList<Operation> list = new LinkedList<>(); - public ArchivOperationController() {} + public ArchiveOperationController() {} public void setServices( OperationService operationService, @@ -82,7 +82,6 @@ public class ArchivOperationController { } private void setOperation() { - // TODO lblCodeHeader.setText(detailOperation.opCode()); String date = "am "; if (detailOperation.created() != null) { diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java index 5bf2c81..a25085a 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java @@ -245,7 +245,7 @@ public class CreateOperationController { } public void onArchivLinkClicked() { - openNewArchivWindow("ArchivOperation.fxml"); + openNewArchivWindow("ArchiveOperation.fxml"); } private void openNewArchivWindow(String fxmlFileName) { @@ -254,9 +254,9 @@ public class CreateOperationController { try { FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/fxml/" + fxmlFileName)); Parent node = fxmlLoader.load(); - ArchivOperationController archivOperationController = fxmlLoader.getController(); - archivOperationController.setServices(operationService, this); - archivOperationController.fillList(); + ArchiveOperationController archiveOperationController = fxmlLoader.getController(); + archiveOperationController.setServices(operationService, this); + archiveOperationController.fillList(); stage.setScene(new Scene(node)); } catch (IOException e) { LOG.error("Could not open new window: {}", e); diff --git a/src/main/resources/fxml/ArchivOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml index 29313af..d9348c1 100644 --- a/src/main/resources/fxml/ArchivOperation.fxml +++ b/src/main/resources/fxml/ArchiveOperation.fxml @@ -6,7 +6,7 @@ <?import javafx.scene.layout.FlowPane?> <?import javafx.scene.text.Font?> -<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" style="-fx-background-color: BLACK;" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.ArchivOperationController"> +<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="650.0" prefWidth="1200.0" style="-fx-background-color: BLACK;" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.ArchiveOperationController"> <children> <AnchorPane prefHeight="650.0" prefWidth="800.0" style="-fx-background-color: rgba(239,235,232,1);" AnchorPane.leftAnchor="200.0" /> <FlowPane fx:id="archiveOperationFlowPane" prefHeight="650.0" prefWidth="800.0" AnchorPane.leftAnchor="200.0" /> |