From: Roland Haeder <roland@mxchange.org>
Date: Sun, 6 Mar 2016 13:50:41 +0000 (+0100)
Subject: Continued:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=f2cd0311a82c93ef193b0671a0e9d421d35b88f9;p=jphone-core.git

Continued:
- added referencedColumnName
- updated jar(s)
- added FacesValidator annotation
- ordered attributes
- added API documentation

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 8fa7868..f2ad1c8 100644
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ
diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
index e31915f..8f2a528 100644
Binary files a/lib/jcountry-core.jar and b/lib/jcountry-core.jar differ
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 6e518ff..cadf17c 100644
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -5,10 +5,12 @@ libs.CopyLibs.prop-version=2.0
 libs.javaee-api-7.0.classpath=\
     ${base}/javaee-api-7.0/javaee-api-7.0.jar
 libs.javaee-api-7.0.displayName=Java EE 7 API Library
-libs.javaee-api-7.0.javadoc=
+libs.javaee-api-7.0.javadoc=\
+    https://docs.oracle.com/javaee/7/api/
 libs.javaee-api-7.0.prop-maven-dependencies=javax:javaee-api:7.0:jar
 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/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
index d792811..e4cbea4 100644
--- a/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/cellphone/CellphoneNumber.java
@@ -22,7 +22,6 @@ import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -53,7 +52,7 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 	 * Connection to table "cellphone_provider" (for dial prefix and more data)
 	 */
 	@JoinColumn (name = "cellphone_provider_id", nullable = false)
-	@OneToOne (targetEntity = CellphoneProvider.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CellphoneProvider.class, cascade = CascadeType.MERGE, optional = false)
 	private SmsProvider cellphoneProvider;
 
 	/**
@@ -69,7 +68,7 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 	 */
 	@Id
 	@GeneratedValue (strategy = GenerationType.IDENTITY)
-	@Column (name = "cellphone_id", length = 20, updatable = false, nullable = false)
+	@Column (name = "cellphone_id", length = 20, nullable = false, updatable = false)
 	private Long phoneId;
 
 	/**
@@ -80,14 +79,14 @@ public class CellphoneNumber implements DialableCellphoneNumber, Comparable<Dial
 	private Long phoneNumber;
 
 	/**
-	 * Contructor with cellphone carrier and number
+	 * Constructor with cellphone carrier and number
 	 * <p>
-	 * @param cellphoneCarrier Cellphone carrier instance
-	 * @param cellphoneNumber Cellphone number
+	 * @param cellphoneProvider Cellphone carrier instance
+	 * @param cellphoneNumber   Cellphone number
 	 * @param phoneEntryCreated When this entry has been created
 	 */
-	public CellphoneNumber (final SmsProvider cellphoneCarrier, final Long cellphoneNumber, final Calendar phoneEntryCreated) {
-		this.cellphoneProvider = cellphoneCarrier;
+	public CellphoneNumber (final SmsProvider cellphoneProvider, final Long cellphoneNumber, final Calendar phoneEntryCreated) {
+		this.cellphoneProvider = cellphoneProvider;
 		this.phoneNumber = cellphoneNumber;
 		this.phoneEntryCreated = phoneEntryCreated;
 	}
diff --git a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
index f4b87a7..88196a5 100644
--- a/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/fax/FaxNumber.java
@@ -22,7 +22,6 @@ import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -59,7 +58,7 @@ public class FaxNumber implements DialableFaxNumber, Comparable<DialableFaxNumbe
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "fax_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false)
 	private Country faxCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
index e7b0503..ac4f7e1 100644
--- a/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
+++ b/src/org/mxchange/jphone/phonenumbers/landline/LandLineNumber.java
@@ -22,7 +22,6 @@ import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -59,7 +58,7 @@ public class LandLineNumber implements DialableLandLineNumber, Comparable<Dialab
 	 * Connection to table "country_data"
 	 */
 	@JoinColumn (name = "phone_country_id", nullable = false, updatable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false)
 	private Country phoneCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
index d0f3e55..1e1fac5 100644
--- a/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
+++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/CellphoneProvider.java
@@ -22,7 +22,6 @@ import javax.persistence.Basic;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -57,7 +56,7 @@ public class CellphoneProvider implements SmsProvider, Comparable<SmsProvider> {
 	 * Country instance ('s dial data)
 	 */
 	@JoinColumn (name = "provider_country_id", nullable = false)
-	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false, fetch = FetchType.EAGER)
+	@OneToOne (targetEntity = CountryData.class, cascade = CascadeType.MERGE, optional = false)
 	private Country providerCountry;
 
 	/**
diff --git a/src/org/mxchange/jphone/validators/PhoneNumberValidator.java b/src/org/mxchange/jphone/validators/PhoneNumberValidator.java
index edb2580..296e5b9 100644
--- a/src/org/mxchange/jphone/validators/PhoneNumberValidator.java
+++ b/src/org/mxchange/jphone/validators/PhoneNumberValidator.java
@@ -18,6 +18,7 @@ package org.mxchange.jphone.validators;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
+import javax.faces.validator.FacesValidator;
 import javax.faces.validator.Validator;
 import org.mxchange.jcoreee.validator.number.BaseLongValidator;
 
@@ -26,6 +27,7 @@ import org.mxchange.jcoreee.validator.number.BaseLongValidator;
  * <p>
  * @author Roland Haeder
  */
+@FacesValidator (value = "PhoneNumberValidator")
 public class PhoneNumberValidator extends BaseLongValidator implements Validator {
 
 	/**