Empty: rename fname,mname,lname,dob

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

diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.java b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
index 359880b409b706c19f8a4b6563a9c6544616dac1..803bdea1c6fbead24d9fe8bb08dfa55176ce41c0 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.java
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.java
@@ -1,6 +1,5 @@
 package org.cacert.gigi.pages.account;
 
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Map;
 
@@ -10,7 +9,7 @@ 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.Form;
+import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.pages.Page;
 import org.cacert.gigi.util.HTMLEncoder;
@@ -21,7 +20,7 @@ public class MyDetailsForm extends Form {
 
     private static Template templ;
     static {
-        templ = new Template(new InputStreamReader(MyDetailsForm.class.getResourceAsStream("MyDetailsForm.templ")));
+        templ = new Template(MyDetailsForm.class.getResource("MyDetailsForm.templ"));
     }
 
     private User target;
@@ -31,7 +30,7 @@ public class MyDetailsForm extends Form {
     public MyDetailsForm(HttpServletRequest hsr, User target) {
         super(hsr);
         this.target = target;
-        this.ds = new DateSelector("day", "month", "year", target.getDob());
+        this.ds = new DateSelector("day", "month", "year", target.getDoB());
     }
 
     @Override
@@ -45,12 +44,12 @@ public class MyDetailsForm extends Form {
                 if (newLname.isEmpty()) {
                     throw new GigiApiException("Last name cannot be empty.");
                 }
-                target.setFname(newFname);
-                target.setLname(newLname);
-                target.setMname(newMname);
+                target.setFName(newFname);
+                target.setLName(newLname);
+                target.setMName(newMname);
                 target.setSuffix(newSuffix);
                 ds.update(req);
-                target.setDob(ds.getDate());
+                target.setDoB(ds.getDate());
                 target.updateUserData();
             } else {
                 throw new GigiApiException("No change after assurance allowed.");
@@ -67,16 +66,16 @@ public class MyDetailsForm extends Form {
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-        vars.put("fname", HTMLEncoder.encodeHTML(target.getFname()));
-        vars.put("mname", target.getMname() == null ? "" : HTMLEncoder.encodeHTML(target.getMname()));
-        vars.put("lname", HTMLEncoder.encodeHTML(target.getLname()));
+        vars.put("fname", HTMLEncoder.encodeHTML(target.getFName()));
+        vars.put("mname", target.getMName() == null ? "" : HTMLEncoder.encodeHTML(target.getMName()));
+        vars.put("lname", HTMLEncoder.encodeHTML(target.getLName()));
         vars.put("suffix", target.getSuffix() == null ? "" : HTMLEncoder.encodeHTML(target.getSuffix()));
         vars.put("details", "");
         if (target.getAssurancePoints() == 0) {
             vars.put("DoB", ds);
             templ.output(out, l, vars);
         } else {
-            vars.put("DoB", DateSelector.getDateFormat().format(target.getDob()));
+            vars.put("DoB", DateSelector.getDateFormat().format(target.getDoB()));
             assured.output(out, l, vars);
         }
     }