Please cherry-pick:

- updated jphone-core.jar requires now some new getter/setter names like
  getMobileEntryUpdated(), setContactEntry<Created|Updated>() and many more

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

diff --git a/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java b/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java
index 3b39a56eef2f820d9e08e8eddfef4d4e2135f9d1..a02662d6568b4d7929ca981601b8e260811c198d 100644 (file)
--- a/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/model/contact/PizzaAdminContactSessionBean.java
@@ -70,7 +70,7 @@ public class PizzaAdminContactSessionBean extends BasePizzaEnterpriseBean implem
                }
 
                // Set created timestamp
-               contact.setContactCreated(new Date());
+               contact.setContactEntryCreated(new Date());
 
                // Set all created timestamps, if instance is there
                this.setAllPhoneEntriesCreated(contact);

diff --git a/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java b/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java
index 89beec26e196e2cf0f95fa6fd10ee2a1990b5337..f0cf286f0a7dd3c754ff8d5e9102ded75efb5282 100644 (file)
--- a/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java
+++ b/src/java/org/mxchange/jcontacts/model/phone/PizzaAdminContactPhoneSessionBean.java
@@ -192,12 +192,12 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaEnterpriseBean i
                } else if (null == mobileNumber) {
                        // Throw NPE
                        throw new NullPointerException("mobileNumber is null"); //NOI18N
-               } else if (mobileNumber.getPhoneId() == null) {
+               } else if (mobileNumber.getMobileId() == null) {
                        // Throw it again
                        throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
-               } else if (mobileNumber.getPhoneId() < 1) {
+               } else if (mobileNumber.getMobileId() < 1) {
                        // Invalid id
-                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getMobileId())); //NOI18N
                } else if (mobileNumber.getMobileProvider() == null) {
                        // Throw NPE again
                        throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
@@ -357,9 +357,9 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaEnterpriseBean i
                } else if (null == mobileNumber) {
                        // Throw NPE
                        throw new NullPointerException("mobileNumber is null"); //NOI18N
-               } else if (mobileNumber.getPhoneId() instanceof Long) {
+               } else if (mobileNumber.getMobileId() instanceof Long) {
                        // Throw it again
-                       throw new IllegalStateException(MessageFormat.format("mobileNumber.phoneId={0} is not null", mobileNumber.getPhoneId())); //NOI18N
+                       throw new IllegalStateException(MessageFormat.format("mobileNumber.phoneId={0} is not null", mobileNumber.getMobileId())); //NOI18N
                } else if (mobileNumber.getMobileProvider() == null) {
                        // Throw NPE again
                        throw new NullPointerException("mobileNumber.mobileProvider is null"); //NOI18N
@@ -372,7 +372,7 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaEnterpriseBean i
                }
 
                // Set created instance
-               mobileNumber.setPhoneEntryCreated(new Date());
+               mobileNumber.setMobileEntryCreated(new Date());
 
                // Set mobile number in contact
                contact.setContactMobileNumber(mobileNumber);
