diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/Cart.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Cart.java similarity index 56% rename from Shop/src/de/th_mannheim/informatik/main/java/shop/Cart.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Cart.java index a38b86d..af36137 100644 --- a/Shop/src/de/th_mannheim/informatik/main/java/shop/Cart.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Cart.java @@ -1,4 +1,4 @@ -package shop; +package shop.backend; public class Cart { diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/CartPosition.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/CartPosition.java similarity index 63% rename from Shop/src/de/th_mannheim/informatik/main/java/shop/CartPosition.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/backend/CartPosition.java index 7a7e913..71bb09a 100644 --- a/Shop/src/de/th_mannheim/informatik/main/java/shop/CartPosition.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/CartPosition.java @@ -1,4 +1,4 @@ -package shop; +package shop.backend; /* @@ -15,5 +15,15 @@ public class CartPosition { this.product = product; this.quantity = quantity; } + public double getTotalPrice(){ + return product.getNetPrice() * quantity; + } + public Product getProduct(){ + return product; + } + public int getQuantity(){ + return quantity; + } + } diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/OnlineShop.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/OnlineShop.java similarity index 89% rename from Shop/src/de/th_mannheim/informatik/main/java/shop/OnlineShop.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/backend/OnlineShop.java index d997d51..c40017b 100644 --- a/Shop/src/de/th_mannheim/informatik/main/java/shop/OnlineShop.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/OnlineShop.java @@ -1,4 +1,4 @@ -package shop; +package shop.backend; /* Controller Klasse des Projektes. TODO @@ -25,8 +25,7 @@ public class OnlineShop { } - public String[] produktListe() { - String[] produkt = new String[lager.size()]; + public String[] produktListe() { String[] produkt = new String[lager.size()]; for (int i = 0; i < lager.size(); i++) produkt[i] = lager.get(i).toString(); @@ -36,6 +35,7 @@ public class OnlineShop { ArrayList lines = new ArrayList<>(); Scanner sc = new Scanner(new File(path)); + while (sc.hasNextLine()) { lines.add(sc.nextLine()); } diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/Order.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Order.java similarity index 70% rename from Shop/src/de/th_mannheim/informatik/main/java/shop/Order.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Order.java index 98a8966..d339896 100644 --- a/Shop/src/de/th_mannheim/informatik/main/java/shop/Order.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Order.java @@ -1,4 +1,4 @@ -package shop; +package shop.backend; /* TODO Kassenbon System */ diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/Product.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Product.java similarity index 98% rename from Shop/src/de/th_mannheim/informatik/main/java/shop/Product.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Product.java index 7519462..cdaf3bd 100644 --- a/Shop/src/de/th_mannheim/informatik/main/java/shop/Product.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/backend/Product.java @@ -1,4 +1,4 @@ -package shop; +package shop.backend; /* TODO diff --git a/Shop/src/de/th_mannheim/informatik/main/java/shop/ShopTUI.java b/Shop/src/de/th_mannheim/informatik/main/java/shop/frontend/ShopTUI.java similarity index 91% rename from Shop/src/de/th_mannheim/informatik/main/java/shop/ShopTUI.java rename to Shop/src/de/th_mannheim/informatik/main/java/shop/frontend/ShopTUI.java index 80cc538..c219dd0 100644 --- a/Shop/src/de/th_mannheim/informatik/main/java/shop/ShopTUI.java +++ b/Shop/src/de/th_mannheim/informatik/main/java/shop/frontend/ShopTUI.java @@ -1,4 +1,6 @@ -package shop; +package shop.frontend; + +import shop.backend.OnlineShop; import java.util.Scanner; diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/CartTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/CartTest.java deleted file mode 100644 index 350153d..0000000 --- a/Shop/src/de/th_mannheim/informatik/test/java/shop/CartTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package shop; - -class CartTest { - -} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/OrderTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/OrderTest.java deleted file mode 100644 index 33b051b..0000000 --- a/Shop/src/de/th_mannheim/informatik/test/java/shop/OrderTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package shop; - -class OrderTest { - -} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/ShopTUITest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/ShopTUITest.java deleted file mode 100644 index be19438..0000000 --- a/Shop/src/de/th_mannheim/informatik/test/java/shop/ShopTUITest.java +++ /dev/null @@ -1,5 +0,0 @@ -package shop; - -class ShopTUITest { - -} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/CartTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/CartTest.java new file mode 100644 index 0000000..e605ad5 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/CartTest.java @@ -0,0 +1,5 @@ +package shop.backend; + +class CartTest { + +} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/OnlineShopTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/OnlineShopTest.java similarity index 52% rename from Shop/src/de/th_mannheim/informatik/test/java/shop/OnlineShopTest.java rename to Shop/src/de/th_mannheim/informatik/test/java/shop/backend/OnlineShopTest.java index a3080c5..4e9af5d 100644 --- a/Shop/src/de/th_mannheim/informatik/test/java/shop/OnlineShopTest.java +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/OnlineShopTest.java @@ -1,4 +1,4 @@ -package shop; +package shop.backend; class OnlineShopTest { diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/OrderTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/OrderTest.java new file mode 100644 index 0000000..579aa78 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/OrderTest.java @@ -0,0 +1,5 @@ +package shop.backend; + +class OrderTest { + +} \ No newline at end of file diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/ProductsTest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/ProductsTest.java similarity index 91% rename from Shop/src/de/th_mannheim/informatik/test/java/shop/ProductsTest.java rename to Shop/src/de/th_mannheim/informatik/test/java/shop/backend/ProductsTest.java index 5a734a6..1a81ad3 100644 --- a/Shop/src/de/th_mannheim/informatik/test/java/shop/ProductsTest.java +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/backend/ProductsTest.java @@ -1,4 +1,4 @@ -package shop; +package shop.backend; import org.junit.jupiter.api.Test; diff --git a/Shop/src/de/th_mannheim/informatik/test/java/shop/frontend/ShopTUITest.java b/Shop/src/de/th_mannheim/informatik/test/java/shop/frontend/ShopTUITest.java new file mode 100644 index 0000000..1579763 --- /dev/null +++ b/Shop/src/de/th_mannheim/informatik/test/java/shop/frontend/ShopTUITest.java @@ -0,0 +1,5 @@ +package shop.frontend; + +class ShopTUITest { + +} \ No newline at end of file