zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Edition lock is working. Working on user interation.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-10-04 20:28:59 -03:00
committed by Paulo Gustavo Veiga
parent 04d43e62c7
commit 6303ba93c7
14 changed files with 350 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapLock.java → wise-webapp/src/main/java/com/wisemapping/rest/model/RestLockInfo.java
View File

@@ -24,14 +24,23 @@ import java.util.Set;
getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY,
isGetterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY)
@JsonIgnoreProperties(ignoreUnknown = true)
public class RestMindmapLock {
public class RestLockInfo {
@NotNull
private Collaborator user;
@Nullable
private LockInfo lockInfo;
final private Collaborator user;
public RestMindmapLock(@Nullable LockInfo lockInfo, @NotNull Collaborator collaborator) {
@Nullable
final private LockInfo lockInfo;
// This is required only for compliance with the JAXB serializer.
public RestLockInfo(){
this.lockInfo = null;
//noinspection ConstantConditions
this.user = null;
}
public RestLockInfo(@Nullable LockInfo lockInfo, @NotNull Collaborator collaborator) {
this.lockInfo = lockInfo;
this.user = collaborator;
@@ -52,4 +61,13 @@ public class RestMindmapLock {
public void setLockedByMe(boolean lockedForMe) {
// Ignore ...
}
public long getTimestamp() {
return lockInfo != null ? lockInfo.getTimestamp() : -1;
}
public void setTimestamp(long value) {
//
}
}