From cb2bb7f8e35b603fcdd78cccf46d93dc53d65dc0 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sun, 1 Oct 2017 12:34:17 +0200 Subject: [PATCH] Fixed #208 - description in paymentcell/searchcell remove tab and new line --- .../budgetmaster/logic/utils/Helpers.java | 12 ++++++++++++ .../budgetmaster/ui/cells/PaymentCell.java | 4 ++-- .../budgetmaster/ui/cells/SearchCell.java | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/de/deadlocker8/budgetmaster/logic/utils/Helpers.java b/src/de/deadlocker8/budgetmaster/logic/utils/Helpers.java index 9c105dcde..fc6054d91 100644 --- a/src/de/deadlocker8/budgetmaster/logic/utils/Helpers.java +++ b/src/de/deadlocker8/budgetmaster/logic/utils/Helpers.java @@ -143,4 +143,16 @@ public class Helpers return null; } } + + /** + * Replaces line breaks and tabs with spaces + * @param text + * @return String + */ + public static String getFlatText(String text) + { + text = text.replace("\n", " "); + text = text.replace("\t", " "); + return text; + } } \ No newline at end of file diff --git a/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java b/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java index b62dad24e..09e8ed765 100644 --- a/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java +++ b/src/de/deadlocker8/budgetmaster/ui/cells/PaymentCell.java @@ -123,8 +123,8 @@ public class PaymentCell extends ListCell<Payment> vboxNameAndDescription.getChildren().add(labelName); if(item.getDescription() != null && !item.getDescription().equals("")) - { - Label labelDescription = new Label(item.getDescription()); + { + Label labelDescription = new Label(Helpers.getFlatText(item.getDescription())); labelDescription.setStyle("-fx-font-size: 14; -fx-text-fill: " + ConvertTo.toRGBHexWithoutOpacity(Colors.TEXT) + "; -fx-font-style: italic"); labelDescription.setAlignment(Pos.CENTER_LEFT); labelDescription.getStyleClass().add("greylabel"); diff --git a/src/de/deadlocker8/budgetmaster/ui/cells/SearchCell.java b/src/de/deadlocker8/budgetmaster/ui/cells/SearchCell.java index c3fe6ff61..bb06c279f 100644 --- a/src/de/deadlocker8/budgetmaster/ui/cells/SearchCell.java +++ b/src/de/deadlocker8/budgetmaster/ui/cells/SearchCell.java @@ -112,7 +112,7 @@ public class SearchCell extends ListCell<Payment> if(item.getDescription() != null && !item.getDescription().equals("")) { - Label labelDescription = new Label(item.getDescription()); + Label labelDescription = new Label(Helpers.getFlatText(item.getDescription())); labelDescription.setStyle("-fx-font-size: 14; -fx-text-fill: " + ConvertTo.toRGBHexWithoutOpacity(Colors.TEXT) + "; -fx-font-style: italic"); labelDescription.setAlignment(Pos.CENTER_LEFT); labelDescription.getStyleClass().add("greylabel"); -- GitLab