From 6aa2a2b2b90e9f05386f7fe1bcc831a6a574a0f6 Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Fri, 20 Jun 2014 18:50:56 +0200
Subject: [PATCH 1/1] Added title attribute + moved page to pages pacckage, too

---
 src/org/cacert/gigi/Gigi.java             |  5 +++--
 src/org/cacert/gigi/pages/LoginPage.java  |  6 ++++--
 src/org/cacert/gigi/pages/MainPage.java   |  6 ++++--
 src/org/cacert/gigi/{ => pages}/Page.java | 16 +++++++++++++++-
 4 files changed, 26 insertions(+), 7 deletions(-)
 rename src/org/cacert/gigi/{ => pages}/Page.java (62%)

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 1b730f29..5cee3a4c 100644
--- 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.Page;
 
 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();
 	}
 
diff --git a/src/org/cacert/gigi/pages/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
index 68fcfd11..2c7d0336 100644
--- 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 org.cacert.gigi.Page;
-
 public class LoginPage extends Page {
+	public LoginPage(String title) {
+		super(title);
+	}
+
 	@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 44d4f46b..55a9b1bc 100644
--- 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 org.cacert.gigi.Page;
-
 public class MainPage extends Page {
+	public MainPage(String title) {
+		super(title);
+	}
+
 	@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 77ffbb67..18eb2944 100644
--- 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;
 
@@ -6,6 +6,12 @@ import javax.servlet.ServletRequest;
 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");
@@ -15,4 +21,12 @@ public abstract class Page {
 			throws IOException {
 		doGet(req, resp);
 	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
 }
-- 
2.39.2