Add pretty format to last moditication time.
This commit is contained in:
@@ -12,8 +12,10 @@ import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.TimeZone;
|
||||
|
||||
@XmlRootElement(name = "map")
|
||||
@XmlAccessorType(XmlAccessType.PROPERTY)
|
||||
@@ -28,6 +30,13 @@ public class RestMindmap {
|
||||
|
||||
@JsonIgnore
|
||||
private MindMap mindmap;
|
||||
@JsonIgnore
|
||||
static private SimpleDateFormat sdf;
|
||||
|
||||
static {
|
||||
sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
|
||||
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||
}
|
||||
|
||||
public RestMindmap() {
|
||||
this(new MindMap());
|
||||
@@ -38,10 +47,16 @@ public class RestMindmap {
|
||||
this.mindmap = mindmap;
|
||||
}
|
||||
|
||||
public Calendar getCreationTime() {
|
||||
return mindmap.getCreationTime();
|
||||
public String getCreationTime() {
|
||||
final Calendar creationTime = mindmap.getCreationTime();
|
||||
String result = null;
|
||||
if (creationTime != null) {
|
||||
result = this.toISO8601(creationTime.getTime());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
public String getDescription() {
|
||||
return mindmap.getDescription();
|
||||
}
|
||||
@@ -66,8 +81,9 @@ public class RestMindmap {
|
||||
return mindmap.getLastModifierUser();
|
||||
}
|
||||
|
||||
public Date getLastModificationDate() {
|
||||
return mindmap.getLastModificationDate();
|
||||
public String getLastModificationTime() {
|
||||
final Calendar date = mindmap.getLastModificationTime();
|
||||
return toISO8601(date.getTime());
|
||||
}
|
||||
|
||||
public boolean isPublic() {
|
||||
@@ -76,7 +92,7 @@ public class RestMindmap {
|
||||
|
||||
|
||||
public void setPublic(boolean value) {
|
||||
// return mindmap.isPublic();
|
||||
// return mindmap.isPublic();
|
||||
}
|
||||
|
||||
public String getXml() throws IOException {
|
||||
@@ -117,7 +133,7 @@ public class RestMindmap {
|
||||
mindmap.setProperties(properties);
|
||||
}
|
||||
|
||||
public void setLastModificationTime(Calendar lastModificationTime) {
|
||||
public void setLastModificationTime(final String value) {
|
||||
}
|
||||
|
||||
public void setLastModifierUser(String lastModifierUser) {
|
||||
@@ -131,4 +147,12 @@ public class RestMindmap {
|
||||
public MindMap getDelegated() {
|
||||
return this.mindmap;
|
||||
}
|
||||
|
||||
private String toISO8601(@Nullable Date date) {
|
||||
String result = "";
|
||||
if (date != null) {
|
||||
result = sdf.format(date) + "Z";
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
@@ -11,8 +11,10 @@ import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlRootElement;
|
||||
import java.io.IOException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.TimeZone;
|
||||
|
||||
@XmlRootElement(name = "map")
|
||||
@XmlAccessorType(XmlAccessType.PROPERTY)
|
||||
@@ -27,6 +29,13 @@ public class RestMindmapInfo {
|
||||
|
||||
@JsonIgnore
|
||||
private MindMap mindmap;
|
||||
@JsonIgnore
|
||||
static private SimpleDateFormat sdf;
|
||||
|
||||
static {
|
||||
sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
|
||||
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
|
||||
}
|
||||
|
||||
public RestMindmapInfo() {
|
||||
this(new MindMap());
|
||||
@@ -37,8 +46,8 @@ public class RestMindmapInfo {
|
||||
this.mindmap = mindmap;
|
||||
}
|
||||
|
||||
public Calendar getCreationTime() {
|
||||
return mindmap.getCreationTime();
|
||||
public String getCreationTime() {
|
||||
return this.toISO8601(mindmap.getCreationTime().getTime());
|
||||
}
|
||||
|
||||
public String getDescription() {
|
||||
@@ -65,8 +74,9 @@ public class RestMindmapInfo {
|
||||
return mindmap.getLastModifierUser();
|
||||
}
|
||||
|
||||
public Date getLastModificationDate() {
|
||||
return mindmap.getLastModificationDate();
|
||||
public String getLastModificationTime() {
|
||||
final Calendar calendar = mindmap.getLastModificationTime();
|
||||
return this.toISO8601(calendar.getTime());
|
||||
}
|
||||
|
||||
public boolean isPublic() {
|
||||
@@ -93,14 +103,18 @@ public class RestMindmapInfo {
|
||||
|
||||
}
|
||||
|
||||
public void setLastModificationTime(Calendar lastModificationTime) {
|
||||
public void setLastModificationTime(String value) {
|
||||
}
|
||||
|
||||
public void setLastModifierUser(String lastModifierUser) {
|
||||
public void setLastModifierUser(String value) {
|
||||
}
|
||||
|
||||
@JsonIgnore
|
||||
public MindMap getDelegated(){
|
||||
public MindMap getDelegated() {
|
||||
return this.mindmap;
|
||||
}
|
||||
|
||||
private String toISO8601(@NotNull Date date) {
|
||||
return sdf.format(date) + "Z";
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user