@@ -489,15 +489,15 @@ public class PizzaAdminContactPhoneSessionBean extends BasePizzaEnterpriseBean i
                } else if (contact.getContactMobileNumber() == null) {
                        // Not set cell phone instance
                        throw new PhoneNumberNotLinkedException(mobileNumber);
-               } else if (contact.getContactMobileNumber().getPhoneId() == null) {
+               } else if (contact.getContactMobileNumber().getMobileId() == null) {
                        // Throw NPE again
                        throw new NullPointerException("contact.contactMobileNumber.phoneId is null"); //NOI18N
-               } else if (contact.getContactMobileNumber().getPhoneId() < 1) {
+               } else if (contact.getContactMobileNumber().getMobileId() < 1) {
                        // Invalid id number
-                       throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} is invalid.", contact.getContactMobileNumber().getPhoneId())); //NOI18N
-               } else if (!Objects.equals(mobileNumber.getPhoneId(), contact.getContactMobileNumber().getPhoneId())) {
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} is invalid.", contact.getContactMobileNumber().getMobileId())); //NOI18N
+               } else if (!Objects.equals(mobileNumber.getMobileId(), contact.getContactMobileNumber().getMobileId())) {
                        // Not same object
-                       throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} and mobileNumber.phoneId={1} are not the same.", contact.getContactMobileNumber().getPhoneId(), mobileNumber.getPhoneId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("contact.contactMobileNumber.phoneId={0} and mobileNumber.phoneId={1} are not the same.", contact.getContactMobileNumber().getMobileId(), mobileNumber.getMobileId())); //NOI18N
                }
 
                // Remove it from contact

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java
index c6c220c5382f390986ba02ceaa3d60ff67e53505..6ade86ced746f5d7e011b87c5e361055f06df9ae 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/basicdata/PizzaAdminBusinessDataSessionBean.java
@@ -18,7 +18,6 @@ package org.mxchange.jcontactsbusiness.model.basicdata;
 
 import java.text.MessageFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
@@ -85,7 +84,7 @@ public class PizzaAdminBusinessDataSessionBean extends BasePizzaEnterpriseBean i
                }
 
                // Now add current date
