Fixed errors

Author: FcoJoseBernalPerez

api/src/main/java/coreapi/OrderFactory.java

@@ -1,60 +1,60 @@
-package coreapi;
-
-import java.util.Date;
-import java.time.LocalDate;
-/**
- * The static factory to use in the creation of new order objects.
- * @author Borja
- * @author Mar�a
- * @version 0.2
- * @see Order
- */
-public class OrderFactory 
-{
-	
-	// There is just this ONE number counter, which is incremental.
-	// It starts at 0 because the first registered order will have 0 as its identification number.
-	private static int orderCount = 0;
-	
-	/**
-	 * Returns the current counter of created Orders.
-	 * 
-	 * This is id number that will be assigned to the next Order created,
-	 * which is unique for each and everyone of them.
-	 * @return	Returns the current unique id counter.
-	 */
-	public static int getOrderCount() 
-	{
-		return orderCount;
-	}
-	
-	/**
-	 * Returns a new instance of Order with a unique id.
-	 * 
-	 * Sets the timestamp as the current time of execution.
-	 * @param assignedCafeteria		The cafeteria to which the new order pertains.	
-	 * @return 	The newly created instance of an order.
-	 * @see Order
-	 */
-	public static Order createOrder(Cafeteria assignedCafeteria)
-	{
-		return createOrder(assignedCafeteria, LocalDate.now());
-	}
-
-	/**
-	 * Returns a new instance of <code>Order</code> with a unique id.
-	 * 
-	 * Sets the specified timestamp as the order's creation date.
-	 * @param assignedCafeteria		The cafeteria to which the new order pertains.
-	 * @param creationDate 			The timestamp to assign to the order.
-	 * @return 		The newly created instance of an order from the indicated date.
-	 * @see Order
-	 * @see Date
-	 */
-	public static Order createOrder(Cafeteria assignedCafeteria, LocalDate creationDate)
-	{
-		OrderImpl createdOrder = new OrderImpl(orderCount++, creationDate);
-		assignedCafeteria.registerOrder(createdOrder);
-		return createdOrder;
-	}
-}
+package coreapi;
+
+import java.util.Date;
+import java.time.LocalDate;
+/**
+ * The static factory to use in the creation of new order objects.
+ * @author Borja
+ * @author Maria
+ * @version 0.2
+ * @see Order
+ */
+public class OrderFactory 
+{
+	
+	// There is just this ONE number counter, which is incremental.
+	// It starts at 0 because the first registered order will have 0 as its identification number.
+	private static int orderCount = 0;
+	
+	/**
+	 * Returns the current counter of created Orders.
+	 * 
+	 * This is id number that will be assigned to the next Order created,
+	 * which is unique for each and everyone of them.
+	 * @return	Returns the current unique id counter.
+	 */
+	public static int getOrderCount() 
+	{
+		return orderCount;
+	}
+	
+	/**
+	 * Returns a new instance of Order with a unique id.
+	 * 
+	 * Sets the timestamp as the current time of execution.
+	 * @param assignedCafeteria		The cafeteria to which the new order pertains.	
+	 * @return 	The newly created instance of an order.
+	 * @see Order
+	 */
+	public static Order createOrder(Cafeteria assignedCafeteria)
+	{
+		return createOrder(assignedCafeteria, LocalDate.now());
+	}
+
+	/**
+	 * Returns a new instance of <code>Order</code> with a unique id.
+	 * 
+	 * Sets the specified timestamp as the order's creation date.
+	 * @param assignedCafeteria		The cafeteria to which the new order pertains.
+	 * @param creationDate 			The timestamp to assign to the order.
+	 * @return 		The newly created instance of an order from the indicated date.
+	 * @see Order
+	 * @see Date
+	 */
+	public static Order createOrder(Cafeteria assignedCafeteria, LocalDate creationDate)
+	{
+		OrderImpl createdOrder = new OrderImpl(orderCount++, creationDate);
+		assignedCafeteria.registerOrder(createdOrder);
+		return createdOrder;
+	}
+}

api/src/main/java/coreapi/OrderService.java

@@ -23,21 +23,21 @@ public OrderService() {}
 
 	/**
 	 * Adds the indicated amount of product to the order passed as an argument.
-	 * @param cafet 		The Cafeteria related to the order.
+	 * @param coffe		The Cafeteria related to the order.
 	 * @param ord 			The order to add the product to.
 	 * @param productId 	The id of the product to add to the order.
 	 * @param quantity 		The quantity of product to add to the order.
 	 * @throws InsufficientStockException	If there isn't enough stock of the product.
 	 */
-	public void addProductToOrder(Cafeteria cafet, OrderImpl ord, int productId, int quantity)
+	public void addProductToOrder(Cafeteria coffe, OrderImpl ord, int productId, int quantity)
 			throws InsufficientStockException
 	{
 		Product prod = ProductCatalog.Instance().getProduct(productId);
-		if(cafet.getAvailableProducts().contains(prod))
+		if(coffe.getAvailableProducts().contains(prod))
 		{
-			if(quantity > 0 && cafet.getProductQuantity(prod) >= quantity)
+			if(quantity > 0 && coffe.getProductQuantity(prod) >= quantity)
 			{
-				cafet.removeStock(prod, quantity);
+				coffe.removeStock(prod, quantity);
 				ord.addProduct(productId, quantity);
 			}
 			else