X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Faddressbook%2Fbeans%2Fcontact%2FAddressbookContactWebSessionBean.java;h=d8611e094a934a2032357c9b81d2f7e8dacbe0fe;hb=93deae43a53f7f3a0884d7b424ceb9e797c0d9f4;hp=49c7ea75a4b140c3deb2e636bd27ccbb06fbb3e0;hpb=59f1b0bab3034341473b016e87a01d1fea497b09;p=addressbook-war.git diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java index 49c7ea75..d8611e09 100644 --- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java +++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebSessionBean.java @@ -384,6 +384,10 @@ public class AddressbookContactWebSessionBean implements AddressbookContactWebSe @Override @SuppressWarnings ("ReturnOfCollectionOrArrayField") public List allContacts () { + // Debug message + /* NOISY-DEBUG: */ System.out.println(MessageFormat.format("ContactController.allContacts: contactList.size()={0} - EXIT!", this.contactList.size())); + + // Return un-modified list return this.contactList; } @@ -910,6 +914,9 @@ public class AddressbookContactWebSessionBean implements AddressbookContactWebSe this.setZipCode(contact.getContactZipCode()); this.setCity(contact.getContactCity()); this.setCountry(contact.getContactCountry()); + this.setEmailAddress(contact.getContactEmailAddress()); + this.setBirthday(contact.getContactBirthday()); + this.setComment(contact.getContactComment()); // Get cellphone, phone and fax instance DialableCellphoneNumber cellphone = contact.getContactCellphoneNumber(); @@ -922,20 +929,17 @@ public class AddressbookContactWebSessionBean implements AddressbookContactWebSe this.setPhoneAreaCode(phone.getPhoneAreaCode()); this.setPhoneNumber(phone.getPhoneNumber()); } + if ((cellphone instanceof DialableCellphoneNumber) && (cellphone.getCellphoneProvider() instanceof MobileProvider)) { this.setCellphoneCarrier(cellphone.getCellphoneProvider()); this.setCellphoneNumber(cellphone.getPhoneNumber()); } + if ((fax instanceof DialableFaxNumber) && (fax.getPhoneAreaCode() > 0)) { this.setFaxCountry(fax.getPhoneCountry()); this.setFaxAreaCode(fax.getPhoneAreaCode()); this.setFaxNumber(fax.getPhoneNumber()); } - this.setEmailAddress(contact.getContactEmailAddress()); - - // -- other data - this.setBirthday(contact.getContactBirthday()); - this.setComment(contact.getContactComment()); } /**