-               basicData.setCompanyCreated(new Date());
+               basicData.setCompanyEntryCreated(new Date());
 
                // Is there a owner set?
                if (basicData.getCompanyUserOwner() instanceof User) {
@@ -144,16 +143,13 @@ public class PizzaAdminBusinessDataSessionBean extends BasePizzaEnterpriseBean i
         * @return Whether same company name has been used
         */
        private boolean isSameCompanyNameAdded (final BasicData basicData) {
-               // Get all available entries
-               final List<BasicData> list = this.businessDataBean.allBusinessBasicData();
-
                // Default is not found
                boolean isFound = false;
 
                // Then check each entry
-               for (final BasicData entry : list) {
+               for (final BasicData currentBasicData : this.businessDataBean.allBusinessBasicData()) {
                        // Is the company name matching?
-                       if (Objects.equals(entry.getCompanyName(), basicData.getCompanyName())) {
+                       if (Objects.equals(currentBasicData.getCompanyName(), basicData.getCompanyName())) {
                                // Found match
                                isFound = true;
                        }
@@ -171,16 +167,13 @@ public class PizzaAdminBusinessDataSessionBean extends BasePizzaEnterpriseBean i
         * @return Whether same company short name has been used
         */
        private boolean isSameCompanyShortNameAdded (final BasicData basicData) {
-               // Get all available entries
-               final List<BasicData> list = this.businessDataBean.allBusinessBasicData();
-
                // Default is not found
                boolean isFound = false;
 
                // Then check each entry
-               for (final BasicData entry : list) {
+               for (final BasicData currentBasicData : this.businessDataBean.allBusinessBasicData()) {
                        // Is the company name matching?
-                       if (Objects.equals(entry.getCompanyShortName(), basicData.getCompanyShortName())) {
+                       if (Objects.equals(currentBasicData.getCompanyShortName(), basicData.getCompanyShortName())) {
                                // Found match
                                isFound = true;
                        }

diff --git a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java
index 4120ee86ff65c0bba5327ba56b59f9bf75724be6..57cb880f078c317bc3a3b421d077e639720df1e2 100644 (file)
--- a/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java
+++ b/src/java/org/mxchange/jcontactsbusiness/model/employee/PizzaAdminEmployeeSessionBean.java
@@ -111,9 +111,9 @@ public class PizzaAdminEmployeeSessionBean extends BasePizzaEnterpriseBean imple
                } else if ((employee.getEmployeeNumber() != null) && (employee.getEmployeeNumber().isEmpty())) {
                        // Throw it again
                        throw new IllegalArgumentException("employee.employeeNumber is empty"); //NOI18N
-               } else if ((employee.getEmployeeMobileNumber() != null) && (employee.getEmployeeMobileNumber().getPhoneId() != null)) {
+               } else if ((employee.getEmployeeMobileNumber() != null) && (employee.getEmployeeMobileNumber().getMobileId() != null)) {
                        // Throw once more
-                       throw new IllegalArgumentException(MessageFormat.format("employee.employeeMobileNumber.phoneId={0} is unexpected.", employee.getEmployeeMobileNumber().getPhoneId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("employee.employeeMobileNumber.phoneId={0} is unexpected.", employee.getEmployeeMobileNumber().getMobileId())); //NOI18N
                } else if ((employee.getEmployeePersonalData() != null) && (employee.getEmployeePersonalData().getContactId() == null)) {
                        // Throw NPE
                        throw new NullPointerException("employee.employeePersonalData.contactId is null"); //NOI18N
@@ -197,7 +197,7 @@ public class PizzaAdminEmployeeSessionBean extends BasePizzaEnterpriseBean imple
                // Is mobile number set?
                if (employee.getEmployeeMobileNumber() instanceof DialableMobileNumber) {
                        // Yes, then set created there as well
-                       employee.getEmployeeMobileNumber().setPhoneEntryCreated(new Date());
+                       employee.getEmployeeMobileNumber().setMobileEntryCreated(new Date());
 
                        // Make mobile provider managed
                        final MobileProvider mobileProvider = this.createManaged(employee.getEmployeeMobileNumber().getMobileProvider());

diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java
index 7074e7d8426cace16f66864dc4789b55128893a9..a97cef06bc9c47c31ac559671304bd7d9341dc42 100644 (file)
--- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/PizzaAdminPhoneSessionBean.java
@@ -153,12 +153,12 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaEnterpriseBean implemen
                if (null == mobileNumber) {
                        // Not set, throw NPE
                        throw new NullPointerException("mobileNumber is null"); //NOI18N
-               } else if (mobileNumber.getPhoneId() == null) {
+               } else if (mobileNumber.getMobileId() == null) {
                        // Throw NPE again
                        throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
-               } else if (mobileNumber.getPhoneId() < 1) {
+               } else if (mobileNumber.getMobileId() < 1) {
                        // Invalid number
-                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getMobileId())); //NOI18N
                } else if (mobileNumber.getMobileProvider() == null) {
                        // Throw NPE
                        throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N
@@ -168,16 +168,16 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaEnterpriseBean implemen
                } else if (mobileNumber.getMobileProvider().getProviderId() < 1) {
                        // Id not valid
                        throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
-               } else if (mobileNumber.getPhoneNumber() == null) {
+               } else if (mobileNumber.getMobileNumber() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
-               } else if (mobileNumber.getPhoneNumber() < 1) {
+                       throw new NullPointerException("mobileNumber.mobileNumber is null"); //NOI18N
+               } else if (mobileNumber.getMobileNumber() < 1) {
                        // Throw NPE again
-                       throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N
+                       throw new NullPointerException(MessageFormat.format("mobileNumber.mobileNumber={0} is not valid.", mobileNumber.getMobileNumber())); //NOI18N
                }
 
                // Get a managed instance
-               final DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getPhoneId());
+               final DialableMobileNumber managedNumber = this.getEntityManager().getReference(mobileNumber.getClass(), mobileNumber.getMobileId());
 
                // Remove it from database
                this.getEntityManager().remove(managedNumber);
@@ -234,7 +234,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaEnterpriseBean implemen
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateFaxData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               FaxNumbers.copyAll(faxNumber, managedNumber);
+               FaxNumbers.copyFaxNumber(faxNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message
@@ -292,7 +292,7 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaEnterpriseBean implemen
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateLandLineData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               LandLineNumbers.copyAll(landLineNumber, managedNumber);
+               LandLineNumbers.copyLandLineNumber(landLineNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message
@@ -311,12 +311,12 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaEnterpriseBean implemen
                if (null == mobileNumber) {
                        // Not set, throw NPE
                        throw new NullPointerException("mobileNumber is null"); //NOI18N
-               } else if (mobileNumber.getPhoneId() == null) {
+               } else if (mobileNumber.getMobileId() == null) {
                        // Throw NPE again
                        throw new NullPointerException("mobileNumber.phoneId is null"); //NOI18N
-               } else if (mobileNumber.getPhoneId() < 1) {
+               } else if (mobileNumber.getMobileId() < 1) {
                        // Invalid number
-                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getPhoneId())); //NOI18N
+                       throw new IllegalArgumentException(MessageFormat.format("mobileNumber.phoneId={0} is not valid", mobileNumber.getMobileId())); //NOI18N
                } else if (mobileNumber.getMobileProvider() == null) {
                        // Throw NPE
                        throw new NullPointerException("mobileNumber.cellphoneProvider is null"); //NOI18N
@@ -326,26 +326,26 @@ public class PizzaAdminPhoneSessionBean extends BasePizzaEnterpriseBean implemen
                } else if (mobileNumber.getMobileProvider().getProviderId() < 1) {
                        // Id not valid
                        throw new IllegalArgumentException(MessageFormat.format("mobileNumber.cellphoneProvider.providerId={0} is not valid.", mobileNumber.getMobileProvider().getProviderId())); //NOI18N
-               } else if (mobileNumber.getPhoneNumber() == null) {
+               } else if (mobileNumber.getMobileNumber() == null) {
                        // Throw NPE again
-                       throw new NullPointerException("mobileNumber.phoneNumber is null"); //NOI18N
-               } else if (mobileNumber.getPhoneNumber() < 1) {
+                       throw new NullPointerException("mobileNumber.mobileNumber is null"); //NOI18N
+               } else if (mobileNumber.getMobileNumber() < 1) {
                        // Throw NPE again
-                       throw new NullPointerException(MessageFormat.format("mobileNumber.phoneNumber={0} is not valid.", mobileNumber.getPhoneNumber())); //NOI18N
+                       throw new NullPointerException(MessageFormat.format("mobileNumber.mobileNumber={0} is not valid.", mobileNumber.getMobileNumber())); //NOI18N
                }
 
                // Get contact from it and find it
-               final DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
+               final DialableMobileNumber managedNumber = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getMobileId());
 
                // Should be found
-               assert (managedNumber instanceof DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getPhoneId()); //NOI18N
+               assert (managedNumber instanceof DialableMobileNumber) : MessageFormat.format("Cell phone number with id {0} not found, but should be.", mobileNumber.getMobileId()); //NOI18N
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getMobileId())); //NOI18N
 
                // Set updated timestamp
-               MobileNumbers.copyAll(mobileNumber, managedNumber);
-               managedNumber.setPhoneEntryUpdated(new Date());
+               MobileNumbers.copyMobileNumber(mobileNumber, managedNumber);
+               managedNumber.setMobileEntryUpdated(new Date());
 
                // Trace message
                this.getLoggerBeanLocal().logTrace(MessageFormat.format("{0}.updateMobileData: managedNumber={1} - EXIT!", this.getClass().getSimpleName(), managedNumber)); //NOI18N

diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java
index aeb2eb710e97c6f5877557491bae2e78572a023a..366e17487ced4ac15d5ff4b751451a948efbe40c 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/PizzaAdminUserSessionBean.java
@@ -83,7 +83,7 @@ public class PizzaAdminUserSessionBean extends BasePizzaEnterpriseBean implement
 
                // Set created timestamp
                user.setUserCreated(new Date());
-               user.getUserContact().setContactCreated(new Date());
+               user.getUserContact().setContactEntryCreated(new Date());
 
                // Update mobile, land-line and fax instance
                this.setAllPhoneEntriesCreated(user.getUserContact());

diff --git a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
index 728f10bee21c141798ee930260fb3144ebbf847f..97cc33e405366dbef45aad3dc6852b8a9cb6a1f5 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/PizzaUserSessionBean.java
@@ -602,19 +602,22 @@ public class PizzaUserSessionBean extends BasePizzaEnterpriseBean implements Use
                // Is there a  mobile instance set?
                if (mobileNumber instanceof DialableMobileNumber) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getPhoneId())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getMobileId())); //NOI18N
 
                        // Then find it, too
-                       final DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getPhoneId());
+                       final DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getMobileId());
 
                        // Should be there
