From 0874272560a930d39d3c82bbdb4ab93fc1aa174b Mon Sep 17 00:00:00 2001
From: Harry Linrui XU <xulr0820@hotmail.com>
Date: Wed, 22 Mar 2023 13:32:43 +0100
Subject: [PATCH] Converted parameters in alertbox to local variables. Changed
the confirmation message to accoutn for both expense and income
---
.../demo/controller/ExpensesController.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
index 2acd76a3..d0f1cd4c 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
@@ -28,7 +28,6 @@ import no.ntnu.idatt1002.demo.data.Economics.Expense;
import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory;
import no.ntnu.idatt1002.demo.data.Economics.ExpenseRegister;
import no.ntnu.idatt1002.demo.data.Economics.FileHandling;
-import no.ntnu.idatt1002.demo.view.ExpenseRepository;
enum DialogMode {
ADD, EDIT, DELETE
@@ -157,19 +156,19 @@ public class ExpensesController {
@FXML
public void handleDeleteBtn(ActionEvent event) {
- Optional<ButtonType> isConfirmed = showConfirmationDialog("Confirm Delete", "Delete Confirmation",
- "Are you sure you would like to delete the selected expense?");
+ Optional<ButtonType> isConfirmed = showConfirmationDialog(
+ );
if (isConfirmed.isPresent() && isConfirmed.get() == ButtonType.OK) {
int selectedIdx = expenseTableView.getSelectionModel().getSelectedIndex();
expenses.remove(selectedIdx);
}
}
- private Optional<ButtonType> showConfirmationDialog(String title, String headerText, String contentText) {
+ private Optional<ButtonType> showConfirmationDialog() {
Alert alert = new Alert(AlertType.CONFIRMATION);
- alert.setTitle(title);
- alert.setHeaderText(headerText);
- alert.setContentText(contentText);
+ alert.setTitle("Confirm Delete");
+ alert.setHeaderText("Delete Confirmation");
+ alert.setContentText("Are you sure you would like to delete the selected entry?");
return alert.showAndWait();
}
--
GitLab