From 1fc78a4a931d26567baffdad6c0019e04901b451 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Mon, 21 Aug 2017 18:06:48 +0200 Subject: [PATCH] Fixed #156 - refresh after database import and delete --- .../ui/controller/SettingsController.java | 17 ++++++++++++++--- .../budgetmasterserver/main/Main.java | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java index 82ae26746..4ab14721f 100644 --- a/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java +++ b/src/de/deadlocker8/budgetmaster/ui/controller/SettingsController.java @@ -359,7 +359,8 @@ public class SettingsController if(modalStage != null) { modalStage.close(); - } + } + AlertGenerator.showAlert(AlertType.INFORMATION, Localization.getString(Strings.INFO_TITLE_DATABASE_IMPORT), "", @@ -368,6 +369,8 @@ public class SettingsController controller.getStage(), null, false); + + controller.refresh(controller.getFilterSettings()); }); } catch(Exception e) @@ -383,6 +386,10 @@ public class SettingsController } }); } + else + { + controller.refresh(controller.getFilterSettings()); + } } public void importDB() @@ -408,7 +415,7 @@ public class SettingsController else if(result.get() == buttonTypeAppend) { importDatabase(); - } + } } public void deleteDB() @@ -440,7 +447,7 @@ public class SettingsController { ServerConnection connection = new ServerConnection(controller.getSettings()); connection.deleteDatabase(); - Platform.runLater(() -> { + Platform.runLater(() -> { if(modalStage != null) { modalStage.close(); @@ -448,6 +455,10 @@ public class SettingsController { importDatabase(); } + else + { + controller.refresh(controller.getFilterSettings()); + } } }); } diff --git a/src/de/deadlocker8/budgetmasterserver/main/Main.java b/src/de/deadlocker8/budgetmasterserver/main/Main.java index f78018848..8ec4d5c9f 100644 --- a/src/de/deadlocker8/budgetmasterserver/main/Main.java +++ b/src/de/deadlocker8/budgetmasterserver/main/Main.java @@ -23,7 +23,7 @@ public class Main public static void main(String[] args) { - Localization.init("de/deadlocker8/budgetmaster/main/"); + Localization.init("de/deadlocker8/budgetmaster/resources/"); Localization.loadLanguage(Locale.GERMANY); Logger.setLevel(LogLevel.ALL); -- GitLab