Implement better result of "Notary.assure"

[gigi.git] / src / org / cacert / gigi / pages / wot / AssuranceForm.java

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index be7be71699fddaa8cf3136745a96126a517726c5..9bb87af512d49165c6c6105c393a403282e24971 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -17,6 +17,7 @@ import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.Template;
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.util.Notary;
+import org.cacert.gigi.util.Notary.AssuranceResult;
 
 public class AssuranceForm extends Form {
        User assuree;
@@ -103,15 +104,14 @@ public class AssuranceForm extends Form {
                        return false;
                }
                try {
-                       boolean success = Notary.assure(LoginPage.getUser(req), assuree,
-                                       Integer.parseInt(req.getParameter("points")),
+                       AssuranceResult success = Notary.assure(LoginPage.getUser(req),
+                                       assuree, Integer.parseInt(req.getParameter("points")),
                                        req.getParameter("location"), req.getParameter("date"));
-                       if (!success) {
-                               outputError(out, req,
-                                               "Assurance failed. Maybe user data changed.");
+                       if (success != AssuranceResult.ASSURANCE_SUCCEDED) {
+                               outputError(out, req, success.getMessage());
                        }
                        out.println("</div>");
-                       return success;
+                       return success == AssuranceResult.ASSURANCE_SUCCEDED;
                } catch (SQLException e) {
                        e.printStackTrace();
                }