diff --git a/src/de/deadlocker8/budgetmaster/ui/FilterController.java b/src/de/deadlocker8/budgetmaster/ui/FilterController.java index 49b2a1505ffed5d3cb1363c181fcc66bb0015d05..504610f91c7cab1b0b7198d891d6dd1ecb0adfc4 100644 --- a/src/de/deadlocker8/budgetmaster/ui/FilterController.java +++ b/src/de/deadlocker8/budgetmaster/ui/FilterController.java @@ -31,14 +31,12 @@ public class FilterController private Stage stage; private Controller controller; - private PaymentController paymentController; private FilterSettings filterSetttings; - public void init(Stage stage, Controller controller, PaymentController paymentController, FilterSettings filterSettings) + public void init(Stage stage, Controller controller, FilterSettings filterSettings) { this.stage = stage; this.controller = controller; - this.paymentController = paymentController; this.filterSetttings = filterSettings; FontIcon iconCancel = new FontIcon(FontIconType.TIMES); @@ -124,16 +122,10 @@ public class FilterController name = null; } - // get new unfiltered list from server - controller.refresh(new FilterSettings()); - FilterSettings newFilterSettings = new FilterSettings(isIncomeAllowed, isPaymentAllowed, isNoRepeatingAllowed, isMonthlyRepeatingAllowed, isRepeatingEveryXDaysAllowed, allowedCategoryIDs, name); - controller.setFilterSettings(newFilterSettings); - controller.getPaymentHandler().filter(newFilterSettings); - + controller.refresh(newFilterSettings); stage.close(); - paymentController.getController().refreshAllTabs(); } public void reset() diff --git a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java index c4b7cc52c7d3ea25d3030b59c9c2c4c165637487..d7e8ec416d92cfd23578c994f305809bf8b00c91 100644 --- a/src/de/deadlocker8/budgetmaster/ui/PaymentController.java +++ b/src/de/deadlocker8/budgetmaster/ui/PaymentController.java @@ -258,8 +258,8 @@ public class PaymentController implements Refreshable newStage.getIcons().add(controller.getIcon()); newStage.setResizable(false); FilterController newController = fxmlLoader.getController(); - newController.init(newStage, controller, this, controller.getFilterSettings()); - newStage.show(); + newController.init(newStage, controller, controller.getFilterSettings()); + newStage.showAndWait(); } catch(IOException e) {