From 7634b75e5cffbf2170ff9dbcbc146fb636d4ecc6 Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Fri, 20 Jun 2014 21:50:27 +0200
Subject: [PATCH] Small abstraction

---
 src/org/cacert/gigi/Gigi.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 7144ea27..191a2f1b 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -85,15 +85,12 @@ public class Gigi extends HttpServlet {
 		}
 		if (pages.containsKey(req.getPathInfo())) {
 			String b0 = baseTemplate[0];
-			int year = Calendar.getInstance().get(Calendar.YEAR);
 			Page p = pages.get(req.getPathInfo());
-			b0 = b0.replaceAll("\\$title\\$", p.getTitle());
-			b0 = b0.replaceAll("\\$year\\$", year + "");
+			b0 = makeDynTempl(b0, p);
 			resp.getWriter().print(b0);
 			p.doGet(req, resp);
 			String b1 = baseTemplate[1];
-			b1 = b1.replaceAll("\\$title\\$", p.getTitle());
-			b1 = b1.replaceAll("\\$year\\$", year + "");
+			b1 = makeDynTempl(b1, p);
 			resp.getWriter().print(b1);
 		} else {
 			resp.sendError(404, "Page not found.");
@@ -101,6 +98,12 @@ public class Gigi extends HttpServlet {
 
 	}
 
+	private String makeDynTempl(String in, Page p) {
+		int year = Calendar.getInstance().get(Calendar.YEAR);
+		in = in.replaceAll("\\$title\\$", p.getTitle());
+		in = in.replaceAll("\\$year\\$", year + "");
+		return in;
+	}
 	private void authWithUnpw(HttpServletRequest req) {
 		String un = req.getParameter("username");
 		String pw = req.getParameter("password");
-- 
2.39.2