upd: enforce a more strict Form call pattern.

[gigi.git] / src / org / cacert / gigi / pages / admin / support / FindUserByEmailForm.java

diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java
index 70a66b048ba0cbed95565f9bc9750866f819abce..2978c48e213ce6435775713ea2c4bfad1ed7f0b4 100644 (file)
--- a/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java
@@ -14,7 +14,19 @@ import org.cacert.gigi.output.template.Template;
 
 public class FindUserByEmailForm extends Form {
 
 
 public class FindUserByEmailForm extends Form {
 

-    private EmailAddress emails[];
+    public static class FindEmailResult extends SuccessMessageResult {
+
+        private final EmailAddress[] emails;
+
+        public FindEmailResult(EmailAddress[] emails) {
+            super(null);
+            this.emails = emails;
+        }
+
+        public EmailAddress[] getEmails() {
+            return emails;
+        }
+    }

 
     private static final Template t = new Template(FindUserByDomainForm.class.getResource("FindUserByEmailForm.templ"));
 
 
     private static final Template t = new Template(FindUserByDomainForm.class.getResource("FindUserByEmailForm.templ"));
 


@@ -23,22 +35,16 @@ public class FindUserByEmailForm extends Form {
     }
 
     @Override
     }
 
     @Override

-    public boolean submit(HttpServletRequest req) throws GigiApiException {
+    public SubmissionResult submit(HttpServletRequest req) throws GigiApiException {

         EmailAddress[] emails = EmailAddress.findByAllEmail(req.getParameter("email"));
         if (emails.length == 0) {
             throw new GigiApiException(SprintfCommand.createSimple("No users found matching {0}", req.getParameter("email")));
         }
         EmailAddress[] emails = EmailAddress.findByAllEmail(req.getParameter("email"));
         if (emails.length == 0) {
             throw new GigiApiException(SprintfCommand.createSimple("No users found matching {0}", req.getParameter("email")));
         }

-        this.emails = emails;
-        return true;
+        return new FindUserByEmailForm.FindEmailResult(emails);

     }
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         t.output(out, l, vars);
     }
     }
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         t.output(out, l, vars);
     }

-
-    public EmailAddress[] getEmails() {
-        return emails;
-    }
-

 }
 }