diff --git a/Shop/src/main/java/backend/pack/Bestellung.java b/Shop/src/main/java/backend/Shop/backend/Bestellung.java similarity index 98% rename from Shop/src/main/java/backend/pack/Bestellung.java rename to Shop/src/main/java/backend/Shop/backend/Bestellung.java index ac21685..7b79901 100644 --- a/Shop/src/main/java/backend/pack/Bestellung.java +++ b/Shop/src/main/java/backend/Shop/backend/Bestellung.java @@ -1,4 +1,4 @@ -package pack; +package Shop.backend; import java.util.ArrayList; diff --git a/Shop/src/main/java/backend/pack/OnlineShop.java b/Shop/src/main/java/backend/Shop/backend/OnlineShop.java similarity index 86% rename from Shop/src/main/java/backend/pack/OnlineShop.java rename to Shop/src/main/java/backend/Shop/backend/OnlineShop.java index 64f8569..a91048f 100644 --- a/Shop/src/main/java/backend/pack/OnlineShop.java +++ b/Shop/src/main/java/backend/Shop/backend/OnlineShop.java @@ -1,4 +1,4 @@ -package pack; +package Shop.backend; import java.io.File; import java.io.FileNotFoundException; @@ -87,6 +87,22 @@ public class OnlineShop { return ProduktListe; } + public Produkt MöglicheSuche(String suche){ + Produkt vlt=null; + int count=0; + for(int i=0;i readFile() throws FileNotFoundException { diff --git a/Shop/src/main/java/backend/pack/Produkt.java b/Shop/src/main/java/backend/Shop/backend/Produkt.java similarity index 88% rename from Shop/src/main/java/backend/pack/Produkt.java rename to Shop/src/main/java/backend/Shop/backend/Produkt.java index c657cd4..9c394df 100644 --- a/Shop/src/main/java/backend/pack/Produkt.java +++ b/Shop/src/main/java/backend/Shop/backend/Produkt.java @@ -1,12 +1,12 @@ -package pack; +package Shop.backend; public class Produkt { - String name; - double preis; - double mwst; + public String name; + public double preis; + public double mwst; int ID; double Gewicht; - int Bestand; + public int Bestand; double bruttopreis; double mwstSatz; diff --git a/Shop/src/main/java/backend/pack/Warenkorb.java b/Shop/src/main/java/backend/Shop/backend/Warenkorb.java similarity index 99% rename from Shop/src/main/java/backend/pack/Warenkorb.java rename to Shop/src/main/java/backend/Shop/backend/Warenkorb.java index 91f43dc..5bc79ab 100644 --- a/Shop/src/main/java/backend/pack/Warenkorb.java +++ b/Shop/src/main/java/backend/Shop/backend/Warenkorb.java @@ -1,4 +1,4 @@ -package pack; +package Shop.backend; import java.io.FileNotFoundException; diff --git a/Shop/src/main/java/backend/pack/WarenkorbArtikel.java b/Shop/src/main/java/backend/Shop/backend/WarenkorbArtikel.java similarity index 98% rename from Shop/src/main/java/backend/pack/WarenkorbArtikel.java rename to Shop/src/main/java/backend/Shop/backend/WarenkorbArtikel.java index 998dc3c..9fb610a 100644 --- a/Shop/src/main/java/backend/pack/WarenkorbArtikel.java +++ b/Shop/src/main/java/backend/Shop/backend/WarenkorbArtikel.java @@ -1,4 +1,4 @@ -package pack; +package Shop.backend; public class WarenkorbArtikel { Produkt produkt; diff --git a/Shop/src/main/java/tui/pack/ShopTUI.java b/Shop/src/main/java/tui/Shop/TUI/ShopTUI.java similarity index 92% rename from Shop/src/main/java/tui/pack/ShopTUI.java rename to Shop/src/main/java/tui/Shop/TUI/ShopTUI.java index 1bd5622..4c2204a 100644 --- a/Shop/src/main/java/tui/pack/ShopTUI.java +++ b/Shop/src/main/java/tui/Shop/TUI/ShopTUI.java @@ -1,8 +1,14 @@ -package pack; +package Shop.TUI; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Scanner; +import Shop.backend.Warenkorb; +import Shop.backend.OnlineShop; +import Shop.backend.Bestellung; +import Shop.backend.Produkt; +import Shop.backend.WarenkorbArtikel; + @@ -86,25 +92,13 @@ public class ShopTUI { } public static void produktsuche() throws FileNotFoundException { IO.print("Ich suche: "); String suche = sc.nextLine(); - int count=0; - Produkt vlt=null; + // boolean[] aufLager= shop.aufLager(); ArrayList ProduktListe= shop.getProduktListe(); IO.println(); Produkt gefunden= shop.suchProdukt(suche); if(gefunden==null) { - for(int i=0;i4) { IO.println("Meinten Sie vielleicht "+ vlt.name + " " +vlt.preis+ "€ ?"); IO.println("Unser Bestand beträgt "+ vlt.Bestand);//TODO hinzufügen ermöglichen diff --git a/Shop/src/test/java/pack/OnlineShopTest.java b/Shop/src/test/java/Shop/backend/OnlineShopTest.java similarity index 60% rename from Shop/src/test/java/pack/OnlineShopTest.java rename to Shop/src/test/java/Shop/backend/OnlineShopTest.java index fa23a7d..ee37767 100644 --- a/Shop/src/test/java/pack/OnlineShopTest.java +++ b/Shop/src/test/java/Shop/backend/OnlineShopTest.java @@ -1,9 +1,7 @@ -package pack; +package Shop.backend; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; - class OnlineShopTest { @Test diff --git a/Shop/src/test/java/pack/ProduktTest.java b/Shop/src/test/java/Shop/backend/ProduktTest.java similarity index 96% rename from Shop/src/test/java/pack/ProduktTest.java rename to Shop/src/test/java/Shop/backend/ProduktTest.java index a186089..6f61719 100644 --- a/Shop/src/test/java/pack/ProduktTest.java +++ b/Shop/src/test/java/Shop/backend/ProduktTest.java @@ -1,9 +1,7 @@ -package pack; +package Shop.backend; import org.junit.jupiter.api.Test; -import java.io.FileNotFoundException; - import static org.junit.jupiter.api.Assertions.*; class ProduktTest { diff --git a/Shop/src/test/java/pack/WarenkorbArtikelTest.java b/Shop/src/test/java/Shop/backend/WarenkorbArtikelTest.java similarity index 98% rename from Shop/src/test/java/pack/WarenkorbArtikelTest.java rename to Shop/src/test/java/Shop/backend/WarenkorbArtikelTest.java index 2626ef1..8e2855c 100644 --- a/Shop/src/test/java/pack/WarenkorbArtikelTest.java +++ b/Shop/src/test/java/Shop/backend/WarenkorbArtikelTest.java @@ -1,4 +1,4 @@ -package pack; +package Shop.backend; import org.junit.jupiter.api.Test; diff --git a/Shop/src/test/java/pack/WarenkorbTest.java b/Shop/src/test/java/Shop/backend/WarenkorbTest.java similarity index 99% rename from Shop/src/test/java/pack/WarenkorbTest.java rename to Shop/src/test/java/Shop/backend/WarenkorbTest.java index ba25dd9..3cdda8f 100644 --- a/Shop/src/test/java/pack/WarenkorbTest.java +++ b/Shop/src/test/java/Shop/backend/WarenkorbTest.java @@ -1,4 +1,4 @@ -package pack; +package Shop.backend; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;