denyskon/info-java
0
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert df521054ef307c0274d6dbffcea459ecbe61779e

Browse Source 
Me dumb
This commit is contained in:
Igor Bartkowski 2024-10-18 15:20:09 +02:00
parent df521054ef
commit b871ab9a85
3 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Technikladen/OrderSystem.java
View File

@ -3,15 +3,9 @@ import java.util.ArrayList;
public class OrderSystem { public class OrderSystem {
private StorageManager systemManager; private StorageManager systemManager;
private ArrayList<Client> systemClients; private ArrayList<Client> systemClients;
<<<<<<< HEAD
public OrderSystem(StorageManager manager) { public OrderSystem(StorageManager manager) {
this.systemManager = manager; this.systemManager = manager;
this.systemClients = new ArrayList<Client>(); this.systemClients = new ArrayList<Client>();
=======
public OrderSystem(StorageManager manager, ArrayList<Client> clients) {
this.systemManager = manager;
this.systemClients = clients;
>>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9
} }
public void addProduct(Product product) { public void addProduct(Product product) {
this.systemManager.addProduct(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()); System.out.println("ID: " + product.getID() + ", Name: " + product.getName() + ", Price: " + product.getPrice() + ", Amount: " + product.getAmount());
} }
} }
<<<<<<< HEAD
} }
=======
}
>>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9

5
Technikladen/StorageManager.java
View File

@ -2,13 +2,8 @@ import java.util.ArrayList;
public class StorageManager { public class StorageManager {
private ArrayList<Product> storageProducts; private ArrayList<Product> storageProducts;
<<<<<<< HEAD
public StorageManager() { public StorageManager() {
this.storageProducts = new ArrayList<Product>(); this.storageProducts = new ArrayList<Product>();
=======
public StorageManager(ArrayList<Product> products) {
this.storageProducts = products;
>>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9
} }
public void addProduct(Product product) { public void addProduct(Product product) {
this.storageProducts.add(product); this.storageProducts.add(product);

16
Technikladen/TechStore.java
View File

@ -1,23 +1,13 @@
<<<<<<< HEAD
import java.util.Scanner; import java.util.Scanner;
import java.util.ArrayList; import java.util.ArrayList;
=======
import java.util.ArrayList;
import java.util.Scanner;
>>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9
public class TechStore { public class TechStore {
public static void p(String input) { public static void p(String input) {
System.out.print(input); System.out.print(input);
} }
public static void main(String[] args) { public static void main(String[] args) {
<<<<<<< HEAD
StorageManager manager = new StorageManager(); StorageManager manager = new StorageManager();
OrderSystem system = new OrderSystem(manager); OrderSystem system = new OrderSystem(manager);
=======
StorageManager manager = new StorageManager(new ArrayList<Product>());
OrderSystem system = new OrderSystem(manager, new ArrayList<Client>());
>>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9
Scanner scnr = new Scanner(System.in); Scanner scnr = new Scanner(System.in);
while (true) { while (true) {
p("\nInput mode: "); p("\nInput mode: ");
@ -116,9 +106,3 @@ public class TechStore {
} }
} }
} }
<<<<<<< HEAD
=======
>>>>>>> 89bb3a674e4304644c37109ed5a608b97926deb9