Merge changes I82859d98,I3da54fbf

[gigi.git] / src / org / cacert / gigi / dbObjects / User.java

diff --git a/src/org/cacert/gigi/dbObjects/User.java b/src/org/cacert/gigi/dbObjects/User.java
index 4312d9acd00a897e7a2159b0b6f34442ed9d978a..cf43f80f3182a4377a1578b3f11ac370375f8e53 100644 (file)
--- a/src/org/cacert/gigi/dbObjects/User.java
+++ b/src/org/cacert/gigi/dbObjects/User.java
@@ -43,7 +43,7 @@ public class User extends CertificateOwner {
 
     public static final int MINIMUM_AGE = 16;
 
-    public static final int MAXIMUM_PLAUSIBLE_AGE = 110;
+    public static final int MAXIMUM_PLAUSIBLE_AGE = 120;
 
     public static final int POJAM_AGE = 14;
 
@@ -51,7 +51,7 @@ public class User extends CertificateOwner {
 
     public static final boolean POJAM_ENABLED = false;
 
-    public static final int EXPERIENCE_POINTS = 2;
+    public static final int EXPERIENCE_POINTS = 4;
 
     /**
      * Time in months a verification is considered "recent".
@@ -136,7 +136,7 @@ public class User extends CertificateOwner {
     public void setDoB(DayDate dob) throws GigiApiException {
         synchronized (Notary.class) {
             if (getReceivedAssurances().length != 0) {
-                throw new GigiApiException("No change after assurance allowed.");
+                throw new GigiApiException("No change after verification allowed.");
             }
 
             if ( !CalendarUtil.isOfAge(dob, User.MINIMUM_AGE)) {
@@ -257,6 +257,7 @@ public class User extends CertificateOwner {
      * 
      * @return the maximal points @
      */
+    @SuppressWarnings("unused")
     public int getMaxAssurePoints() {
         if ( !CalendarUtil.isOfAge(dob, ADULT_AGE) && POJAM_ENABLED) {
             return 10; // PoJAM
@@ -395,7 +396,7 @@ public class User extends CertificateOwner {
 
     }
 
-    public Name getPreferredName() {
+    public synchronized Name getPreferredName() {
         return preferredName;
     }