Created the exception classes as separate files.

Author: ProgrammingKiddo

src/main/java/coreapi/InsufficientStockException.java

@@ -0,0 +1,21 @@
+/**
+ * 
+ */
+package coreapi;
+
+/**
+ * @author Maria
+ * @author Borja
+ * @version 0.1
+ *
+ */
+public class InsufficientStockException extends Exception {
+
+	/**
+	 * @param message
+	 */
+	public InsufficientStockException(String message) {
+		super(message);
+	}
+
+}

src/main/java/coreapi/OrderService.java

@@ -1,5 +1,6 @@
 /**
- *  @author María
+ *  @author Maria
+ *  @author Borja
  *  @version 0.2
  */
 
@@ -8,36 +9,7 @@
 import java.math.BigDecimal;
 import java.util.Date;
 
-/*_________________________________________EXCEPTION_CLASSES______________________________ */
 
-//Class that throws an exception when there is not enough stock of the product.
-class InsufficientStock extends Exception
-{
-	public InsufficientStock(String msg)
-	{
-		super(msg);
-	}
-}
-
-//Class that throws exceptions related to the products in the basket.
-class ExistenceInTheBasket extends Exception
-{
-	public ExistenceInTheBasket(String msg)
-	{
-		super(msg);
-	}
-}
-
-//Class that throws exceptions related to order status change.
-class StatusException extends Exception
-{
-	public StatusException(String msg)
-	{
-		super(msg);
-	}
-}
-
-/*_________________________________________CLASS_ORDERSERVICE______________________________ */
 public class OrderService
 {
 	//Create a new object of OrderService
@@ -56,12 +28,12 @@ public OrderService() {}
 	 * @throws If the product is already in the basket
 	 * @throws If there isn't enough stock of the product
 	 */
-	public void addProductToOrder(Cafeteria coffe, OrderImpl ord, int productId, int q)throws InsufficientStock, ExistenceInTheBasket
+	public void addProductToOrder(Cafeteria coffe, OrderImpl ord, int productId, int q)throws InsufficientStockException, ProductAlreadyInOrderException
 	{
 		Product prod = ProductCatalog.Instance().getProduct(productId);
 		if(ord.containsProduct(productId))
 		{
-			throw new ExistenceInTheBasket("This product is already in your basket, you can modify the quantity of it if you wish.");
+			throw new ProductAlreadyInOrderException("This product is already in your basket, you can modify the quantity of it if you wish.");
 		}
 		else
 		{
@@ -73,7 +45,7 @@ public void addProductToOrder(Cafeteria coffe, OrderImpl ord, int productId, int
 				}
 				else
 				{
-					throw new InsufficientStock("There is not enough stock of the product.");
+					throw new InsufficientStockException("There is not enough stock of the product.");
 				}
 			}
 		}
@@ -90,7 +62,7 @@ public void addProductToOrder(Cafeteria coffe, OrderImpl ord, int productId, int
 	 * @throws If there isn't enough stock of the product
 	 * @throws If the product isn't in the basket
 	 */
-	public void modifyProductQuantity(Cafeteria coffe, OrderImpl ord, int productId, int q)throws InsufficientStock, ExistenceInTheBasket
+	public void modifyProductQuantity(Cafeteria coffe, OrderImpl ord, int productId, int q)throws InsufficientStockException, ProductNotContainedInOrderException
 	{
 		Product prod = ProductCatalog.Instance().getProduct(productId);
 
@@ -102,12 +74,12 @@ public void modifyProductQuantity(Cafeteria coffe, OrderImpl ord, int productId,
 			}
 			else
 			{
-				throw new InsufficientStock("There is not enough stock of the product.");
+				throw new InsufficientStockException("There is not enough stock of the product.");
 			}
 		}
 		else
 		{
-			throw new ExistenceInTheBasket("The product is not in your basket.");
+			throw new ProductNotContainedInOrderException("The product is not in your basket.");
 		}
 
 	}
@@ -121,7 +93,7 @@ public void modifyProductQuantity(Cafeteria coffe, OrderImpl ord, int productId,
 	 * @throws If the quantity to remove is bigger than the quantity which is stock in the order
 	 * @throws If the product isn't in the basket
 	 */
-	public void removeProductFromOrder(OrderImpl ord, int productId, int q)throws ExistenceInTheBasket, InsufficientStock
+	public void removeProductFromOrder(OrderImpl ord, int productId, int q)throws InsufficientStockException, ProductNotContainedInOrderException
 	{
 		int quantbasket = ord.checkProductQuantity(productId);
 		if(ord.containsProduct(productId))
@@ -132,12 +104,12 @@ public void removeProductFromOrder(OrderImpl ord, int productId, int q)throws Ex
 			}
 			else
 			{
-				throw new InsufficientStock("Can't remove that amount of product.");
+				throw new InsufficientStockException("Can't remove that amount of product.");
 			}
 		}	
 		else
 		{
-			throw new ExistenceInTheBasket("This object is not in your basket.");
+			throw new ProductNotContainedInOrderException("This product is not in your basket.");
 		}
 
 	}
