From f2cd0311a82c93ef193b0671a0e9d421d35b88f9 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 6 Mar 2016 14:50:41 +0100 Subject: [PATCH] Continued: - added referencedColumnName - updated jar(s) - added FacesValidator annotation - ordered attributes - added API documentation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jcoreee.jar | Bin 18591 -> 18919 bytes lib/jcountry-core.jar | Bin 6761 -> 6761 bytes lib/nblibraries.properties | 6 ++++-- .../cellphone/CellphoneNumber.java | 15 +++++++-------- .../jphone/phonenumbers/fax/FaxNumber.java | 3 +-- .../phonenumbers/landline/LandLineNumber.java | 3 +-- .../smsprovider/CellphoneProvider.java | 3 +-- .../validators/PhoneNumberValidator.java | 2 ++ 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index 8fa7868d036fb8592e8acfcd35cc661720d5984d..f2ad1c85d97e64c5a60b7580b4a440554a198134 100644 GIT binary patch delta 1121 zcma)*TSydP6vxjut2?vnu9sDN*i~k4y1TlU*^8p4dv$j;F-@q*lGsc`XcJsD2zsy! zJ_XtVA&4X}Lg+;{dIYjnBV-*EH9EB zB>KTVRf!fr06(sJL>&f5TQ{7hXhUuTr6u6p;-jC2p%LYuKc?Enh-DE zvIH4&AEvTV^l1SiSN2ds`0}{?4D{F+fantYoKZa`D_E(qcKo8}(W~tSwGug?R z8`C=QfHyA(mKejUU_WIjqYSl_K^I~SX3k)t6bB48%3#ca{W!z5&=-+g@;tn=siAhT zh)_$cm{sY~7185_Tw!a`f`)@g&?G^#1a1jDtmYNLCxRk^pTq5TJ|iT655ral7y73` z`qP>0*r8)OYC{!+#P?yBItU>G?c6f@DtT9AgrUwyFHuw@MYU7Z-DuJ!aGM00Hxy7C zDQbNV9D{vCs8JpMBiI{jl(yn5PR_jHl|K7-Yb&C!ls~5j9FFrRKi(eXoIz0|M zU(GzL0+4lr9``z9`@cU}%Y4t@>+tgG@DSDh~y3*t3b6zh$U5`y+( z(pY5d0B*WRYJ#u_!r*`?#?5Rq0~Y{Tz}Wqhr0a^AswIcOn_o9(#rMk^5Do_Y)UOsD zBN4+9(!dIa&{4sZ%Qg<4k`9U7jXY({kNK#tS_d20@lj8cZasVP^7N%C9Rd(6{)x^@ zui36a;Z-ZVnuOOzm-K2SFIS~k;m`&rucrIT!^gr&R)V~SayFbu+HlfY=Z%{aKpv zn7G*B62lBouwu;HDZ!lO4;y*gq0c-#O diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar index e31915f9ce83516b740ec7236e0ef32e13ebe3a9..8f2a52866c7ad118b28db9a470c105f6fc62f655 100644 GIT binary patch delta 140 zcmaE9^3sGiz?+$ci-CcIfkCM^Z6dD*vm%hPm=C6I$%CmsV8O}ijD{fY - * @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 { * 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; *

* @author Roland Haeder */ +@FacesValidator (value = "PhoneNumberValidator") public class PhoneNumberValidator extends BaseLongValidator implements Validator { /** -- 2.39.5