ZhouXY108
/
wisemapping-open-source
mirror of https://github.com/wisemapping/wisemapping-open-source.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace all User.equals for Collaborator.identityEquality

main
Paulo Gustavo Veiga 2012-11-14 20:35:09 -03:00
parent 596aeeebc4
commit 6560973237
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/src/main/java/com/wisemapping/rest/MindmapFilter.java
View File

@ -36,7 +36,7 @@ public enum MindmapFilter {
MY_MAPS("my_maps") { MY_MAPS("my_maps") {
@Override @Override
boolean accept(@NotNull Mindmap mindmap, @NotNull User user) { boolean accept(@NotNull Mindmap mindmap, @NotNull User user) {
return mindmap.getCreator().equals(user); return mindmap.getCreator().identityEquality(user);
} }
}, },
STARRED("starred") { STARRED("starred") {

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java
View File

@ -68,7 +68,7 @@ public class RestLockInfo {
} }
public boolean isLockedByMe() { public boolean isLockedByMe() {
return isLocked() && lockInfo != null && lockInfo.getUser().equals(user); return isLocked() && lockInfo != null && lockInfo.getUser().identityEquality(user);
} }
public void setLockedByMe(boolean lockedForMe) { public void setLockedByMe(boolean lockedForMe) {

2
wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java
View File

@ -69,7 +69,7 @@ class LockManagerImpl implements LockManager {
} }
final LockInfo result = this.getLockInfo(mindmap); 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); throw new IllegalStateException("Could not update map lock timeout if you are not the locking user. User:" + result.getUser() + ", " + user);
} }