@@ -148,7 +120,7 @@ public void removeProductFromOrder(OrderImpl ord, int productId, int q)throws Ex
 	 * Assign the status to the order
 	 * @param ord the order which status change
 	 */
-	public void OrderStatus_InKitchen(OrderImpl ord)throws StatusException
+	public void OrderStatus_InKitchen(OrderImpl ord)throws UnreachableStatusException
 	{
 		//There must be products in the basket and the order be in the open state
 		if(!ord.getProducts().isEmpty() && ord.getStatus() == OrderStatus.OPEN)
@@ -157,7 +129,7 @@ public void OrderStatus_InKitchen(OrderImpl ord)throws StatusException
 		}
 		else
 		{
-			throw new StatusException("The order has no products to send to the kitchen.");
+			throw new UnreachableStatusException("The order has no products to send to the kitchen.");
 		}
 	}
 
@@ -166,7 +138,7 @@ public void OrderStatus_InKitchen(OrderImpl ord)throws StatusException
 	 * Assign the status to the order
 	 * @param ord the order which status change
 	 */
-	public void OrderStatus_Delivered(OrderImpl ord)throws StatusException
+	public void OrderStatus_Delivered(OrderImpl ord)throws UnreachableStatusException
 	{
 		//The state must be in the kitchen to be delivered
 		if(ord.getStatus() == OrderStatus.IN_KITCHEN)
@@ -175,15 +147,15 @@ public void OrderStatus_Delivered(OrderImpl ord)throws StatusException
 		}
 		else
 		{
-			throw new StatusException("The order cannot be entered if it has not been in the kitchen.");
+			throw new UnreachableStatusException("The order cannot be entered if it has not been in the kitchen.");
 		}
 	}
 	/**
 	 * Receive an order
 	 * Assign the status to the order
 	 * @param ord the order which status change
 	 */
-	public void OrderStatus_Payed(OrderImpl ord)throws StatusException
+	public void OrderStatus_Payed(OrderImpl ord)throws UnreachableStatusException
 	{
 		//The state must be delivered or in the kitchen in order to be paid
 		if(ord.getStatus() == OrderStatus.IN_KITCHEN || ord.getStatus() == OrderStatus.DELIVERED)
@@ -192,7 +164,7 @@ public void OrderStatus_Payed(OrderImpl ord)throws StatusException
 		}
 		else
 		{
-			throw new StatusException("The order cannot be charged because it is not yet in the kitchen or delivered.");
+			throw new UnreachableStatusException("The order cannot be charged because it is not yet in the kitchen or delivered.");
 		}
 
 	}
@@ -201,7 +173,7 @@ public void OrderStatus_Payed(OrderImpl ord)throws StatusException
 	 * Assign the status to the order
 	 * @param ord the order which status change
 	 */
-	public void OrderStatus_Finished(OrderImpl ord)throws StatusException
+	public void OrderStatus_Finished(OrderImpl ord)throws UnreachableStatusException
 	{
 		// The state must be charged in order to be finalized
 		if(ord.getStatus() == OrderStatus.PAYED)
@@ -210,7 +182,7 @@ public void OrderStatus_Finished(OrderImpl ord)throws StatusException
 		}
 		else
 		{
-			throw new StatusException("The order cannot be finalized because it has not been charged.");
+			throw new UnreachableStatusException("The order cannot be finalized because it has not been charged.");
 		}
 
 	}

src/main/java/coreapi/ProductAlreadyInOrderException.java

@@ -0,0 +1,21 @@
+/**
+ * 
+ */
+package coreapi;
+
+/**
+ * @author Maria
+ * @author Borja
+ * @version 0.1
+ *
+ */
+public class ProductAlreadyInOrderException extends Exception
+{
+
+	/**
+	 * @param message
+	 */
+	public ProductAlreadyInOrderException(String message) {
+		super(message);
+	}
+}

src/main/java/coreapi/ProductNotContainedInOrderException.java

@@ -0,0 +1,22 @@
+/**
+ * 
+ */
+package coreapi;
+
+/**
+ * @author Maria
+ * @author Borja
+ * @version 0.1
+ *
+ */
+public class ProductNotContainedInOrderException extends Exception
+{
+
+	/**
+	 * @param message
+	 */
+	public ProductNotContainedInOrderException(String message) {
+		super(message);
+	}
+
+}

src/main/java/coreapi/UnreachableStatusException.java

@@ -0,0 +1,21 @@
+/**
+ * 
+ */
+package coreapi;
+
+/**
+ * @author Maria
+ * @author Borja
+ * @version 0.1
+ *
+ */
+public class UnreachableStatusException extends Exception
+{
+
+	/**
+	 * @param message
+	 */
+	public UnreachableStatusException(String message) {
+		super(message);
+	}
+}