Minor fixes, UML

LAB-9/Project3.uml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<UMLApplication><downloaded downloaded="no" /><Version number="1.8" /><author name="" /><class name="Order" x="114" y="58" type="Class"><variables><variable name="- count : int" /><variable name="- items : MenuItem[]" /><variable name="- orderNum : int" /><variable name="- DF : NumberFormat" /><variable name="- VALUE_WIDTH : int" /><variable name="- LABEL_WIDTH : int" /><variable name="- INITIAL_SIZE" /></variables><methods><method name="+ Order(orderNum : int)" /><method name="+ Order(other : Order)" /><method name="+ getOrderNumber() : int" /><method name="+ getItemCount() : int" /><method name="+ getItem(pos : int) : MenuItem" /><method name="+ countItems(type : MenuItemType) : int" /><method name="+ addItem(item : MenuItem) : boolean" /><method name="+ getTotalCost() : double" /><method name="+ getTax() : double" /><method name="+ getTipAmount(percentage : double) : double" /><method name="+ toString() : String" /><method name="+ substituteItem(subItem : MenuItem, replacementItem : String) : boolean" /><method name="- formatLabel(labelWidth : int, valueWidth : int, value : double, label : String) : String" /></methods><data /></class><class name="MenuItemType" x="693" y="745" type="Class"><variables><variable name="+ DESSERT" /><variable name="+ SIDE" /><variable name="+ DRINK" /><variable name="+ SALAD" /><variable name="+ SOUP" /><variable name="+ ENTREE" /></variables><methods /><data /></class><class name="MenuItem" x="101" y="523" type="Class"><variables><variable name="- cost : double" /><variable name="- name: String" /><variable name="- type : MenuItemType" /><variable name="- DEFAULT_COST : double" /></variables><methods><method name="+ MenuItem(nName : String, nCost : double, nType : MenuItemType)" /><method name="+ getType() : MenuItemType" /><method name="+ getName() : String" /><method name="+ getCost() : double" /></methods><data /></class><class name="OrderList" x="866" y="46" type="Class"><variables><variable name="- count : int" /><variable name="- orders : Order[]" /><variable name="- INITIAL_SIZE : int" /></variables><methods><method name="+ OrderList()" /><method name="+ OrderList(other : OrderList)" /><method name="+ getOrderCount() : int" /><method name="+ getOrder(pos : int) : Order" /><method name="+ addOrder(other : Order) : void" /><method name="+ findOrder(orderNumber : int) : Order" /><method name="+ getGrandTotal() : double" /><method name="+ substituteItems(subItem : MenuItem, replacementName : String) : int" /><method name="+ clearList() : void" /><method name="- growArray() : void" /></methods><data /></class><class name="OrderProcessor" x="940" y="475" type="Class"><variables><variable name="- oList : OrderList" /><variable name="- DF : NumberFormat" /></variables><methods><method name="+ OrderProcessor(nOlist : OrderList)" /><method name="+ getList() : OrderList" /><method name="+ processOrders(sc : Scanner) : void" /><method name="+ getOrderSummary() : String" /><method name="+ getMenuItemSummary(types : MenuItemType[]) : String" /><method name="- orderCommand(sc : Scanner) : void" /><method name="- itemCommand(sc : Scanner) : void" /><method name="- subCommand(sc : Scanner) : void" /><method name="- readItem(sc : Scanner) : MenuItem" /></methods><data /></class><relation from="Order" to="MenuItem" type="Aggregation"><data /></relation><relation from="MenuItem" to="MenuItemType" type="Aggregation"><data /></relation><relation from="OrderList" to="Order" type="Aggregation"><data /></relation><relation from="OrderProcessor" to="OrderList" type="Aggregation"><data /></relation><relation from="OrderProcessor" to="MenuItemType" type="Association"><data /></relation><relation from="OrderProcessor" to="MenuItem" type="Association"><data /></relation><relation from="OrderList" to="MenuItem" type="Association"><data /></relation><relation from="Order" to="MenuItemType" type="Association"><data /></relation><data><item id="org.minimUML.plugins.classes.DefaultClassPlugin" value="MethodsFirst:null" /></data></UMLApplication>

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);
 	}
 
 }