-                       assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N
+                       assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
+
+                       // Copy all
+                       MobileNumbers.copyMobileNumber(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
 
                        // Should be there
-                       assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getPhoneId()); //NOI18N
+                       assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getMobileId()); //NOI18N
 
                        // Copy all
                        MobileNumbers.copyAll(managedUser.getUserContact().getContactMobileNumber(), managedMobile);
@@ -637,6 +640,9 @@ public class PizzaUserSessionBean extends BasePizzaEnterpriseBean implements Use
                        // Should be there
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
+                       // Copy all
+                       FaxNumbers.copyFaxNumber(managedUser.getUserContact().getContactFaxNumber(), foundFax);
+
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
 
@@ -664,6 +670,9 @@ public class PizzaUserSessionBean extends BasePizzaEnterpriseBean implements Use
                        // Should be there
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
+                       // Copy all
+                       LandLineNumbers.copyLandLineNumber(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
+
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
 

diff --git a/src/java/org/mxchange/pizzaapplication/enterprise/BasePizzaEnterpriseBean.java b/src/java/org/mxchange/pizzaapplication/enterprise/BasePizzaEnterpriseBean.java
index 82fa989228bbc732f9ee96aef26b615a8e1b077e..06dd2f4914f81ade6a154bc2f895044eeed17975 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/enterprise/BasePizzaEnterpriseBean.java
+++ b/src/java/org/mxchange/pizzaapplication/enterprise/BasePizzaEnterpriseBean.java
@@ -819,12 +819,12 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                }
 
                // Is a mobile number instance set?
