From 99fa8f06973789cdff76aa0a4415b5057250fff8 Mon Sep 17 00:00:00 2001 From: Andreas <andreksv@ntnu.no> Date: Mon, 13 Mar 2023 12:50:29 +0100 Subject: [PATCH] Made Item and ItemOverview abstract --- .../no/ntnu/idatt1002/demo/data/Economics/Item.java | 2 +- .../idatt1002/demo/data/Economics/ItemOverview.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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 94570afd..ba80deff 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 @@ -70,7 +70,7 @@ public abstract class Item { */ public void setAmount(double amount) { if(amount <= 1.0f ) { - throw new IllegalArgumentException("A positive amount must be provided."); + throw new IllegalArgumentException("A positive amount must be provided"); } this.amount = amount; } diff --git a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java index 85cda928..c16e9633 100644 --- a/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java +++ b/src/main/java/no/ntnu/idatt1002/demo/data/Economics/ItemOverview.java @@ -3,7 +3,7 @@ package no.ntnu.idatt1002.demo.data.Economics; import java.util.ArrayList; /** - * ItemOverview is an abstract class for storing and getting + * ItemOverview is an abstract class for storing and getting. * information on items. Superclass for Income- and ExpenseOverview. */ public abstract class ItemOverview { @@ -17,8 +17,8 @@ public abstract class ItemOverview { } /** - * Class constructor that takes in an ArrayList of Item´s as argument - * @param items An ArrayList of the Item´s you want to overview + * Class constructor that takes in an ArrayList of Item´s as argument. + * @param items An ArrayList of the Item´s you want to overview. */ public ItemOverview(ArrayList<Item> items){ this.items = items; @@ -44,8 +44,8 @@ public abstract class ItemOverview { } /** - * Get the sum of all Item´s in items - * @return Sum of all Item´s + * Get the sum of all Item´s in items. + * @return Sum of all Item´s. */ public double getTotalSum(){ return items.stream().map(Item::getAmount).mapToDouble(Double::doubleValue).sum(); -- GitLab