X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FName.java;h=d0cf00f7d225d89be29f190aa048dacdba0d8c5d;hb=2f50dbb24105e6345329b8e9ecb5ef4d67ab2a8c;hp=e28bf2b26e2bbfb514eebc3e6e4f73d59b6c3a81;hpb=3e9f3d6f2655dd7ff819a77fba2076da3c1f3717;p=gigi.git

diff --git a/src/org/cacert/gigi/dbObjects/Name.java b/src/org/cacert/gigi/dbObjects/Name.java
index e28bf2b2..d0cf00f7 100644
--- a/src/org/cacert/gigi/dbObjects/Name.java
+++ b/src/org/cacert/gigi/dbObjects/Name.java
@@ -3,18 +3,21 @@ package org.cacert.gigi.dbObjects;
 import java.io.PrintWriter;
 import java.util.Map;
 
+import org.cacert.gigi.dbObjects.wrappers.DataContainer;
 import org.cacert.gigi.localisation.Language;
-import org.cacert.gigi.output.Outputable;
+import org.cacert.gigi.output.template.Outputable;
+import org.cacert.gigi.util.HTMLEncoder;
 
-public class Name implements Outputable, Cloneable {
+@DataContainer
+public class Name implements Outputable {
 
-    String fname;
+    private final String fname;
 
-    String mname;
+    private final String mname;
 
-    String lname;
+    private final String lname;
 
-    String suffix;
+    private final String suffix;
 
     public Name(String fname, String lname, String mname, String suffix) {
         this.fname = fname;
@@ -27,10 +30,10 @@ public class Name implements Outputable, Cloneable {
     public void output(PrintWriter out, Language l, Map<String, Object> vars) {
         out.println("<span class=\"accountdetail\">");
         out.print("<span class=\"fname\">");
-        out.print(fname);
+        out.print(HTMLEncoder.encodeHTML(fname));
         out.print("</span> ");
         out.print("<span class=\"lname\">");
-        out.print(lname);
+        out.print(HTMLEncoder.encodeHTML(lname));
         out.print("</span>");
         out.println("</span>");
     }
@@ -101,13 +104,20 @@ public class Name implements Outputable, Cloneable {
                 (mname != null && suffix != null && text.equals(fname + " " + mname + " " + lname + " " + suffix));
     }
 
-    @Override
-    protected Name clone() {
-        try {
-            return (Name) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new Error(e);
-        }
+    public String getFname() {
+        return fname;
+    }
+
+    public String getLname() {
+        return lname;
+    }
+
+    public String getMname() {
+        return mname;
+    }
+
+    public String getSuffix() {
+        return suffix;
     }
 
 }