From e51bfa33501da0cbceb66d535caf870ae213f653 Mon Sep 17 00:00:00 2001 From: Ireozar Zareoto Date: Mon, 14 Oct 2024 18:33:34 +0200 Subject: [PATCH 01/21] added tech_store --- Technikladen/.classpath | 10 +++ Technikladen/.project | 17 +++++ Technikladen/Client.java | 39 +++++++++++ Technikladen/Order.java | 44 ++++++++++++ Technikladen/OrderEntry.java | 16 +++++ Technikladen/OrderSystem.java | 57 ++++++++++++++++ Technikladen/Product.java | 36 ++++++++++ Technikladen/Receipt.java | 14 ++++ Technikladen/StorageManager.java | 27 ++++++++ Technikladen/TechStore.java | 113 +++++++++++++++++++++++++++++++ 10 files changed, 373 insertions(+) create mode 100644 Technikladen/.classpath create mode 100644 Technikladen/.project create mode 100755 Technikladen/Client.java create mode 100755 Technikladen/Order.java create mode 100755 Technikladen/OrderEntry.java create mode 100755 Technikladen/OrderSystem.java create mode 100755 Technikladen/Product.java create mode 100755 Technikladen/Receipt.java create mode 100755 Technikladen/StorageManager.java create mode 100755 Technikladen/TechStore.java diff --git a/Technikladen/.classpath b/Technikladen/.classpath new file mode 100644 index 0000000..adeb0a3 --- /dev/null +++ b/Technikladen/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Technikladen/.project b/Technikladen/.project new file mode 100644 index 0000000..d12a5e0 --- /dev/null +++ b/Technikladen/.project @@ -0,0 +1,17 @@ + + + Technikladen + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/Technikladen/Client.java b/Technikladen/Client.java new file mode 100755 index 0000000..c7f9528 --- /dev/null +++ b/Technikladen/Client.java @@ -0,0 +1,39 @@ +package tech_store; + +import java.util.ArrayList; + +public class Client { + private static int clientCounter; + private int clientID; + private String clientName; + private String clientEmail; + private ArrayList clientOrders; + public Client(String clientName, String clientEmail) { + clientCounter++; + this.clientID = clientCounter; + this.clientName = clientName; + this.clientEmail = clientEmail; + this.clientOrders = new ArrayList(); + } + public int getID() { + return this.clientID; + } + public String getName() { + return this.clientName; + } + public String getEmail() { + return this.clientEmail; + } + public ArrayList getOrders() { + return this.clientOrders; + } + public void addOrder(Order order) { + this.clientOrders.add(order); + } + public boolean hasOrder() { + return !this.clientOrders.isEmpty(); + } + public String toString() { + return ("ID: " + this.clientID + ", Name: " + this.clientName + ", Email: " + this.clientEmail); + } +} diff --git a/Technikladen/Order.java b/Technikladen/Order.java new file mode 100755 index 0000000..cc6c232 --- /dev/null +++ b/Technikladen/Order.java @@ -0,0 +1,44 @@ +package tech_store; + +import java.util.ArrayList; + +public class Order { + private int orderClientID; + private ArrayList orderEntries; + private String orderDate; + public Order(int clientID, String date) { + this.orderClientID = clientID; + this.orderEntries = new ArrayList(); + this.orderDate = date; + } + public int getClientID() { + return this.orderClientID; + } + public String getDate() { + return this.orderDate; + } + public ArrayList getEntries() { + return this.orderEntries; + } + public void addEntry(OrderEntry entry) { + this.orderEntries.add(entry); + } + public int calcPrice() { + int price = 0; + for (OrderEntry entry : this.orderEntries) { + price += entry.calcPrice(); + } + return price; + } + public String createReceipt() { + String output = "\n"; + for (OrderEntry entry : this.orderEntries) { + output += entry.toString() + ", Price: " + entry.calcPrice() + "\n"; + } + output += "=====" + this.calcPrice() + "====="; + return output; + } + public String toString() { + return ("Client: " + this.orderClientID + ", Date: " + this.orderDate); + } +} diff --git a/Technikladen/OrderEntry.java b/Technikladen/OrderEntry.java new file mode 100755 index 0000000..c607a20 --- /dev/null +++ b/Technikladen/OrderEntry.java @@ -0,0 +1,16 @@ +package tech_store; + +public class OrderEntry { + private Product orderProduct; + private int entryAmount; + public OrderEntry(Product product, int amt) { + this.orderProduct = product; + this.entryAmount = amt; + } + public int calcPrice() { + return this.entryAmount * this.orderProduct.getPrice(); + } + public String toString() { + return ("Product: " + this.orderProduct.getName() + ", Amount: " + this.entryAmount); + } +} diff --git a/Technikladen/OrderSystem.java b/Technikladen/OrderSystem.java new file mode 100755 index 0000000..ca37ec1 --- /dev/null +++ b/Technikladen/OrderSystem.java @@ -0,0 +1,57 @@ +package tech_store; + +import java.util.ArrayList; + +public class OrderSystem { + private StorageManager systemManager; + private ArrayList systemClients; + public OrderSystem(StorageManager manager, ArrayList clients) { + this.systemManager = manager; + this.systemClients = clients; + } + public void addProduct(Product product) { + this.systemManager.addProduct(product); + } + public void addClient(Client client) { + this.systemClients.add(client); + } + public Client getClientByID(int id) { + for (Client client : this.systemClients) { + if (client.getID() == id) { + return client; + } + } + return new Client("", ""); + } + public void createOrder(int id, Order order) { + this.getClientByID(id).addOrder(order); + } + public ArrayList getClients() { + return this.systemClients; + } + public Product getProductByID(int id) { + for (Product product : this.systemManager.getStorage()) { + if (product.getID() == id) { + return product; + } + } + return new Product(-1, "", 0, 0); + } + public StorageManager getManager() { + return this.systemManager; + } + public void showClients() { + for (Client client : this.systemClients) { + System.out.println(client.toString()); + } + } + public void showProducts() { + if (this.systemManager.getStorage().isEmpty()) { + System.out.println("No products exist"); + return; + } + for (Product product : this.systemManager.getStorage()) { + System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount()); + } + } +} \ No newline at end of file diff --git a/Technikladen/Product.java b/Technikladen/Product.java new file mode 100755 index 0000000..56adbda --- /dev/null +++ b/Technikladen/Product.java @@ -0,0 +1,36 @@ +package tech_store; + +public class Product { + private int productID; + private String productName; + private int productPrice; + private int productAmount; + public Product(int id, String name, int price, int amt) { + this.productID = id; + this.productName = name; + this.productPrice = price; + this.productAmount = amt; + } + public int getID() { + return this.productID; + } + public String getName() { + return this.productName; + } + public int getPrice() { + return this.productPrice; + } + public int getAmount() { + return this.productAmount; + } + public void reduceAmount(int amt) { + if (this.productAmount < amt) { + System.out.println("Not enough of product " + this.productID + "(" + this.productName + ") available!"); + return; + } + this.productAmount -= amt; + } + public void increaseAmount(int amt) { + this.productAmount += amt; + } +} diff --git a/Technikladen/Receipt.java b/Technikladen/Receipt.java new file mode 100755 index 0000000..c6168d8 --- /dev/null +++ b/Technikladen/Receipt.java @@ -0,0 +1,14 @@ +package tech_store; + +public class Receipt { + private Order receiptOrder; + private Client receiptClient; + public Receipt(Order order, Client client) { + this.receiptOrder = order; + this.receiptClient = client; + } + public void printReceipt() { + System.out.println("Client:\n" + this.receiptClient.toString()); + System.out.println(this.receiptOrder.createReceipt()); + } +} diff --git a/Technikladen/StorageManager.java b/Technikladen/StorageManager.java new file mode 100755 index 0000000..ea4a4e5 --- /dev/null +++ b/Technikladen/StorageManager.java @@ -0,0 +1,27 @@ +package tech_store; + +import java.util.ArrayList; + +public class StorageManager { + private ArrayList storageProducts; + public StorageManager(ArrayList products) { + this.storageProducts = products; + } + public void addProduct(Product product) { + this.storageProducts.add(product); + } + public ArrayList getStorage() { + return this.storageProducts; + } + public void increaseStorage(int id, int amt) { + this.getProductByID(id).increaseAmount(amt); + } + public Product getProductByID(int id) { + for (Product product : this.storageProducts) { + if (product.getID() == id) { + return product; + } + } + return new Product(-1, "", 0, 0); + } +} diff --git a/Technikladen/TechStore.java b/Technikladen/TechStore.java new file mode 100755 index 0000000..f8229d0 --- /dev/null +++ b/Technikladen/TechStore.java @@ -0,0 +1,113 @@ +package tech_store; + +import java.util.ArrayList; +import java.util.Scanner; + +public class TechStore { + public static void p(String input) { + System.out.print(input); + } + public static void main(String[] args) { + StorageManager manager = new StorageManager(new ArrayList()); + OrderSystem system = new OrderSystem(manager, new ArrayList()); + Scanner scnr = new Scanner(System.in); + while (true) { + p("\nInput mode: "); + String input = scnr.nextLine(); + if (input.equals("8")) { + break; + } + switch (Integer.parseInt(input)) { + case 1: { + p("Name: "); + String name = scnr.nextLine(); + p("E-Mail: "); + String email = scnr.nextLine(); + system.addClient(new Client(name, email)); + break; + } + case 2: { + ArrayList clients = system.getClients(); + if (clients.isEmpty()) { + System.out.println("No clients found"); + break; + } + for (Client client : clients) { + System.out.println(client.toString()); + } + break; + } + case 3: { + p("ID: "); + int id = Integer.parseInt(scnr.nextLine()); + p("Name: "); + String name = scnr.nextLine(); + p("Price: "); + int price = Integer.parseInt(scnr.nextLine()); + p("Amount: "); + int amt = Integer.parseInt(scnr.nextLine()); + system.addProduct(new Product(id, name, price, amt)); + break; + } + case 4: { + system.showProducts(); + break; + } + case 5: { + system.showProducts(); + p("ID: "); + int id = Integer.parseInt(scnr.nextLine()); + p("Amount: "); + int amt = Integer.parseInt(scnr.nextLine()); + manager.increaseStorage(id, amt); + break; + } + case 6: { + system.showClients(); + p("ID: "); + int clientID = Integer.parseInt(scnr.nextLine()); + p("Date: "); + String date = scnr.nextLine(); + Order order = new Order(clientID, date); + system.showProducts(); + while (true) { + p("ID: "); + String id_str = scnr.nextLine(); + if (id_str.equals("exit")) { + break; + } + int id = Integer.parseInt(id_str); + p("Amount: "); + int amt = Integer.parseInt(scnr.nextLine()); + if (manager.getProductByID(id).getAmount() < amt) { + System.out.println("Amount chosen too high"); + continue; + } + order.addEntry(new OrderEntry(system.getProductByID(id), amt)); + } + system.createOrder(clientID, order); + break; + } + case 7: { + system.showClients(); + p("ID: "); + int id = Integer.parseInt(scnr.nextLine()); + int n = 0; + for (Order order : system.getClientByID(id).getOrders()) { + System.out.println((n++) + order.toString()); + } + p("ID: "); + int order_id = Integer.parseInt(scnr.nextLine()); + System.out.println(system.getClientByID(id).getOrders().get(order_id).createReceipt()); + break; + } + case 8: { + return; + } + } + } + } +} + + + From 6dc6d1aa5765da36a365b5216cd6fb46ae6763a7 Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:04:12 +0200 Subject: [PATCH 02/21] Delete Technikladen/.project --- Technikladen/.project | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Technikladen/.project diff --git a/Technikladen/.project b/Technikladen/.project deleted file mode 100644 index d12a5e0..0000000 --- a/Technikladen/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - Technikladen - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - From ef25b53add502f0a06c33720bff519e0b1d2fa3d Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:04:27 +0200 Subject: [PATCH 03/21] Delete Technikladen/.classpath --- Technikladen/.classpath | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Technikladen/.classpath diff --git a/Technikladen/.classpath b/Technikladen/.classpath deleted file mode 100644 index adeb0a3..0000000 --- a/Technikladen/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - From c2f1ec6efdd4280726b7fa0f9c6e23ab11aed7fb Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:05:24 +0200 Subject: [PATCH 04/21] Update Technikladen/Client.java Removed package line --- Technikladen/Client.java | 76 +++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/Technikladen/Client.java b/Technikladen/Client.java index c7f9528..3b32333 100755 --- a/Technikladen/Client.java +++ b/Technikladen/Client.java @@ -1,39 +1,37 @@ -package tech_store; - -import java.util.ArrayList; - -public class Client { - private static int clientCounter; - private int clientID; - private String clientName; - private String clientEmail; - private ArrayList clientOrders; - public Client(String clientName, String clientEmail) { - clientCounter++; - this.clientID = clientCounter; - this.clientName = clientName; - this.clientEmail = clientEmail; - this.clientOrders = new ArrayList(); - } - public int getID() { - return this.clientID; - } - public String getName() { - return this.clientName; - } - public String getEmail() { - return this.clientEmail; - } - public ArrayList getOrders() { - return this.clientOrders; - } - public void addOrder(Order order) { - this.clientOrders.add(order); - } - public boolean hasOrder() { - return !this.clientOrders.isEmpty(); - } - public String toString() { - return ("ID: " + this.clientID + ", Name: " + this.clientName + ", Email: " + this.clientEmail); - } -} +import java.util.ArrayList; + +public class Client { + private static int clientCounter; + private int clientID; + private String clientName; + private String clientEmail; + private ArrayList clientOrders; + public Client(String clientName, String clientEmail) { + clientCounter++; + this.clientID = clientCounter; + this.clientName = clientName; + this.clientEmail = clientEmail; + this.clientOrders = new ArrayList(); + } + public int getID() { + return this.clientID; + } + public String getName() { + return this.clientName; + } + public String getEmail() { + return this.clientEmail; + } + public ArrayList getOrders() { + return this.clientOrders; + } + public void addOrder(Order order) { + this.clientOrders.add(order); + } + public boolean hasOrder() { + return !this.clientOrders.isEmpty(); + } + public String toString() { + return ("ID: " + this.clientID + ", Name: " + this.clientName + ", Email: " + this.clientEmail); + } +} From 192ae021dc9702c81ad23024e8b272e258d1b9f9 Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:06:05 +0200 Subject: [PATCH 05/21] Update Technikladen/Order.java Removed package line --- Technikladen/Order.java | 86 ++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/Technikladen/Order.java b/Technikladen/Order.java index cc6c232..dc08e7c 100755 --- a/Technikladen/Order.java +++ b/Technikladen/Order.java @@ -1,44 +1,42 @@ -package tech_store; - -import java.util.ArrayList; - -public class Order { - private int orderClientID; - private ArrayList orderEntries; - private String orderDate; - public Order(int clientID, String date) { - this.orderClientID = clientID; - this.orderEntries = new ArrayList(); - this.orderDate = date; - } - public int getClientID() { - return this.orderClientID; - } - public String getDate() { - return this.orderDate; - } - public ArrayList getEntries() { - return this.orderEntries; - } - public void addEntry(OrderEntry entry) { - this.orderEntries.add(entry); - } - public int calcPrice() { - int price = 0; - for (OrderEntry entry : this.orderEntries) { - price += entry.calcPrice(); - } - return price; - } - public String createReceipt() { - String output = "\n"; - for (OrderEntry entry : this.orderEntries) { - output += entry.toString() + ", Price: " + entry.calcPrice() + "\n"; - } - output += "=====" + this.calcPrice() + "====="; - return output; - } - public String toString() { - return ("Client: " + this.orderClientID + ", Date: " + this.orderDate); - } -} +import java.util.ArrayList; + +public class Order { + private int orderClientID; + private ArrayList orderEntries; + private String orderDate; + public Order(int clientID, String date) { + this.orderClientID = clientID; + this.orderEntries = new ArrayList(); + this.orderDate = date; + } + public int getClientID() { + return this.orderClientID; + } + public String getDate() { + return this.orderDate; + } + public ArrayList getEntries() { + return this.orderEntries; + } + public void addEntry(OrderEntry entry) { + this.orderEntries.add(entry); + } + public int calcPrice() { + int price = 0; + for (OrderEntry entry : this.orderEntries) { + price += entry.calcPrice(); + } + return price; + } + public String createReceipt() { + String output = "\n"; + for (OrderEntry entry : this.orderEntries) { + output += entry.toString() + ", Price: " + entry.calcPrice() + "\n"; + } + output += "=====" + this.calcPrice() + "====="; + return output; + } + public String toString() { + return ("Client: " + this.orderClientID + ", Date: " + this.orderDate); + } +} From ddc485ddebd50535d7a4a4d3d68e226e73268a1a Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:06:31 +0200 Subject: [PATCH 06/21] Update Technikladen/OrderEntry.java Removed package line --- Technikladen/OrderEntry.java | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/Technikladen/OrderEntry.java b/Technikladen/OrderEntry.java index c607a20..9d47921 100755 --- a/Technikladen/OrderEntry.java +++ b/Technikladen/OrderEntry.java @@ -1,16 +1,14 @@ -package tech_store; - -public class OrderEntry { - private Product orderProduct; - private int entryAmount; - public OrderEntry(Product product, int amt) { - this.orderProduct = product; - this.entryAmount = amt; - } - public int calcPrice() { - return this.entryAmount * this.orderProduct.getPrice(); - } - public String toString() { - return ("Product: " + this.orderProduct.getName() + ", Amount: " + this.entryAmount); - } -} +public class OrderEntry { + private Product orderProduct; + private int entryAmount; + public OrderEntry(Product product, int amt) { + this.orderProduct = product; + this.entryAmount = amt; + } + public int calcPrice() { + return this.entryAmount * this.orderProduct.getPrice(); + } + public String toString() { + return ("Product: " + this.orderProduct.getName() + ", Amount: " + this.entryAmount); + } +} From f66f633416be84925fd8efb0728a75f2c9b726c4 Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:06:53 +0200 Subject: [PATCH 07/21] Update Technikladen/OrderSystem.java Removed package line --- Technikladen/OrderSystem.java | 110 +++++++++++++++++----------------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/Technikladen/OrderSystem.java b/Technikladen/OrderSystem.java index ca37ec1..c111eac 100755 --- a/Technikladen/OrderSystem.java +++ b/Technikladen/OrderSystem.java @@ -1,57 +1,55 @@ -package tech_store; - -import java.util.ArrayList; - -public class OrderSystem { - private StorageManager systemManager; - private ArrayList systemClients; - public OrderSystem(StorageManager manager, ArrayList clients) { - this.systemManager = manager; - this.systemClients = clients; - } - public void addProduct(Product product) { - this.systemManager.addProduct(product); - } - public void addClient(Client client) { - this.systemClients.add(client); - } - public Client getClientByID(int id) { - for (Client client : this.systemClients) { - if (client.getID() == id) { - return client; - } - } - return new Client("", ""); - } - public void createOrder(int id, Order order) { - this.getClientByID(id).addOrder(order); - } - public ArrayList getClients() { - return this.systemClients; - } - public Product getProductByID(int id) { - for (Product product : this.systemManager.getStorage()) { - if (product.getID() == id) { - return product; - } - } - return new Product(-1, "", 0, 0); - } - public StorageManager getManager() { - return this.systemManager; - } - public void showClients() { - for (Client client : this.systemClients) { - System.out.println(client.toString()); - } - } - public void showProducts() { - if (this.systemManager.getStorage().isEmpty()) { - System.out.println("No products exist"); - return; - } - for (Product product : this.systemManager.getStorage()) { - System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount()); - } - } +import java.util.ArrayList; + +public class OrderSystem { + private StorageManager systemManager; + private ArrayList systemClients; + public OrderSystem(StorageManager manager, ArrayList clients) { + this.systemManager = manager; + this.systemClients = clients; + } + public void addProduct(Product product) { + this.systemManager.addProduct(product); + } + public void addClient(Client client) { + this.systemClients.add(client); + } + public Client getClientByID(int id) { + for (Client client : this.systemClients) { + if (client.getID() == id) { + return client; + } + } + return new Client("", ""); + } + public void createOrder(int id, Order order) { + this.getClientByID(id).addOrder(order); + } + public ArrayList getClients() { + return this.systemClients; + } + public Product getProductByID(int id) { + for (Product product : this.systemManager.getStorage()) { + if (product.getID() == id) { + return product; + } + } + return new Product(-1, "", 0, 0); + } + public StorageManager getManager() { + return this.systemManager; + } + public void showClients() { + for (Client client : this.systemClients) { + System.out.println(client.toString()); + } + } + public void showProducts() { + if (this.systemManager.getStorage().isEmpty()) { + System.out.println("No products exist"); + return; + } + for (Product product : this.systemManager.getStorage()) { + System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount()); + } + } } \ No newline at end of file From fdb1719171b8ea89e88dfedf161e28343b542a1a Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:07:17 +0200 Subject: [PATCH 08/21] Update Technikladen/Product.java Removed package line --- Technikladen/Product.java | 70 +++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/Technikladen/Product.java b/Technikladen/Product.java index 56adbda..3471cd3 100755 --- a/Technikladen/Product.java +++ b/Technikladen/Product.java @@ -1,36 +1,34 @@ -package tech_store; - -public class Product { - private int productID; - private String productName; - private int productPrice; - private int productAmount; - public Product(int id, String name, int price, int amt) { - this.productID = id; - this.productName = name; - this.productPrice = price; - this.productAmount = amt; - } - public int getID() { - return this.productID; - } - public String getName() { - return this.productName; - } - public int getPrice() { - return this.productPrice; - } - public int getAmount() { - return this.productAmount; - } - public void reduceAmount(int amt) { - if (this.productAmount < amt) { - System.out.println("Not enough of product " + this.productID + "(" + this.productName + ") available!"); - return; - } - this.productAmount -= amt; - } - public void increaseAmount(int amt) { - this.productAmount += amt; - } -} +public class Product { + private int productID; + private String productName; + private int productPrice; + private int productAmount; + public Product(int id, String name, int price, int amt) { + this.productID = id; + this.productName = name; + this.productPrice = price; + this.productAmount = amt; + } + public int getID() { + return this.productID; + } + public String getName() { + return this.productName; + } + public int getPrice() { + return this.productPrice; + } + public int getAmount() { + return this.productAmount; + } + public void reduceAmount(int amt) { + if (this.productAmount < amt) { + System.out.println("Not enough of product " + this.productID + "(" + this.productName + ") available!"); + return; + } + this.productAmount -= amt; + } + public void increaseAmount(int amt) { + this.productAmount += amt; + } +} From bb83044c782e1fb329d1ea0e62ab23e158ca13aa Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:07:46 +0200 Subject: [PATCH 09/21] Update Technikladen/Receipt.java Removed package line --- Technikladen/Receipt.java | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Technikladen/Receipt.java b/Technikladen/Receipt.java index c6168d8..95ddeb5 100755 --- a/Technikladen/Receipt.java +++ b/Technikladen/Receipt.java @@ -1,14 +1,12 @@ -package tech_store; - -public class Receipt { - private Order receiptOrder; - private Client receiptClient; - public Receipt(Order order, Client client) { - this.receiptOrder = order; - this.receiptClient = client; - } - public void printReceipt() { - System.out.println("Client:\n" + this.receiptClient.toString()); - System.out.println(this.receiptOrder.createReceipt()); - } -} +public class Receipt { + private Order receiptOrder; + private Client receiptClient; + public Receipt(Order order, Client client) { + this.receiptOrder = order; + this.receiptClient = client; + } + public void printReceipt() { + System.out.println("Client:\n" + this.receiptClient.toString()); + System.out.println(this.receiptOrder.createReceipt()); + } +} From a5fea776498c76bc47fba1db17a081419fc432e6 Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:08:10 +0200 Subject: [PATCH 10/21] Update Technikladen/StorageManager.java Removed package line --- Technikladen/StorageManager.java | 52 +++++++++++++++----------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/Technikladen/StorageManager.java b/Technikladen/StorageManager.java index ea4a4e5..9771cad 100755 --- a/Technikladen/StorageManager.java +++ b/Technikladen/StorageManager.java @@ -1,27 +1,25 @@ -package tech_store; - -import java.util.ArrayList; - -public class StorageManager { - private ArrayList storageProducts; - public StorageManager(ArrayList products) { - this.storageProducts = products; - } - public void addProduct(Product product) { - this.storageProducts.add(product); - } - public ArrayList getStorage() { - return this.storageProducts; - } - public void increaseStorage(int id, int amt) { - this.getProductByID(id).increaseAmount(amt); - } - public Product getProductByID(int id) { - for (Product product : this.storageProducts) { - if (product.getID() == id) { - return product; - } - } - return new Product(-1, "", 0, 0); - } -} +import java.util.ArrayList; + +public class StorageManager { + private ArrayList storageProducts; + public StorageManager(ArrayList products) { + this.storageProducts = products; + } + public void addProduct(Product product) { + this.storageProducts.add(product); + } + public ArrayList getStorage() { + return this.storageProducts; + } + public void increaseStorage(int id, int amt) { + this.getProductByID(id).increaseAmount(amt); + } + public Product getProductByID(int id) { + for (Product product : this.storageProducts) { + if (product.getID() == id) { + return product; + } + } + return new Product(-1, "", 0, 0); + } +} From ed9f84a466ea1c9b3393608d8db49fdec0f5233d Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Mon, 14 Oct 2024 19:08:48 +0200 Subject: [PATCH 11/21] Update Technikladen/TechStore.java Removed package line --- Technikladen/TechStore.java | 224 ++++++++++++++++++------------------ 1 file changed, 111 insertions(+), 113 deletions(-) diff --git a/Technikladen/TechStore.java b/Technikladen/TechStore.java index f8229d0..a11e42a 100755 --- a/Technikladen/TechStore.java +++ b/Technikladen/TechStore.java @@ -1,113 +1,111 @@ -package tech_store; - -import java.util.ArrayList; -import java.util.Scanner; - -public class TechStore { - public static void p(String input) { - System.out.print(input); - } - public static void main(String[] args) { - StorageManager manager = new StorageManager(new ArrayList()); - OrderSystem system = new OrderSystem(manager, new ArrayList()); - Scanner scnr = new Scanner(System.in); - while (true) { - p("\nInput mode: "); - String input = scnr.nextLine(); - if (input.equals("8")) { - break; - } - switch (Integer.parseInt(input)) { - case 1: { - p("Name: "); - String name = scnr.nextLine(); - p("E-Mail: "); - String email = scnr.nextLine(); - system.addClient(new Client(name, email)); - break; - } - case 2: { - ArrayList clients = system.getClients(); - if (clients.isEmpty()) { - System.out.println("No clients found"); - break; - } - for (Client client : clients) { - System.out.println(client.toString()); - } - break; - } - case 3: { - p("ID: "); - int id = Integer.parseInt(scnr.nextLine()); - p("Name: "); - String name = scnr.nextLine(); - p("Price: "); - int price = Integer.parseInt(scnr.nextLine()); - p("Amount: "); - int amt = Integer.parseInt(scnr.nextLine()); - system.addProduct(new Product(id, name, price, amt)); - break; - } - case 4: { - system.showProducts(); - break; - } - case 5: { - system.showProducts(); - p("ID: "); - int id = Integer.parseInt(scnr.nextLine()); - p("Amount: "); - int amt = Integer.parseInt(scnr.nextLine()); - manager.increaseStorage(id, amt); - break; - } - case 6: { - system.showClients(); - p("ID: "); - int clientID = Integer.parseInt(scnr.nextLine()); - p("Date: "); - String date = scnr.nextLine(); - Order order = new Order(clientID, date); - system.showProducts(); - while (true) { - p("ID: "); - String id_str = scnr.nextLine(); - if (id_str.equals("exit")) { - break; - } - int id = Integer.parseInt(id_str); - p("Amount: "); - int amt = Integer.parseInt(scnr.nextLine()); - if (manager.getProductByID(id).getAmount() < amt) { - System.out.println("Amount chosen too high"); - continue; - } - order.addEntry(new OrderEntry(system.getProductByID(id), amt)); - } - system.createOrder(clientID, order); - break; - } - case 7: { - system.showClients(); - p("ID: "); - int id = Integer.parseInt(scnr.nextLine()); - int n = 0; - for (Order order : system.getClientByID(id).getOrders()) { - System.out.println((n++) + order.toString()); - } - p("ID: "); - int order_id = Integer.parseInt(scnr.nextLine()); - System.out.println(system.getClientByID(id).getOrders().get(order_id).createReceipt()); - break; - } - case 8: { - return; - } - } - } - } -} - - - +import java.util.ArrayList; +import java.util.Scanner; + +public class TechStore { + public static void p(String input) { + System.out.print(input); + } + public static void main(String[] args) { + StorageManager manager = new StorageManager(new ArrayList()); + OrderSystem system = new OrderSystem(manager, new ArrayList()); + Scanner scnr = new Scanner(System.in); + while (true) { + p("\nInput mode: "); + String input = scnr.nextLine(); + if (input.equals("8")) { + break; + } + switch (Integer.parseInt(input)) { + case 1: { + p("Name: "); + String name = scnr.nextLine(); + p("E-Mail: "); + String email = scnr.nextLine(); + system.addClient(new Client(name, email)); + break; + } + case 2: { + ArrayList clients = system.getClients(); + if (clients.isEmpty()) { + System.out.println("No clients found"); + break; + } + for (Client client : clients) { + System.out.println(client.toString()); + } + break; + } + case 3: { + p("ID: "); + int id = Integer.parseInt(scnr.nextLine()); + p("Name: "); + String name = scnr.nextLine(); + p("Price: "); + int price = Integer.parseInt(scnr.nextLine()); + p("Amount: "); + int amt = Integer.parseInt(scnr.nextLine()); + system.addProduct(new Product(id, name, price, amt)); + break; + } + case 4: { + system.showProducts(); + break; + } + case 5: { + system.showProducts(); + p("ID: "); + int id = Integer.parseInt(scnr.nextLine()); + p("Amount: "); + int amt = Integer.parseInt(scnr.nextLine()); + manager.increaseStorage(id, amt); + break; + } + case 6: { + system.showClients(); + p("ID: "); + int clientID = Integer.parseInt(scnr.nextLine()); + p("Date: "); + String date = scnr.nextLine(); + Order order = new Order(clientID, date); + system.showProducts(); + while (true) { + p("ID: "); + String id_str = scnr.nextLine(); + if (id_str.equals("exit")) { + break; + } + int id = Integer.parseInt(id_str); + p("Amount: "); + int amt = Integer.parseInt(scnr.nextLine()); + if (manager.getProductByID(id).getAmount() < amt) { + System.out.println("Amount chosen too high"); + continue; + } + order.addEntry(new OrderEntry(system.getProductByID(id), amt)); + } + system.createOrder(clientID, order); + break; + } + case 7: { + system.showClients(); + p("ID: "); + int id = Integer.parseInt(scnr.nextLine()); + int n = 0; + for (Order order : system.getClientByID(id).getOrders()) { + System.out.println((n++) + order.toString()); + } + p("ID: "); + int order_id = Integer.parseInt(scnr.nextLine()); + System.out.println(system.getClientByID(id).getOrders().get(order_id).createReceipt()); + break; + } + case 8: { + return; + } + } + } + } +} + + + From 1e9ecee35581f80925cc7cb01ab774003500d8ce Mon Sep 17 00:00:00 2001 From: Ireozar Zareoto Date: Tue, 15 Oct 2024 06:17:06 +0200 Subject: [PATCH 12/21] cleanup signatures --- Technikladen/OrderSystem.java | 6 +++--- Technikladen/StorageManager.java | 4 ++-- Technikladen/TechStore.java | 8 ++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Technikladen/OrderSystem.java b/Technikladen/OrderSystem.java index c111eac..5f08c11 100755 --- a/Technikladen/OrderSystem.java +++ b/Technikladen/OrderSystem.java @@ -3,9 +3,9 @@ import java.util.ArrayList; public class OrderSystem { private StorageManager systemManager; private ArrayList systemClients; - public OrderSystem(StorageManager manager, ArrayList clients) { + public OrderSystem(StorageManager manager) { this.systemManager = manager; - this.systemClients = clients; + this.systemClients = new ArrayList(); } public void addProduct(Product product) { this.systemManager.addProduct(product); @@ -52,4 +52,4 @@ public class OrderSystem { System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount()); } } -} \ No newline at end of file +} diff --git a/Technikladen/StorageManager.java b/Technikladen/StorageManager.java index 9771cad..c22eb41 100755 --- a/Technikladen/StorageManager.java +++ b/Technikladen/StorageManager.java @@ -2,8 +2,8 @@ import java.util.ArrayList; public class StorageManager { private ArrayList storageProducts; - public StorageManager(ArrayList products) { - this.storageProducts = products; + public StorageManager() { + this.storageProducts = new ArrayList; } public void addProduct(Product product) { this.storageProducts.add(product); diff --git a/Technikladen/TechStore.java b/Technikladen/TechStore.java index a11e42a..2883f58 100755 --- a/Technikladen/TechStore.java +++ b/Technikladen/TechStore.java @@ -1,4 +1,3 @@ -import java.util.ArrayList; import java.util.Scanner; public class TechStore { @@ -6,8 +5,8 @@ public class TechStore { System.out.print(input); } public static void main(String[] args) { - StorageManager manager = new StorageManager(new ArrayList()); - OrderSystem system = new OrderSystem(manager, new ArrayList()); + StorageManager manager = new StorageManager(); + OrderSystem system = new OrderSystem(manager); Scanner scnr = new Scanner(System.in); while (true) { p("\nInput mode: "); @@ -106,6 +105,3 @@ public class TechStore { } } } - - - From 2694e7b7b056a9ace4c40bab3c6713556a8b4d90 Mon Sep 17 00:00:00 2001 From: Ireozar Zareoto Date: Tue, 15 Oct 2024 06:20:09 +0200 Subject: [PATCH 13/21] fix cleanup --- Technikladen/Client.class | Bin 0 -> 1680 bytes Technikladen/Order.class | Bin 0 -> 2071 bytes Technikladen/OrderEntry.class | Bin 0 -> 993 bytes Technikladen/OrderSystem.class | Bin 0 -> 2698 bytes Technikladen/Product.class | Bin 0 -> 1477 bytes Technikladen/StorageManager.class | Bin 0 -> 1124 bytes Technikladen/StorageManager.java | 2 +- Technikladen/TechStore.class | Bin 0 -> 3363 bytes Technikladen/TechStore.java | 1 + 9 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Technikladen/Client.class create mode 100644 Technikladen/Order.class create mode 100644 Technikladen/OrderEntry.class create mode 100644 Technikladen/OrderSystem.class create mode 100644 Technikladen/Product.class create mode 100644 Technikladen/StorageManager.class create mode 100644 Technikladen/TechStore.class diff --git a/Technikladen/Client.class b/Technikladen/Client.class new file mode 100644 index 0000000000000000000000000000000000000000..cddad01e5bebc31597cc593759940f2267050ce0 GIT binary patch literal 1680 zcmaJ>+fv(B6kW#`WE&X>I5nXybs9))L*usTHKycZAaQDv2WOH=`qG1~0R>s|NXMDs zPdfd9zVx9tl9_a-AJC8LbR9_qVcd>J=WK1QeOY_&bN>G4&0hdo*exK1w1JF?ET#nJ zUdWfS;YfGC@o4Xb)l&jf8@6k!O@VZ^_9TxS@&*bfreX45%dst&pkgl+THeT2mMN}9-}aVPUNA9_1%X1Od?*K&zaiXQ;H|`E}x*!=E@W+lm8@HYeX*-#?{HTRy7-LwPR~G)2(neuj`TFgx~c%6)0a0cP(|` z^@AL43oN#`ZdSy4Me_`WkPoHVDcmjapllh~);-=4SUDY4+kNRBT8$`d)b<_OQ=ZS! z_#xSc7#M}TFWtUl1uGrTI~)z0=R2OzoH2ZSG_)qbzf0gx<~5;;U9_a*bZup^{$|^C zEx+Z+Ag}@h?D6V3PLonK@GS@M|Dn7TB3`)6qnP5^$fBTc3rZ<{9fUh?fNublDtFIrURR0s@XRmST7)!qr zEO4FcG7PSHWSD}!vKF{5qR3z~?By&`4SXDj(Fq8mv-Lkv{Q0emsZe==>nHe>tIjA1 zo%>}BS|aGiL}+OoS|;=}e9pRzdtDlbF2%+9f+k<$t2mLXG}R?8Fz2PUS6F^}%3a^= zI@LU@!0QLAvCR$cn&+Ihd4&&uWJP~MCao!_!m34-E4WEb7O9!r+MxNCQk~t<4(4^C n_-aR`H@FInCw+y;jnM5k*yOJJdWY{V+~Ze)(tSKY2bcZ@u)T0H literal 0 HcmV?d00001 diff --git a/Technikladen/Order.class b/Technikladen/Order.class new file mode 100644 index 0000000000000000000000000000000000000000..f4dffd7420a205da3056904dae12c1045b1168d0 GIT binary patch literal 2071 zcmaJ?ZBrXn6n-uNHY^*!kb*#8pg>6iH1(xw8$b&b8x2q!1WSGCWwXMTbeGvI9r@t@ z&|lCme$W}ABhEPe+#lgbe}pqypS!!j0vVIZ-FwfTm*+g^+>=-T9{vGf4&Ul%LPA5c zfflq1bUl&JWT7UV&BF4=6U+1kTBmHs_GbhV+1zRyl4#SQ8)%0i(6a1REl(ijs^?tI zwj94SFCa=9It01{Z@a!-E8OusxmUL9zK#?U%FP=F(&!d20^7Te@7Y#e;6k~9QBfIO zFwlcufwsV4Uiy|mI@AsTSLngnEUEx~2Kq5T$g*0c%WO<5Oskk%S9+HWT*eiFr0rXt z^j)UXlg-5tlp=Yt9YeUPVc5V3Mj7`6doH_Cx zBe;wGW{ZkV{hY4;Hw zY1a9D10Ud)K<`tzZOyrkDg8Cu-{P+BOUEbcx8f8Y)a>&H3&vVD)y!${aufY495y}++S1W6Do@{MODy7zE@e4Ik!qL zon_mxmUf?RSl)`IoI%BjAsa`X zBe+z>m*)1O+=(!yOwVG+Kd?;8-tjfuKXq4+IzX?uyPjz+*eZ>%r>?6`rSh!n`gPxv zJByaT7s5qvSYhh{<~0s%zL_CC}y52&x9on9KjK$}t+| z#i5X7;{yqk&S-&oo@Qy0;Ilvf0wO=K4=w*YQV(CC zb01y#iG5^#;ah>bTzhB-aH`Ws8^0Oo=wmd21r#EGm-rOaYRUf!?WbeY)D zRiWdmnV-+7c2VgbN<@8Dwd<^Eca-8MH2DqIocIlc0zaacn`;6ukzX2^Jix@`spqf%8c+!~#klF?sh^1r zaGYPn7l!Ww%RdYd>tQ6%{PdTGZ-`7!xHnCBe1{O?~ibSSGM#*&(|_ll~Kb zgb$inP5R&u@JAW%vKv4lW->E(=ALus-n(ai{l57Lpo$j;Vu))UbGte9BE8iO{Xr`kfDdbTBo4-av-O>AJ3K;$~+J@Tv+ ziuG~E4dvNxyRuA`ZJD@>ZHDz8?~1B)Ev`P;sza8qxT}1Iox(J;HX|BCx-hDwRy=1& zRAr0a&eUyJ91nU;;hpiOLpQp`9V^N?rDT{6HK`#7o+S?L0FxPaY(L1HTK-l_Oi98|c^kQ>);yO**n%Hg|V(TChpGWa;3 zCd-Y0;d@8iZ8^fv)urqX`jzRfOx*lMJiF?P8Ssx2_)tTY$+kuzs@!oJwh|T6P0e+M zS9Q4W3tz)ihWu1bvr^S?z_9&)D9Jah3-?KcF;Yg125EO_ks@i2gOT{}(VC^xLGVM+ zo+9CReH0F68kuoeZ#QvgPYbm`l0YTvQc`8=X0 zhfbZ=huDlL#fY**6oRh@%p2SRzWhToDYYEk#gNA%+EWyuNOK2eIvHd=!81I^#vhE1 B>+S#m literal 0 HcmV?d00001 diff --git a/Technikladen/OrderSystem.class b/Technikladen/OrderSystem.class new file mode 100644 index 0000000000000000000000000000000000000000..3675e7c18cf8105c34ba0c4bd492dbf6c66678c1 GIT binary patch literal 2698 zcmaJ@TXPd-7=FHncGF~gAkac7w8gfNv?<{%5JYJJiKZzy-l=bg9UNISxegCZvZm*E`k<> z6l_w_iZ+4n>)H)1Ro0A!)Xe;Kz2FG6oh%t8=afJwo|tV%80`uoDxy#YqBB-exAM!j zqgMnvZ1*sw8QOwwF7*(+cdj(=^nCmVA%A#gZ z>$eDqd|r_e2^C`)7uaOD=B@SIK_m($I0=uA2$D#t*pCAOtqZ!7J>%xehH*#$@~=na zG>;1G4fd3Gtdg;i4s_{TBpYEIQ*j(8$UHN8btac(=4d>d$ax0xoy18M&wy$OlQnnx zq&c2*PcE-LcuvJ>Ow!Cu{zL?})w^mQJSD*zia(eL6`7Kc=Vb%u1-8etPvXsHr4C=f ziwbforZC+k+qxJ-W{n*Cx+$5d3+$e7EM2R(eOyrS5-ze2$Mkp*XlCALCxT0OS;4G| z%Xp=(-sXI4penPMjdd~#5Zr+)Dy~XZC?)%BrRpq)@tVNqX>+LRDbya)Z@I5R2Cu7l zLt<0N;IvlJB_;DJ3UcCM+Sp6MHR>wfl*V=%Pgl&E;l%h_FRCcvIytXsOM1pM3Yv4d zl~V`AJSA`kJ9vl-{Ep=G#0vKH|A^L!yFdN& z*Fz-dVh3XfS8@0*<67Kidf7j)8U1W)nB0u=f{mjW7Og5mj}cZdyz>#g1#CD0ydio- z#`;(AbaDmh^?3V;cL%*|m}IPEcNf3$wnD4KD*@@$~X%v?+CU?{YTbL-n2!~ie$JrqWq&5mPat$!-%t5Pj`9p2QiGkd-759LQpu#q68e4H1??h-AbfE==qu8DdXcGi{{&31`k6 z01=Ql@Bw@j;`PiBoY>+pz15p~Rj<1G*Y6)c0hIADjRg8EByIE~B{1^VdFK=xj<;ES zvhh~dv_R^n>$&>2KwmEZY!Cw&w2-zj1Y5vb_f@@ZP=l>#Re2yFDh77Q#xO<%hGNT_ z)06_EtN$3P+IPLpk^zs}7&8v-7`*PgHE9eJHYSZB6C3U|Rol~pID%;lGd5;%bYIlf zoj}VbgH>%tH4(A7sz`^PCZTkirBS9nXX7}s0#i+ATb7kqbM$jpZ*di9$J2qpa<0-H zYrgv^jT1O&VZp{CmITJa{Pr_asFvYxcnm4m?IQn7;7BjJO2wFxWmTti!>g_**V@eu z=|6Qg8a(OWl-dZ+%2dd~T_o~&u1A~#0|bP^vRqt7Qc`nYvWD{SHkk`aGga->wjVpK znCp=1)u>*uhf7yg+pozL*F<8kN98|jvS&f=E2RVNJFUl3Z>f4PfNKJaYf5LOr`nra zS@k9xS2QbfBA?}NZo_0XKb*piG)lN>;g%^9Z{EVcJL7uq)V3@}S0}35ic{0d-w}A< zDQygl_#Zi5y&;2zRi(Dutx|UdI!^Ze_;jZwd%$0H;G;e%bt)daC_9Zt)zz{@eJY+O z{c^(z0vTAiM=`o`>J_SmvcTN`p={A8FU+%H61?0=j_gma5~c^kne7$M>?Y0@czdwS zF~{8sas8ZU3g00Lv%9bgr+1Ml9NWd=!bEZx-g*kOnt$W37cQ$2gAcR%zrMtG{$-?Mj{krGL&tavd{1(;#)-U66SD$ zN%TP+rT>e2EXy&=P~_?LK3UB>3}h+fJYko(PT(@Ga2}wO>-?_b4tHs;?&3ZkVEPX# C!9-&K literal 0 HcmV?d00001 diff --git a/Technikladen/StorageManager.class b/Technikladen/StorageManager.class new file mode 100644 index 0000000000000000000000000000000000000000..0ca4e98dad6a5a22e39e81dbd2bfda3ea6161164 GIT binary patch literal 1124 zcmZuw+fEZv6kVqmrX2=aDffbM5uBDw@q)J^S}-O}3Yyel;O)>(>L5(bbZX>NeDlp$ zOteHvjL-gte_@QePMMZsNR!=j_UyIS+L!a=&)07N*0HW5fS`tufiSuR;(PLq%Ylxy$+@mPEZ8+qhlXGj-7qxt80bYzpttB% zU0JaIGXKuAzFL^bAfx-p3vMSjn1AR!4RhG+)Gfx9Mlx0&pI{5|+3}T36 z70dJUt{vtd3m9fTRq#E`ID%0PNdsdT7tnk^VYX9pEm^a22i3a6azlh|DFIguOkh$V zVtbY=DO_OCOm*nZ`~GY{i-sTFp|=dbP~RSiyFz&HBNv*#;>No#Omy3kXJ+K{hXii*{`Te6&?j--0 zc?;k+yT+EHi}nsZO9=7=#M8$R=@V$%$B2H0{;`R@OWVr`5D_9K#`O@mhx storageProducts; public StorageManager() { - this.storageProducts = new ArrayList; + this.storageProducts = new ArrayList(); } public void addProduct(Product product) { this.storageProducts.add(product); diff --git a/Technikladen/TechStore.class b/Technikladen/TechStore.class new file mode 100644 index 0000000000000000000000000000000000000000..12c02f03703af992bea2d0b58f4929cf4f025168 GIT binary patch literal 3363 zcmaJ@Yj7J^75=U)YuD?Ioyw78;Ura)w3hscX%f;zY9WrDV5NQ}v2kjLrd>-LX>Dm& z(XP^%M_P)Yw6stteWXC31tMA=C4ow5OiBtAO5qPPFw8KW=`V(%KbX!i%#@HOoVzR8 zlI>wMS9^EwIp?19o$s7`-@JD5RRI0?g9I1q1h{3?!^5z8MmeGMrW8HVJ32k1#w-TU z?V7GxA7-cvh9(*yqCtQpqY-kA_}H9jscDija-`%NvJGiQ?}4nQTVqyMRnid&O=uRd zTE-3VGPJB9!%&~$8e}5q*sz@;1Dc+QgeC;6VQ3n&jI5GShZUXvvl3c(3~L!0N3(G? z>$oDJ6@DJp2WY3@P_2q>X&u82whK8+OZAS$6kS)dJi-k!ZbX2=rRmk7MD|K6nM(k5vKt9aN!W>9 z0>UyPxV-|1jd@hJR6>_r$tYPVmE2*?HN|IR5&1D53Tg4 zG*!1G^kINQwwIw}h2$=eF*L!G_)!^yh!R#xJnmScL_zz_&C9!S!!0H>@u|0_!2FDk2K;a?h$aW428SmU8G}0 zge)f&bA-siWn(hpAWFD7JC-t|oKuc-LPpYNk!3hp5-~$s(E*;I6xpP*jM>>DhKqe^ zipJvE%GgUrJQt&M8OZW<5t41e=<@7DqYm~t87FWbVNdxvkhOIgPd}aY{8>49>bTYsStI_e(jly4)747p@kqg8js8P z3cgB2BuNJ{n;b;{uhCx4mq09On5rJI3?q=#5=jA15i+)Cdvz;2$I1GrgeP&D`}i!i zhee=lJoEU5jBnx$rG@acbqJf_(4vVlpx>799G)jkIBJ$^uk*r)I-+H%@5=Zd&eApu zh2aE8a-m8Ial(9G#tXcFcx<*Q%1s^#FP#!Ul<_0{n93=w%&Pr{9#gEtnw6xPX(_rz z^ypX-=jDvyweb@f=Ww2Yqm6h!AvbK&SDiUjpn3dE#>p6l;Vs-7 zs`WjFVVPD|$qcJj(ukWPenAHUW6d7CCgGR(m4IJ!U|wg~ycmF{pD)sOa&OYHl7fjM-c!vfTfwFExtea~X97@oEGrjefa_ekGL}qYf1z zsz>?J*Pl{MQ#A#=!Ep1km{xLCz?%#k{=X;{sS_7&qO;FMgaYb7OaxM{?@`2ud~DWWUv_Pf2kMcjHCo`P$a-+ckMy-0T9 z+CqQ!&h+f1ahS##8vmg2E-kgwAa7hf-a9I`>b)PSOg-K6=$rJ{`#mM}7qPFv{@Pu{ z{&2m&zKD_2Xrg$$<3&sq*lYaLWZ2{Pyn?$KPGdcvO*33ZUsxbHzfi<6E_(g#0(-)% zmG>Y|choO#?(xo6EePIp)tgA(7?VEo#wYm15{?&P71$tobh5zu_+yFHYGqHCuiob= z;*$l|N}~5K5q)qW8E?+|tUo7IwKIwS} zo+s>>FZqReJUQ9Tm!I}YB|KBa*9+Irc2hV6%(n`7V7XUyJ3O>r#CM7)aBvC3GPoUl zW`mm#b5i*{c@Oi8MZ9twy|5V zorQ24>%mU)X%~wi%yuKfqIBguh&$LgUE1zKAG@2bYsb*fW--8y(>?7J_OS;s$R48m z*JIevp2nT*Svn@3!w5TzQT7rJuuC||UdJK!2FBT2bWM626YTFe%-+Ei`zMaDf6-0o zDlz#wj=DDC9@kFX>xw{e?Z&h#ikK^gxa$}at^{UWGnmCiLTn1YYgi|sML?^7_N!Pc zVC%Myt7sE2dKDf4N3USh6}bM3{hm%9F|7;8JA&`iJ9`hU??JkTjf~bvy5~RWyu$NR ehj}|cKgT6{id58>X}n6 Date: Tue, 15 Oct 2024 06:24:03 +0200 Subject: [PATCH 14/21] fixed stupidness --- Technikladen/Client.class | Bin 1680 -> 0 bytes Technikladen/Order.class | Bin 2071 -> 0 bytes Technikladen/OrderEntry.class | Bin 993 -> 0 bytes Technikladen/OrderSystem.class | Bin 2698 -> 0 bytes Technikladen/Product.class | Bin 1477 -> 0 bytes Technikladen/StorageManager.class | Bin 1124 -> 0 bytes Technikladen/TechStore.class | Bin 3363 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Technikladen/Client.class delete mode 100644 Technikladen/Order.class delete mode 100644 Technikladen/OrderEntry.class delete mode 100644 Technikladen/OrderSystem.class delete mode 100644 Technikladen/Product.class delete mode 100644 Technikladen/StorageManager.class delete mode 100644 Technikladen/TechStore.class diff --git a/Technikladen/Client.class b/Technikladen/Client.class deleted file mode 100644 index cddad01e5bebc31597cc593759940f2267050ce0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmaJ>+fv(B6kW#`WE&X>I5nXybs9))L*usTHKycZAaQDv2WOH=`qG1~0R>s|NXMDs zPdfd9zVx9tl9_a-AJC8LbR9_qVcd>J=WK1QeOY_&bN>G4&0hdo*exK1w1JF?ET#nJ zUdWfS;YfGC@o4Xb)l&jf8@6k!O@VZ^_9TxS@&*bfreX45%dst&pkgl+THeT2mMN}9-}aVPUNA9_1%X1Od?*K&zaiXQ;H|`E}x*!=E@W+lm8@HYeX*-#?{HTRy7-LwPR~G)2(neuj`TFgx~c%6)0a0cP(|` z^@AL43oN#`ZdSy4Me_`WkPoHVDcmjapllh~);-=4SUDY4+kNRBT8$`d)b<_OQ=ZS! z_#xSc7#M}TFWtUl1uGrTI~)z0=R2OzoH2ZSG_)qbzf0gx<~5;;U9_a*bZup^{$|^C zEx+Z+Ag}@h?D6V3PLonK@GS@M|Dn7TB3`)6qnP5^$fBTc3rZ<{9fUh?fNublDtFIrURR0s@XRmST7)!qr zEO4FcG7PSHWSD}!vKF{5qR3z~?By&`4SXDj(Fq8mv-Lkv{Q0emsZe==>nHe>tIjA1 zo%>}BS|aGiL}+OoS|;=}e9pRzdtDlbF2%+9f+k<$t2mLXG}R?8Fz2PUS6F^}%3a^= zI@LU@!0QLAvCR$cn&+Ihd4&&uWJP~MCao!_!m34-E4WEb7O9!r+MxNCQk~t<4(4^C n_-aR`H@FInCw+y;jnM5k*yOJJdWY{V+~Ze)(tSKY2bcZ@u)T0H diff --git a/Technikladen/Order.class b/Technikladen/Order.class deleted file mode 100644 index f4dffd7420a205da3056904dae12c1045b1168d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2071 zcmaJ?ZBrXn6n-uNHY^*!kb*#8pg>6iH1(xw8$b&b8x2q!1WSGCWwXMTbeGvI9r@t@ z&|lCme$W}ABhEPe+#lgbe}pqypS!!j0vVIZ-FwfTm*+g^+>=-T9{vGf4&Ul%LPA5c zfflq1bUl&JWT7UV&BF4=6U+1kTBmHs_GbhV+1zRyl4#SQ8)%0i(6a1REl(ijs^?tI zwj94SFCa=9It01{Z@a!-E8OusxmUL9zK#?U%FP=F(&!d20^7Te@7Y#e;6k~9QBfIO zFwlcufwsV4Uiy|mI@AsTSLngnEUEx~2Kq5T$g*0c%WO<5Oskk%S9+HWT*eiFr0rXt z^j)UXlg-5tlp=Yt9YeUPVc5V3Mj7`6doH_Cx zBe;wGW{ZkV{hY4;Hw zY1a9D10Ud)K<`tzZOyrkDg8Cu-{P+BOUEbcx8f8Y)a>&H3&vVD)y!${aufY495y}++S1W6Do@{MODy7zE@e4Ik!qL zon_mxmUf?RSl)`IoI%BjAsa`X zBe+z>m*)1O+=(!yOwVG+Kd?;8-tjfuKXq4+IzX?uyPjz+*eZ>%r>?6`rSh!n`gPxv zJByaT7s5qvSYhh{<~0s%zL_CC}y52&x9on9KjK$}t+| z#i5X7;{yqk&S-&oo@Qy0;Ilvf0wO=K4=w*YQV(CC zb01y#iG5^#;ah>bTzhB-aH`Ws8^0Oo=wmd21r#EGm-rOaYRUf!?WbeY)D zRiWdmnV-+7c2VgbN<@8Dwd<^Eca-8MH2DqIocIlc0zaacn`;6ukzX2^Jix@`spqf%8c+!~#klF?sh^1r zaGYPn7l!Ww%RdYd>tQ6%{PdTGZ-`7!xHnCBe1{O?~ibSSGM#*&(|_ll~Kb zgb$inP5R&u@JAW%vKv4lW->E(=ALus-n(ai{l57Lpo$j;Vu))UbGte9BE8iO{Xr`kfDdbTBo4-av-O>AJ3K;$~+J@Tv+ ziuG~E4dvNxyRuA`ZJD@>ZHDz8?~1B)Ev`P;sza8qxT}1Iox(J;HX|BCx-hDwRy=1& zRAr0a&eUyJ91nU;;hpiOLpQp`9V^N?rDT{6HK`#7o+S?L0FxPaY(L1HTK-l_Oi98|c^kQ>);yO**n%Hg|V(TChpGWa;3 zCd-Y0;d@8iZ8^fv)urqX`jzRfOx*lMJiF?P8Ssx2_)tTY$+kuzs@!oJwh|T6P0e+M zS9Q4W3tz)ihWu1bvr^S?z_9&)D9Jah3-?KcF;Yg125EO_ks@i2gOT{}(VC^xLGVM+ zo+9CReH0F68kuoeZ#QvgPYbm`l0YTvQc`8=X0 zhfbZ=huDlL#fY**6oRh@%p2SRzWhToDYYEk#gNA%+EWyuNOK2eIvHd=!81I^#vhE1 B>+S#m diff --git a/Technikladen/OrderSystem.class b/Technikladen/OrderSystem.class deleted file mode 100644 index 3675e7c18cf8105c34ba0c4bd492dbf6c66678c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2698 zcmaJ@TXPd-7=FHncGF~gAkac7w8gfNv?<{%5JYJJiKZzy-l=bg9UNISxegCZvZm*E`k<> z6l_w_iZ+4n>)H)1Ro0A!)Xe;Kz2FG6oh%t8=afJwo|tV%80`uoDxy#YqBB-exAM!j zqgMnvZ1*sw8QOwwF7*(+cdj(=^nCmVA%A#gZ z>$eDqd|r_e2^C`)7uaOD=B@SIK_m($I0=uA2$D#t*pCAOtqZ!7J>%xehH*#$@~=na zG>;1G4fd3Gtdg;i4s_{TBpYEIQ*j(8$UHN8btac(=4d>d$ax0xoy18M&wy$OlQnnx zq&c2*PcE-LcuvJ>Ow!Cu{zL?})w^mQJSD*zia(eL6`7Kc=Vb%u1-8etPvXsHr4C=f ziwbforZC+k+qxJ-W{n*Cx+$5d3+$e7EM2R(eOyrS5-ze2$Mkp*XlCALCxT0OS;4G| z%Xp=(-sXI4penPMjdd~#5Zr+)Dy~XZC?)%BrRpq)@tVNqX>+LRDbya)Z@I5R2Cu7l zLt<0N;IvlJB_;DJ3UcCM+Sp6MHR>wfl*V=%Pgl&E;l%h_FRCcvIytXsOM1pM3Yv4d zl~V`AJSA`kJ9vl-{Ep=G#0vKH|A^L!yFdN& z*Fz-dVh3XfS8@0*<67Kidf7j)8U1W)nB0u=f{mjW7Og5mj}cZdyz>#g1#CD0ydio- z#`;(AbaDmh^?3V;cL%*|m}IPEcNf3$wnD4KD*@@$~X%v?+CU?{YTbL-n2!~ie$JrqWq&5mPat$!-%t5Pj`9p2QiGkd-759LQpu#q68e4H1??h-AbfE==qu8DdXcGi{{&31`k6 z01=Ql@Bw@j;`PiBoY>+pz15p~Rj<1G*Y6)c0hIADjRg8EByIE~B{1^VdFK=xj<;ES zvhh~dv_R^n>$&>2KwmEZY!Cw&w2-zj1Y5vb_f@@ZP=l>#Re2yFDh77Q#xO<%hGNT_ z)06_EtN$3P+IPLpk^zs}7&8v-7`*PgHE9eJHYSZB6C3U|Rol~pID%;lGd5;%bYIlf zoj}VbgH>%tH4(A7sz`^PCZTkirBS9nXX7}s0#i+ATb7kqbM$jpZ*di9$J2qpa<0-H zYrgv^jT1O&VZp{CmITJa{Pr_asFvYxcnm4m?IQn7;7BjJO2wFxWmTti!>g_**V@eu z=|6Qg8a(OWl-dZ+%2dd~T_o~&u1A~#0|bP^vRqt7Qc`nYvWD{SHkk`aGga->wjVpK znCp=1)u>*uhf7yg+pozL*F<8kN98|jvS&f=E2RVNJFUl3Z>f4PfNKJaYf5LOr`nra zS@k9xS2QbfBA?}NZo_0XKb*piG)lN>;g%^9Z{EVcJL7uq)V3@}S0}35ic{0d-w}A< zDQygl_#Zi5y&;2zRi(Dutx|UdI!^Ze_;jZwd%$0H;G;e%bt)daC_9Zt)zz{@eJY+O z{c^(z0vTAiM=`o`>J_SmvcTN`p={A8FU+%H61?0=j_gma5~c^kne7$M>?Y0@czdwS zF~{8sas8ZU3g00Lv%9bgr+1Ml9NWd=!bEZx-g*kOnt$W37cQ$2gAcR%zrMtG{$-?Mj{krGL&tavd{1(;#)-U66SD$ zN%TP+rT>e2EXy&=P~_?LK3UB>3}h+fJYko(PT(@Ga2}wO>-?_b4tHs;?&3ZkVEPX# C!9-&K diff --git a/Technikladen/StorageManager.class b/Technikladen/StorageManager.class deleted file mode 100644 index 0ca4e98dad6a5a22e39e81dbd2bfda3ea6161164..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1124 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 ehj}|cKgT6{id58>X}n6 Date: Fri, 18 Oct 2024 15:20:09 +0200 Subject: [PATCH 15/21] revert df521054ef307c0274d6dbffcea459ecbe61779e Me dumb --- Technikladen/OrderSystem.java | 10 ---------- Technikladen/StorageManager.java | 5 ----- Technikladen/TechStore.java | 16 ---------------- 3 files changed, 31 deletions(-) diff --git a/Technikladen/OrderSystem.java b/Technikladen/OrderSystem.java index 076fe31..5f08c11 100755 --- a/Technikladen/OrderSystem.java +++ b/Technikladen/OrderSystem.java @@ -3,15 +3,9 @@ import java.util.ArrayList; public class OrderSystem { private StorageManager systemManager; private ArrayList systemClients; -<<<<<<< HEAD public OrderSystem(StorageManager manager) { this.systemManager = manager; this.systemClients = new ArrayList(); -======= - public OrderSystem(StorageManager manager, ArrayList clients) { - this.systemManager = manager; - this.systemClients = clients; ->>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9 } public void addProduct(Product product) { this.systemManager.addProduct(product); @@ -58,8 +52,4 @@ public class OrderSystem { System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount()); } } -<<<<<<< HEAD } -======= -} ->>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9 diff --git a/Technikladen/StorageManager.java b/Technikladen/StorageManager.java index 0ba6822..1229c13 100755 --- a/Technikladen/StorageManager.java +++ b/Technikladen/StorageManager.java @@ -2,13 +2,8 @@ import java.util.ArrayList; public class StorageManager { private ArrayList storageProducts; -<<<<<<< HEAD public StorageManager() { this.storageProducts = new ArrayList(); -======= - public StorageManager(ArrayList products) { - this.storageProducts = products; ->>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9 } public void addProduct(Product product) { this.storageProducts.add(product); diff --git a/Technikladen/TechStore.java b/Technikladen/TechStore.java index 67eefea..18d4e14 100755 --- a/Technikladen/TechStore.java +++ b/Technikladen/TechStore.java @@ -1,23 +1,13 @@ -<<<<<<< HEAD import java.util.Scanner; import java.util.ArrayList; -======= -import java.util.ArrayList; -import java.util.Scanner; ->>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9 public class TechStore { public static void p(String input) { System.out.print(input); } public static void main(String[] args) { -<<<<<<< HEAD StorageManager manager = new StorageManager(); OrderSystem system = new OrderSystem(manager); -======= - StorageManager manager = new StorageManager(new ArrayList()); - OrderSystem system = new OrderSystem(manager, new ArrayList()); ->>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9 Scanner scnr = new Scanner(System.in); while (true) { p("\nInput mode: "); @@ -116,9 +106,3 @@ public class TechStore { } } } -<<<<<<< HEAD -======= - - - ->>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9 From 2416f27d17be79c4c49b0ca6c2348e07ec75608b Mon Sep 17 00:00:00 2001 From: ibartkowski Date: Fri, 18 Oct 2024 15:20:22 +0200 Subject: [PATCH 16/21] revert f9fc852421b1592983f317c56563172b3e6c7365 revert fixed stupidness --- Technikladen/Client.class | Bin 0 -> 1680 bytes Technikladen/Order.class | Bin 0 -> 2071 bytes Technikladen/OrderEntry.class | Bin 0 -> 993 bytes Technikladen/OrderSystem.class | Bin 0 -> 2698 bytes Technikladen/Product.class | Bin 0 -> 1477 bytes Technikladen/StorageManager.class | Bin 0 -> 1124 bytes Technikladen/TechStore.class | Bin 0 -> 3363 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Technikladen/Client.class create mode 100644 Technikladen/Order.class create mode 100644 Technikladen/OrderEntry.class create mode 100644 Technikladen/OrderSystem.class create mode 100644 Technikladen/Product.class create mode 100644 Technikladen/StorageManager.class create mode 100644 Technikladen/TechStore.class diff --git a/Technikladen/Client.class b/Technikladen/Client.class new file mode 100644 index 0000000000000000000000000000000000000000..cddad01e5bebc31597cc593759940f2267050ce0 GIT binary patch literal 1680 zcmaJ>+fv(B6kW#`WE&X>I5nXybs9))L*usTHKycZAaQDv2WOH=`qG1~0R>s|NXMDs zPdfd9zVx9tl9_a-AJC8LbR9_qVcd>J=WK1QeOY_&bN>G4&0hdo*exK1w1JF?ET#nJ zUdWfS;YfGC@o4Xb)l&jf8@6k!O@VZ^_9TxS@&*bfreX45%dst&pkgl+THeT2mMN}9-}aVPUNA9_1%X1Od?*K&zaiXQ;H|`E}x*!=E@W+lm8@HYeX*-#?{HTRy7-LwPR~G)2(neuj`TFgx~c%6)0a0cP(|` z^@AL43oN#`ZdSy4Me_`WkPoHVDcmjapllh~);-=4SUDY4+kNRBT8$`d)b<_OQ=ZS! z_#xSc7#M}TFWtUl1uGrTI~)z0=R2OzoH2ZSG_)qbzf0gx<~5;;U9_a*bZup^{$|^C zEx+Z+Ag}@h?D6V3PLonK@GS@M|Dn7TB3`)6qnP5^$fBTc3rZ<{9fUh?fNublDtFIrURR0s@XRmST7)!qr zEO4FcG7PSHWSD}!vKF{5qR3z~?By&`4SXDj(Fq8mv-Lkv{Q0emsZe==>nHe>tIjA1 zo%>}BS|aGiL}+OoS|;=}e9pRzdtDlbF2%+9f+k<$t2mLXG}R?8Fz2PUS6F^}%3a^= zI@LU@!0QLAvCR$cn&+Ihd4&&uWJP~MCao!_!m34-E4WEb7O9!r+MxNCQk~t<4(4^C n_-aR`H@FInCw+y;jnM5k*yOJJdWY{V+~Ze)(tSKY2bcZ@u)T0H literal 0 HcmV?d00001 diff --git a/Technikladen/Order.class b/Technikladen/Order.class new file mode 100644 index 0000000000000000000000000000000000000000..f4dffd7420a205da3056904dae12c1045b1168d0 GIT binary patch literal 2071 zcmaJ?ZBrXn6n-uNHY^*!kb*#8pg>6iH1(xw8$b&b8x2q!1WSGCWwXMTbeGvI9r@t@ z&|lCme$W}ABhEPe+#lgbe}pqypS!!j0vVIZ-FwfTm*+g^+>=-T9{vGf4&Ul%LPA5c zfflq1bUl&JWT7UV&BF4=6U+1kTBmHs_GbhV+1zRyl4#SQ8)%0i(6a1REl(ijs^?tI zwj94SFCa=9It01{Z@a!-E8OusxmUL9zK#?U%FP=F(&!d20^7Te@7Y#e;6k~9QBfIO zFwlcufwsV4Uiy|mI@AsTSLngnEUEx~2Kq5T$g*0c%WO<5Oskk%S9+HWT*eiFr0rXt z^j)UXlg-5tlp=Yt9YeUPVc5V3Mj7`6doH_Cx zBe;wGW{ZkV{hY4;Hw zY1a9D10Ud)K<`tzZOyrkDg8Cu-{P+BOUEbcx8f8Y)a>&H3&vVD)y!${aufY495y}++S1W6Do@{MODy7zE@e4Ik!qL zon_mxmUf?RSl)`IoI%BjAsa`X zBe+z>m*)1O+=(!yOwVG+Kd?;8-tjfuKXq4+IzX?uyPjz+*eZ>%r>?6`rSh!n`gPxv zJByaT7s5qvSYhh{<~0s%zL_CC}y52&x9on9KjK$}t+| z#i5X7;{yqk&S-&oo@Qy0;Ilvf0wO=K4=w*YQV(CC zb01y#iG5^#;ah>bTzhB-aH`Ws8^0Oo=wmd21r#EGm-rOaYRUf!?WbeY)D zRiWdmnV-+7c2VgbN<@8Dwd<^Eca-8MH2DqIocIlc0zaacn`;6ukzX2^Jix@`spqf%8c+!~#klF?sh^1r zaGYPn7l!Ww%RdYd>tQ6%{PdTGZ-`7!xHnCBe1{O?~ibSSGM#*&(|_ll~Kb zgb$inP5R&u@JAW%vKv4lW->E(=ALus-n(ai{l57Lpo$j;Vu))UbGte9BE8iO{Xr`kfDdbTBo4-av-O>AJ3K;$~+J@Tv+ ziuG~E4dvNxyRuA`ZJD@>ZHDz8?~1B)Ev`P;sza8qxT}1Iox(J;HX|BCx-hDwRy=1& zRAr0a&eUyJ91nU;;hpiOLpQp`9V^N?rDT{6HK`#7o+S?L0FxPaY(L1HTK-l_Oi98|c^kQ>);yO**n%Hg|V(TChpGWa;3 zCd-Y0;d@8iZ8^fv)urqX`jzRfOx*lMJiF?P8Ssx2_)tTY$+kuzs@!oJwh|T6P0e+M zS9Q4W3tz)ihWu1bvr^S?z_9&)D9Jah3-?KcF;Yg125EO_ks@i2gOT{}(VC^xLGVM+ zo+9CReH0F68kuoeZ#QvgPYbm`l0YTvQc`8=X0 zhfbZ=huDlL#fY**6oRh@%p2SRzWhToDYYEk#gNA%+EWyuNOK2eIvHd=!81I^#vhE1 B>+S#m literal 0 HcmV?d00001 diff --git a/Technikladen/OrderSystem.class b/Technikladen/OrderSystem.class new file mode 100644 index 0000000000000000000000000000000000000000..3675e7c18cf8105c34ba0c4bd492dbf6c66678c1 GIT binary patch literal 2698 zcmaJ@TXPd-7=FHncGF~gAkac7w8gfNv?<{%5JYJJiKZzy-l=bg9UNISxegCZvZm*E`k<> z6l_w_iZ+4n>)H)1Ro0A!)Xe;Kz2FG6oh%t8=afJwo|tV%80`uoDxy#YqBB-exAM!j zqgMnvZ1*sw8QOwwF7*(+cdj(=^nCmVA%A#gZ z>$eDqd|r_e2^C`)7uaOD=B@SIK_m($I0=uA2$D#t*pCAOtqZ!7J>%xehH*#$@~=na zG>;1G4fd3Gtdg;i4s_{TBpYEIQ*j(8$UHN8btac(=4d>d$ax0xoy18M&wy$OlQnnx zq&c2*PcE-LcuvJ>Ow!Cu{zL?})w^mQJSD*zia(eL6`7Kc=Vb%u1-8etPvXsHr4C=f ziwbforZC+k+qxJ-W{n*Cx+$5d3+$e7EM2R(eOyrS5-ze2$Mkp*XlCALCxT0OS;4G| z%Xp=(-sXI4penPMjdd~#5Zr+)Dy~XZC?)%BrRpq)@tVNqX>+LRDbya)Z@I5R2Cu7l zLt<0N;IvlJB_;DJ3UcCM+Sp6MHR>wfl*V=%Pgl&E;l%h_FRCcvIytXsOM1pM3Yv4d zl~V`AJSA`kJ9vl-{Ep=G#0vKH|A^L!yFdN& z*Fz-dVh3XfS8@0*<67Kidf7j)8U1W)nB0u=f{mjW7Og5mj}cZdyz>#g1#CD0ydio- z#`;(AbaDmh^?3V;cL%*|m}IPEcNf3$wnD4KD*@@$~X%v?+CU?{YTbL-n2!~ie$JrqWq&5mPat$!-%t5Pj`9p2QiGkd-759LQpu#q68e4H1??h-AbfE==qu8DdXcGi{{&31`k6 z01=Ql@Bw@j;`PiBoY>+pz15p~Rj<1G*Y6)c0hIADjRg8EByIE~B{1^VdFK=xj<;ES zvhh~dv_R^n>$&>2KwmEZY!Cw&w2-zj1Y5vb_f@@ZP=l>#Re2yFDh77Q#xO<%hGNT_ z)06_EtN$3P+IPLpk^zs}7&8v-7`*PgHE9eJHYSZB6C3U|Rol~pID%;lGd5;%bYIlf zoj}VbgH>%tH4(A7sz`^PCZTkirBS9nXX7}s0#i+ATb7kqbM$jpZ*di9$J2qpa<0-H zYrgv^jT1O&VZp{CmITJa{Pr_asFvYxcnm4m?IQn7;7BjJO2wFxWmTti!>g_**V@eu z=|6Qg8a(OWl-dZ+%2dd~T_o~&u1A~#0|bP^vRqt7Qc`nYvWD{SHkk`aGga->wjVpK znCp=1)u>*uhf7yg+pozL*F<8kN98|jvS&f=E2RVNJFUl3Z>f4PfNKJaYf5LOr`nra zS@k9xS2QbfBA?}NZo_0XKb*piG)lN>;g%^9Z{EVcJL7uq)V3@}S0}35ic{0d-w}A< zDQygl_#Zi5y&;2zRi(Dutx|UdI!^Ze_;jZwd%$0H;G;e%bt)daC_9Zt)zz{@eJY+O z{c^(z0vTAiM=`o`>J_SmvcTN`p={A8FU+%H61?0=j_gma5~c^kne7$M>?Y0@czdwS zF~{8sas8ZU3g00Lv%9bgr+1Ml9NWd=!bEZx-g*kOnt$W37cQ$2gAcR%zrMtG{$-?Mj{krGL&tavd{1(;#)-U66SD$ zN%TP+rT>e2EXy&=P~_?LK3UB>3}h+fJYko(PT(@Ga2}wO>-?_b4tHs;?&3ZkVEPX# C!9-&K literal 0 HcmV?d00001 diff --git a/Technikladen/StorageManager.class b/Technikladen/StorageManager.class new file mode 100644 index 0000000000000000000000000000000000000000..0ca4e98dad6a5a22e39e81dbd2bfda3ea6161164 GIT binary patch literal 1124 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 ehj}|cKgT6{id58>X}n6 Date: Fri, 18 Oct 2024 15:21:05 +0200 Subject: [PATCH 17/21] revert 2694e7b7b056a9ace4c40bab3c6713556a8b4d90 revert fix cleanup --- Technikladen/Client.class | Bin 1680 -> 0 bytes Technikladen/Order.class | Bin 2071 -> 0 bytes Technikladen/OrderEntry.class | Bin 993 -> 0 bytes Technikladen/OrderSystem.class | Bin 2698 -> 0 bytes Technikladen/Product.class | Bin 1477 -> 0 bytes Technikladen/StorageManager.class | Bin 1124 -> 0 bytes Technikladen/StorageManager.java | 2 +- Technikladen/TechStore.class | Bin 3363 -> 0 bytes Technikladen/TechStore.java | 1 - 9 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 Technikladen/Client.class delete mode 100644 Technikladen/Order.class delete mode 100644 Technikladen/OrderEntry.class delete mode 100644 Technikladen/OrderSystem.class delete mode 100644 Technikladen/Product.class delete mode 100644 Technikladen/StorageManager.class delete mode 100644 Technikladen/TechStore.class diff --git a/Technikladen/Client.class b/Technikladen/Client.class deleted file mode 100644 index cddad01e5bebc31597cc593759940f2267050ce0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmaJ>+fv(B6kW#`WE&X>I5nXybs9))L*usTHKycZAaQDv2WOH=`qG1~0R>s|NXMDs zPdfd9zVx9tl9_a-AJC8LbR9_qVcd>J=WK1QeOY_&bN>G4&0hdo*exK1w1JF?ET#nJ zUdWfS;YfGC@o4Xb)l&jf8@6k!O@VZ^_9TxS@&*bfreX45%dst&pkgl+THeT2mMN}9-}aVPUNA9_1%X1Od?*K&zaiXQ;H|`E}x*!=E@W+lm8@HYeX*-#?{HTRy7-LwPR~G)2(neuj`TFgx~c%6)0a0cP(|` z^@AL43oN#`ZdSy4Me_`WkPoHVDcmjapllh~);-=4SUDY4+kNRBT8$`d)b<_OQ=ZS! z_#xSc7#M}TFWtUl1uGrTI~)z0=R2OzoH2ZSG_)qbzf0gx<~5;;U9_a*bZup^{$|^C zEx+Z+Ag}@h?D6V3PLonK@GS@M|Dn7TB3`)6qnP5^$fBTc3rZ<{9fUh?fNublDtFIrURR0s@XRmST7)!qr zEO4FcG7PSHWSD}!vKF{5qR3z~?By&`4SXDj(Fq8mv-Lkv{Q0emsZe==>nHe>tIjA1 zo%>}BS|aGiL}+OoS|;=}e9pRzdtDlbF2%+9f+k<$t2mLXG}R?8Fz2PUS6F^}%3a^= zI@LU@!0QLAvCR$cn&+Ihd4&&uWJP~MCao!_!m34-E4WEb7O9!r+MxNCQk~t<4(4^C n_-aR`H@FInCw+y;jnM5k*yOJJdWY{V+~Ze)(tSKY2bcZ@u)T0H diff --git a/Technikladen/Order.class b/Technikladen/Order.class deleted file mode 100644 index f4dffd7420a205da3056904dae12c1045b1168d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2071 zcmaJ?ZBrXn6n-uNHY^*!kb*#8pg>6iH1(xw8$b&b8x2q!1WSGCWwXMTbeGvI9r@t@ z&|lCme$W}ABhEPe+#lgbe}pqypS!!j0vVIZ-FwfTm*+g^+>=-T9{vGf4&Ul%LPA5c zfflq1bUl&JWT7UV&BF4=6U+1kTBmHs_GbhV+1zRyl4#SQ8)%0i(6a1REl(ijs^?tI zwj94SFCa=9It01{Z@a!-E8OusxmUL9zK#?U%FP=F(&!d20^7Te@7Y#e;6k~9QBfIO zFwlcufwsV4Uiy|mI@AsTSLngnEUEx~2Kq5T$g*0c%WO<5Oskk%S9+HWT*eiFr0rXt z^j)UXlg-5tlp=Yt9YeUPVc5V3Mj7`6doH_Cx zBe;wGW{ZkV{hY4;Hw zY1a9D10Ud)K<`tzZOyrkDg8Cu-{P+BOUEbcx8f8Y)a>&H3&vVD)y!${aufY495y}++S1W6Do@{MODy7zE@e4Ik!qL zon_mxmUf?RSl)`IoI%BjAsa`X zBe+z>m*)1O+=(!yOwVG+Kd?;8-tjfuKXq4+IzX?uyPjz+*eZ>%r>?6`rSh!n`gPxv zJByaT7s5qvSYhh{<~0s%zL_CC}y52&x9on9KjK$}t+| z#i5X7;{yqk&S-&oo@Qy0;Ilvf0wO=K4=w*YQV(CC zb01y#iG5^#;ah>bTzhB-aH`Ws8^0Oo=wmd21r#EGm-rOaYRUf!?WbeY)D zRiWdmnV-+7c2VgbN<@8Dwd<^Eca-8MH2DqIocIlc0zaacn`;6ukzX2^Jix@`spqf%8c+!~#klF?sh^1r zaGYPn7l!Ww%RdYd>tQ6%{PdTGZ-`7!xHnCBe1{O?~ibSSGM#*&(|_ll~Kb zgb$inP5R&u@JAW%vKv4lW->E(=ALus-n(ai{l57Lpo$j;Vu))UbGte9BE8iO{Xr`kfDdbTBo4-av-O>AJ3K;$~+J@Tv+ ziuG~E4dvNxyRuA`ZJD@>ZHDz8?~1B)Ev`P;sza8qxT}1Iox(J;HX|BCx-hDwRy=1& zRAr0a&eUyJ91nU;;hpiOLpQp`9V^N?rDT{6HK`#7o+S?L0FxPaY(L1HTK-l_Oi98|c^kQ>);yO**n%Hg|V(TChpGWa;3 zCd-Y0;d@8iZ8^fv)urqX`jzRfOx*lMJiF?P8Ssx2_)tTY$+kuzs@!oJwh|T6P0e+M zS9Q4W3tz)ihWu1bvr^S?z_9&)D9Jah3-?KcF;Yg125EO_ks@i2gOT{}(VC^xLGVM+ zo+9CReH0F68kuoeZ#QvgPYbm`l0YTvQc`8=X0 zhfbZ=huDlL#fY**6oRh@%p2SRzWhToDYYEk#gNA%+EWyuNOK2eIvHd=!81I^#vhE1 B>+S#m diff --git a/Technikladen/OrderSystem.class b/Technikladen/OrderSystem.class deleted file mode 100644 index 3675e7c18cf8105c34ba0c4bd492dbf6c66678c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2698 zcmaJ@TXPd-7=FHncGF~gAkac7w8gfNv?<{%5JYJJiKZzy-l=bg9UNISxegCZvZm*E`k<> z6l_w_iZ+4n>)H)1Ro0A!)Xe;Kz2FG6oh%t8=afJwo|tV%80`uoDxy#YqBB-exAM!j zqgMnvZ1*sw8QOwwF7*(+cdj(=^nCmVA%A#gZ z>$eDqd|r_e2^C`)7uaOD=B@SIK_m($I0=uA2$D#t*pCAOtqZ!7J>%xehH*#$@~=na zG>;1G4fd3Gtdg;i4s_{TBpYEIQ*j(8$UHN8btac(=4d>d$ax0xoy18M&wy$OlQnnx zq&c2*PcE-LcuvJ>Ow!Cu{zL?})w^mQJSD*zia(eL6`7Kc=Vb%u1-8etPvXsHr4C=f ziwbforZC+k+qxJ-W{n*Cx+$5d3+$e7EM2R(eOyrS5-ze2$Mkp*XlCALCxT0OS;4G| z%Xp=(-sXI4penPMjdd~#5Zr+)Dy~XZC?)%BrRpq)@tVNqX>+LRDbya)Z@I5R2Cu7l zLt<0N;IvlJB_;DJ3UcCM+Sp6MHR>wfl*V=%Pgl&E;l%h_FRCcvIytXsOM1pM3Yv4d zl~V`AJSA`kJ9vl-{Ep=G#0vKH|A^L!yFdN& z*Fz-dVh3XfS8@0*<67Kidf7j)8U1W)nB0u=f{mjW7Og5mj}cZdyz>#g1#CD0ydio- z#`;(AbaDmh^?3V;cL%*|m}IPEcNf3$wnD4KD*@@$~X%v?+CU?{YTbL-n2!~ie$JrqWq&5mPat$!-%t5Pj`9p2QiGkd-759LQpu#q68e4H1??h-AbfE==qu8DdXcGi{{&31`k6 z01=Ql@Bw@j;`PiBoY>+pz15p~Rj<1G*Y6)c0hIADjRg8EByIE~B{1^VdFK=xj<;ES zvhh~dv_R^n>$&>2KwmEZY!Cw&w2-zj1Y5vb_f@@ZP=l>#Re2yFDh77Q#xO<%hGNT_ z)06_EtN$3P+IPLpk^zs}7&8v-7`*PgHE9eJHYSZB6C3U|Rol~pID%;lGd5;%bYIlf zoj}VbgH>%tH4(A7sz`^PCZTkirBS9nXX7}s0#i+ATb7kqbM$jpZ*di9$J2qpa<0-H zYrgv^jT1O&VZp{CmITJa{Pr_asFvYxcnm4m?IQn7;7BjJO2wFxWmTti!>g_**V@eu z=|6Qg8a(OWl-dZ+%2dd~T_o~&u1A~#0|bP^vRqt7Qc`nYvWD{SHkk`aGga->wjVpK znCp=1)u>*uhf7yg+pozL*F<8kN98|jvS&f=E2RVNJFUl3Z>f4PfNKJaYf5LOr`nra zS@k9xS2QbfBA?}NZo_0XKb*piG)lN>;g%^9Z{EVcJL7uq)V3@}S0}35ic{0d-w}A< zDQygl_#Zi5y&;2zRi(Dutx|UdI!^Ze_;jZwd%$0H;G;e%bt)daC_9Zt)zz{@eJY+O z{c^(z0vTAiM=`o`>J_SmvcTN`p={A8FU+%H61?0=j_gma5~c^kne7$M>?Y0@czdwS zF~{8sas8ZU3g00Lv%9bgr+1Ml9NWd=!bEZx-g*kOnt$W37cQ$2gAcR%zrMtG{$-?Mj{krGL&tavd{1(;#)-U66SD$ zN%TP+rT>e2EXy&=P~_?LK3UB>3}h+fJYko(PT(@Ga2}wO>-?_b4tHs;?&3ZkVEPX# C!9-&K diff --git a/Technikladen/StorageManager.class b/Technikladen/StorageManager.class deleted file mode 100644 index 0ca4e98dad6a5a22e39e81dbd2bfda3ea6161164..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1124 zcmZuw+fEZv6kVqmrX2=aDffbM5uBDw@q)J^S}-O}3Yyel;O)>(>L5(bbZX>NeDlp$ zOteHvjL-gte_@QePMMZsNR!=j_UyIS+L!a=&)07N*0HW5fS`tufiSuR;(PLq%Ylxy$+@mPEZ8+qhlXGj-7qxt80bYzpttB% zU0JaIGXKuAzFL^bAfx-p3vMSjn1AR!4RhG+)Gfx9Mlx0&pI{5|+3}T36 z70dJUt{vtd3m9fTRq#E`ID%0PNdsdT7tnk^VYX9pEm^a22i3a6azlh|DFIguOkh$V zVtbY=DO_OCOm*nZ`~GY{i-sTFp|=dbP~RSiyFz&HBNv*#;>No#Omy3kXJ+K{hXii*{`Te6&?j--0 zc?;k+yT+EHi}nsZO9=7=#M8$R=@V$%$B2H0{;`R@OWVr`5D_9K#`O@mhx storageProducts; public StorageManager() { - this.storageProducts = new ArrayList(); + this.storageProducts = new ArrayList; } public void addProduct(Product product) { this.storageProducts.add(product); diff --git a/Technikladen/TechStore.class b/Technikladen/TechStore.class deleted file mode 100644 index 12c02f03703af992bea2d0b58f4929cf4f025168..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3363 zcmaJ@Yj7J^75=U)YuD?Ioyw78;Ura)w3hscX%f;zY9WrDV5NQ}v2kjLrd>-LX>Dm& z(XP^%M_P)Yw6stteWXC31tMA=C4ow5OiBtAO5qPPFw8KW=`V(%KbX!i%#@HOoVzR8 zlI>wMS9^EwIp?19o$s7`-@JD5RRI0?g9I1q1h{3?!^5z8MmeGMrW8HVJ32k1#w-TU z?V7GxA7-cvh9(*yqCtQpqY-kA_}H9jscDija-`%NvJGiQ?}4nQTVqyMRnid&O=uRd zTE-3VGPJB9!%&~$8e}5q*sz@;1Dc+QgeC;6VQ3n&jI5GShZUXvvl3c(3~L!0N3(G? z>$oDJ6@DJp2WY3@P_2q>X&u82whK8+OZAS$6kS)dJi-k!ZbX2=rRmk7MD|K6nM(k5vKt9aN!W>9 z0>UyPxV-|1jd@hJR6>_r$tYPVmE2*?HN|IR5&1D53Tg4 zG*!1G^kINQwwIw}h2$=eF*L!G_)!^yh!R#xJnmScL_zz_&C9!S!!0H>@u|0_!2FDk2K;a?h$aW428SmU8G}0 zge)f&bA-siWn(hpAWFD7JC-t|oKuc-LPpYNk!3hp5-~$s(E*;I6xpP*jM>>DhKqe^ zipJvE%GgUrJQt&M8OZW<5t41e=<@7DqYm~t87FWbVNdxvkhOIgPd}aY{8>49>bTYsStI_e(jly4)747p@kqg8js8P z3cgB2BuNJ{n;b;{uhCx4mq09On5rJI3?q=#5=jA15i+)Cdvz;2$I1GrgeP&D`}i!i zhee=lJoEU5jBnx$rG@acbqJf_(4vVlpx>799G)jkIBJ$^uk*r)I-+H%@5=Zd&eApu zh2aE8a-m8Ial(9G#tXcFcx<*Q%1s^#FP#!Ul<_0{n93=w%&Pr{9#gEtnw6xPX(_rz z^ypX-=jDvyweb@f=Ww2Yqm6h!AvbK&SDiUjpn3dE#>p6l;Vs-7 zs`WjFVVPD|$qcJj(ukWPenAHUW6d7CCgGR(m4IJ!U|wg~ycmF{pD)sOa&OYHl7fjM-c!vfTfwFExtea~X97@oEGrjefa_ekGL}qYf1z zsz>?J*Pl{MQ#A#=!Ep1km{xLCz?%#k{=X;{sS_7&qO;FMgaYb7OaxM{?@`2ud~DWWUv_Pf2kMcjHCo`P$a-+ckMy-0T9 z+CqQ!&h+f1ahS##8vmg2E-kgwAa7hf-a9I`>b)PSOg-K6=$rJ{`#mM}7qPFv{@Pu{ z{&2m&zKD_2Xrg$$<3&sq*lYaLWZ2{Pyn?$KPGdcvO*33ZUsxbHzfi<6E_(g#0(-)% zmG>Y|choO#?(xo6EePIp)tgA(7?VEo#wYm15{?&P71$tobh5zu_+yFHYGqHCuiob= z;*$l|N}~5K5q)qW8E?+|tUo7IwKIwS} zo+s>>FZqReJUQ9Tm!I}YB|KBa*9+Irc2hV6%(n`7V7XUyJ3O>r#CM7)aBvC3GPoUl zW`mm#b5i*{c@Oi8MZ9twy|5V zorQ24>%mU)X%~wi%yuKfqIBguh&$LgUE1zKAG@2bYsb*fW--8y(>?7J_OS;s$R48m z*JIevp2nT*Svn@3!w5TzQT7rJuuC||UdJK!2FBT2bWM626YTFe%-+Ei`zMaDf6-0o zDlz#wj=DDC9@kFX>xw{e?Z&h#ikK^gxa$}at^{UWGnmCiLTn1YYgi|sML?^7_N!Pc zVC%Myt7sE2dKDf4N3USh6}bM3{hm%9F|7;8JA&`iJ9`hU??JkTjf~bvy5~RWyu$NR ehj}|cKgT6{id58>X}n6 Date: Fri, 18 Oct 2024 15:21:45 +0200 Subject: [PATCH 18/21] revert 1e9ecee35581f80925cc7cb01ab774003500d8ce revert cleanup signatures --- Technikladen/OrderSystem.java | 6 +++--- Technikladen/StorageManager.java | 4 ++-- Technikladen/TechStore.java | 8 ++++++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Technikladen/OrderSystem.java b/Technikladen/OrderSystem.java index 5f08c11..c111eac 100755 --- a/Technikladen/OrderSystem.java +++ b/Technikladen/OrderSystem.java @@ -3,9 +3,9 @@ import java.util.ArrayList; public class OrderSystem { private StorageManager systemManager; private ArrayList systemClients; - public OrderSystem(StorageManager manager) { + public OrderSystem(StorageManager manager, ArrayList clients) { this.systemManager = manager; - this.systemClients = new ArrayList(); + this.systemClients = clients; } public void addProduct(Product product) { this.systemManager.addProduct(product); @@ -52,4 +52,4 @@ public class OrderSystem { System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount()); } } -} +} \ No newline at end of file diff --git a/Technikladen/StorageManager.java b/Technikladen/StorageManager.java index c22eb41..9771cad 100755 --- a/Technikladen/StorageManager.java +++ b/Technikladen/StorageManager.java @@ -2,8 +2,8 @@ import java.util.ArrayList; public class StorageManager { private ArrayList storageProducts; - public StorageManager() { - this.storageProducts = new ArrayList; + public StorageManager(ArrayList products) { + this.storageProducts = products; } public void addProduct(Product product) { this.storageProducts.add(product); diff --git a/Technikladen/TechStore.java b/Technikladen/TechStore.java index 2883f58..a11e42a 100755 --- a/Technikladen/TechStore.java +++ b/Technikladen/TechStore.java @@ -1,3 +1,4 @@ +import java.util.ArrayList; import java.util.Scanner; public class TechStore { @@ -5,8 +6,8 @@ public class TechStore { System.out.print(input); } public static void main(String[] args) { - StorageManager manager = new StorageManager(); - OrderSystem system = new OrderSystem(manager); + StorageManager manager = new StorageManager(new ArrayList()); + OrderSystem system = new OrderSystem(manager, new ArrayList()); Scanner scnr = new Scanner(System.in); while (true) { p("\nInput mode: "); @@ -105,3 +106,6 @@ public class TechStore { } } } + + + From be65e3e445cc9b244189af29b8a4de6cd885f823 Mon Sep 17 00:00:00 2001 From: Ireozar Zareoto Date: Fri, 18 Oct 2024 18:12:21 +0200 Subject: [PATCH 19/21] added Aktienhandel --- Aktienhandel/Aktie.java | 37 +++++++++++++++++++++++++++++ Aktienhandel/Broker.java | 16 +++++++++++++ Aktienhandel/DayTrader.java | 15 ++++++++++++ Aktienhandel/LangFristInvestor.java | 15 ++++++++++++ Aktienhandel/Main.java | 29 ++++++++++++++++++++++ Aktienhandel/OnlineBroker.java | 16 +++++++++++++ Aktienhandel/Person.java | 19 +++++++++++++++ Aktienhandel/Trader.java | 37 +++++++++++++++++++++++++++++ 8 files changed, 184 insertions(+) create mode 100755 Aktienhandel/Aktie.java create mode 100755 Aktienhandel/Broker.java create mode 100755 Aktienhandel/DayTrader.java create mode 100755 Aktienhandel/LangFristInvestor.java create mode 100755 Aktienhandel/Main.java create mode 100755 Aktienhandel/OnlineBroker.java create mode 100755 Aktienhandel/Person.java create mode 100755 Aktienhandel/Trader.java diff --git a/Aktienhandel/Aktie.java b/Aktienhandel/Aktie.java new file mode 100755 index 0000000..2969158 --- /dev/null +++ b/Aktienhandel/Aktie.java @@ -0,0 +1,37 @@ +public class Aktie{ + private String name; + private int count; + private double value; + public Aktie(String name, int count, double value) { + this.name = name; + this.count = count; + this.value = value; + } + public double getAktienWert() { + return count * value; + } + public void anzahlErhoehen(int amt) { + this.count += amt; + } + public void anzahlVerringern(int amt) { + this.count -= (this.count < amt) ? 0 : amt; + } + public String getName() { + return this.name; + } + public int getCount() { + return this.count; + } + public double getValue() { + return this.value; + } + public void setName(String name) { + this.name = name; + } + public void setCount(int count) { + this.count = count; + } + public void setValue(int value) { + this.value = value; + } +} diff --git a/Aktienhandel/Broker.java b/Aktienhandel/Broker.java new file mode 100755 index 0000000..b4b0502 --- /dev/null +++ b/Aktienhandel/Broker.java @@ -0,0 +1,16 @@ +public class Broker extends Person { + protected double provision; + protected int clientCount; + public Broker(String name, int age, double money, double provision, int clientCount) { + super(name, age, money); + this.provision = provision; + this.clientCount = clientCount; + } + public void tradeAbwickeln(Trader trader, String aktieName, double price, int amt) { + trader.aktieKaufen(aktieName, price, amt); + this.money += this.provision; + } + public void kundenAnzeigen() { + System.out.println("Kunden: " + this.clientCount); + } +} diff --git a/Aktienhandel/DayTrader.java b/Aktienhandel/DayTrader.java new file mode 100755 index 0000000..cade848 --- /dev/null +++ b/Aktienhandel/DayTrader.java @@ -0,0 +1,15 @@ +public class DayTrader extends Trader { + protected int tradesPerDay; + protected boolean hebelTrade; + public DayTrader(String name, int age, double money, int tradesPerDay, boolean hebelTrade) { + super(name, age, money); + this.tradesPerDay = tradesPerDay; + this.hebelTrade = hebelTrade; + } + public void schnellerTrade(double profit) { + this.money += profit; + } + public void risikoEingrenzen() { + //do stuff I guess + } +} diff --git a/Aktienhandel/LangFristInvestor.java b/Aktienhandel/LangFristInvestor.java new file mode 100755 index 0000000..950bbe9 --- /dev/null +++ b/Aktienhandel/LangFristInvestor.java @@ -0,0 +1,15 @@ +public class LangfristInvestor extends Trader { + protected double dividends; + protected double investDuration; + public LangfristInvestor(String name, int age, double money, double dividends) { + super(name, age, money); + this.dividends = dividends; + } + public void dividendeErhalten(double amt) { + this.dividends += amt; + this.money += amt; + } + public void portfolioUmschichten() { + //stuff + } +} diff --git a/Aktienhandel/Main.java b/Aktienhandel/Main.java new file mode 100755 index 0000000..729161b --- /dev/null +++ b/Aktienhandel/Main.java @@ -0,0 +1,29 @@ +public class Main { + public static void main(String[] args) { + // Erstellen eines LangfristInvestors + LangfristInvestor investor = new LangfristInvestor("Lisa", 45, 20000, 10); + investor.aktieKaufen("Apple", 150, 10); + investor.dividendeErhalten(500); + investor.portfolioUmschichten(); + investor.anzeigen(); + + // Erstellen eines Brokers + Broker broker = new Broker("Paul", 50, 50000, 100, 5); + broker.tradeAbwickeln(investor, "Apple", 150, 5); + broker.kundenAnzeigen(); + + // Erstellen eines OnlineBrokers + OnlineBroker onlineBroker = new OnlineBroker("OnlineTrade", 35, 100000, 50, 1000, 10, "TradeZone"); + onlineBroker.gebuehrErheben(investor); + onlineBroker.neueKundenAkquirieren(50); + + // Erstellen eines DayTraders + DayTrader dayTrader = new DayTrader("Tom", 30, 30000, 5, true); + dayTrader.aktieKaufen("Tesla", 700, 3); + dayTrader.schnellerTrade(300); // Profit von 300 EUR durch schnellen Trade + dayTrader.aktieVerkaufen("Tesla", 720, 2); // Verkauf von 2 Tesla-Aktien + dayTrader.anzeigen(); + } +} + + diff --git a/Aktienhandel/OnlineBroker.java b/Aktienhandel/OnlineBroker.java new file mode 100755 index 0000000..8ac3d27 --- /dev/null +++ b/Aktienhandel/OnlineBroker.java @@ -0,0 +1,16 @@ +public class OnlineBroker extends Broker { + protected double platformFee; + protected String platformName; + public OnlineBroker(String name, int age, double money, double provision, int clientCount, double platformFee, String platformName) { + super(name, age, money, provision, clientCount); + this.platformFee = platformFee; + this.platformName = platformName; + } + public void gebuehrErheben(Trader trader) { + trader.geldAuszahlen(this.platformFee); + this.money += this.platformFee; + } + public void neueKundenAkquirieren(int amt) { + this.clientCount += amt; + } +} diff --git a/Aktienhandel/Person.java b/Aktienhandel/Person.java new file mode 100755 index 0000000..589f509 --- /dev/null +++ b/Aktienhandel/Person.java @@ -0,0 +1,19 @@ +public class Person { + protected String name; + protected int age; + protected double money; + public Person(String name, int age, double money) { + this.name = name; + this.age = age; + this.money = money; + } + public void geldEinzahlen(double amt) { + this.money += amt; + } + public void geldAuszahlen(double amt) { + this.money -= (this.money < amt) ? 0 : amt; + } + public void show() { + System.out.println("Name: " + name + ", Age: " + age + ", Money: " + money); + } +} diff --git a/Aktienhandel/Trader.java b/Aktienhandel/Trader.java new file mode 100755 index 0000000..f9f5d51 --- /dev/null +++ b/Aktienhandel/Trader.java @@ -0,0 +1,37 @@ +import java.util.ArrayList; + +public class Trader extends Person { + protected ArrayList aktien; + public Trader(String name, int age, double money) { + super(name, age, money); + this.aktien = new ArrayList(); + } + public void aktieKaufen(String name, double price, int amt) { + Aktie aktie = new Aktie(name, amt, price); + this.aktien.add(aktie); + this.geldAuszahlen(aktie.getAktienWert()); + } + public void aktieVerkaufen(String name, double price, int amt) { + for (Aktie aktie : this.aktien) { + if (aktie.getName() == name) { + this.geldEinzahlen(price * amt); + aktie.anzahlVerringern(amt); + break; + } + } + } + public double getPortfolioWert() { + double out = 0; + for (Aktie aktie : this.aktien) { + out += aktie.getAktienWert(); + } + return out; + } + public void anzeigen() { + String out = ""; + for (Aktie aktie : aktien) { + out += "\nAktie: " + aktie.getName() + ", Count: " + aktie.getCount() + ", Value: " + aktie.getValue(); + } + System.out.println("Name: " + name + ", Age: " + age + ", Money: " + money + out + "\nGesamtwert: " + this.getPortfolioWert()); + } +} From 08cbf4a7f55074cc1dffe51f66a5832586b7da4d Mon Sep 17 00:00:00 2001 From: Ireozar Zareoto Date: Fri, 18 Oct 2024 18:16:21 +0200 Subject: [PATCH 20/21] fixed Langfristinvestor --- Aktienhandel/{LangFristInvestor.java => LangfristInvestor.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Aktienhandel/{LangFristInvestor.java => LangfristInvestor.java} (100%) diff --git a/Aktienhandel/LangFristInvestor.java b/Aktienhandel/LangfristInvestor.java similarity index 100% rename from Aktienhandel/LangFristInvestor.java rename to Aktienhandel/LangfristInvestor.java From c6fdc4b0938bc780d54dfa75e649172b0c2b18e9 Mon Sep 17 00:00:00 2001 From: Ireozar Zareoto Date: Fri, 18 Oct 2024 18:19:16 +0200 Subject: [PATCH 21/21] cleand up function signatures --- Technikladen/OrderSystem.java | 6 +++--- Technikladen/StorageManager.java | 4 ++-- Technikladen/TechStore.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Technikladen/OrderSystem.java b/Technikladen/OrderSystem.java index c111eac..5f08c11 100755 --- a/Technikladen/OrderSystem.java +++ b/Technikladen/OrderSystem.java @@ -3,9 +3,9 @@ import java.util.ArrayList; public class OrderSystem { private StorageManager systemManager; private ArrayList systemClients; - public OrderSystem(StorageManager manager, ArrayList clients) { + public OrderSystem(StorageManager manager) { this.systemManager = manager; - this.systemClients = clients; + this.systemClients = new ArrayList(); } public void addProduct(Product product) { this.systemManager.addProduct(product); @@ -52,4 +52,4 @@ public class OrderSystem { System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount()); } } -} \ No newline at end of file +} diff --git a/Technikladen/StorageManager.java b/Technikladen/StorageManager.java index 9771cad..1229c13 100755 --- a/Technikladen/StorageManager.java +++ b/Technikladen/StorageManager.java @@ -2,8 +2,8 @@ import java.util.ArrayList; public class StorageManager { private ArrayList storageProducts; - public StorageManager(ArrayList products) { - this.storageProducts = products; + public StorageManager() { + this.storageProducts = new ArrayList(); } public void addProduct(Product product) { this.storageProducts.add(product); diff --git a/Technikladen/TechStore.java b/Technikladen/TechStore.java index a11e42a..3540304 100755 --- a/Technikladen/TechStore.java +++ b/Technikladen/TechStore.java @@ -6,8 +6,8 @@ public class TechStore { System.out.print(input); } public static void main(String[] args) { - StorageManager manager = new StorageManager(new ArrayList()); - OrderSystem system = new OrderSystem(manager, new ArrayList()); + StorageManager manager = new StorageManager(); + OrderSystem system = new OrderSystem(manager); Scanner scnr = new Scanner(System.in); while (true) { p("\nInput mode: ");