From 6f92f8dd1d4b7f04a90949f832b59a2145937cbc Mon Sep 17 00:00:00 2001
From: Andreas <andreksv@ntnu.no>
Date: Sat, 4 Mar 2023 19:19:47 +0100
Subject: [PATCH] Made superclass revenue, and expense and income. Scraped
 previous income idea

---
 .../{Income.java => TotalIncomeIdea.java}     |  4 +-
 .../java/no/ntnu/idatt1002/demo/expense.java  | 14 ++++++
 .../java/no/ntnu/idatt1002/demo/income.java   | 14 ++++++
 .../java/no/ntnu/idatt1002/demo/revenue.java  | 49 +++++++++++++++++++
 4 files changed, 79 insertions(+), 2 deletions(-)
 rename src/main/java/no/ntnu/idatt1002/demo/{Income.java => TotalIncomeIdea.java} (94%)
 create mode 100644 src/main/java/no/ntnu/idatt1002/demo/expense.java
 create mode 100644 src/main/java/no/ntnu/idatt1002/demo/income.java
 create mode 100644 src/main/java/no/ntnu/idatt1002/demo/revenue.java

diff --git a/src/main/java/no/ntnu/idatt1002/demo/Income.java b/src/main/java/no/ntnu/idatt1002/demo/TotalIncomeIdea.java
similarity index 94%
rename from src/main/java/no/ntnu/idatt1002/demo/Income.java
rename to src/main/java/no/ntnu/idatt1002/demo/TotalIncomeIdea.java
index 71f3a3a1..bb87775c 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/Income.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/TotalIncomeIdea.java
@@ -5,7 +5,7 @@ package no.ntnu.idatt1002.demo;
  * and editing it.
  * @author Andreas
  */
-public class Income {
+public class TotalIncomeIdea {
     private double totalIncome;
     private final double fixedIncome;
 
@@ -13,7 +13,7 @@ public class Income {
      * Class constructor
      * @param fixedIncome   An income which you will always receive, for example a loan.
      */
-    protected Income(double fixedIncome){
+    protected TotalIncomeIdea(double fixedIncome){
         if(fixedIncome<0){
             throw new IllegalArgumentException("You can not have a negativ income");
         }
diff --git a/src/main/java/no/ntnu/idatt1002/demo/expense.java b/src/main/java/no/ntnu/idatt1002/demo/expense.java
new file mode 100644
index 00000000..d91f1d6a
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/expense.java
@@ -0,0 +1,14 @@
+package no.ntnu.idatt1002.demo;
+
+public class expense extends revenue{
+    /**
+     * The class constructor.
+     *
+     * @param category    A general explanation for the change in revenue.
+     * @param description A more specific explanation of the change in revenue.
+     * @param amount      The amount the revenue is changed.
+     */
+    protected expense(String category, String description, double amount) {
+        super(category, description, amount);
+    }
+}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/income.java b/src/main/java/no/ntnu/idatt1002/demo/income.java
new file mode 100644
index 00000000..d9a2e9f6
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/income.java
@@ -0,0 +1,14 @@
+package no.ntnu.idatt1002.demo;
+
+public class income extends revenue{
+    /**
+     * The class constructor.
+     *
+     * @param category    A general explanation for the change in revenue.
+     * @param description A more specific explanation of the change in revenue.
+     * @param amount      The amount the revenue is changed.
+     */
+    protected income(String category, String description, double amount) {
+        super(category, description, amount);
+    }
+}
diff --git a/src/main/java/no/ntnu/idatt1002/demo/revenue.java b/src/main/java/no/ntnu/idatt1002/demo/revenue.java
new file mode 100644
index 00000000..40870cdb
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/revenue.java
@@ -0,0 +1,49 @@
+package no.ntnu.idatt1002.demo;
+
+/**
+ * Revenue is a Superclass for both income
+ * and expense. It is for registering a change in
+ * revenue.
+ * @author Andreas
+ */
+public class revenue {
+    private String category;
+    private String description;
+    private double amount;
+
+    /**
+     * The class constructor.
+     * @param category   A general explanation for the change in revenue.
+     * @param description   A more specific explanation of the change in revenue.
+     * @param amount   The amount the revenue is changed.
+     */
+    protected revenue(String category, String description, double amount){
+        this.category = category;
+        this.description = description;
+        this.amount = amount;
+    }
+
+    /**
+     * Return the category of the revenue change.
+     * @return   The revenue change category.
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * Return the description of the revenue change.
+     * @return   The revenue change description.
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Return the amount of the revenue change.
+     * @return   The revenue change amount.
+     */
+    public double getAmount() {
+        return amount;
+    }
+}
-- 
GitLab