diff --git a/myapp/.classpath b/myapp/.classpath index d598423bc916e3469710194a8b42b4b8b2abcff8..c427616fa700cc247aa84a3617d0c07a05265956 100644 --- a/myapp/.classpath +++ b/myapp/.classpath @@ -31,7 +31,7 @@ </classpathentry> <classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry exported="true" kind="lib" path="mysql-connector-java-8.0.19.jar"/> - <classpathentry exported="true" kind="lib" path="C:/Users/alita/Downloads/joda-time-2.10.5.jar"/> + <classpathentry kind="lib" path="C:/Users/alita/Downloads/joda-time-2.10.5.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> diff --git a/myapp/src/main/java/com/com1028/cw/mt00969/Main.java b/myapp/src/main/java/com/com1028/cw/mt00969/Main.java index c36df3b8e44450b38d2c1bbb55711945565a269e..b6dff4b685a85effdd13e663b4a83762c67256a3 100644 --- a/myapp/src/main/java/com/com1028/cw/mt00969/Main.java +++ b/myapp/src/main/java/com/com1028/cw/mt00969/Main.java @@ -48,9 +48,7 @@ public class Main { PaymentDAO paymentDAO = null; try { - if (paymentDAO == null) { - System.out.println("Connection to the database is succesfull\n"); - } + paymentDAO = DAOFactory.getPaymentDAO(); System.out.println( @@ -76,9 +74,7 @@ public class Main { OrderDAO orderDAO = null; try { - if (orderDAO == null) { - System.out.println("Connection to the database is succesfull\n"); - } + orderDAO = DAOFactory.getOrderDAO(); System.out.println( diff --git a/myapp/src/main/java/com/com1028/cw/mt00969/PaymentDAOImpl.java b/myapp/src/main/java/com/com1028/cw/mt00969/PaymentDAOImpl.java index ca85571db430e9188f1492ae0004dc0125b27763..b4f0c0a8a47d04cc64c019bbb54742f522bc957b 100644 --- a/myapp/src/main/java/com/com1028/cw/mt00969/PaymentDAOImpl.java +++ b/myapp/src/main/java/com/com1028/cw/mt00969/PaymentDAOImpl.java @@ -170,7 +170,7 @@ public class PaymentDAOImpl implements PaymentDAO { out += "customerNumber: " + p.getCustomerNumber() + "\n" + "customerName: " + c.getCustomerName() + "\n" + "contactFullName: " + c.getContactFirstName() + " " + c.getContactLastName() + "\n" + "amount: $" - + NumberFormat.getNumberInstance(Locale.US).format(p.getAmount()) + "\n"; + + NumberFormat.getNumberInstance(Locale.US).format(p.getAmount()) + "\n\n"; counter++; } } diff --git a/myapp/src/test/java/com/com1028/cw/mt00969/TestReq2.java b/myapp/src/test/java/com/com1028/cw/mt00969/TestReq2.java index 776b5eb895c92e01504b7df7d66475e836728d70..4987785abef0a05c23494819b0cb0c909b8c3268 100644 --- a/myapp/src/test/java/com/com1028/cw/mt00969/TestReq2.java +++ b/myapp/src/test/java/com/com1028/cw/mt00969/TestReq2.java @@ -105,7 +105,7 @@ public class TestReq2 { out += ("customerNumber: " + p.getCustomerNumber()) + "\n" + "customerName: " + c.getCustomerName() + "\n" + "contactFullName: " + c.getContactFirstName() + " " + c.getContactLastName() + "\n" + "amount: $" - + NumberFormat.getNumberInstance(Locale.US).format(p.getAmount()) + "\n"; + + NumberFormat.getNumberInstance(Locale.US).format(p.getAmount()) + "\n\n"; counter++; } }