summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e2b54ba)
- renamed variable
- fixed class name
DialableFaxNumber detachedNumber = null;
// Is there a difference?
DialableFaxNumber detachedNumber = null;
// Is there a difference?
- if (!FaxNumbers.isSameFaxNumber(faxNumber, fetchedNumber)) {
+ if (!FaxNumberUtils.isSameFaxNumber(faxNumber, fetchedNumber)) {
// @TODO Copy all to foundNumber, then merge
// Merge this entry
// @TODO Copy all to foundNumber, then merge
// Merge this entry
assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
// Copy all data
assert (foundUser instanceof User) : MessageFormat.format("User with id {0} not found, but should be.", user.getUserId()); //NOI18N
// Copy all data
- UserUtils.copyUserData(detachedUser, foundUser);
+ UserUtils.copyUserData(user, foundUser);
// Merge user
final User managedUser = this.getEntityManager().merge(foundUser);
// Merge user
final User managedUser = this.getEntityManager().merge(foundUser);