Continued rewriting:

- added jcontacts-lib
- updated jars
- fixed imports
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar
new file mode 100644 (file)
index 0000000..6059126
Binary files /dev/null and b/lib/jcontacts-lib.jar differ

diff --git a/lib/jcore.jar b/lib/jcore.jar
index 848bebf4503c8caeeb9557874ffa4a124337d3fb..197b9734f769ec7838a7632dec07f052ddc5990f 100644 (file)
Binary files a/lib/jcore.jar and b/lib/jcore.jar differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5655ed762391d8fd4e01294a614e258fc2700603..2bf8614d58adc9a91e1d616d2ae1686634f7ddd9 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -31,6 +31,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.commons-codec-1.10.jar=lib\\commons-codec-1.10.jar
+file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcoreee.jar=lib/jcoreee.jar
 includes=**
@@ -40,6 +41,7 @@ jar.index=${jnlp.enabled}
 javac.classpath=\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcoreee.jar}:\
+    ${file.reference.jcontacts-lib.jar}:\
     ${file.reference.commons-codec-1.10.jar}:\
     ${libs.javaee-api-7.0.classpath}
 # Space-separated list of extra javac options
@@ -93,6 +95,7 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
+source.reference.jcontacts-lib.jar=../jcontacts-lib/src/
 source.reference.jcore.jar=../jcore/src/
 source.reference.jcoreee.jar=../jcoreee/src/
 src.dir=src

diff --git a/src/org/mxchange/jshopcore/model/customer/Customer.java b/src/org/mxchange/jshopcore/model/customer/Customer.java
index 0a9492f40b3bc046c68b1b3f60f48d1d322a5892..a86b71b2f109890bb4b4bbfaf11446869292a640 100644 (file)
--- a/src/org/mxchange/jshopcore/model/customer/Customer.java
+++ b/src/org/mxchange/jshopcore/model/customer/Customer.java
@@ -18,7 +18,7 @@ package org.mxchange.jshopcore.model.customer;
 
 import java.io.Serializable;
 import java.util.Calendar;
-import org.mxchange.jcore.model.contact.Contact;
+import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jshopcore.model.customer.status.CustomerAccountStatus;
 
 /**

diff --git a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java
index 6de33c56e65c2c78bffdb55d09bc7488fab73d2a..b52754b679d5b96b4beec8b54729b8fa4d7e488b 100644 (file)
--- a/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java
+++ b/src/org/mxchange/jshopcore/model/customer/ShopCustomer.java
@@ -30,8 +30,8 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
-import org.mxchange.jcore.model.contact.Contact;
-import org.mxchange.jcore.model.contact.UserContact;
+import org.mxchange.jcontacts.contact.Contact;
+import org.mxchange.jcontacts.contact.UserContact;
 import org.mxchange.jshopcore.model.customer.status.CustomerAccountStatus;
 
 /**