From 8cb7251fabd7966a847800ab85c0658660085b66 Mon Sep 17 00:00:00 2001
From: Andreas <andreksv@ntnu.no>
Date: Sun, 19 Mar 2023 19:59:37 +0100
Subject: [PATCH] Rewrote toString methods in Expense, Income and Item
---
.../java/no/ntnu/idatt1002/demo/data/Economics/Expense.java | 2 +-
.../java/no/ntnu/idatt1002/demo/data/Economics/Income.java | 2 +-
src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
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 deea3c2d..5066f6b0 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()+category.toString()+"\n";
+ return super.toString()+"\ncategory="+category.toString()+"\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 46a6d43c..480636b0 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()+category.toString()+"\n";
+ return super.toString()+"\ncategory="+category.toString()+"\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 bc46bede..04b6bc51 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 "\n"+date+"\n"+description+"\n"+amount+"\n"+isReoccuring+"\n";
+ return "\ndate=" + date+"\ndescription=" + description+"\namount="+amount+"\nisReoccuring="+isReoccuring;
}
else{
- return "\n"+date+"\n"+amount+"\n"+isReoccuring+"\n";
+ return "\ndate="+date+"\namount="+amount+"\nisReoccuring="+isReoccuring;
}
}
--
GitLab