]> git.mxchange.org Git - addressbook-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Sat, 5 Nov 2022 04:39:57 +0000 (05:39 +0100)
committerRoland Häder <roland@mxchange.org>
Sat, 5 Nov 2022 04:43:46 +0000 (05:43 +0100)
- updated to latest changes in constructor (order of parameters)
- also used newly added constructor with all optional class fields, except
  contactId, fax/land-line/mobile number and created/updated fields

src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java

index 0ed6037b6c96fd80b38771b60075931465b78645..e40ff96d20acff8ea3e58dc1422d005254e22bb9 100644 (file)
@@ -422,19 +422,21 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookBean i
                                          this.getPersonalTitle(),
                                          this.getFirstName(),
                                          this.getFamilyName(),
-                                         this.getContactCountry()
+                                         this.getContactCountry(),
+                                         Boolean.FALSE,
+                                         this.getStreet(),
+                                         this.getHouseNumber(),
+                                         this.getHouseNumberExtension(),
+                                         this.getZipCode(),
+                                         this.getCity(),
+                                         this.getEmailAddress(),
+                                         this.getAcademicTitle(),
+                                         this.getBirthday(),
+                                         this.getComment()
                          );
 
-               // Add all others
-               localContact.setContactBirthday(this.getBirthday());
-               localContact.setContactCity(this.getCity());
-               localContact.setContactComment(this.getComment());
-               localContact.setContactEmailAddress(this.getEmailAddress());
-               localContact.setContactHouseNumber(this.getHouseNumber());
+               // Add missing fields
                localContact.setContactId(this.getContactId());
-               localContact.setContactStreet(this.getStreet());
-               localContact.setContactTitle(this.getAcademicTitle());
-               localContact.setContactZipCode(this.getZipCode());
 
                // Don't set null or wrong references
                if ((landLine instanceof DialableLandLineNumber) && (landLine.getPhoneCountry() instanceof Country) && (this.getLandLineAreaCode() != null) && (this.getLandLineNumber() != null) && (this.getLandLineAreaCode() > 0) && (this.getLandLineNumber() > 0)) {
index 4bcf24cff03ba83e7ca818635290b6555668aae8..eec159650cb7753dffb4c6eacf3063855e240546 100644 (file)
@@ -497,7 +497,8 @@ public class AddressbookContactWebRequestBean extends BaseAddressbookBean implem
                                          this.getPersonalTitle(),
                                          this.getFirstName(),
                                          this.getFamilyName(),
-                                         this.getCountry()
+                                         this.getCountry(),
+                                         Boolean.FALSE
                          );
 
                // Don't set null or wrong references