From 9cea8b8e7eb50c8d79e7eecea683e17efe583c59 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Thu, 26 Jun 2014 22:51:18 +0200
Subject: [PATCH] Pullup Signup.outputError to Form.

---
 src/org/cacert/gigi/output/Form.java       | 13 +++++++++++--
 src/org/cacert/gigi/pages/main/Signup.java |  9 ++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/org/cacert/gigi/output/Form.java b/src/org/cacert/gigi/output/Form.java
index 1aa356ab..9a27127c 100644
--- a/src/org/cacert/gigi/output/Form.java
+++ b/src/org/cacert/gigi/output/Form.java
@@ -2,9 +2,18 @@ package org.cacert.gigi.output;
 
 import java.io.PrintWriter;
 
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
-public interface Form extends Outputable {
-	public boolean submit(PrintWriter out, HttpServletRequest req);
+import org.cacert.gigi.pages.Page;
+
+public abstract class Form implements Outputable {
+	public abstract boolean submit(PrintWriter out, HttpServletRequest req);
+
+	protected void outputError(PrintWriter out, ServletRequest req, String text) {
+		out.print("<div>");
+		out.print(Page.translate(req, text));
+		out.println("</div>");
+	}
 
 }
diff --git a/src/org/cacert/gigi/pages/main/Signup.java b/src/org/cacert/gigi/pages/main/Signup.java
index 2a7ea912..3d074441 100644
--- a/src/org/cacert/gigi/pages/main/Signup.java
+++ b/src/org/cacert/gigi/pages/main/Signup.java
@@ -11,7 +11,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Language;
@@ -28,7 +27,7 @@ import org.cacert.gigi.util.PasswordStrengthChecker;
 import org.cacert.gigi.util.RandomToken;
 import org.cacert.gigi.util.ServerConstants;
 
-public class Signup implements Form {
+public class Signup extends Form {
 	User buildup = new User();
 	Template t;
 	boolean general = true, country = true, regional = true, radius = true;
@@ -92,6 +91,7 @@ public class Signup implements Form {
 		myDoB.update(r);
 	}
 
+	@Override
 	public synchronized boolean submit(PrintWriter out, HttpServletRequest req) {
 		update(req);
 		boolean failed = false;
@@ -218,11 +218,6 @@ public class Signup implements Form {
 		}
 		return true;
 	}
-	private void outputError(PrintWriter out, ServletRequest req, String text) {
-		out.print("<div>");
-		out.print(Page.translate(req, text));
-		out.println("</div>");
-	}
 
 	private void run(HttpServletRequest req, String password)
 			throws SQLException {
-- 
2.39.2