From: Roland Haeder Date: Sun, 6 Mar 2016 15:26:01 +0000 (+0100) Subject: updated jar(s) + added API documentation + added referencedColumnName X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f030f3c7c82485f354fed26d5f52cab2ecdf4f72;p=jcontacts-core.git updated jar(s) + added API documentation + added referencedColumnName Signed-off-by: Roland Häder --- diff --git a/lib/jcore.jar b/lib/jcore.jar index eda5d6c..23ef19d 100644 Binary files a/lib/jcore.jar and b/lib/jcore.jar differ diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index 2623d9d..8f2a528 100644 Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 207f305..4d6b6c1 100644 Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties index eb8bfc7..8d00141 100644 --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@ -5,5 +5,6 @@ libs.CopyLibs.prop-version=2.0 libs.jpa20-persistence.classpath=\ ${base}/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar libs.jpa20-persistence.displayName=Persistence (JPA 2.1) -libs.jpa20-persistence.javadoc= +libs.jpa20-persistence.javadoc=\ + https://docs.oracle.com/javaee/7/api/ libs.jpa20-persistence.prop-maven-dependencies=org.eclipse.persistence:javax.persistence:2.1.0:jar diff --git a/nbproject/project.properties b/nbproject/project.properties index 7c117d2..2de7e48 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -45,6 +45,7 @@ javac.classpath=\ # Space-separated list of extra javac options javac.compilerargs=-Xlint:unchecked -Xlint:deprecation javac.deprecation=true +javac.external.vm=false javac.processorpath=\ ${javac.classpath} javac.source=1.7 diff --git a/src/org/mxchange/jcontacts/contact/UserContact.java b/src/org/mxchange/jcontacts/contact/UserContact.java index 84620d9..5d24b7b 100644 --- a/src/org/mxchange/jcontacts/contact/UserContact.java +++ b/src/org/mxchange/jcontacts/contact/UserContact.java @@ -85,7 +85,7 @@ public class UserContact implements Contact, Comparable { /** * Cellphone number */ - @JoinColumn (name = "contact_cellphone_number_id") + @JoinColumn (name = "contact_cellphone_number_id", referencedColumnName = "cellphone_id") @OneToOne (targetEntity = CellphoneNumber.class, cascade = CascadeType.ALL) private DialableCellphoneNumber contactCellphoneNumber; @@ -105,7 +105,7 @@ public class UserContact implements Contact, Comparable { /** * Country code */ - @JoinColumn (name = "contact_country_id", nullable = false) + @JoinColumn (name = "contact_country_id", nullable = false, referencedColumnName = "country_id") @OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER) private Country contactCountry; @@ -133,7 +133,7 @@ public class UserContact implements Contact, Comparable { /** * Fax number */ - @JoinColumn (name = "contact_fax_number_id") + @JoinColumn (name = "contact_fax_number_id", referencedColumnName = "fax_id") @OneToOne (targetEntity = FaxNumber.class, cascade = CascadeType.ALL) private DialableFaxNumber contactFaxNumber; @@ -175,7 +175,7 @@ public class UserContact implements Contact, Comparable { /** * Phone number */ - @JoinColumn (name = "contact_phone_number_id") + @JoinColumn (name = "contact_phone_number_id", referencedColumnName = "phone_id") @OneToOne (targetEntity = LandLineNumber.class, cascade = CascadeType.ALL) private DialableLandLineNumber contactPhoneNumber; @@ -212,6 +212,9 @@ public class UserContact implements Contact, Comparable { * @param contactFamilyName Family name */ public UserContact (final Gender contactGender, final String contactFirstName, final String contactFamilyName) { + // Call other constructor + this(); + // Set all this.contactGender = contactGender; this.contactFirstName = contactFirstName; @@ -222,15 +225,10 @@ public class UserContact implements Contact, Comparable { * Default constructor */ public UserContact () { + // Default is not user's own contact + this.contactOwnContact = Boolean.FALSE; } - /** - * Compares two contacts with each other - *

- * @param contact Contact comparator - *

- * @return Comparison value - */ @Override public int compareTo (final Contact contact) { // contact should not be null