diff --git a/LAB-9/Project3.uml b/LAB-9/Project3.uml new file mode 100644 index 0000000..dc1a163 --- /dev/null +++ b/LAB-9/Project3.uml @@ -0,0 +1,2 @@ + + diff --git a/LAB-9/Project3UML.png b/LAB-9/Project3UML.png new file mode 100644 index 0000000..d25b10e Binary files /dev/null and b/LAB-9/Project3UML.png differ diff --git a/LAB-9/src/uwstout/courses/cs144/projects/project3/orders/OrderProcessor.java b/LAB-9/src/uwstout/courses/cs144/projects/project3/orders/OrderProcessor.java index 09eb3ba..2ca4b7a 100644 --- a/LAB-9/src/uwstout/courses/cs144/projects/project3/orders/OrderProcessor.java +++ b/LAB-9/src/uwstout/courses/cs144/projects/project3/orders/OrderProcessor.java @@ -186,20 +186,13 @@ public class OrderProcessor { * @return The MenuItem read in */ private MenuItem readItem(Scanner sc) { - if (sc.hasNext()) { - String itemName = sc.next(); + String itemName = sc.next(); - if (sc.hasNextDouble()) { - double itemCost = sc.nextDouble(); + double itemCost = sc.nextDouble(); - if (sc.hasNext()) { - MenuItemType itemType = MenuItemType.valueOf(sc.next()); + MenuItemType itemType = MenuItemType.valueOf(sc.next()); - return new MenuItem(itemName, itemCost, itemType); - } - } - } - return null; + return new MenuItem(itemName, itemCost, itemType); } }