package org.cacert.gigi.util;
import java.text.ParseException;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import org.cacert.gigi.dbObjects.Name;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.output.DateSelector;
+import org.cacert.gigi.output.template.SprintfCommand;
public class Notary {
* @throws GigiApiException
* if the assurance fails (for various reasons)
*/
- public synchronized static void assure(User assurer, User assuree, Name assureeName, Date dob, int awarded, String location, String date, AssuranceType type) throws GigiApiException {
+ public synchronized static void assure(User assurer, User assuree, Name assureeName, DayDate dob, int awarded, String location, String date, AssuranceType type) throws GigiApiException {
may(assurer, assuree, AssuranceType.FACE_TO_FACE);
GigiApiException gae = new GigiApiException();
if ( !gae.isEmpty()) {
} else if (type == AssuranceType.TTP_ASSISTED) {
assureTTP(assurer, assuree, awarded, location, date);
} else {
- throw new GigiApiException("Unknown Assurance type: " + type);
+ throw new GigiApiException(new SprintfCommand("Unknown Assurance type: %s", Arrays.asList(type.toString())));
}
assurer.invalidateMadeAssurances();
assuree.invalidateReceivedAssurances();
private static void assureNucleus(User assurer, User assuree, int awarded, String location, String date) throws GigiApiException {
may(assurer, assuree, AssuranceType.NUCLEUS);
// Do up to 35 points as f2f
- int f2fPoints = Math.min(35, awarded);
+ int f2fPoints = Math.min(assurer.getMaxAssurePoints(), awarded);
assureF2F(assurer, assuree, f2fPoints, location, date);
awarded -= f2fPoints;