From: Roland Haeder Date: Mon, 12 Oct 2015 11:50:33 +0000 (+0200) Subject: updated jar(s) + fixed method calls + template X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=edf9c387789b34b8062883dba8cab3508599130b;p=addressbook-war.git updated jar(s) + fixed method calls + template Signed-off-by:Roland Häder --- diff --git a/lib/jcontacts-business-core.jar b/lib/jcontacts-business-core.jar index fbe26f77..bc2ca161 100644 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 b9770441..30e96408 100644 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 b8dca2da..6da09db1 100644 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 0e0609ac..e958960e 100644 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 f861daab..01ae202d 100644 --- 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 c54746b3..77e992e4 100644 --- a/web/WEB-INF/templates/generic/form_personal_data.tpl +++ b/web/WEB-INF/templates/generic/form_personal_data.tpl @@ -176,7 +176,7 @@
- +