From 439a9f2b80b37acc77fdd92ce0c9e0078bacc878 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 17 Sep 2017 14:24:30 +0200
Subject: [PATCH] #96 - fixed usage of connection alert
---
.../budgetmaster/ui/controller/FilterController.java | 4 +++-
.../budgetmaster/ui/controller/ReportController.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/FilterController.java b/src/de/deadlocker8/budgetmaster/ui/controller/FilterController.java
index 531ba2697..441dab1b4 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/FilterController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/FilterController.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import de.deadlocker8.budgetmaster.logic.FilterSettings;
import de.deadlocker8.budgetmaster.logic.category.Category;
+import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler;
import de.deadlocker8.budgetmaster.logic.serverconnection.ServerTagConnection;
import de.deadlocker8.budgetmaster.logic.tag.Tag;
import de.deadlocker8.budgetmaster.logic.utils.Colors;
@@ -101,8 +102,9 @@ public class FilterController extends BaseController implements Styleable
}
catch(Exception e)
{
- //ERRORHANDLING
Logger.error(e);
+ controller.showConnectionErrorAlert(ExceptionHandler.getMessageForException(e));
+ return;
}
textFieldSearch.setOnKeyPressed((event)->{
diff --git a/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java b/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java
index be2ba945b..872ed127d 100644
--- a/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/controller/ReportController.java
@@ -25,6 +25,7 @@ import de.deadlocker8.budgetmaster.logic.report.ReportGenerator;
import de.deadlocker8.budgetmaster.logic.report.ReportItem;
import de.deadlocker8.budgetmaster.logic.report.ReportPreferences;
import de.deadlocker8.budgetmaster.logic.report.ReportSorting;
+import de.deadlocker8.budgetmaster.logic.serverconnection.ExceptionHandler;
import de.deadlocker8.budgetmaster.logic.tag.TagHandler;
import de.deadlocker8.budgetmaster.logic.utils.Colors;
import de.deadlocker8.budgetmaster.logic.utils.FileHelper;
@@ -544,7 +545,7 @@ public class ReportController implements Refreshable, Styleable
catch(Exception e)
{
Logger.error(e);
- controller.showConnectionErrorAlert(Localization.getString(Strings.ERROR_SERVER_CONNECTION_WITH_DETAILS));
+ controller.showConnectionErrorAlert(ExceptionHandler.getMessageForException(e));
}
reportItems.add(reportItem);
--
GitLab