From f5d307e518fe8bbe3bf2b52aef9faf61fda6ae77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Fri, 27 Jun 2014 18:06:17 +0200 Subject: [PATCH] Make Name.equals, User.getMaxAssurancePoints() --- src/org/cacert/gigi/Name.java | 26 ++++++++++++++++++++++++++ src/org/cacert/gigi/User.java | 20 ++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/src/org/cacert/gigi/Name.java b/src/org/cacert/gigi/Name.java index 4e748954..933982e9 100644 --- a/src/org/cacert/gigi/Name.java +++ b/src/org/cacert/gigi/Name.java @@ -27,4 +27,30 @@ public class Name implements Outputable { 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; + + } } diff --git a/src/org/cacert/gigi/User.java b/src/org/cacert/gigi/User.java index 2dba0c5c..96e0a111 100644 --- a/src/org/cacert/gigi/User.java +++ b/src/org/cacert/gigi/User.java @@ -156,4 +156,24 @@ public class User { return name.equals(s.name) && email.equals(s.email) && dob.equals(s.dob); } + public int getMaxAssurePoints() throws SQLException { + int exp = getExperiencePoints(); + int points = 10; + if (exp >= 10) { + points += 5; + } + if (exp >= 20) { + points += 5; + } + if (exp >= 30) { + points += 5; + } + if (exp >= 40) { + points += 5; + } + if (exp >= 50) { + points += 5; + } + return points; + } } -- 2.39.2