[EMPTY] Formatting with configured formatter.

[gigi.git] / src / org / cacert / gigi / util / Notary.java

diff --git a/src/org/cacert/gigi/util/Notary.java b/src/org/cacert/gigi/util/Notary.java
index 515b25cd30a23601e77a04ea5e6499e47d1bf378..7cd38e37080d9557978aadee889c086ecfc329d0 100644 (file)
--- 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.");
+               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;
@@ -82,10 +75,8 @@ public class Notary {
                        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);