From: Roland Haeder Date: Thu, 1 Oct 2015 12:50:37 +0000 (+0200) Subject: Continued rewriting: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c65fa698270f5d8d2827b88accc04f27fafdb190;p=jcustomer-core.git Continued rewriting: - added jcontacts-lib - updated jars - fixed imports Signed-off-by:Roland Häder --- diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar new file mode 100644 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 848bebf..197b973 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/nbproject/project.properties b/nbproject/project.properties index 5655ed7..2bf8614 100644 --- 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 0a9492f..a86b71b 100644 --- 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 6de33c5..b52754b 100644 --- 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; /**