From be53535902590dd7ff0ec25defb33868d1333015 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 13 Mar 2018 22:56:45 +0100 Subject: [PATCH] Continued: - changed copyright to the Free Software Foundation - itemProductQuantity needs to be BigDecial to have DECIMAL type in database, FLOAT was not the right one MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../added/ObservableReceiptAddedEvent.java | 2 +- .../added/ObservableReceiptItemAddedEvent.java | 2 +- .../receipt/ReceiptAlreadyAddedException.java | 2 +- .../receipt/ReceiptNotFoundException.java | 2 +- .../ReceiptItemAlreadyAddedException.java | 2 +- .../jfinancials/model/bonus_card/BonusCard.java | 2 +- .../model/bonus_card/FinancialBonusCard.java | 2 +- .../model/income/BillableIncome.java | 2 +- .../model/income/FinancialIncome.java | 2 +- .../jfinancials/model/income/IncomeUtils.java | 2 +- .../income/interval/FinancialInterval.java | 2 +- .../model/receipt/BillableReceipt.java | 2 +- .../model/receipt/FinancialReceipt.java | 2 +- .../jfinancials/model/receipt/Receipts.java | 2 +- .../model/receipt_item/BillableReceiptItem.java | 6 +++--- .../receipt_item/FinancialReceiptItem.java | 17 +++++++++-------- .../model/receipt_item/ReceiptItems.java | 2 +- 17 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/org/mxchange/jfinancials/events/receipt/added/ObservableReceiptAddedEvent.java b/src/org/mxchange/jfinancials/events/receipt/added/ObservableReceiptAddedEvent.java index 18a6e78..0032f7a 100644 --- a/src/org/mxchange/jfinancials/events/receipt/added/ObservableReceiptAddedEvent.java +++ b/src/org/mxchange/jfinancials/events/receipt/added/ObservableReceiptAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/events/receipt_item/added/ObservableReceiptItemAddedEvent.java b/src/org/mxchange/jfinancials/events/receipt_item/added/ObservableReceiptItemAddedEvent.java index 1ecd668..d00ae77 100644 --- a/src/org/mxchange/jfinancials/events/receipt_item/added/ObservableReceiptItemAddedEvent.java +++ b/src/org/mxchange/jfinancials/events/receipt_item/added/ObservableReceiptItemAddedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptAlreadyAddedException.java b/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptAlreadyAddedException.java index ddc931c..a82af68 100644 --- a/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptAlreadyAddedException.java +++ b/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptAlreadyAddedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptNotFoundException.java b/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptNotFoundException.java index f1a9d16..ba5b1b5 100644 --- a/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptNotFoundException.java +++ b/src/org/mxchange/jfinancials/exceptions/receipt/ReceiptNotFoundException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/exceptions/receipt_item/ReceiptItemAlreadyAddedException.java b/src/org/mxchange/jfinancials/exceptions/receipt_item/ReceiptItemAlreadyAddedException.java index f7447b1..c7d041b 100644 --- a/src/org/mxchange/jfinancials/exceptions/receipt_item/ReceiptItemAlreadyAddedException.java +++ b/src/org/mxchange/jfinancials/exceptions/receipt_item/ReceiptItemAlreadyAddedException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/bonus_card/BonusCard.java b/src/org/mxchange/jfinancials/model/bonus_card/BonusCard.java index 7833bd6..0595211 100644 --- a/src/org/mxchange/jfinancials/model/bonus_card/BonusCard.java +++ b/src/org/mxchange/jfinancials/model/bonus_card/BonusCard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or diff --git a/src/org/mxchange/jfinancials/model/bonus_card/FinancialBonusCard.java b/src/org/mxchange/jfinancials/model/bonus_card/FinancialBonusCard.java index 340e25c..b74ac63 100644 --- a/src/org/mxchange/jfinancials/model/bonus_card/FinancialBonusCard.java +++ b/src/org/mxchange/jfinancials/model/bonus_card/FinancialBonusCard.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/income/BillableIncome.java b/src/org/mxchange/jfinancials/model/income/BillableIncome.java index 7953247..2285c97 100644 --- a/src/org/mxchange/jfinancials/model/income/BillableIncome.java +++ b/src/org/mxchange/jfinancials/model/income/BillableIncome.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/income/FinancialIncome.java b/src/org/mxchange/jfinancials/model/income/FinancialIncome.java index 73dfc96..92ba782 100644 --- a/src/org/mxchange/jfinancials/model/income/FinancialIncome.java +++ b/src/org/mxchange/jfinancials/model/income/FinancialIncome.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/income/IncomeUtils.java b/src/org/mxchange/jfinancials/model/income/IncomeUtils.java index 70054da..e4c6591 100644 --- a/src/org/mxchange/jfinancials/model/income/IncomeUtils.java +++ b/src/org/mxchange/jfinancials/model/income/IncomeUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Roland Häder + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/income/interval/FinancialInterval.java b/src/org/mxchange/jfinancials/model/income/interval/FinancialInterval.java index 99a1476..bd02b0a 100644 --- a/src/org/mxchange/jfinancials/model/income/interval/FinancialInterval.java +++ b/src/org/mxchange/jfinancials/model/income/interval/FinancialInterval.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Roland Häder + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java index b717de8..5e5ca0d 100644 --- a/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java +++ b/src/org/mxchange/jfinancials/model/receipt/BillableReceipt.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Roland Häder + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java index 7a69728..de53976 100644 --- a/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java +++ b/src/org/mxchange/jfinancials/model/receipt/FinancialReceipt.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Roland Häder + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/org/mxchange/jfinancials/model/receipt/Receipts.java b/src/org/mxchange/jfinancials/model/receipt/Receipts.java index 9c1c893..24fb923 100644 --- a/src/org/mxchange/jfinancials/model/receipt/Receipts.java +++ b/src/org/mxchange/jfinancials/model/receipt/Receipts.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as diff --git a/src/org/mxchange/jfinancials/model/receipt_item/BillableReceiptItem.java b/src/org/mxchange/jfinancials/model/receipt_item/BillableReceiptItem.java index bc0edaf..b573f09 100644 --- a/src/org/mxchange/jfinancials/model/receipt_item/BillableReceiptItem.java +++ b/src/org/mxchange/jfinancials/model/receipt_item/BillableReceiptItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Roland Häder + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -135,14 +135,14 @@ public interface BillableReceiptItem extends Serializable { *

* @return Product quantity */ - Short getItemProductQuantity (); + BigDecimal getItemProductQuantity (); /** * Setter for product quantity *

* @param itemProductQuantity Product quantity */ - void setItemProductQuantity (final Short itemProductQuantity); + void setItemProductQuantity (final BigDecimal itemProductQuantity); /** * Getter for item's net price diff --git a/src/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItem.java b/src/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItem.java index 7c62037..93c6735 100644 --- a/src/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItem.java +++ b/src/org/mxchange/jfinancials/model/receipt_item/FinancialReceiptItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016, 2017 Roland Häder + * Copyright (C) 2016 - 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -98,7 +98,8 @@ public class FinancialReceiptItem implements BillableReceiptItem { /** * Gross price of item */ - @Column (name = "item_gross_price", precision = 2) + @Basic (optional = false) + @Column (name = "item_gross_price", nullable = false, precision = 10, scale = 2) private BigDecimal itemGrossPrice; /** @@ -133,7 +134,7 @@ public class FinancialReceiptItem implements BillableReceiptItem { /** * Net price of item */ - @Column (name = "item_net_price", precision = 2) + @Column (name = "item_net_price", precision = 10, scale = 2) private BigDecimal itemNetPrice; /** @@ -153,8 +154,8 @@ public class FinancialReceiptItem implements BillableReceiptItem { * Product quantity */ @Basic (optional = false) - @Column (name = "item_product_quantity", nullable = false) - private Short itemProductQuantity; + @Column (name = "item_product_quantity", nullable = false, precision = 3) + private BigDecimal itemProductQuantity; /** * Connected itemReceipt item @@ -182,7 +183,7 @@ public class FinancialReceiptItem implements BillableReceiptItem { * @param itemProductQuantity Product quantity * @param itemReceipt FinancialReceipt instance */ - public FinancialReceiptItem (final Product itemProduct, final Short itemProductQuantity, final BillableReceipt itemReceipt) { + public FinancialReceiptItem (final Product itemProduct, final BigDecimal itemProductQuantity, final BillableReceipt itemReceipt) { // Call other constructor this(); @@ -341,12 +342,12 @@ public class FinancialReceiptItem implements BillableReceiptItem { } @Override - public Short getItemProductQuantity () { + public BigDecimal getItemProductQuantity () { return this.itemProductQuantity; } @Override - public void setItemProductQuantity (final Short itemProductQuantity) { + public void setItemProductQuantity (final BigDecimal itemProductQuantity) { this.itemProductQuantity = itemProductQuantity; } diff --git a/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java b/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java index bb8ef5d..dea7327 100644 --- a/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java +++ b/src/org/mxchange/jfinancials/model/receipt_item/ReceiptItems.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 Roland Häder + * Copyright (C) 2017, 2018 Free Software Foundation * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as -- 2.39.5