From 51f90b60457be41377aaf7b5182415f60d18f52d Mon Sep 17 00:00:00 2001
From: alita <alita@Ali.Home>
Date: Sun, 19 Apr 2020 20:53:04 +0100
Subject: [PATCH] Formatted code
---
myapp/.classpath | 2 +-
myapp/src/main/java/com/com1028/cw/mt00969/Main.java | 8 ++------
.../main/java/com/com1028/cw/mt00969/PaymentDAOImpl.java | 2 +-
myapp/src/test/java/com/com1028/cw/mt00969/TestReq2.java | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/myapp/.classpath b/myapp/.classpath
index d598423..c427616 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 c36df3b..b6dff4b 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 ca85571..b4f0c0a 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 776b5eb..4987785 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++;
}
}
--
GitLab