UPD: move the standard date format to "dateSelector"

diff --git a/src/org/cacert/gigi/output/CertificateValiditySelector.java b/src/org/cacert/gigi/output/CertificateValiditySelector.java
index 37e5afd224bf03a6e0f912dd52365f25f0fcc6a9..6f7d89fe99c767b2acedd40750b8c4ca0abe9020 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateValiditySelector.java
+++ b/src/org/cacert/gigi/output/CertificateValiditySelector.java
@@ -2,10 +2,8 @@ package org.cacert.gigi.output;
 
 import java.io.PrintWriter;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.sql.Date;
 import java.util.Map;
-import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -15,8 +13,6 @@ import org.cacert.gigi.util.HTMLEncoder;
 
 public class CertificateValiditySelector implements Outputable {
 
-    private static ThreadLocal<SimpleDateFormat> fmt = new ThreadLocal<>();
-
     private static final long DAY = 1000 * 60 * 60 * 24;
 
     private Date from;
@@ -27,16 +23,6 @@ public class CertificateValiditySelector implements Outputable {
 
     }
 
-    public static SimpleDateFormat getDateFormat() {
-        SimpleDateFormat local = fmt.get();
-        if (local == null) {
-            local = new SimpleDateFormat("yyyy-MM-dd");
-            local.setTimeZone(TimeZone.getTimeZone("UTC"));
-            fmt.set(local);
-        }
-        return local;
-    }
-
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         out.print("<select name='validFrom'><option value='now'");
@@ -49,7 +35,7 @@ public class CertificateValiditySelector implements Outputable {
         long base = getCurrentDayBase();
         for (int i = 0; i < 14; i++) {
             long date = base + DAY * i;
-            String d = getDateFormat().format(new Date(date));
+            String d = DateSelector.getDateFormat().format(new Date(date));
             out.print("<option value='");
             out.print(d);
             out.print("'");
@@ -119,7 +105,7 @@ public class CertificateValiditySelector implements Outputable {
             }
         } else {
             try {
-                getDateFormat().parse(newval);
+                DateSelector.getDateFormat().parse(newval);
             } catch (ParseException e) {
                 throw new GigiApiException("The validity interval entered is invalid.");
             }
@@ -131,7 +117,7 @@ public class CertificateValiditySelector implements Outputable {
             this.from = null;
         } else {
             try {
-                this.from = new Date(getDateFormat().parse(from).getTime());
+                this.from = new Date(DateSelector.getDateFormat().parse(from).getTime());
             } catch (ParseException e) {
                 throw new GigiApiException("The validity start date entered is invalid.");
             }

diff --git a/src/org/cacert/gigi/output/DateSelector.java b/src/org/cacert/gigi/output/DateSelector.java
index f98ec8fa6993e9e349848c8f40e02f13a827adb6..0728eca3e73a7d69bbaf670e1779112fc344e603 100644 (file)
--- a/src/org/cacert/gigi/output/DateSelector.java
+++ b/src/org/cacert/gigi/output/DateSelector.java
@@ -39,6 +39,8 @@ public class DateSelector implements Outputable {
 
     private int year;
 
+    private static ThreadLocal<SimpleDateFormat> fmt = new ThreadLocal<>();
+
     @Override
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         out.print("<nobr>");
@@ -128,4 +130,14 @@ public class DateSelector implements Outputable {
         return new java.sql.Date(gc.getTime().getTime());
     }
 
+    public static SimpleDateFormat getDateFormat() {
+        SimpleDateFormat local = fmt.get();
+        if (local == null) {
+            local = new SimpleDateFormat("yyyy-MM-dd");
+            local.setTimeZone(TimeZone.getTimeZone("UTC"));
+            fmt.set(local);
+        }
+        return local;
+    }
+
 }

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 4faa66276d98d44971ce1f1ba93793062fb8cea0..147fa95008b219c669d061e1ea4e26df34446f15 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -4,12 +4,12 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.sql.SQLException;
 import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.User;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.CertificateValiditySelector;
 import org.cacert.gigi.output.DateSelector;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
@@ -81,7 +81,7 @@ public class MyDetailsForm extends Form {
                 vars.put("DoB", ds);
                 templ.output(out, l, vars);
             } else {
-                vars.put("DoB", CertificateValiditySelector.getDateFormat().format(target.getDob()));
+                vars.put("DoB", DateSelector.getDateFormat().format(target.getDob()));
                 assured.output(out, l, vars);
             }
         } catch (SQLException e) {

diff --git a/util/org/cacert/gigi/util/SimpleSigner.java b/util/org/cacert/gigi/util/SimpleSigner.java
index 3597caf7f37c3b0ed3aa1a472018b23dca18ecf3..ebc5db85f30333a98c2b04fdc52e2ddce58252c1 100644 (file)
--- a/util/org/cacert/gigi/util/SimpleSigner.java
+++ b/util/org/cacert/gigi/util/SimpleSigner.java
@@ -25,7 +25,7 @@ import java.util.TimeZone;
 
 import org.cacert.gigi.Certificate.CSRType;
 import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.output.CertificateValiditySelector;
+import org.cacert.gigi.output.DateSelector;
 
 public class SimpleSigner {
 
@@ -225,7 +225,7 @@ public class SimpleSigner {
                     }
                     toDate = c.getTime();
                 } else {
-                    toDate = CertificateValiditySelector.getDateFormat().parse(length);
+                    toDate = DateSelector.getDateFormat().parse(length);
                 }
 
                 getSANSs.setInt(1, id);