From e7f6ecd77998e0bda037daabd07ff87422f911d8 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Thu, 3 Dec 2015 17:15:49 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D1=82=D0=BE=D0=B4=20=D0=B3=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Код создания модели выведен в отдельный метод WebApp.getDefaultModel()
---
 src/main/java/kinosearch/webapp/WebApp.java       | 15 ++++++++++++++-
 .../kinosearch/webapp/servlets/IndexServlet.java  |  6 +-----
 .../webapp/servlets/TemplateServlet.java          |  6 +-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/kinosearch/webapp/WebApp.java b/src/main/java/kinosearch/webapp/WebApp.java
index 07cf54a..238c67e 100644
--- a/src/main/java/kinosearch/webapp/WebApp.java
+++ b/src/main/java/kinosearch/webapp/WebApp.java
@@ -1,10 +1,14 @@
 package kinosearch.webapp;
 
+import kinosearch.core.Tools;
 import kinosearch.webapp.template.FreemakerProcessor;
 import kinosearch.webapp.template.TemplateProcessor;
 
+import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
+import java.util.HashMap;
+import java.util.Map;
 
 public class WebApp implements ServletContextListener {
     private static boolean _init = false;
@@ -14,6 +18,16 @@ public class WebApp implements ServletContextListener {
         return (_init ? templateProcessor : null);
     }
 
+    public static Map<String, Object> getDefaultModel(ServletContext context) {
+        Map<String, Object> model = new HashMap<>();
+        model.put(".templatedir", context.getRealPath("WEB-INF"));
+        model.put("basedir", context.getContextPath());
+        model.put("version", Tools.VERSION);
+        model.put("rutext", "Поиск кино по пиратским кинотеатрам");
+
+        return model;
+    }
+
     @Override
     public void contextInitialized(ServletContextEvent sce) {
         templateProcessor = new FreemakerProcessor();
@@ -25,5 +39,4 @@ public class WebApp implements ServletContextListener {
         _init = false;
     }
 
-
 }
diff --git a/src/main/java/kinosearch/webapp/servlets/IndexServlet.java b/src/main/java/kinosearch/webapp/servlets/IndexServlet.java
index fa9d2bf..8578167 100644
--- a/src/main/java/kinosearch/webapp/servlets/IndexServlet.java
+++ b/src/main/java/kinosearch/webapp/servlets/IndexServlet.java
@@ -26,11 +26,7 @@ public class IndexServlet extends HttpServlet {
     }
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        Map<String, Object> model = new HashMap<>();
-        model.put(".templatedir", getServletContext().getRealPath("WEB-INF"));
-        model.put("basedir", getServletContext().getContextPath());
-        model.put("version", Tools.VERSION);
-        model.put("rutext", "Поиск кино по пиратским кинотеатрам");
+        Map<String, Object> model = WebApp.getDefaultModel(getServletContext());
 
         if (request.getParameter("search") != null && !request.getParameter("search").trim().isEmpty()) {
             boolean strong = false;
diff --git a/src/main/java/kinosearch/webapp/servlets/TemplateServlet.java b/src/main/java/kinosearch/webapp/servlets/TemplateServlet.java
index 8cf823a..430f989 100644
--- a/src/main/java/kinosearch/webapp/servlets/TemplateServlet.java
+++ b/src/main/java/kinosearch/webapp/servlets/TemplateServlet.java
@@ -32,11 +32,7 @@ public class TemplateServlet extends HttpServlet {
         String fileName = Tools.getFileFromURI(req.getRequestURI(), req.getContextPath());
         Path path = Paths.get(getServletContext().getRealPath("WEB-INF/simple_template" + fileName));
         if (Files.exists(path)) {
-            Map<String, Object> model = new HashMap<>();
-            model.put(".templatedir", getServletContext().getRealPath("WEB-INF"));
-            model.put("basedir", getServletContext().getContextPath());
-            model.put("version", Tools.VERSION);
-            model.put("rutext", "Поиск кино по пиратским кинотеатрам");
+            Map<String, Object> model = WebApp.getDefaultModel(getServletContext());
 
             resp.setCharacterEncoding("UTF-8");
             resp.setContentType("text/html;charset=UTF-8");