Context is given by paramter.

Author: ProgrammingKiddo

terminalCli/src/main/java/commands/AddProduct.java

@@ -19,10 +19,10 @@ public AddProduct(Product prod)
 		this.prod = prod;
 	}
 
-	public void execute()
+	public void execute(Screen context)
 	{
 		try {
-			Screen.ordSer.addProductToOrder(Screen.activeCafeteria, Screen.activeOrder, prod, 1);			
+			context.ordSer.addProductToOrder(context.activeCafeteria, context.activeOrder, prod, 1);			
 		} catch (InsufficientStockException ex)
 		{
 			System.err.println(ex.toString());

terminalCli/src/main/java/commands/Command.java

@@ -1,11 +1,13 @@
 package commands;
 
+import terminalcli.Screen;
+
 /**
  * @author Borja_FM
  */
 
 
 public interface Command {
 
-	public void execute();
+	public void execute(Screen context);
 }

terminalCli/src/main/java/commands/RemoveProduct.java

@@ -20,10 +20,10 @@ public RemoveProduct(Product prod)
 		this.prod = prod;
 	}
 
-	public void execute()
+	public void execute(Screen context)
 	{
 		try {
-			Screen.ordSer.removeProductFromOrder(Screen.activeCafeteria, Screen.activeOrder, prod, 1);			
+			context.ordSer.removeProductFromOrder(context.activeCafeteria, context.activeOrder, prod, 1);			
 		} catch (InsufficientStockException ex)
 		{
 			System.err.println(ex.toString());

terminalCli/src/main/java/commands/ShowCafeteriaProducts.java

@@ -10,7 +10,7 @@
 
 public class ShowCafeteriaProducts implements Command {
 
-	public void execute()
+	public void execute(Screen context)
 	{
 
 	}

terminalCli/src/main/java/commands/ShowProductTypes.java

@@ -21,9 +21,9 @@ public ShowProductTypes(UIElement menu, String type)
 		productType = type;
 	}
 
-	public void execute()
+	public void execute(Screen context)
 	{
-		List<String> types = Screen.activeCafeteria.getTypes();
+		List<String> types = context.activeCafeteria.getTypes();
 
 		for(String type : types)
 		{