Move setContentType out.

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 191a2f1b4878386731167dcc7f888844f2ebb371..0cf0c62cc8739dfc8cc37bb85aef2ef52ba8bb0b 100644 (file)
--- 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 2c7d0336c8a83b08f6603080000fd1797e8dbada..905daf16aa1248252a073f602f6ad6df227018d0 100644 (file)
--- 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 55a9b1bcb008eab8514d344287f2780f809aa30e..d1528528743f0f80cac2148572d44b329ebb206d 100644 (file)
--- 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 18eb2944083e858331d2fd375ddb6edd862ff450..afe96dc76f4dddba3820e0b05da08f91851f3763 100644 (file)
--- 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 {