Added title attribute + moved page to pages pacckage, too

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 1b730f29568cb3e1cd67532816df35d5a72b8355..5cee3a4c2a8d010accba7082ff3ae8da4a705ea6 100644 (file)
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -12,14 +12,15 @@ import javax.servlet.http.HttpSession;
 
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;
 
 import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.MainPage;

+import org.cacert.gigi.pages.Page;

 
 public class Gigi extends HttpServlet {
        private HashMap<String, Page> pages = new HashMap<String, Page>();
 
        @Override
        public void init() throws ServletException {
 
 public class Gigi extends HttpServlet {
        private HashMap<String, Page> pages = new HashMap<String, Page>();
 
        @Override
        public void init() throws ServletException {

-               pages.put("/login", new LoginPage());
-               pages.put("/", new MainPage());
+               pages.put("/login", new LoginPage("CACert - Login"));
+               pages.put("/", new MainPage("CACert - Home"));

                super.init();
        }
 
                super.init();
        }
 

diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 68fcfd11634fecbcd5075996a44a730e0933464e..2c7d0336c8a83b08f6603080000fd1797e8dbada 100644 (file)
--- a/src/org/cacert/gigi/pages/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -5,9 +5,11 @@ import java.io.IOException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 

-import org.cacert.gigi.Page;
-

 public class LoginPage extends Page {
 public class LoginPage extends Page {

+       public LoginPage(String title) {
+               super(title);
+       }
+

        @Override
        public void doGet(ServletRequest req, ServletResponse resp)
                        throws IOException {
        @Override
        public void doGet(ServletRequest req, ServletResponse resp)
                        throws IOException {

diff --git a/src/org/cacert/gigi/pages/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java
index 44d4f46b662793c98d09489e12a6ce217824ab33..55a9b1bcb008eab8514d344287f2780f809aa30e 100644 (file)
--- a/src/org/cacert/gigi/pages/MainPage.java
+++ b/src/org/cacert/gigi/pages/MainPage.java
@@ -5,9 +5,11 @@ import java.io.IOException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 

-import org.cacert.gigi.Page;
-

 public class MainPage extends Page {
 public class MainPage extends Page {

+       public MainPage(String title) {
+               super(title);
+       }
+

        @Override
        public void doGet(ServletRequest req, ServletResponse resp)
                        throws IOException {
        @Override
        public void doGet(ServletRequest req, ServletResponse resp)
                        throws IOException {

diff --git a/src/org/cacert/gigi/Page.java b/src/org/cacert/gigi/pages/Page.java
similarity index 62%
rename from src/org/cacert/gigi/Page.java
rename to src/org/cacert/gigi/pages/Page.java
index 77ffbb673f516c9ee89cb0271252a1f7220b4650..18eb2944083e858331d2fd375ddb6edd862ff450 100644 (file)
--- a/src/org/cacert/gigi/Page.java
+++ b/src/org/cacert/gigi/pages/Page.java
@@ -1,4 +1,4 @@
-package org.cacert.gigi;
+package org.cacert.gigi.pages;

 
 import java.io.IOException;
 
 
 import java.io.IOException;
 


@@ -6,6 +6,12 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
 public abstract class Page {
 import javax.servlet.ServletResponse;
 
 public abstract class Page {

+       private String title;
+
+       public Page(String title) {
+               this.title = title;
+       }
+

        public void doGet(ServletRequest req, ServletResponse resp)
                        throws IOException {
                resp.setContentType("text/html");
        public void doGet(ServletRequest req, ServletResponse resp)
                        throws IOException {
                resp.setContentType("text/html");


@@ -15,4 +21,12 @@ public abstract class Page {
                        throws IOException {
                doGet(req, resp);
        }
                        throws IOException {
                doGet(req, resp);
        }

+
+       public String getTitle() {
+               return title;
+       }
+
+       public void setTitle(String title) {
+               this.title = title;
+       }

 }
 }