From 3b770f9fa59a4f2b294a03c91c215d2b02012892 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 12 May 2020 06:00:11 +0200
Subject: [PATCH] Don't cherry-pick: - cache can be updated from the
uniqueAddFoo() method - fixed some German umlauts
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Signed-off-by: Roland Häder <roland@mxchange.org>
---
.../FinancialsReceiptItemListWebViewBean.java | 9 +++++----
.../localization/project_de_DE.properties | 15 +++++----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/list/FinancialsReceiptItemListWebViewBean.java b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/list/FinancialsReceiptItemListWebViewBean.java
index 0d935b70..9487d62e 100644
--- a/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/list/FinancialsReceiptItemListWebViewBean.java
+++ b/src/java/org/mxchange/jfinancials/beans/financial/model/receipt_item/list/FinancialsReceiptItemListWebViewBean.java
@@ -128,8 +128,7 @@ public class FinancialsReceiptItemListWebViewBean extends BaseFinancialsBean imp
throw new IllegalArgumentException(MessageFormat.format("event.addedReceiptItem.itemId={0} is not valid", event.getAddedReceiptItem().getItemId())); //NOI18N
}
- // Add to cache and general list
- this.receiptItemCache.put(event.getAddedReceiptItem().getItemId(), event.getAddedReceiptItem());
+ // Uniquely add to cache
this.uniqueAddReceiptItem(event.getAddedReceiptItem());
}
@@ -155,8 +154,7 @@ public class FinancialsReceiptItemListWebViewBean extends BaseFinancialsBean imp
throw new IllegalArgumentException(MessageFormat.format("event.updatedReceiptItem.itemId={0} is not valid", event.getUpdatedReceiptItem().getItemId())); //NOI18N
}
- // Add to cache and general list
- this.receiptItemCache.put(event.getUpdatedReceiptItem().getItemId(), event.getUpdatedReceiptItem());
+ // Uniquely update instance
this.uniqueAddReceiptItem(event.getUpdatedReceiptItem());
}
@@ -330,6 +328,9 @@ public class FinancialsReceiptItemListWebViewBean extends BaseFinancialsBean imp
* @param receiptItem To be added/updated receipt item instance
*/
private void uniqueAddReceiptItem (final BillableReceiptItem receiptItem) {
+ // Add to cache and general list
+ this.receiptItemCache.put(receiptItem.getItemId(), receiptItem);
+
// Get iterator
final Iterator<BillableReceiptItem> allIterator = this.getAllReceiptItems().iterator();
diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties
index dc6379b1..8eb9e23f 100644
--- a/src/java/org/mxchange/localization/project_de_DE.properties
+++ b/src/java/org/mxchange/localization/project_de_DE.properties
@@ -167,13 +167,11 @@ AGE_GROUP_SENIOR=Altersgruppe "Senior"
#@TODO Please fix German umlauts!
SELECT_RECEIPT_ITEM_PRODUCT=Waehle Produkt zum Kassenboneintrag aus:
ADMIN_EDIT_RECEIPT_NUMBER_TITLE=Kassenbonnummer {0} (Id {1}) bearbeiten:
-#@TODO Please fix German umlauts!
-BUTTON_ADMIN_EDIT_RECEIPT=Kassenbon aendern
+BUTTON_ADMIN_EDIT_RECEIPT=Kassenbon \u00e4ndern
CONTENT_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT=Kassenbon bearbeiten:
PAGE_TITLE_ADMIN_FINANCIALS_EDIT_RECEIPT=Kassenbon bearbeiten
ADMIN_EDIT_RECEIPT_TITLE=Kassenbon mit Id {0} bearbeiten:
-#@TODO Please fix German umlauts!
-ADMIN_ERROR_FINANCIAL_RECEIPT_NOT_CHANGED=Fehler: Sie haben den Kassenbon nicht geaendert.
+ADMIN_ERROR_FINANCIAL_RECEIPT_NOT_CHANGED=Fehler: Sie haben den Kassenbon nicht ge\u00e4ndert.
PARAMETER_RECEIPT_ID_INVALID=Kassenbon mit Id-Nummer "receiptId" nicht gefunden.
ERROR_PARAMETER_RECEIPT_ID_NOT_SET=Fehler: Parameter "receiptId" nicht gesetzt.
#@TODO Please fix German umlauts!
@@ -186,12 +184,9 @@ ADMIN_EDIT_RECEIPT_ITEM_NUMBER_TITLE=Kassenboneintrag mit Bonummer {0} (Id {1})
ADMIN_EDIT_RECEIPT_ITEM_TITLE=Kassenboneintrag Id {0} bearbeiten:
#@TODO Please fix German umlauts!
ADMIN_EDIT_RECEIPT_ITEM_MINIMUM_DATA=Geben Sie mindestens die mit * markierten Daten fuer diesen Kassenboneintrag an.
-#@TODO Please fix German umlauts!
-BUTTON_ADMIN_EDIT_RECEIPT_ITEM=Kassenboneintrag aendern
-#@TODO Please fix German umlauts!
-RECEIPT_ITEM_UPDATED_TITLE=Wann dieser Kassenboneintrag als letztes geaendert wurde.
-#@TODO Please fix German umlauts!
-ADMIN_ERROR_FINANCIAL_RECEIPT_ITEM_NOT_CHANGED=Fehler: Sie haben den Kassenboneintrag nicht geaendert.
+BUTTON_ADMIN_EDIT_RECEIPT_ITEM=Kassenboneintrag \u00e4ndern
+RECEIPT_ITEM_UPDATED_TITLE=Wann dieser Kassenboneintrag als letztes ge\u00e4ndert wurde.
+ADMIN_ERROR_FINANCIAL_RECEIPT_ITEM_NOT_CHANGED=Fehler: Sie haben den Kassenboneintrag nicht ge\u00e4ndert.
#@TODO Please fix German umlauts!
ADMIN_ENABLE_INCOME_REQUIRED=Sie muessen entweder das Einkommen aktivieren oder deaktivieren.
ADMIN_ENABLE_INCOME=Einkommen aktiviert?
--
2.39.5