-               if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getPhoneId() == null)) {
+               if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getMobileId() == null)) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug("setAllPhoneEntriesCreated: Setting created timestamp for mobile number ..."); //NOI18N
 
                        // Set updated timestamp
-                       mobileNumber.setPhoneEntryCreated(new Date());
+                       mobileNumber.setMobileEntryCreated(new Date());
                }
 
                // Trace message
@@ -994,16 +994,16 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                if (null == mobileNumber) {
                        // Throw NPE
                        throw new NullPointerException("mobileNumber is null"); //NOI18N
-               } else if (fetchedNumber.getPhoneId() == null) {
+               } else if (fetchedNumber.getMobileId() == null) {
                        // ..and again
                        throw new NullPointerException("fetchedNumber.phoneId is null"); //NOI18N
                }
 
                // Debug message
-               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: fetchedNumber.phoneId={0}", fetchedNumber.getPhoneId())); //NOI18N
+               this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: fetchedNumber.phoneId={0}", fetchedNumber.getMobileId())); //NOI18N
 
                // Init query instance
-               final DialableMobileNumber foundNumber = this.getEntityManager().find(fetchedNumber.getClass(), fetchedNumber.getPhoneId());
+               final DialableMobileNumber foundNumber = this.getEntityManager().find(fetchedNumber.getClass(), fetchedNumber.getMobileId());
 
                // Debug message
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("getDetached: foundNumber={0}", foundNumber)); //NOI18N
@@ -1012,7 +1012,9 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                DialableMobileNumber detachedNumber = null;
 
                // Is there a difference?
