Skip to content
Snippets Groups Projects
Commit 047bb591 authored by Andreas's avatar Andreas
Browse files

Moved Income, Expense, Item, overview and test classes into a package

parent bd0ba3e9
No related branches found
No related tags found
1 merge request!5Created register for storing information on Income and Expense
Pipeline #204638 failed
Showing
with 70 additions and 14 deletions
package no.ntnu.idatt1002.demo.data;
package no.ntnu.idatt1002.demo.data.Economics;
public class Expense extends Item{
private ExpenseCategory category;
......
package no.ntnu.idatt1002.demo.data;
package no.ntnu.idatt1002.demo.data.Economics;
public enum ExpenseCategory {
......
package no.ntnu.idatt1002.demo.data;
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;
}
}
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
......
package no.ntnu.idatt1002.demo.data;
package no.ntnu.idatt1002.demo.data.Economics;
public enum IncomeCategory {
SALARY,
......
package no.ntnu.idatt1002.demo.data;
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;
}
}
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment