Please cherry-pick:

- updated JARs have new copyFooData() method names

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

diff --git a/src/java/org/mxchange/addressbook/enterprise/BaseAddressbookEnterpriseBean.java b/src/java/org/mxchange/addressbook/enterprise/BaseAddressbookEnterpriseBean.java
index 5c0659cb3996317bb869761c617d3f7923a9d262..361b58b51433bdc6e9e7b261e502c247f3c43cc2 100644 (file)
--- a/src/java/org/mxchange/addressbook/enterprise/BaseAddressbookEnterpriseBean.java
+++ b/src/java/org/mxchange/addressbook/enterprise/BaseAddressbookEnterpriseBean.java
@@ -867,7 +867,7 @@ public abstract class BaseAddressbookEnterpriseBean extends BaseEnterpriseBean {
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("mergeContactData: foundContact.contactId={0}", foundContact.getContactId())); //NOI18N
 
                // Copy all
-               Contacts.copyAll(detachedContact, foundContact);
+               Contacts.copyContactData(detachedContact, foundContact);
 
                // Merge contact instance
                final Contact managedContact = this.getEntityManager().merge(foundContact);
@@ -917,7 +917,7 @@ public abstract class BaseAddressbookEnterpriseBean extends BaseEnterpriseBean {
                        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);
+                       MobileNumbers.copyMobileNumberData(detachedContact.getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
@@ -941,7 +941,7 @@ public abstract class BaseAddressbookEnterpriseBean extends BaseEnterpriseBean {
                        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);
+                       FaxNumbers.copyFaxNumberData(detachedContact.getContactFaxNumber(), foundFax);
 
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -965,7 +965,7 @@ public abstract class BaseAddressbookEnterpriseBean extends BaseEnterpriseBean {
                        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);
+                       LandLineNumbers.copyLandLineNumberData(detachedContact.getContactLandLineNumber(), foundLandLine);
 
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);

diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/mobile/AddressbookAdminMobileSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/mobile/AddressbookAdminMobileSessionBean.java
index 8fc58c3f4ae22acf317a01cf737b1a48c390de70..72cbccfa9d28e12fd17ee1f3e2c57ed4eceb88c3 100644 (file)
--- a/src/java/org/mxchange/jphone/model/phonenumbers/mobile/AddressbookAdminMobileSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/mobile/AddressbookAdminMobileSessionBean.java
@@ -126,7 +126,7 @@ public class AddressbookAdminMobileSessionBean extends BaseAddressbookEnterprise
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateMobileData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getMobileId())); //NOI18N
 
                // Set updated timestamp
-               MobileNumbers.copyMobileNumber(mobileNumber, managedNumber);
+               MobileNumbers.copyMobileNumberData(mobileNumber, managedNumber);
                managedNumber.setMobileEntryUpdated(new Date());
 
                // Trace message

diff --git a/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java b/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java
index ca0be6db50e2ce9da7dfd1f76ded1ceaa846a859..c6dde242821cfce5f99fe4b56364243474e4e792 100644 (file)
--- a/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java
+++ b/src/java/org/mxchange/jphone/model/phonenumbers/phone/AddressbookAdminPhoneSessionBean.java
@@ -190,7 +190,7 @@ public class AddressbookAdminPhoneSessionBean extends BaseAddressbookEnterpriseB
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateFaxData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               FaxNumbers.copyFaxNumber(faxNumber, managedNumber);
+               FaxNumbers.copyFaxNumberData(faxNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message
@@ -248,7 +248,7 @@ public class AddressbookAdminPhoneSessionBean extends BaseAddressbookEnterpriseB
                this.getLoggerBeanLocal().logDebug(MessageFormat.format("{0}.updateLandLineData: managedNumber.phoneId={1}", this.getClass().getSimpleName(), managedNumber.getPhoneId())); //NOI18N
 
                // Set updated timestamp
-               LandLineNumbers.copyLandLineNumber(landLineNumber, managedNumber);
+               LandLineNumbers.copyLandLineNumberData(landLineNumber, managedNumber);
                managedNumber.setPhoneEntryUpdated(new Date());
 
                // Trace message

diff --git a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java
index f0d38d1268f73b67520789c43ff9bf3538ebe381..7ffc1c10bc3f737e8a93afa626f85f9bf6535d08 100644 (file)
--- a/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java
+++ b/src/java/org/mxchange/jusercore/model/user/AddressbookUserSessionBean.java
@@ -285,7 +285,10 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im
                final User foundUser = this.getEntityManager().find(user.getClass(), user.getUserId());
 
                // Should be found!
-               assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
+               assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", detachedUser.getUserId()); //NOI18N
+
+               // Copy all data
+               Users.copyUserData(detachedUser, foundUser);
 
                // Merge user
                final User managedUser = this.getEntityManager().merge(foundUser);
@@ -293,9 +296,6 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im
                // Should be found!
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not merged, but should be.", managedUser.getUserId()); //NOI18N
 
-               // Copy all data
-               Users.copyAll(managedUser, managedUser);
-
                // Set as updated
                managedUser.setUserUpdated(new Date());
 
@@ -412,7 +412,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im
                assert (managedUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
 
                // Copy all data
-               Users.copyAll(user, managedUser);
+               Users.copyUserData(user, managedUser);
 
                // Set as updated
                managedUser.setUserUpdated(new Date());
@@ -454,7 +454,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im
                        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);
+                       MobileNumbers.copyMobileNumberData(managedUser.getUserContact().getContactMobileNumber(), foundMobile);
 
                        // Then merge it, too
                        final DialableMobileNumber managedMobile = this.getEntityManager().merge(foundMobile);
@@ -484,7 +484,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im
                        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);
+                       FaxNumbers.copyFaxNumberData(managedUser.getUserContact().getContactFaxNumber(), foundFax);
 
                        // Then merge it, too
                        final DialableFaxNumber managedFax = this.getEntityManager().merge(foundFax);
@@ -514,7 +514,7 @@ public class AddressbookUserSessionBean extends BaseAddressbookEnterpriseBean im
                        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);
+                       LandLineNumbers.copyLandLineNumberData(managedUser.getUserContact().getContactLandLineNumber(), foundLandLine);
 
                        // Then merge it, too
                        final DialableLandLineNumber managedLandLine = this.getEntityManager().merge(foundLandLine);