Move the "dbObject"s to their own package.

[gigi.git] / src / org / cacert / gigi / pages / wot / AssuranceForm.java

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index e3dfe54c106f04b05b2635f259a092ac3c79a9d8..3df399426afb2411fd15b3e4fd8e3e1375e8773a 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -10,7 +10,7 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.cacert.gigi.User;
+import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
@@ -20,9 +20,9 @@ import org.cacert.gigi.util.Notary.AssuranceResult;
 
 public class AssuranceForm extends Form {
 
-    User assuree;
+    private User assuree;
 
-    static final Template templ;
+    private static final Template templ;
     static {
         templ = new Template(AssuranceForm.class.getResource("AssuranceForm.templ"));
     }
@@ -34,17 +34,21 @@ public class AssuranceForm extends Form {
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
+    SimpleDateFormat sdf2 = new SimpleDateFormat("dd. MMM yyyy");
+
     @Override
     public void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         HashMap<String, Object> res = new HashMap<String, Object>();
         res.putAll(vars);
-        res.put("name", assuree.getName());
+        res.put("nameExplicit", assuree.getName());
+        res.put("name", assuree.getName().toString());
         try {
             res.put("maxpoints", assuree.getMaxAssurePoints());
         } catch (SQLException e) {
             e.printStackTrace();
         }
         res.put("dob", sdf.format(assuree.getDob()));
+        res.put("dobFmt2", sdf2.format(assuree.getDob()));
         templ.output(out, l, res);
     }
 
@@ -93,4 +97,8 @@ public class AssuranceForm extends Form {
         return false;
     }
 
+    public User getAssuree() {
+        return assuree;
+    }
+
 }