X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2FName.java;h=0c919dab4da4057a66c2437a6ad3763ece1ce2b0;hb=c7f07265ee5cd2af26fb62949d6cd768b16434fe;hp=933982e980ce0565af9e23519714b075c8dfc719;hpb=f5d307e518fe8bbe3bf2b52aef9faf61fda6ae77;p=gigi.git diff --git a/src/org/cacert/gigi/Name.java b/src/org/cacert/gigi/Name.java index 933982e9..0c919dab 100644 --- a/src/org/cacert/gigi/Name.java +++ b/src/org/cacert/gigi/Name.java @@ -6,51 +6,58 @@ import java.util.Map; import org.cacert.gigi.output.Outputable; public class Name implements Outputable { - String fname; - String mname; - String lname; - String suffix; - - public Name(String fname, String lname) { - this.fname = fname; - this.lname = lname; - } - - @Override - public void output(PrintWriter out, Language l, Map vars) { - out.println(""); - out.print(""); - out.print(fname); - out.print(" "); - out.print(""); - out.print(lname); - out.print(""); - out.println(""); - } - @Override - public boolean equals(Object obj) { - if (!(obj instanceof Name)) { - return false; - } - Name n = (Name) obj; - if (!(n.fname.equals(fname) && n.lname.equals(lname))) { - return false; - } - if (mname == null) { - if (n.mname != null) { - return false; - } - } else if (!mname.equals(n.mname)) { - return false; - } - if (suffix == null) { - if (n.suffix != null) { - return false; - } - } else if (!suffix.equals(n.suffix)) { - return false; - } - return true; - - } + + String fname; + + String mname; + + String lname; + + String suffix; + + public Name(String fname, String lname, String mname, String suffix) { + this.fname = fname; + this.lname = lname; + this.mname = mname; + this.suffix = suffix; + } + + @Override + public void output(PrintWriter out, Language l, Map vars) { + out.println(""); + out.print(""); + out.print(fname); + out.print(" "); + out.print(""); + out.print(lname); + out.print(""); + out.println(""); + } + + @Override + public boolean equals(Object obj) { + if ( !(obj instanceof Name)) { + return false; + } + Name n = (Name) obj; + if ( !(n.fname.equals(fname) && n.lname.equals(lname))) { + return false; + } + if (mname == null) { + if (n.mname != null) { + return false; + } + } else if ( !mname.equals(n.mname)) { + return false; + } + if (suffix == null) { + if (n.suffix != null) { + return false; + } + } else if ( !suffix.equals(n.suffix)) { + return false; + } + return true; + + } }