upd: enforce a more strict Form call pattern.

[gigi.git] / src / org / cacert / gigi / pages / OneFormPage.java

diff --git a/src/org/cacert/gigi/pages/OneFormPage.java b/src/org/cacert/gigi/pages/OneFormPage.java
index cfcc1983167675cffe15ff5a53218426e0c31ce8..512dad49367aeb126453531ad791f57b350c38df 100644 (file)
--- a/src/org/cacert/gigi/pages/OneFormPage.java
+++ b/src/org/cacert/gigi/pages/OneFormPage.java
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.output.template.Form;
 
-public abstract class OneFormPage extends Page {
+public class OneFormPage extends Page {
 
     Class<? extends Form> c;
 
@@ -18,11 +18,16 @@ public abstract class OneFormPage extends Page {
         c = t;
     }
 
+    @Override
+    public boolean beforePost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+        return Form.getForm(req, c).submitExceptionProtected(req, resp);
+    }
+
     @Override
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
         Form form = Form.getForm(req, c);
-        if (form.submitProtected(resp.getWriter(), req)) {
-            resp.sendRedirect(getSuccessPath(form));
+        if (Form.printFormErrors(req, resp.getWriter())) {
+            form.output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
         }
     }
 
@@ -35,6 +40,4 @@ public abstract class OneFormPage extends Page {
         }
     }
 
-    public abstract String getSuccessPath(Form f);
-
 }