From 6825a011ce5ee13769394479d056f78f1081415d Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Tue, 18 Aug 2020 20:15:39 +0200
Subject: [PATCH] Fixed #538 - New transactions are saved with wrong
income/expenditure state
---
.../java/de/deadlocker8/budgetmaster/templates/Template.java | 2 +-
.../budgetmaster/templates/TemplateController.java | 4 ++--
.../de/deadlocker8/budgetmaster/transactions/Transaction.java | 2 +-
.../budgetmaster/transactions/TransactionBase.java | 2 +-
.../budgetmaster/transactions/TransactionService.java | 2 +-
.../utils/eventlistener/IntroduceIsExpenditureMember.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java b/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
index 7eaa176fe..e0b58d35a 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/Template.java
@@ -139,7 +139,7 @@ public class Template implements TransactionBase
return isExpenditure;
}
- public void setExpenditure(Boolean expenditure)
+ public void setIsExpenditure(Boolean expenditure)
{
isExpenditure = expenditure;
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index 972a4e6cc..1f7a484fb 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -129,7 +129,7 @@ public class TemplateController extends BaseController
if(template.getAmount() == null)
{
- template.setExpenditure(true);
+ template.setIsExpenditure(true);
}
final DateTime date = dateService.getDateTimeFromCookie(cookieDate);
@@ -175,7 +175,7 @@ public class TemplateController extends BaseController
if(template.isExpenditure() == null)
{
- template.setExpenditure(false);
+ template.setIsExpenditure(true);
}
if(template.getAmount() != null)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
index 0c950ba7c..af010b146 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/Transaction.java
@@ -111,7 +111,7 @@ public class Transaction implements TransactionBase
return isExpenditure;
}
- public void setExpenditure(Boolean expenditure)
+ public void setIsExpenditure(Boolean expenditure)
{
isExpenditure = expenditure;
}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java
index 06b7bdb74..5589d577f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionBase.java
@@ -14,7 +14,7 @@ public interface TransactionBase
Boolean isExpenditure();
- void setExpenditure(Boolean isExpenditure);
+ void setIsExpenditure(Boolean isExpenditure);
Category getCategory();
diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
index 6b4fd35b3..969d49b94 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionService.java
@@ -225,7 +225,7 @@ public class TransactionService implements Resetable
{
if(item.isExpenditure() == null)
{
- item.setExpenditure(false);
+ item.setIsExpenditure(true);
}
if(item.getAmount() == null)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/IntroduceIsExpenditureMember.java b/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/IntroduceIsExpenditureMember.java
index bd0c0f8b1..f037631cc 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/IntroduceIsExpenditureMember.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/utils/eventlistener/IntroduceIsExpenditureMember.java
@@ -55,7 +55,7 @@ public class IntroduceIsExpenditureMember
continue;
}
- transaction.setExpenditure(transaction.getAmount() <= 0);
+ transaction.setIsExpenditure(transaction.getAmount() <= 0);
fixedTransactionsCount++;
}
--
GitLab