From a4d79790896b92b38d4b6516d3c6589f8ebf4077 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 10 Oct 2015 22:02:27 +0200 Subject: [PATCH] Rewrite: - introduced jcountry-core which is a library for handling country-related data, e.g. dial prefix, country code ... - introduced jphone-core which is a library for handling phone, fax and cell phone numbers - these both new libraries required a rewrite of many parts --- .gitignore | 8 +- lib/jcontacts-business-core.jar | Bin 38326 -> 39604 bytes lib/jcontacts-core.jar | Bin 18101 -> 19800 bytes lib/jcontacts-lib.jar | Bin 372 -> 372 bytes lib/jcore-logger-lib.jar | Bin 2505 -> 2505 bytes lib/jcore.jar | Bin 13656 -> 13656 bytes lib/jcoreee.jar | Bin 17973 -> 17973 bytes lib/jcountry-core.jar | Bin 0 -> 5394 bytes lib/jphone-core.jar | Bin 0 -> 14657 bytes lib/juser-core.jar | Bin 16590 -> 16704 bytes lib/juser-lib.jar | Bin 3758 -> 3758 bytes nbproject/ant-deploy.xml | 212 +++++++++--------- nbproject/build-impl.xml | 76 ++++--- nbproject/genfiles.properties | 4 +- nbproject/project.properties | 6 + nbproject/project.xml | 154 +++++++------ .../beans/addressbook/AddressbookWebBean.java | 6 +- .../addressbook/beans/user/UserWebBean.java | 40 ++-- .../beans/user/UserWebController.java | 20 +- 19 files changed, 279 insertions(+), 247 deletions(-) create mode 100644 lib/jcountry-core.jar create mode 100644 lib/jphone-core.jar diff --git a/.gitignore b/.gitignore index 22f399f1..0383bcc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ -/dist/ -/build/ /nbproject/private/ +/nbproject/*~ +/manifest.mf +/build/ +/dist/ +/data/* +/*.properties diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index 9607d5cafc2f4f73a146df8192b1c83889597c96..5665c86076d45e0aeacb6a44e94b985cedcd6ef8 100644 GIT binary patch delta 3684 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 diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index 98ca617007e9f5e8090f6843513e80bec85acfa1..855385dcf75d9ff7c6acb19cddb65dde39bd5bc0 100644 GIT binary patch literal 19800 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 Ov)fz@!S#Jy#{U5Yz|DUE delta 5439 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 j%xTt~tnaEFWOPq1PH%0A;k^U?;1-WWeuvpKNm`!)iezsq diff --git a/lib/jcontacts-lib.jar b/lib/jcontacts-lib.jar index c1c68c3bec9651418b93e49019c93c307cf4b456..a736f4c652e10429aff4fb485a7ddf78e2ce089a 100644 GIT binary patch delta 43 tcmeyu^o5Bxz?+$ci-CcIfk9xs*F;_oW_}=Lv6UIb`(Od$P1a`g1OV}f3*G<# delta 43 tcmeyu^o5Bxz?+$ci-CcIfkA1l=R{r&Wp9c diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar index 8e5a5b954c3f18434a17e24e50fd7392d64bf46e..4cb7da5146cc64855a32f2f76722c7325c3514cb 100644 GIT binary patch delta 172 zcmX>pd{USmx!A#6R(pd{USmx!A#6R(UxZto@SqRIte8EL{tb zk0vkGwFgN|ey*zzrX}?(z;uY79hjb~=LM!8>A8YwEqzZgU8WD=@6&e!^Vto8z;uj3 zIGEmM5C*3C4Wq$yu3UxZto@SqRIte8EL{tb zk0vkGwFgN|ey*zzrX}?(z;uY79hjb~=LM!8>A8YwEqzZgU8WD=@6&e!^Vto8z;uj3 zIGEmM5C*3C4Wq$yu3+A{d!7IQ delta 389 zcmdnm!??AFkvG7bnT3mifrEiTajoY>UJYgiAZ0NhOx=+T5erNyy diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..ed08999183499faff1992f30a52fc7c2576ad80a GIT binary patch literal 5394 zcmeHLTW=dh6h7l5zHIC^x28>cNqV7mnkG&tl-|K{lj1fvnl#WtF&lf5Y`fWY*Xt_j z3lt$CKtf3HzzaN}3V1-`qS8tr0ne3q>>uDA_y>h^X2;(3W^M9EDI_Ds(D6 zot+q;n;)KU2bIy{n4(uSueT~zZcydV4U;fdj62_<83)#inv zv30^9A0EjaJ2s>lHn$8_A6gt4?N82FYF_948Ph77mTIHwfrOG!T!#M1G$TXPT29qR zBqU;WEx)1~%e(=!+Yh~-H_L`?tv8U_Sy!f@+Nw`*E%)9B(I#9K{3ja=W}K0S^SW9p zJ$(GbPY6E>eG%9df!z_I2$1Sw3c3WN4d6)r%5dP6`VM{Z^ z4AKICbr>R|jzUb-3bcwk4j6X$d<$$9b(?Ir%XWuscgl8`Y;Tk8ZrCp5c0dn~$er~vJ zLXW_zg0&F=GXlj3+(b*3gt=rsyqrCU7Q4V8kui;uts3@%s+T$1Eb->8YswIVSl)?m z3Z6Dk6w2`GxrBK~TjdK{NkjXm4a2lWIxI2h7Vx!Hk#cXz=0={UvIX>{eE|>7bAw|d zjH#Db$rqaqbroGnk>qk3vJ30nShiPa<+~U}jk2zjOHdmZCRQ$zOJN6t zRw?GhaEE7B)kyCN7=27FX?YwxY8ENst2+8}g+Ly28jTb}9%VzjSr#pZMv#aNq25yw z)hR*b3h2YRqDT>>M`5sC0yf5aZ$(rUIl?Q8o-7|$BfhPI)-W&RFfovRT20yS$;s_r zQ^<_mQ4udv?#|If8SJVI5}XJ+J$fp6fI)vnlUB+(lXm8tv#Pl#d|ER!`z*$9lJZ8g zvqD=ZHG@x=R~NZ8@2p^lFz14bk&i1XJDcql4c#s|xw-hlmHgLsCXAZZqH6JZlfj|Q z5IQxGWe|}DVsKy+b3p$8Z-DN$`k&qaYt9MI4klJSHm5Bcs$I4)rYuj;NXTZqz$29r zPDc@OdNYz|(SvGs=C+KJ>&5Ql?9M@1cpNjny-w~|324f!c(4&vYV*Aa%~NqW0Vm^l zEPM*X!QIL)8>Mm)&(E0kXK<4c`^NZMo{RK~=ecRq?yn;H*SS4Rie}<~yKWrz!+|&q zQZY=$2o=ZRnN6K2;&2Ye864bPrf6{f5QkUS?ywiP+pTy4h(jB`()2<*bl~RGNjn3+ zq=bk$ws&BAA8y}tW}p+pPCTdVD#32plZ8I$zlv)1Q4yj^O8kCoJ%RTJ>46kDL;^`i zVBjhoMhF^23iQ+pglL2#Brt>z&}0o@sR|5@Dq(wSwKb8pQGz|`3?HJ^mDnJvPkX4! zx#40p;Beg0+l~-)9xP9xp;A~gtXmF00QN23gy1xmVbQr4&ftCA0l-;!7F!ISgEW@4 z!uKHbjZat&6dr?&6h4bXg=nb5gWp5Q9a<5+OL)v&78<%8lpLO@Id);>aaCPS0;T*2 zO;R|9ZWTh_GBKIKdpHwk$QWxN2m566jVgIDcIH_A6 zBH=2Lu=HaFlQ0!PB;qG>JCMjU%mfjM_=&uZMBb=F#0d}vvw=jSej;xL5_ut*NYqc{ z9VGH@9U@NPF}M^+B<3gbejt&#U?MR;kq?o`M|Freq0L}Ekci?Z@^K)M%fUnxKao$6 z$ftFPILU*-0=yXDBdvZSp9KGw_WvOv88*F^oQ$m5jNbEp>c;cKAEo7syj)YVk~vlhzZ)ds(( zsjhyxaz1joqCuazNPw=pcLuSnih4eJH5!~gLpc`>{wvI-`# zQTj~fTqN3yi92||ZKQ)fTe&)>>*}B*$cB0NKVwx?-M#a6V@2{HG@yhU9FGM eyunix^t{I_@wsgFVoR8$qxd_7{`jbaT7Lrx@v2+^ literal 0 HcmV?d00001 diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar new file mode 100644 index 0000000000000000000000000000000000000000..480f9f8edebf04e4b9fe061fdeb991e5fe3849ea GIT binary patch literal 14657 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 I(i8mczs@C64FCWD literal 0 HcmV?d00001 diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 764cab64475977ea25d6ca0ab651a9505265ddcd..ae1dbfb3fe91d0177eebae36ea3da33efb5e7f15 100644 GIT binary patch delta 1048 zcmZ9LNla5g7{|Y9`&wy(tO~UfMWnnI$x}$A>5fq}EQ*N<3I5M@0CDpLfoM@4%gi(;=WS&N+AonC%^=z6r-==HgqR{-qo~dCX;!%M_Ps zE>BeOR0T6~70l8+!5BQMT_MUCpV!q;Ne#MO+OMnh-pe zx=hHkpdl?l;;X;{>1Ch?YdH`X*uYLhyVr#_P(VAaH*TS8>7JAhh=DHl!QGGsJ&*-{ z$c0|WgFYyP0Ik;NlR><@s27DH5MY>27?P+aLn33yOEN@ZlJP0z1B}lgUuJxc@piZywM;EA;y;&&nF*|{buYFW1sPEo>3xS z7`F*)jD1D+&Y0NT0CKnr1Vk@fgXZ$%&hRt`lKJ>QN5TGRPy1aDP|Mj7JAa` zz&>P_&_j&#bCu-)dXc3VeZ+Dk(sfj34KGu!^#n4%)r0=W+Jt_^=0pE!yM$h0uR&k3 z*Z;pJMULZmH15#JW;1DOl$Nby4E^SaN4(DPiWI?mM5mlOStuuhG}Nz6rZ1dZl`UpA GlJFO<+#O{A delta 974 zcmZva*-KPW9LK+BX0A4qONx`rw2X|)b;g?12PbC_u|kZ3z|!i)Bq3AGHlvyx*GjYT zfDdYExqv|%Q(y}cB(!Q0L@9wi)syrO1a;1D%m})0e&6r+bI-k(bNN0Gve{-9ySr4Y zGXSfAj5|9+v8vW0#4$v&u#w~^L7vU>W#k8#n{<#lmb1!#F(dh8O|jJQAx*i4%%rYd zM8?o^lCD=c{wT$qrx&DOjsZCa<+v`#4LOG77?$H^G;T#>BpRdKuUNyo zQWqFA@Xe+|K4Qw})h18)qv@!^%zQF^UHC!z9AjhQpe4joD#5DZgbVH}c#v6vENI|` zj}K=gac|~Vr3pHm<$kM?Z_TP(A3!{U;(INypcR|YhC;N%j}DZglTT-rurAtb&Q_HW z6!h|joMe7D+s^ukPY6CB_#p8m!H0?GtEw_4_&D)Xs-4{?{#5XLg5M|pOYn!pi*r=v zvEWYxFJV)}W(0d7*fi};u-e%x!QIM?V6(*f1^YmI7pk5GJ=0Iv*~I|03=+BiM+RmDnm{+e&Pgv1286%6RE-HDx*Wy_@g*rUm561yFzd zi2c}^s_=W8F;cAW_8*Zx%@>5Dw4%+trzq0UH$`6AI3DA)lX{#H-sIdydCFNv8t2-v zoK5_ME7JA}*Ivnb-F0-U!QDi<ji#8)a=!>EE)cQ=C8av_mEouDOGJY#?MFHXZ4Hll^UmF!yB;WEIxep4q diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index 0d4d6af3b8cfe072a93b6724f5332dff52b47760..2d9fa0509af5f2be2b488328cd52658ffbdfdab1 100644 GIT binary patch delta 204 zcmZ1{yH1ujz?+$ci-CcIfk9}!*F;_oWE z9hkns=m@4|m~27x<`|~!Okjo>D?2lop}?_^i5Y18&a1c`LxQ4POxeER#Em delta 204 zcmZ1{yH1ujz?+$ci-CcIfk9=h=R{r&W@R8{F`pU4yCn~%{%C-x$?A+oU^<4;0!&Y5 zv;)&O7#+d143jO0-WkH-v@aBQ(gS-`B+J>(P0KaTK1^@s6 diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml index 3c015605..2d5f8778 100644 --- a/nbproject/ant-deploy.xml +++ b/nbproject/ant-deploy.xml @@ -1,111 +1,111 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 4de471dc..a20c1a6a 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f The libs.CopyLibs.classpath property is not set up. -This property must point to +This property must point to org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at +of NetBeans IDE installation and is usually located at <netbeans_installation>/java<version>/ant/extra folder. Either open the project in the IDE and make sure CopyLibs library exists or setup the property manually. For example like this: @@ -1036,6 +1036,8 @@ exists or setup the property manually. For example like this: + + @@ -1051,6 +1053,8 @@ exists or setup the property manually. For example like this: + + @@ -1368,7 +1372,7 @@ exists or setup the property manually. For example like this: @@ -1407,7 +1411,7 @@ exists or setup the property manually. For example like this: @@ -1443,7 +1447,7 @@ exists or setup the property manually. For example like this: @@ -1465,35 +1469,35 @@ exists or setup the property manually. For example like this: - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + CLEANUP SECTION + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 8245c238..a923f677 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=d8bc4ea8 -nbproject/build-impl.xml.script.CRC32=855e3438 +nbproject/build-impl.xml.data.CRC32=80fe4962 +nbproject/build-impl.xml.script.CRC32=498d3940 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index 7e91062f..f47c2cdf 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -43,6 +43,8 @@ file.reference.jcontacts-lib.jar=lib/jcontacts-lib.jar file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar file.reference.jcore.jar=lib/jcore.jar file.reference.jcoreee.jar=lib/jcoreee.jar +file.reference.jcountry-core.jar=lib/jcountry-core.jar +file.reference.jphone-core.jar=lib/jphone-core.jar file.reference.juser-core.jar=lib/juser-core.jar file.reference.juser-lib.jar=lib/juser-lib.jar includes=** @@ -65,6 +67,8 @@ javac.classpath=\ ${file.reference.jcontacts-core.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.jcontacts-lib.jar}:\ + ${file.reference.jcountry-core.jar}:\ + ${file.reference.jphone-core.jar}:\ ${file.reference.juser-core.jar}:\ ${file.reference.juser-lib.jar}:\ ${reference.addressbook-lib.jar}:\ @@ -115,6 +119,8 @@ source.reference.jcontacts-lib.jar=../jcontacts-lib/src/ source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/ source.reference.jcore.jar=../jcore/src/ source.reference.jcoreee.jar=../jcoreee/src/ +source.reference.jcountry-core.jar=../jcountry-core/src/ +source.reference.jphone-core.jar=../jphone-core/src/ source.reference.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ source.root=src diff --git a/nbproject/project.xml b/nbproject/project.xml index a7f5af57..d6e38d45 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,76 +1,84 @@ - org.netbeans.modules.web.project - - - addressbook-war - 1.6.5 - - - ${file.reference.jcore.jar} - WEB-INF/lib - - - ${file.reference.jcoreee.jar} - WEB-INF/lib - - - ${file.reference.jcore-logger-lib.jar} - WEB-INF/lib - - - ${file.reference.jcontacts-core.jar} - WEB-INF/lib - - - ${file.reference.jcontacts-business-core.jar} - WEB-INF/lib - - - ${file.reference.jcontacts-lib.jar} - WEB-INF/lib - - - ${file.reference.juser-core.jar} - WEB-INF/lib - - - ${file.reference.juser-lib.jar} - WEB-INF/lib - - - ${reference.addressbook-lib.jar} - WEB-INF/lib - - - ${file.reference.cdi-api.jar} - WEB-INF/lib - - - ${file.reference.gf-client.jar} - WEB-INF/lib - - - - - - - - - - - - .\lib\nblibraries.properties - - - - addressbook-lib - jar - - jar - clean - jar - - - + org.netbeans.modules.web.project + + + addressbook-war + 1.6.5 + + + ${file.reference.jcore.jar} + WEB-INF/lib + + + ${file.reference.jcoreee.jar} + WEB-INF/lib + + + ${file.reference.jcore-logger-lib.jar} + WEB-INF/lib + + + ${file.reference.jcontacts-core.jar} + WEB-INF/lib + + + ${file.reference.jcontacts-business-core.jar} + WEB-INF/lib + + + ${file.reference.jcontacts-lib.jar} + WEB-INF/lib + + + ${file.reference.jcountry-core.jar} + WEB-INF/lib + + + ${file.reference.jphone-core.jar} + WEB-INF/lib + + + ${file.reference.juser-core.jar} + WEB-INF/lib + + + ${file.reference.juser-lib.jar} + WEB-INF/lib + + + ${reference.addressbook-lib.jar} + WEB-INF/lib + + + ${file.reference.cdi-api.jar} + WEB-INF/lib + + + ${file.reference.gf-client.jar} + WEB-INF/lib + + + + + + + + + + + + .\lib\nblibraries.properties + + + + addressbook-lib + jar + + jar + clean + jar + + + diff --git a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java index 078626ab..b007703e 100644 --- a/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/addressbook/AddressbookWebBean.java @@ -18,6 +18,7 @@ package org.mxchange.addressbook.beans.addressbook; import java.text.MessageFormat; import java.util.ArrayList; +import java.util.GregorianCalendar; import java.util.List; import javax.annotation.PostConstruct; import javax.enterprise.context.SessionScoped; @@ -119,11 +120,11 @@ public class AddressbookWebBean implements AddressbookWebController { throw new FaceletException("This method can only be called as logged-in user."); //NOI18N } else if (this.getAddressbookName() == null) { // Address book name is null - throw new IllegalStateException("addressbookName is null"); + throw new NullPointerException("addressbookName is null"); } else if (this.getAddressbookName().isEmpty()) { // Address book name is empty throw new IllegalStateException("addressbookName is empty."); - } else if (!this.isAddressbookNameUsed(this.getAddressbookName())) { + } else if (this.isAddressbookNameUsed(this.getAddressbookName())) { // Already used by this user throw new FaceletException(MessageFormat.format("Address book name {0} already used.", this.getAddressbookName())); //NOI18N } @@ -134,6 +135,7 @@ public class AddressbookWebBean implements AddressbookWebController { // Set default status to UNLOCKED and owner addressbook.setAddressbookStatus(AddressbokStatus.UNLOCKED); addressbook.setAddressbookUser(this.loginController.getLoggedInUser()); + addressbook.setAddressbookCreated(new GregorianCalendar()); try { // Register this address book diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java index 9739db93..3bc0d362 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java @@ -31,6 +31,10 @@ import javax.naming.NamingException; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcountry.data.Country; +import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.LoginUser; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.UserSessionBeanRemote; @@ -58,7 +62,7 @@ public class UserWebBean implements UserWebController { /** * Cellphone number */ - private String cellphoneNumber; + private DialableCellphoneNumber cellphoneNumber; /** * City @@ -71,9 +75,9 @@ public class UserWebBean implements UserWebController { private String comment; /** - * Country code + * Country instance */ - private String countryCode; + private Country country; /** * Email address @@ -98,7 +102,7 @@ public class UserWebBean implements UserWebController { /** * Fax number */ - private String faxNumber; + private DialableFaxNumber faxNumber; /** * First name @@ -118,7 +122,7 @@ public class UserWebBean implements UserWebController { /** * Phone number */ - private String phoneNumber; + private DialableLandLineNumber phoneNumber; /** * Street @@ -210,7 +214,7 @@ public class UserWebBean implements UserWebController { this.setHouseNumber(null); this.setZipCode(null); this.setCity(null); - this.setCountryCode(null); + this.setCountry(null); // - contact data this.setEmailAddress(null); @@ -239,7 +243,7 @@ public class UserWebBean implements UserWebController { this.setHouseNumber(user.getUserContact().getHouseNumber()); this.setZipCode(user.getUserContact().getZipCode()); this.setCity(user.getUserContact().getCity()); - this.setCountryCode(user.getUserContact().getCountryCode()); + this.setCountry(user.getUserContact().getCountry()); // - contact data this.setPhoneNumber(user.getUserContact().getPhoneNumber()); @@ -270,7 +274,7 @@ public class UserWebBean implements UserWebController { contact.setHouseNumber(this.getHouseNumber()); contact.setZipCode(this.getZipCode()); contact.setCity(this.getCity()); - contact.setCountryCode(this.getCountryCode()); + contact.setCountry(this.getCountry()); contact.setEmailAddress(this.getEmailAddress()); contact.setPhoneNumber(this.getPhoneNumber()); contact.setFaxNumber(this.getFaxNumber()); @@ -303,12 +307,12 @@ public class UserWebBean implements UserWebController { } @Override - public String getCellphoneNumber () { + public DialableCellphoneNumber getCellphoneNumber () { return this.cellphoneNumber; } @Override - public void setCellphoneNumber (final String cellphoneNumber) { + public void setCellphoneNumber (final DialableCellphoneNumber cellphoneNumber) { this.cellphoneNumber = cellphoneNumber; } @@ -333,13 +337,13 @@ public class UserWebBean implements UserWebController { } @Override - public String getCountryCode () { - return this.countryCode; + public Country getCountry () { + return this.country; } @Override - public void setCountryCode (final String countryCode) { - this.countryCode = countryCode; + public void setCountry (final Country country) { + this.country = country; } @Override @@ -373,12 +377,12 @@ public class UserWebBean implements UserWebController { } @Override - public String getFaxNumber () { + public DialableFaxNumber getFaxNumber () { return this.faxNumber; } @Override - public void setFaxNumber (final String faxNumber) { + public void setFaxNumber (final DialableFaxNumber faxNumber) { this.faxNumber = faxNumber; } @@ -413,12 +417,12 @@ public class UserWebBean implements UserWebController { } @Override - public String getPhoneNumber () { + public DialableLandLineNumber getPhoneNumber () { return this.phoneNumber; } @Override - public void setPhoneNumber (final String phoneNumber) { + public void setPhoneNumber (final DialableLandLineNumber phoneNumber) { this.phoneNumber = phoneNumber; } diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java index 56b2da08..3da777b1 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebController.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebController.java @@ -19,6 +19,10 @@ package org.mxchange.addressbook.beans.user; import java.io.Serializable; import java.util.Date; import org.mxchange.jcontacts.contact.gender.Gender; +import org.mxchange.jcountry.data.Country; +import org.mxchange.jphone.phonenumbers.cellphone.DialableCellphoneNumber; +import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; +import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; import org.mxchange.jusercore.model.user.User; /** @@ -73,14 +77,14 @@ public interface UserWebController extends Serializable { *

* @return the cellphoneNumber */ - public String getCellphoneNumber (); + public DialableCellphoneNumber getCellphoneNumber (); /** * Cellphone number *

* @param cellphoneNumber the cellphoneNumber to set */ - public void setCellphoneNumber (final String cellphoneNumber); + public void setCellphoneNumber (final DialableCellphoneNumber cellphoneNumber); /** * City @@ -115,14 +119,14 @@ public interface UserWebController extends Serializable { *

* @return the countryCode */ - public String getCountryCode (); + public Country getCountry (); /** * Country code *

* @param countryCode the countryCode to set */ - public void setCountryCode (final String countryCode); + public void setCountry (final Country countryCode); /** * Getter for email address @@ -171,14 +175,14 @@ public interface UserWebController extends Serializable { *

* @return the faxNumber */ - public String getFaxNumber (); + public DialableFaxNumber getFaxNumber (); /** * Fax number *

* @param faxNumber the faxNumber to set */ - public void setFaxNumber (final String faxNumber); + public void setFaxNumber (final DialableFaxNumber faxNumber); /** * First name @@ -227,14 +231,14 @@ public interface UserWebController extends Serializable { *

* @return the phoneNumber */ - public String getPhoneNumber (); + public DialableLandLineNumber getPhoneNumber (); /** * Phone number *

* @param phoneNumber the phoneNumber to set */ - public void setPhoneNumber (final String phoneNumber); + public void setPhoneNumber (final DialableLandLineNumber phoneNumber); /** * Street -- 2.39.5