From 656097323732e5480d08adbecfe04813d219f6e0 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Wed, 14 Nov 2012 20:35:09 -0300
Subject: [PATCH] Replace all User.equals for Collaborator.identityEquality

---
 .../src/main/java/com/wisemapping/rest/MindmapFilter.java       | 2 +-
 .../src/main/java/com/wisemapping/rest/model/RestLockInfo.java  | 2 +-
 .../src/main/java/com/wisemapping/service/LockManagerImpl.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
index fb53e456..1b954a8b 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
@@ -36,7 +36,7 @@ public enum MindmapFilter {
     MY_MAPS("my_maps") {
         @Override
         boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
-            return mindmap.getCreator().equals(user);
+            return mindmap.getCreator().identityEquality(user);
         }
     },
     STARRED("starred") {
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java
index e0d00b2c..ccb88f9f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java
@@ -68,7 +68,7 @@ public class RestLockInfo {
     }
 
     public boolean isLockedByMe() {
-        return isLocked() && lockInfo != null && lockInfo.getUser().equals(user);
+        return isLocked() && lockInfo != null && lockInfo.getUser().identityEquality(user);
     }
 
     public void setLockedByMe(boolean lockedForMe) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
index 21730dc9..0ba39239 100644
--- a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
@@ -69,7 +69,7 @@ class LockManagerImpl implements LockManager {
         }
 
         final LockInfo result = this.getLockInfo(mindmap);
-        if (!result.getUser().equals(user)) {
+        if (!result.getUser().identityEquality(user)) {
             throw new IllegalStateException("Could not update map lock timeout if you are not the locking user. User:" + result.getUser() + ", " + user);
         }