updated jar(s) + fixed method calls + template

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

diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar
index fbe26f77d5b6b551c3c196627875d93f84c8d915..bc2ca161b5dcd606d2dff54511b93357bd6fde5a 100644 (file)
Binary files a/lib/jcontacts-business-core.jar and b/lib/jcontacts-business-core.jar differ

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
index b977044176df140d0a842f3cd87d2d9913325158..30e9640892d5fe2c8dbe696eeb1e857b2d0c5c9c 100644 (file)
Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ

diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar
index b8dca2dabf7a76459a987f1aa219cbae8f80a21f..6da09db142b3d85355881e06c93e869b931e72a0 100644 (file)
Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ

diff --git a/lib/juser-core.jar b/lib/juser-core.jar
index 0e0609acaf1efab9977d37fb9aba9fc99e0c48ce..e958960ef6dbcf19788af4b132336397601aa098 100644 (file)
Binary files a/lib/juser-core.jar and b/lib/juser-core.jar differ

diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
index f861daab8af3f5939ac7351e6a4bb9e799e1b90a..01ae202d93fc4fc4f80836e55ae21b79e855b139 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
@@ -219,16 +219,16 @@ public class UserWebBean implements UserWebController {
                if (this.userNameList.contains(user.getUserName())) {
                        // Abort here
                        throw new IllegalArgumentException(MessageFormat.format("User name {0} already added.", user.getUserName()));
-               } else if (this.emailAddressList.contains(user.getUserContact().getEmailAddress())) {
+               } else if (this.emailAddressList.contains(user.getUserContact().getContactEmailAddress())) {
                        // Already added
-                       throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getEmailAddress()));
+                       throw new IllegalArgumentException(MessageFormat.format("Email address {0} already added.", user.getUserContact().getContactEmailAddress()));
                }
 
                // Add user name
                this.userNameList.add(user.getUserName());
 
                // Add email addres
-               this.emailAddressList.add(user.getUserContact().getEmailAddress());
+               this.emailAddressList.add(user.getUserContact().getContactEmailAddress());
        }
 
        @Override
@@ -265,19 +265,19 @@ public class UserWebBean implements UserWebController {
                // Copy all fields:
                // - base data
                this.setUserId(user.getUserId());
-               this.setGender(user.getUserContact().getGender());
-               this.setFirstName(user.getUserContact().getFirstName());
-               this.setFamilyName(user.getUserContact().getFamilyName());
-               this.setStreet(user.getUserContact().getStreet());
-               this.setHouseNumber(user.getUserContact().getHouseNumber());
-               this.setZipCode(user.getUserContact().getZipCode());
-               this.setCity(user.getUserContact().getCity());
-               this.setCountry(user.getUserContact().getCountry());
+               this.setGender(user.getUserContact().getContactGender());
+               this.setFirstName(user.getUserContact().getContactFirstName());
+               this.setFamilyName(user.getUserContact().getContactFamilyName());
+               this.setStreet(user.getUserContact().getContactStreet());
+               this.setHouseNumber(user.getUserContact().getContactHouseNumber());
+               this.setZipCode(user.getUserContact().getContactZipCode());
+               this.setCity(user.getUserContact().getContactCity());
+               this.setCountry(user.getUserContact().getContactCountry());
 
                // Get cellphone, phone and fax instance
-               DialableCellphoneNumber cellphone = user.getUserContact().getCellphoneNumber();
-               DialableFaxNumber fax = user.getUserContact().getFaxNumber();
-               DialableLandLineNumber phone = user.getUserContact().getPhoneNumber();
+               DialableCellphoneNumber cellphone = user.getUserContact().getContactCellphoneNumber();
+               DialableFaxNumber fax = user.getUserContact().getContactFaxNumber();
+               DialableLandLineNumber phone = user.getUserContact().getContactPhoneNumber();
 
                // - contact data
                if (phone instanceof DialableLandLineNumber) {
@@ -294,11 +294,11 @@ public class UserWebBean implements UserWebController {
                        this.setFaxAreaCode(fax.getPhoneAreaCode());
                        this.setFaxNumber(fax.getPhoneNumber());
                }
-               this.setEmailAddress(user.getUserContact().getEmailAddress());
+               this.setEmailAddress(user.getUserContact().getContactEmailAddress());
 
                // -- other data
-               this.setBirthday(user.getUserContact().getBirthday());
-               this.setComment(user.getUserContact().getComment());
+               this.setBirthday(user.getUserContact().getContactBirthday());
+               this.setComment(user.getUserContact().getContactComment());
        }
 
        @Override
@@ -320,21 +320,21 @@ public class UserWebBean implements UserWebController {
 
                // Create new contact
                Contact contact = new UserContact(this.getGender(), this.getFirstName(), this.getFamilyName());
-               contact.setStreet(this.getStreet());
-               contact.setHouseNumber(this.getHouseNumber());
-               contact.setZipCode(this.getZipCode());
-               contact.setCity(this.getCity());
-               contact.setCountry(this.getCountry());
-               contact.setEmailAddress(this.getEmailAddress());
-               contact.setPhoneNumber(phone);
-               contact.setFaxNumber(fax);
-               contact.setCellphoneNumber(cellphone);
-               contact.setBirthday(this.getBirthday());
-               contact.setComment(this.getComment());
+               contact.setContactStreet(this.getStreet());
+               contact.setContactHouseNumber(this.getHouseNumber());
+               contact.setContactZipCode(this.getZipCode());
+               contact.setContactCity(this.getCity());
+               contact.setContactCountry(this.getCountry());
+               contact.setContactEmailAddress(this.getEmailAddress());
+               contact.setContactPhoneNumber(phone);
+               contact.setContactFaxNumber(fax);
+               contact.setContactCellphoneNumber(cellphone);
+               contact.setContactBirthday(this.getBirthday());
+               contact.setContactComment(this.getComment());
 
                // Created timestamp and ownContact
-               contact.setCreated(new GregorianCalendar());
-               contact.setOwnContact(Boolean.TRUE);
+               contact.setContactCreated(new GregorianCalendar());
+               contact.setContactOwnContact(Boolean.TRUE);
 
                // Set contact in user
                user.setUserContact(contact);
@@ -597,7 +597,7 @@ public class UserWebBean implements UserWebController {
 
        @Override
        public boolean isEmailAddressRegistered (final User user) {
-               return ((this.emailAddressList instanceof List) && (this.emailAddressList.contains(user.getUserContact().getEmailAddress())));
+               return ((this.emailAddressList instanceof List) && (this.emailAddressList.contains(user.getUserContact().getContactEmailAddress())));
        }
 
        @Override

diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index c54746b3a33db5b89fd05b5dabb20a7eeb4476d6..77e992e43f12b390d79642ea627bceea933bf6f4 100644 (file)
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -176,7 +176,7 @@
                                <div class="table_right">
                                        <h:selectOneMenu class="select" id="cellphoneCarrier" value="#{userController.cellphoneCarrier}" converter="cellphoneCarrier">
                                                <f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-                                               <f:selectItems value="#{cellphone.allSmsProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.country.countryLocalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
+                                               <f:selectItems value="#{cellphone.allSmsProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryLocalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
                                        </h:selectOneMenu>
 
                                        <h:inputText class="input" id="cellphoneNumber" size="10" maxlength="20" value="#{userController.cellphoneNumber}">