From f215c42e41faf75fb9cce622d512aad1ff73c0b6 Mon Sep 17 00:00:00 2001
From: Andreas <andreksv@ntnu.no>
Date: Sun, 19 Mar 2023 17:59:26 +0100
Subject: [PATCH] Rewrote toString methods for Expense, Income and Item
---
.../no/ntnu/idatt1002/demo/data/Economics/Expense.java | 2 +-
.../no/ntnu/idatt1002/demo/data/Economics/Income.java | 2 +-
.../no/ntnu/idatt1002/demo/data/Economics/Item.java | 10 +++++-----
3 files changed, 7 insertions(+), 7 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 d7cc7362..deea3c2d 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()+"\n"+category.toString();
+ return super.toString()+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 41289016..46a6d43c 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()+"\n"+category.toString();
+ return super.toString()+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 3938308f..bc46bede 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
@@ -130,18 +130,18 @@ public abstract class Item {
*/
@Override
public String toString() {
- String isRecuring = "";
+ String isReoccuring = "";
if(recurring){
- isRecuring = "Reoccurring";
+ isReoccuring = "Reoccurring";
}
else{
- isRecuring = "Not reoccurring";
+ isReoccuring = "Not reoccurring";
}
if(!description.isBlank()){
- return date+"\n"+description+"\n"+amount+"\n"+isRecuring+"\n";
+ return "\n"+date+"\n"+description+"\n"+amount+"\n"+isReoccuring+"\n";
}
else{
- return date+"\n"+amount+"\n"+isRecuring+"\n";
+ return "\n"+date+"\n"+amount+"\n"+isReoccuring+"\n";
}
}
--
GitLab