From 047bb5914427169b7e12ce2b2adb7e438c75e04e Mon Sep 17 00:00:00 2001
From: Andreas <andreksv@ntnu.no>
Date: Mon, 13 Mar 2023 12:46:50 +0100
Subject: [PATCH] Moved Income, Expense, Item, overview and test classes into a
package
---
.../demo/data/{ => Economics}/Expense.java | 2 +-
.../data/{ => Economics}/ExpenseCategory.java | 2 +-
.../demo/data/Economics/ExpenseOverview.java | 23 ++++++++++++++++
.../demo/data/{ => Economics}/Income.java | 2 +-
.../data/{ => Economics}/IncomeCategory.java | 2 +-
.../demo/data/Economics/IncomeOverview.java | 26 +++++++++++++++++++
.../demo/data/{ => Economics}/Item.java | 4 +--
.../data/{ => Economics}/ItemOverview.java | 7 +++--
.../idatt1002/demo/data/ExpenseOverview.java | 10 -------
.../idatt1002/demo/data/IncomeOverview.java | 11 --------
.../data/{ => Economics}/ExpenseTest.java | 4 ++-
.../{ => Economics}/IncomeOverviewTest.java | 5 +++-
.../demo/data/{ => Economics}/IncomeTest.java | 4 ++-
.../demo/data/{ => Economics}/ItemTest.java | 3 ++-
14 files changed, 70 insertions(+), 35 deletions(-)
rename src/main/java/no/ntnu/idatt1002/demo/data/{ => Economics}/Expense.java (98%)
rename src/main/java/no/ntnu/idatt1002/demo/data/{ => Economics}/ExpenseCategory.java (62%)
create mode 100644 src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseOverview.java
rename src/main/java/no/ntnu/idatt1002/demo/data/{ => Economics}/Income.java (98%)
rename src/main/java/no/ntnu/idatt1002/demo/data/{ => Economics}/IncomeCategory.java (60%)
create mode 100644 src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverview.java
rename src/main/java/no/ntnu/idatt1002/demo/data/{ => Economics}/Item.java (98%)
rename src/main/java/no/ntnu/idatt1002/demo/data/{ => Economics}/ItemOverview.java (87%)
delete mode 100644 src/main/java/no/ntnu/idatt1002/demo/data/ExpenseOverview.java
delete mode 100644 src/main/java/no/ntnu/idatt1002/demo/data/IncomeOverview.java
rename src/test/java/no/ntnu/idatt1002/demo/data/{ => Economics}/ExpenseTest.java (82%)
rename src/test/java/no/ntnu/idatt1002/demo/data/{ => Economics}/IncomeOverviewTest.java (88%)
rename src/test/java/no/ntnu/idatt1002/demo/data/{ => Economics}/IncomeTest.java (82%)
rename src/test/java/no/ntnu/idatt1002/demo/data/{ => Economics}/ItemTest.java (89%)
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Expense.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
similarity index 98%
rename from src/main/java/no/ntnu/idatt1002/demo/data/Expense.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
index 15a59f7e..74fe9d89 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Expense.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Expense.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
public class Expense extends Item{
private ExpenseCategory category;
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseCategory.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseCategory.java
similarity index 62%
rename from src/main/java/no/ntnu/idatt1002/demo/data/ExpenseCategory.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseCategory.java
index 0460a400..c1043a4d 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseCategory.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseCategory.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
public enum ExpenseCategory {
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseOverview.java
new file mode 100644
index 00000000..7dff5877
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseOverview.java
@@ -0,0 +1,23 @@
+package no.ntnu.idatt1002.demo.data.Economics;
+
+import java.util.ArrayList;
+
+/**
+ *ExpenseOverview is an abstract class for storing and getting
+ * information on Expense.
+ */
+public class ExpenseOverview {
+ private ArrayList<Expense> expenses;
+
+ public ExpenseOverview(){
+ this.expenses = new ArrayList<>();
+ }
+
+ /**
+ * Class constructor that takes in an ArrayList of Expense´s as argument
+ * @param expenses An ArrayList of the Expense´s you want to overview
+ */
+ public ExpenseOverview(ArrayList<Expense> expenses){
+ this.expenses = expenses;
+ }
+}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Income.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
similarity index 98%
rename from src/main/java/no/ntnu/idatt1002/demo/data/Income.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
index 10e2f7ae..646b1d82 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Income.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Income.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
/**
* The Income class inherits from the Item class. The Item class additionally has a private field for an
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeCategory.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeCategory.java
similarity index 60%
rename from src/main/java/no/ntnu/idatt1002/demo/data/IncomeCategory.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeCategory.java
index 1ead5339..021d993c 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeCategory.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeCategory.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
public enum IncomeCategory {
SALARY,
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverview.java
new file mode 100644
index 00000000..1257d12d
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverview.java
@@ -0,0 +1,26 @@
+package no.ntnu.idatt1002.demo.data.Economics;
+
+import java.util.ArrayList;
+
+/**
+ * IncomeOverview is an abstract class for storing and getting
+ * information on income.
+ */
+public class IncomeOverview extends ItemOverview {
+ private ArrayList<Income> income;
+
+ /**
+ * An "empty" class constructor.
+ */
+ public IncomeOverview(){
+ this.income = new ArrayList<>();
+ }
+
+ /**
+ * Class constructor that takes in an ArrayList of Income as argument
+ * @param income An ArrayList of the Income you want to overview
+ */
+ public IncomeOverview(ArrayList<Income> income){
+ this.income = income;
+ }
+}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Item.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
similarity index 98%
rename from src/main/java/no/ntnu/idatt1002/demo/data/Item.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
index 562b2999..94570afd 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/Item.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/Item.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
/**
* The Item class represents a good or service purchased in real life. The item belongs to a category and
@@ -7,7 +7,7 @@ package no.ntnu.idatt1002.demo.data;
* @author HanneSofie
*
*/
-public class Item {
+public abstract class Item {
private String description = "";
private double amount;
private boolean recurring;
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/ItemOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java
similarity index 87%
rename from src/main/java/no/ntnu/idatt1002/demo/data/ItemOverview.java
rename to src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java
index f9bfbe1c..85cda928 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/data/ItemOverview.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java
@@ -1,11 +1,10 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
import java.util.ArrayList;
/**
- * ItemOverview is a class for storing and getting
- * information on items. It is meant for storing EITHER
- * Income or Expense
+ * ItemOverview is an abstract class for storing and getting
+ * information on items. Superclass for Income- and ExpenseOverview.
*/
public abstract class ItemOverview {
ArrayList<Item> items;
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseOverview.java
deleted file mode 100644
index d5144e70..00000000
--- a/src/main/java/no/ntnu/idatt1002/demo/data/ExpenseOverview.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.ntnu.idatt1002.demo.data;
-
-import java.util.ArrayList;
-public class ExpenseOverview {
- private ArrayList<Expense> expenses;
-
- public ExpenseOverview(){
- this.expenses = new ArrayList<>();
- }
-}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/IncomeOverview.java
deleted file mode 100644
index 38e6ea00..00000000
--- a/src/main/java/no/ntnu/idatt1002/demo/data/IncomeOverview.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package no.ntnu.idatt1002.demo.data;
-
-import java.util.ArrayList;
-
-public class IncomeOverview extends ItemOverview {
- private ArrayList<Income> income;
-
- public IncomeOverview(){
- this.income = new ArrayList<>();
- }
-}
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/ExpenseTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseTest.java
similarity index 82%
rename from src/test/java/no/ntnu/idatt1002/demo/data/ExpenseTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseTest.java
index e72597e9..338f63fb 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/ExpenseTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ExpenseTest.java
@@ -1,5 +1,7 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
+import no.ntnu.idatt1002.demo.data.Economics.Expense;
+import no.ntnu.idatt1002.demo.data.Economics.ExpenseCategory;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeOverviewTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverviewTest.java
similarity index 88%
rename from src/test/java/no/ntnu/idatt1002/demo/data/IncomeOverviewTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverviewTest.java
index 0cc69907..d6745c0d 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeOverviewTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeOverviewTest.java
@@ -1,5 +1,8 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
+import no.ntnu.idatt1002.demo.data.Economics.Income;
+import no.ntnu.idatt1002.demo.data.Economics.IncomeCategory;
+import no.ntnu.idatt1002.demo.data.Economics.IncomeOverview;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeTest.java
similarity index 82%
rename from src/test/java/no/ntnu/idatt1002/demo/data/IncomeTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeTest.java
index 6e711804..f832f99a 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/IncomeTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/IncomeTest.java
@@ -1,5 +1,7 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
+import no.ntnu.idatt1002.demo.data.Economics.Income;
+import no.ntnu.idatt1002.demo.data.Economics.IncomeCategory;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
diff --git a/src/test/java/no/ntnu/idatt1002/demo/data/ItemTest.java b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ItemTest.java
similarity index 89%
rename from src/test/java/no/ntnu/idatt1002/demo/data/ItemTest.java
rename to src/test/java/no/ntnu/idatt1002/demo/data/Economics/ItemTest.java
index 7ab5a18f..e7259780 100644
--- a/src/test/java/no/ntnu/idatt1002/demo/data/ItemTest.java
+++ b/src/test/java/no/ntnu/idatt1002/demo/data/Economics/ItemTest.java
@@ -1,5 +1,6 @@
-package no.ntnu.idatt1002.demo.data;
+package no.ntnu.idatt1002.demo.data.Economics;
+import no.ntnu.idatt1002.demo.data.Economics.Item;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
--
GitLab