From: Janis Streib <janis@dogcraft.de>
Date: Thu, 4 Jun 2015 20:42:09 +0000 (+0200)
Subject: UPD: packed date formatting in Outputable (now you cann pass dates
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=8efbd22b42900f0184bd7265af9feb38fc0a4e08

UPD: packed date formatting in Outputable (now you cann pass dates
directly to string templates outputs)
---

diff --git a/src/org/cacert/gigi/output/CertificateIterable.java b/src/org/cacert/gigi/output/CertificateIterable.java
index 380b7a77..8bfff7ef 100644
--- a/src/org/cacert/gigi/output/CertificateIterable.java
+++ b/src/org/cacert/gigi/output/CertificateIterable.java
@@ -36,14 +36,14 @@ public class CertificateIterable implements IterableDataset {
             vars.put("revokable", st != CertificateStatus.REVOKED && st == CertificateStatus.ISSUED);
             if (st == CertificateStatus.ISSUED || st == CertificateStatus.REVOKED) {
                 X509Certificate cert = c.cert();
-                vars.put("issued", DateSelector.getDateFormat().format(cert.getNotBefore()));
-                vars.put("expire", DateSelector.getDateFormat().format(cert.getNotAfter()));
+                vars.put("issued", cert.getNotBefore());
+                vars.put("expire", cert.getNotAfter());
             } else {
                 vars.put("issued", l.getTranslation("N/A"));
                 vars.put("expire", l.getTranslation("N/A"));
             }
             if (st == CertificateStatus.REVOKED) {
-                vars.put("revoked", DateSelector.getDateFormat().format(c.getRevocationDate()));
+                vars.put("revoked", c.getRevocationDate());
             } else {
                 vars.put("revoked", "n/a");
             }
diff --git a/src/org/cacert/gigi/output/template/Template.java b/src/org/cacert/gigi/output/template/Template.java
index 8bcbc8f2..2a2bba6a 100644
--- a/src/org/cacert/gigi/output/template/Template.java
+++ b/src/org/cacert/gigi/output/template/Template.java
@@ -9,12 +9,14 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.cacert.gigi.localisation.Language;
+import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.util.HTMLEncoder;
 
 public class Template implements Outputable {
@@ -187,6 +189,8 @@ public class Template implements Outputable {
         }
         if (s instanceof Outputable) {
             ((Outputable) s).output(out, l, vars);
+        } else if (s instanceof Date) {
+            out.print(DateSelector.getDateFormat().format(s));
         } else {
             out.print(s == null ? "null" : (unescaped ? s.toString() : HTMLEncoder.encodeHTML(s.toString())));
         }
diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 8f7c7bf8..0339326a 100644
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -74,7 +74,7 @@ public class MyDetailsForm extends Form {
             vars.put("DoB", ds);
             templ.output(out, l, vars);
         } else {
-            vars.put("DoB", DateSelector.getDateFormat().format(target.getDoB()));
+            vars.put("DoB", target.getDoB());
             assured.output(out, l, vars);
         }
     }
diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
index 58bf2eea..a52afed3 100644
--- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.java
@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.LoginPage;
@@ -39,7 +38,7 @@ public class TTPAdminForm extends Form {
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         vars.put("name", u.getName());
         vars.put("email", u.getEmail());
-        vars.put("DoB", DateSelector.getDateFormat().format(u.getDoB()));
+        vars.put("DoB", u.getDoB());
         vars.put("uid", Integer.toString(u.getId()));
         t.output(out, l, vars);
     }
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
index af02cb53..e4bedb34 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.java
@@ -13,7 +13,6 @@ import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.SupportedUser;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
@@ -78,7 +77,7 @@ public class SupportRevokeCertificatesForm extends Form {
                 if (lastExpire == Long.MIN_VALUE) {
                     vars.put("lastdate", "-");
                 } else {
-                    vars.put("lastdate", DateSelector.getDateFormat().format(new Date(lastExpire)));
+                    vars.put("lastdate", new Date(lastExpire));
                 }
                 typeIndex++;
                 return true;