-               if (!PhoneUtils.isSameMobileNumber(mobileNumber, fetchedNumber)) {
+               if (!MobileNumbers.isSameMobileNumber(mobileNumber, fetchedNumber)) {
+                       // @TODO Copy all to foundNumber, then merge
+
                        // Merge this entry
                        detachedNumber = this.getEntityManager().merge(foundNumber);
 
@@ -1060,7 +1062,9 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                DialableLandLineNumber detachedNumber = null;
 
                // Is there a difference?
-               if (!PhoneUtils.isSameLandLineNumber(landLineNumber, fetchedNumber)) {
+               if (!LandLineNumbers.isSameLandLineNumber(landLineNumber, fetchedNumber)) {
+                       // @TODO Copy all to foundNumber, then merge
+
                        // Merge this entry
                        detachedNumber = this.getEntityManager().merge(foundNumber);
 
@@ -1108,7 +1112,9 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                DialableFaxNumber detachedNumber = null;
 
                // Is there a difference?
-               if (!PhoneUtils.isSameFaxNumber(faxNumber, fetchedNumber)) {
+               if (!FaxNumbers.isSameFaxNumber(faxNumber, fetchedNumber)) {
+                       // @TODO Copy all to foundNumber, then merge
+
                        // Merge this entry
                        detachedNumber = this.getEntityManager().merge(foundNumber);
 
@@ -1146,7 +1152,7 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                }
 
                // Set updated timestamp
-               detachedContact.setContactUpdated(new Date());
+               detachedContact.setContactEntryUpdated(new Date());
 
                // Get contact from it and find it
                final Contact foundContact = this.getEntityManager().find(detachedContact.getClass(), detachedContact.getContactId());
@@ -1210,26 +1216,29 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                }
 
                // Get all instances
-               final DialableMobileNumber mobile = detachedContact.getContactMobileNumber();
-               final DialableLandLineNumber landLine = detachedContact.getContactLandLineNumber();
-               final DialableFaxNumber fax = detachedContact.getContactFaxNumber();
+               final DialableMobileNumber mobileNumber = detachedContact.getContactMobileNumber();
+               final DialableLandLineNumber landLineNumber = detachedContact.getContactLandLineNumber();
+               final DialableFaxNumber faxNumber = detachedContact.getContactFaxNumber();
 
                // Is there a  mobile instance set?
-               if (mobile instanceof DialableMobileNumber) {
+               if (mobileNumber instanceof DialableMobileNumber) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobile.getPhoneId())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: mobile.phoneId={0} is being updated ...", mobileNumber.getMobileId())); //NOI18N
 
                        // Then find it, too
-                       final DialableMobileNumber foundMobile = this.getEntityManager().find(mobile.getClass(), mobile.getPhoneId());
+                       final DialableMobileNumber foundMobile = this.getEntityManager().find(mobileNumber.getClass(), mobileNumber.getMobileId());
 
                        // Should be there
-                       assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getPhoneId()); //NOI18N
+                       assert (foundMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", foundMobile.getMobileId()); //NOI18N
+
+                       // Copy all
+                       MobileNumbers.copyMobileNumber(detachedContact.getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
 
                        // Should be there
-                       assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getPhoneId()); //NOI18N
+                       assert (managedMobile instanceof DialableMobileNumber) : MessageFormat.format("Mobile number with id {0} not found but should be.", managedMobile.getMobileId()); //NOI18N
 
                        // Copy all
                        MobileNumbers.copyAll(detachedContact.getContactMobileNumber(), managedMobile);
@@ -1239,16 +1248,19 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                }
 
                // Is there a  fax instance set?
-               if (fax instanceof DialableFaxNumber) {
+               if (faxNumber instanceof DialableFaxNumber) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: fax.phoneId={0} is being updated ...", fax.getPhoneId())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: fax.phoneId={0} is being updated ...", faxNumber.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       final DialableFaxNumber foundFax = this.getEntityManager().find(fax.getClass(), fax.getPhoneId());
+                       final DialableFaxNumber foundFax = this.getEntityManager().find(faxNumber.getClass(), faxNumber.getPhoneId());
 
                        // Should be there
                        assert (foundFax instanceof DialableFaxNumber) : MessageFormat.format("Fax number with id {0} not found but should be.", foundFax.getPhoneId()); //NOI18N
 
+                       // Copy all
+                       FaxNumbers.copyFaxNumber(detachedContact.getContactFaxNumber(), foundFax);
+
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
 
@@ -1263,16 +1275,19 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                }
 
                // Is there a  fax instance set?
-               if (landLine instanceof DialableLandLineNumber) {
+               if (landLineNumber instanceof DialableLandLineNumber) {
                        // Debug message
-                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: landLine.phoneId={0} is being updated ...", landLine.getPhoneId())); //NOI18N
+                       this.getLoggerBeanLocal().logDebug(MessageFormat.format("updateUserPersonalData: landLine.phoneId={0} is being updated ...", landLineNumber.getPhoneId())); //NOI18N
 
                        // Then find it, too
-                       final DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLine.getClass(), landLine.getPhoneId());
+                       final DialableLandLineNumber foundLandLine = this.getEntityManager().find(landLineNumber.getClass(), landLineNumber.getPhoneId());
 
                        // Should be there
                        assert (foundLandLine instanceof DialableLandLineNumber) : MessageFormat.format("Land line number with id {0} not found but should be.", foundLandLine.getPhoneId()); //NOI18N
 
+                       // Copy all
+                       LandLineNumbers.copyLandLineNumber(detachedContact.getContactLandLineNumber(), foundLandLine);
+
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);
 
@@ -1426,7 +1441,7 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: other.contactMobileNumber={0}", other.getContactMobileNumber())); //NOI18N
 
                // Is other mobile not set?
-               if ((other.getContactMobileNumber() == null) || (PhoneUtils.isSameMobileNumber(contact.getContactMobileNumber(), other.getContactMobileNumber()))) {
+               if ((other.getContactMobileNumber() == null) || (MobileNumbers.isSameMobileNumber(contact.getContactMobileNumber(), other.getContactMobileNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: Copying mobile entry ...", this.getClass().getSimpleName())); //NOI18N
 
@@ -1444,7 +1459,7 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: other.contactLandLineNumber={0}", other.getContactLandLineNumber())); //NOI18N
 
                // Is other mobile not set?
-               if ((other.getContactLandLineNumber() == null) || (PhoneUtils.isSameLandLineNumber(contact.getContactLandLineNumber(), other.getContactLandLineNumber()))) {
+               if ((other.getContactLandLineNumber() == null) || (LandLineNumbers.isSameLandLineNumber(contact.getContactLandLineNumber(), other.getContactLandLineNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: Copying land-line entry ...", this.getClass().getSimpleName())); //NOI18N
 
@@ -1462,7 +1477,7 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: other.contactFaxNumber={1}", this.getClass().getSimpleName(), other.getContactFaxNumber())); //NOI18N
 
                // Is other mobile not set?
-               if ((other.getContactFaxNumber() == null) || (PhoneUtils.isSameFaxNumber(contact.getContactFaxNumber(), other.getContactFaxNumber()))) {
+               if ((other.getContactFaxNumber() == null) || (FaxNumbers.isSameFaxNumber(contact.getContactFaxNumber(), other.getContactFaxNumber()))) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntries: Copying fax entry ...", this.getClass().getSimpleName())); //NOI18N
 
@@ -1543,12 +1558,12 @@ public abstract class BasePizzaEnterpriseBean extends BaseEnterpriseBean {
                }
 
                // Is a mobile number instance set?
-               if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getPhoneId() instanceof Long) && (mobileNumber.getPhoneId() > 0)) {
+               if ((mobileNumber instanceof DialableMobileNumber) && (mobileNumber.getMobileId() instanceof Long) && (mobileNumber.getMobileId() > 0)) {
                        // Debug message
                        this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.setAllContactPhoneEntriesUpdated: Setting updated timestamp for mobile number ...", this.getClass().getSimpleName())); //NOI18N
 
                        // Set updated timestamp
-                       mobileNumber.setPhoneEntryUpdated(new Date());
+                       mobileNumber.setMobileEntryUpdated(new Date());
                }
 
                // Trace message