From: Janis Streib <janis@dogcraft.de>
Date: Fri, 20 Jun 2014 16:43:12 +0000 (+0200)
Subject: Pages in a own package
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=f00a29a230689e952d413818073fff0644e04786

Pages in a own package
---

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index b4ebf8b7..1b730f29 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -10,6 +10,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.pages.MainPage;
+
 public class Gigi extends HttpServlet {
 	private HashMap<String, Page> pages = new HashMap<String, Page>();
 
@@ -58,7 +61,6 @@ public class Gigi extends HttpServlet {
 			resp.sendRedirect("/login");
 			return;
 		}
-		System.out.println(req.getPathInfo());
 		if (pages.containsKey(req.getPathInfo())) {
 			Page p = pages.get(req.getPathInfo());
 			p.doGet(req, resp);
diff --git a/src/org/cacert/gigi/LoginPage.java b/src/org/cacert/gigi/pages/LoginPage.java
similarity index 88%
rename from src/org/cacert/gigi/LoginPage.java
rename to src/org/cacert/gigi/pages/LoginPage.java
index 419ebb44..68fcfd11 100644
--- a/src/org/cacert/gigi/LoginPage.java
+++ b/src/org/cacert/gigi/pages/LoginPage.java
@@ -1,10 +1,12 @@
-package org.cacert.gigi;
+package org.cacert.gigi.pages;
 
 import java.io.IOException;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.cacert.gigi.Page;
+
 public class LoginPage extends Page {
 	@Override
 	public void doGet(ServletRequest req, ServletResponse resp)
diff --git a/src/org/cacert/gigi/MainPage.java b/src/org/cacert/gigi/pages/MainPage.java
similarity index 83%
rename from src/org/cacert/gigi/MainPage.java
rename to src/org/cacert/gigi/pages/MainPage.java
index 6d52e8bc..44d4f46b 100644
--- a/src/org/cacert/gigi/MainPage.java
+++ b/src/org/cacert/gigi/pages/MainPage.java
@@ -1,10 +1,12 @@
-package org.cacert.gigi;
+package org.cacert.gigi.pages;
 
 import java.io.IOException;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.cacert.gigi.Page;
+
 public class MainPage extends Page {
 	@Override
 	public void doGet(ServletRequest req, ServletResponse resp)