X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Futil%2FNotary.java;h=7cd38e37080d9557978aadee889c086ecfc329d0;hb=2cbe88c14309c3a10dab336cb395c3e995d81ec5;hp=0577fbfcf7d9944dc7453604632eb3e0c3afedb3;hpb=086118bb498331de19b4d8d55caa59e0efd41402;p=gigi.git

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index 0577fbfc..7cd38e37 100644
--- a/src/org/cacert/gigi/util/Notary.java
+++ b/src/org/cacert/gigi/util/Notary.java
@@ -8,14 +8,11 @@ import org.cacert.gigi.User;
 import org.cacert.gigi.database.DatabaseConnection;
 
 public class Notary {
-	public static void writeUserAgreement(int memid, String document,
-			String method, String comment, boolean active, int secmemid)
-			throws SQLException {
-		PreparedStatement q = DatabaseConnection
-				.getInstance()
-				.prepare(
-						"insert into `user_agreements` set `memid`=?, `secmemid`=?,"
-								+ " `document`=?,`date`=NOW(), `active`=?,`method`=?,`comment`=?");
+	public static void writeUserAgreement(int memid, String document, String method, String comment, boolean active,
+		int secmemid) throws SQLException {
+		PreparedStatement q = DatabaseConnection.getInstance().prepare(
+			"insert into `user_agreements` set `memid`=?, `secmemid`=?,"
+				+ " `document`=?,`date`=NOW(), `active`=?,`method`=?,`comment`=?");
 		q.setInt(1, memid);
 		q.setInt(2, secmemid);
 		q.setString(3, document);
@@ -25,16 +22,13 @@ public class Notary {
 		q.execute();
 	}
 
-	public static AssuranceResult checkAssuranceIsPossible(User assurer,
-			User target) {
+	public static AssuranceResult checkAssuranceIsPossible(User assurer, User target) {
 		if (assurer.getId() == target.getId()) {
 			return AssuranceResult.CANNOT_ASSURE_SELF;
 		}
 		try {
-			PreparedStatement ps = DatabaseConnection
-					.getInstance()
-					.prepare(
-							"SELECT 1 FROM `notary` where `to`=? and `from`=? AND `deleted`=0");
+			PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+				"SELECT 1 FROM `notary` where `to`=? and `from`=? AND `deleted`=0");
 			ps.setInt(1, target.getId());
 			ps.setInt(2, assurer.getId());
 			ResultSet rs = ps.executeQuery();
@@ -53,23 +47,22 @@ public class Notary {
 	}
 
 	public enum AssuranceResult {
-		CANNOT_ASSURE("You cannot assure."), ALREADY_ASSUREED(
-				"You already assured this person."), CANNOT_ASSURE_SELF(
-				"Cannot assure myself."), ASSURANCE_SUCCEDED(""), ASSUREE_CHANGED(
-				"Person details changed. Please start over again."), POINTS_OUT_OF_RANGE(
-				"Points out of range.");
-		String message;
+		CANNOT_ASSURE("You cannot assure."), ALREADY_ASSUREED("You already assured this person."), CANNOT_ASSURE_SELF(
+			"Cannot assure myself."), ASSURANCE_SUCCEDED(""), ASSUREE_CHANGED(
+			"Person details changed. Please start over again."), POINTS_OUT_OF_RANGE("Points out of range.");
+		private final String message;
+
 		private AssuranceResult(String message) {
 			this.message = message;
 		}
+
 		public String getMessage() {
 			return message;
 		}
 	}
 
-	public synchronized static AssuranceResult assure(User assurer,
-			User target, int awarded, String location, String date)
-			throws SQLException {
+	public synchronized static AssuranceResult assure(User assurer, User target, int awarded, String location,
+		String date) throws SQLException {
 		AssuranceResult can = checkAssuranceIsPossible(assurer, target);
 		if (can != AssuranceResult.ASSURANCE_SUCCEDED) {
 			return can;
@@ -78,15 +71,12 @@ public class Notary {
 		if (!u.equals(target)) {
 			return AssuranceResult.ASSUREE_CHANGED;
 		}
-		System.out.println("Would now assure.");
 		if (awarded > assurer.getMaxAssurePoints() || awarded < 0) {
 			return AssuranceResult.POINTS_OUT_OF_RANGE;
 		}
 
-		PreparedStatement ps = DatabaseConnection
-				.getInstance()
-				.prepare(
-						"INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?");
+		PreparedStatement ps = DatabaseConnection.getInstance().prepare(
+			"INSERT INTO `notary` SET `from`=?, `to`=?, `points`=?, `location`=?, `date`=?");
 		ps.setInt(1, assurer.getId());
 		ps.setInt(2, target.getId());
 		ps.setInt(3, awarded);