Fix templating. Add language to IterableDataset.

[gigi.git] / src / org / cacert / gigi / pages / account / MyDetails.java

diff --git a/src/org/cacert/gigi/pages/account/MyDetails.java b/src/org/cacert/gigi/pages/account/MyDetails.java
index c3f114167d51920ad80996afc7640d7f5eace3f8..753bdb2bb52e4c89b2b4e19811a33e8c975c4bef 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetails.java
+++ b/src/org/cacert/gigi/pages/account/MyDetails.java
@@ -3,9 +3,7 @@ package org.cacert.gigi.pages.account;
 import static org.cacert.gigi.Gigi.USER;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
@@ -13,46 +11,31 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.DateSelector;
-import org.cacert.gigi.output.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;
 
 public class MyDetails extends Page {
-       private Template t;
 
        public MyDetails() {
                super("My Details");
-               try {
-                       t = new Template(new InputStreamReader(
-                                       MyDetails.class.getResourceAsStream(MyDetails.class
-                                                       .getSimpleName() + ".templ"), "UTF-8"));
-               } catch (UnsupportedEncodingException e) {
-                       e.printStackTrace();
-               }
        }
 
-       public static final String PATH = "/account/myDetails";
+       public static final String PATH = "/account/details";
 
        @Override
-       public void doGet(HttpServletRequest req, HttpServletResponse resp)
-                       throws IOException {
+       public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
                User u = (User) req.getSession().getAttribute(USER);
 
                PrintWriter out = resp.getWriter();
                HashMap<String, Object> map = new HashMap<String, Object>();
                map.put("fname", HTMLEncoder.encodeHTML(u.getFname()));
-               map.put("mname",
-                               u.getMname() == null
-                                               ? ""
-                                               : HTMLEncoder.encodeHTML(u.getMname()));
+               map.put("mname", u.getMname() == null ? "" : HTMLEncoder.encodeHTML(u.getMname()));
                map.put("lname", HTMLEncoder.encodeHTML(u.getLname()));
-               map.put("suffix",
-                               u.getSuffix() == null ? "" : HTMLEncoder.encodeHTML(u
-                                               .getSuffix()));
+               map.put("suffix", u.getSuffix() == null ? "" : HTMLEncoder.encodeHTML(u.getSuffix()));
                DateSelector ds = new DateSelector("day", "month", "year");
                map.put("DoB", ds);
                map.put("details", "");
-               t.output(out, getLanguage(req), map);
+               getDefaultTemplate().output(out, getLanguage(req), map);
 
        }
 }