You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/02/06 17:20:41 UTC

[2/2] git commit: MARMOTTA-189: Added js-parsable timestamps for versions in the template.

MARMOTTA-189: Added js-parsable timestamps for versions in the template.


Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5e583688
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5e583688
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5e583688

Branch: refs/heads/develop
Commit: 5e5836886daa024dc1932aa3216384460989ebdf
Parents: 6fa889c
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Feb 6 17:19:18 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Feb 6 17:19:18 2014 +0100

----------------------------------------------------------------------
 .../platform/versioning/io/HtmlVersionSerializer.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/5e583688/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/io/HtmlVersionSerializer.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/io/HtmlVersionSerializer.java b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/io/HtmlVersionSerializer.java
index a32974b..ddc4e9c 100644
--- a/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/io/HtmlVersionSerializer.java
+++ b/platform/marmotta-versioning-kiwi/src/main/java/org/apache/marmotta/platform/versioning/io/HtmlVersionSerializer.java
@@ -20,11 +20,8 @@ package org.apache.marmotta.platform.versioning.io;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -50,6 +47,12 @@ public class HtmlVersionSerializer implements VersionSerializer {
 
     private static final String TEMPLATE = "memento_timemap.ftl";
 
+    private static final SimpleDateFormat TSTAMP;
+    static {
+        TSTAMP = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+        TSTAMP.setTimeZone(TimeZone.getTimeZone("GMT"));
+    }
+
     @Inject
     private ConfigurationService configurationService;
     
@@ -100,6 +103,7 @@ public class HtmlVersionSerializer implements VersionSerializer {
                 Map<String,String> m = new HashMap<String,String>();
                 m.put("date",v.getCommitTime().toString());
                 m.put("uri",MementoUtils.resourceURI(original.toString(), v.getCommitTime(), configurationService.getBaseUri()).toString());
+                m.put("tstamp", TSTAMP.format(v.getCommitTime()));
                 vs.add(m);
             }