From: Felix Dörre <felix@dogcraft.de>
Date: Sat, 21 Jun 2014 09:13:46 +0000 (+0200)
Subject: Move setContentType out.
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=6eca3763ffd17eaa7651db4dfdff48f259135865

Move setContentType out.
---

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 191a2f1b..0cf0c62c 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -87,6 +87,7 @@ public class Gigi extends HttpServlet {
 			String b0 = baseTemplate[0];
 			Page p = pages.get(req.getPathInfo());
 			b0 = makeDynTempl(b0, p);
+			resp.setContentType("text/html");
 			resp.getWriter().print(b0);
 			p.doGet(req, resp);
 			String b1 = baseTemplate[1];
diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 2c7d0336..905daf16 100644
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -13,12 +13,11 @@ public class LoginPage extends Page {
 	@Override
 	public void doGet(ServletRequest req, ServletResponse resp)
 			throws IOException {
-		super.doGet(req, resp);
 		resp.getWriter()
 				.println(
 						"<form method='POST' action='/login'>"
-				+ "<input type='text' name='username'>"
-				+ "<input type='password' name='password'> <input type='submit' value='login'></form>");
+								+ "<input type='text' name='username'>"
+								+ "<input type='password' name='password'> <input type='submit' value='login'></form>");
 	}
 
 }
diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java
index 55a9b1bc..d1528528 100644
--- a/src/org/cacert/gigi/pages/MainPage.java
+++ b/src/org/cacert/gigi/pages/MainPage.java
@@ -13,7 +13,6 @@ public class MainPage extends Page {
 	@Override
 	public void doGet(ServletRequest req, ServletResponse resp)
 			throws IOException {
-		super.doGet(req, resp);
 		resp.getWriter().println("Access granted.");
 	}
 }
diff --git a/src/org/cacert/gigi/pages/Page.java b/src/org/cacert/gigi/pages/Page.java
index 18eb2944..afe96dc7 100644
--- a/src/org/cacert/gigi/pages/Page.java
+++ b/src/org/cacert/gigi/pages/Page.java
@@ -12,10 +12,8 @@ public abstract class Page {
 		this.title = title;
 	}
 
-	public void doGet(ServletRequest req, ServletResponse resp)
-			throws IOException {
-		resp.setContentType("text/html");
-	}
+	public abstract void doGet(ServletRequest req, ServletResponse resp)
+			throws IOException;
 
 	public void doPost(ServletRequest req, ServletResponse resp)
 			throws IOException {