diff --git a/myapp/src/main/java/com/com1028/cw/mt00969/Class Diagram.ucls b/myapp/src/main/java/com/com1028/cw/mt00969/Class Diagram.ucls index 12c4e090c247e392b8092d618afd4d527b7a6e3a..968b5cd3e574a74ff876a818122bac510b7a0355 100644 --- a/myapp/src/main/java/com/com1028/cw/mt00969/Class Diagram.ucls +++ b/myapp/src/main/java/com/com1028/cw/mt00969/Class Diagram.ucls @@ -3,7 +3,7 @@ associations="true" dependencies="false" nesting-relationships="true" router="FAN"> <class id="1" language="java" name="com.com1028.cw.mt00969.BaseQuery" project="myapp" file="/myapp/src/main/java/com/com1028/cw/mt00969/BaseQuery.java" binary="false" corner="BOTTOM_RIGHT"> - <position height="-1" width="-1" x="719" y="154"/> + <position height="-1" width="-1" x="716" y="155"/> <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" sort-features="false" accessors="true" visibility="true"> <attributes public="true" package="true" protected="true" private="true" static="true"/> diff --git a/myapp/src/main/java/com/com1028/cw/mt00969/Order.java b/myapp/src/main/java/com/com1028/cw/mt00969/Order.java index 0a94f78e796717a4fc02fd9314330001501d2f61..fec0995c83853f55c88f6db759acfd06ef91b16f 100644 --- a/myapp/src/main/java/com/com1028/cw/mt00969/Order.java +++ b/myapp/src/main/java/com/com1028/cw/mt00969/Order.java @@ -102,7 +102,7 @@ public class Order { return sortedOrders; } - public static String allOrders() { + public static String allOrdersAverageDeliveryTime() { int counter = 0; String pattern = "###.00"; @@ -136,7 +136,7 @@ public class Order { System.out.println( "\n----- Compute the average time between order date and ship date for each customer. -----\n----- Order it by the largest difference ----- \n"); - System.out.println(allOrders()); + System.out.println(allOrdersAverageDeliveryTime()); System.out.println( "End of printing...\n------------------------------------------------------------------------------------------------------------"); diff --git a/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java b/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java index 6897b7ac681a76ef469f60a9e5f5d7fb74a32e57..65806675e8572fe5dc62879ca7140aa3c9b07f3f 100644 --- a/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java +++ b/myapp/src/test/java/com/com1028/cw/mt00969/RequirementTests.java @@ -169,7 +169,7 @@ public class RequirementTests { } Order.getData(); - Actual = Order.allOrders(); + Actual = Order.allOrdersAverageDeliveryTime(); System.out.println("*****Requirement Set F Task 3*****");