From 35827a56037a583eabea82708a801b7fc3f6d355 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sun, 04 Mar 2018 13:25:08 +0000 Subject: [PATCH] Umgestellt auf Thumbnailator --- src/de/uhilger/wbx/web/ViewServlet.java | 50 +++++++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/de/uhilger/wbx/web/ViewServlet.java b/src/de/uhilger/wbx/web/ViewServlet.java index 19b0c8b..76e1a04 100644 --- a/src/de/uhilger/wbx/web/ViewServlet.java +++ b/src/de/uhilger/wbx/web/ViewServlet.java @@ -41,6 +41,29 @@ private static final Logger logger = Logger.getLogger(ViewServlet.class.getName()); private static final String HOME_CTX = "/home"; + + private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + ServletOutputStream out = response.getOutputStream(); + printHeader(out); + super.doGet(request, response); + printFooter(out); + } + + private void printHeader(ServletOutputStream out) throws IOException { + out.print("<!DOCTYPE html><html><head>\r\n"); + out.print("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/lightbox/lightbox.css\">\r\n"); + out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">\r\n"); + out.print("</head><body class=\"p-3\">\r\n"); + } + + private void printFooter(ServletOutputStream out) throws IOException { + out.print("<script src=\"/jslib/jquery/jquery.min.js\"></script>\r\n"); + out.print("<script src=\"/jslib/lightbox/lightbox.min.js\"></script>\r\n"); + out.print("</body></html>"); + } + /** * Handles the HTTP <code>GET</code> method. * @@ -50,8 +73,7 @@ * @throws IOException if an I/O error occurs */ @Override - protected void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { String contextPath = request.getContextPath(); if(HOME_CTX.equals(contextPath)) { String userName = getUserName(request); @@ -70,25 +92,7 @@ } } - private void seiteAusgeben(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - ServletOutputStream out = response.getOutputStream(); - printHeader(out); - super.doGet(request, response); - printFooter(out); - } - - private void printHeader(ServletOutputStream out) throws IOException { - out.print("<!DOCTYPE html><html><head>"); - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"/jslib/bootstrap/css/bootstrap.min.css\">"); - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"stile.css\">"); - out.print("</head><body class=\"p-3\">"); - } - - private void printFooter(ServletOutputStream out) throws IOException { - out.print("</body></html>"); - } - - private String getUrlUser(HttpServletRequest request, String userName) throws IOException { + protected String getUrlUser(HttpServletRequest request, String userName) { String result = ""; String requestUrlStr = request.getRequestURL().toString(); String contextPath = request.getContextPath(); @@ -106,7 +110,7 @@ return result; } - private String getUserName(HttpServletRequest hr) { + protected String getUserName(HttpServletRequest hr) { String userName = null; Object p = hr.getUserPrincipal(); if (p instanceof Principal) { @@ -114,7 +118,7 @@ } return userName; } - + /** * Returns a short description of the servlet. * -- Gitblit v1.9.3