X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;ds=inline;f=src%2Forg%2Fcacert%2Fgigi%2FdbObjects%2FName.java;h=7c803b8a67244996ae3d7d924b656f04d6b83ad8;hb=aac731a4213533e5e9c3143f95e99af4b273b17a;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..7c803b8a 100644 --- a/src/org/cacert/gigi/dbObjects/Name.java +++ b/src/org/cacert/gigi/dbObjects/Name.java @@ -4,9 +4,10 @@ import java.io.PrintWriter; import java.util.Map; 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 { +public class Name implements Outputable { String fname; @@ -27,10 +28,10 @@ public class Name implements Outputable, Cloneable { public void output(PrintWriter out, Language l, Map vars) { out.println(""); out.print(""); - out.print(fname); + out.print(HTMLEncoder.encodeHTML(fname)); out.print(" "); out.print(""); - out.print(lname); + out.print(HTMLEncoder.encodeHTML(lname)); out.print(""); out.println(""); } @@ -101,13 +102,4 @@ 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); - } - } - }