From 9ca8782d4c7327249ac439d577d883f70ef3b718 Mon Sep 17 00:00:00 2001
From: Andreas <andreksv@ntnu.no>
Date: Mon, 20 Mar 2023 14:05:44 +0100
Subject: [PATCH] Rewrote toString method in Income, Expense and Item
---
.../java/no/ntnu/idatt1002/demo/data/Economics/Expense.java | 2 +-
.../java/no/ntnu/idatt1002/demo/data/Economics/Income.java | 2 +-
.../java/no/ntnu/idatt1002/demo/data/Economics/Item.java | 4 ++--
src/main/resources/expenseRegisterTest.itemRegister | 6 ------
src/main/resources/incomeRegisterTest.itemRegister | 6 ------
5 files changed, 4 insertions(+), 16 deletions(-)
delete mode 100644 src/main/resources/expenseRegisterTest.itemRegister
delete mode 100644 src/main/resources/incomeRegisterTest.itemRegister
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
index 5066f6b0..078ec99f 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
@@ -66,6 +66,6 @@ public class Expense extends Item{
*/
@Override
public String toString() {
- return super.toString()+"\ncategory="+category.toString()+"\n";
+ return super.toString()+"category="+category.toString()+"\n\n";
}
}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
index 480636b0..c07821dc 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
@@ -73,6 +73,6 @@ public class Income extends Item{
*/
@Override
public String toString() {
- return super.toString()+"\ncategory="+category.toString()+"\n";
+ return super.toString()+"category="+category.toString()+"\n\n";
}
}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
index 04b6bc51..7bd8b00e 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
@@ -138,10 +138,10 @@ public abstract class Item {
isReoccuring = "Not reoccurring";
}
if(!description.isBlank()){
- return "\ndate=" + date+"\ndescription=" + description+"\namount="+amount+"\nisReoccuring="+isReoccuring;
+ return "date=" + date+"\ndescription=" + description+"\namount="+amount+"\nisReoccuring="+isReoccuring+"\n";
}
else{
- return "\ndate="+date+"\namount="+amount+"\nisReoccuring="+isReoccuring;
+ return "date="+date+"\namount="+amount+"\nisReoccuring="+isReoccuring+"\n";
}
}
diff --git a/src/main/resources/expenseRegisterTest.itemRegister b/src/main/resources/expenseRegisterTest.itemRegister
deleted file mode 100644
index 7f98526b..00000000
--- a/src/main/resources/expenseRegisterTest.itemRegister
+++ /dev/null
@@ -1,6 +0,0 @@
-
-date=03.03.23
-description=description
-amount=59.900001525878906
-isReoccuring=Not reoccurring
-category=CLOTHES
diff --git a/src/main/resources/incomeRegisterTest.itemRegister b/src/main/resources/incomeRegisterTest.itemRegister
deleted file mode 100644
index 6bfe0943..00000000
--- a/src/main/resources/incomeRegisterTest.itemRegister
+++ /dev/null
@@ -1,6 +0,0 @@
-
-date=03.03.23
-description=description
-amount=59.900001525878906
-isReoccuring=Not reoccurring
-category=GIFT
--
GitLab