changeset
renames some crappy constants
Wed, 13 May 2020 18:45:28 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Wed, 13 May 2020 18:45:28 +0200
- changeset 43
- 9abf0bf44c7b
- parent 42
- f962ff9dd44e
- child 44
- 835dd169642a
renames some crappy constants
--- a/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java Wed May 13 18:40:52 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java Wed May 13 18:45:28 2020 +0200 @@ -53,7 +53,7 @@ private static final Logger LOG = LoggerFactory.getLogger(AbstractLightPITServlet.class); - private static final String HTML_FULL_DISPATCHER = Functions.jspPath("html_full"); + private static final String SITE_JSP = Functions.jspPath("site"); /** * The EL proxy is necessary, because the EL resolver cannot handle annotation properties. @@ -234,7 +234,7 @@ throws IOException, ServletException { req.setAttribute(Constants.REQ_ATTR_MENU, getModuleManager().getMainMenu()); - req.getRequestDispatcher(HTML_FULL_DISPATCHER).forward(req, resp); + req.getRequestDispatcher(SITE_JSP).forward(req, resp); } private Optional<Method> findMapping(HttpMethod method, HttpServletRequest req) { @@ -248,7 +248,7 @@ switch (type) { case NONE: return; - case HTML_FULL: + case HTML: forwardToFullView(req, resp); return; // TODO: implement remaining response types
--- a/src/main/java/de/uapcore/lightpit/ResponseType.java Wed May 13 18:40:52 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/ResponseType.java Wed May 13 18:45:28 2020 +0200 @@ -33,7 +33,7 @@ /** * Renders a full HTML view including the header. */ - HTML_FULL, + HTML, /** * Renders a HTML fragment only. * May be used for AJAX responses.
--- a/src/main/java/de/uapcore/lightpit/modules/ErrorModule.java Wed May 13 18:40:52 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/ErrorModule.java Wed May 13 18:45:28 2020 +0200 @@ -56,7 +56,7 @@ setStylesheet(req, "error"); setDynamicFragment(req, "error"); - return ResponseType.HTML_FULL; + return ResponseType.HTML; } @RequestMapping(requestPath = "404", method = HttpMethod.GET)
--- a/src/main/java/de/uapcore/lightpit/modules/HomeModule.java Wed May 13 18:40:52 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/HomeModule.java Wed May 13 18:45:28 2020 +0200 @@ -49,6 +49,6 @@ @RequestMapping(method = HttpMethod.GET) public ResponseType handle() { - return ResponseType.HTML_FULL; + return ResponseType.HTML; } }
--- a/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java Wed May 13 18:40:52 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/LanguageModule.java Wed May 13 18:45:28 2020 +0200 @@ -92,7 +92,7 @@ setStylesheet(req, "language"); setDynamicFragment(req, "language"); - return ResponseType.HTML_FULL; + return ResponseType.HTML; } @RequestMapping(method = HttpMethod.POST)
--- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Wed May 13 18:40:52 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Wed May 13 18:45:28 2020 +0200 @@ -49,6 +49,6 @@ @RequestMapping(method = HttpMethod.GET) public ResponseType handle(HttpServletRequest req, DataAccessObjects dao) { - return ResponseType.HTML_FULL; + return ResponseType.HTML; } }
--- a/src/main/java/de/uapcore/lightpit/modules/VersionsModule.java Wed May 13 18:40:52 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/VersionsModule.java Wed May 13 18:45:28 2020 +0200 @@ -48,6 +48,6 @@ @RequestMapping(method = HttpMethod.GET) public ResponseType handle(HttpServletRequest req, DataAccessObjects dao) { - return ResponseType.HTML_FULL; + return ResponseType.HTML; } }
--- a/src/main/webapp/WEB-INF/jsp/html_full.jsp Wed May 13 18:40:52 2020 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -<%-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - -Copyright 2018 Mike Becker. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---%> -<%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %> -<%@page import="de.uapcore.lightpit.Constants" %> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - -<%-- Define an alias for the main menu --%> -<c:set scope="page" var="mainMenu" value="${requestScope[Constants.REQ_ATTR_MENU]}"/> - -<%-- Define an alias for the fragment name --%> -<c:set scope="page" var="fragment" value="${requestScope[Constants.REQ_ATTR_FRAGMENT]}"/> - -<%-- Define an alias for the additional stylesheet --%> -<c:set scope="page" var="extraCss" value="${requestScope[Constants.REQ_ATTR_STYLESHEET]}"/> - -<%-- Define an alias for the module info --%> -<c:set scope="page" var="moduleInfo" value="${requestScope[Constants.REQ_ATTR_MODULE_INFO]}"/> - -<%-- Apply the session locale (should always be present, but check nevertheless) --%> -<c:if test="${not empty sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"> -<fmt:setLocale scope="request" value="${sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"/> -</c:if> - -<!DOCTYPE html> -<html> - <head> - <base href="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}/"> - <title>LightPIT - - <fmt:bundle basename="${moduleInfo.bundleBaseName}"> - <fmt:message key="${moduleInfo.titleKey}" /> - </fmt:bundle> - </title> - <meta charset="UTF-8"> - <link rel="stylesheet" href="lightpit.css" type="text/css"> - <c:if test="${not empty extraCss}"> - <link rel="stylesheet" href="${extraCss}" type="text/css"> - </c:if> - </head> - <body> - <div id="mainMenu"> - <c:forEach var="menu" items="${mainMenu}"> - <div class="menuEntry" - <c:if test="${requestScope[Constants.REQ_ATTR_MODULE_CLASSNAME] eq menu.moduleClassName}"> - data-active - </c:if> - > - <a href="${menu.pathName}"> - <fmt:bundle basename="${menu.resourceKey.bundle}"> - <fmt:message key="${menu.resourceKey.key}" /> - </fmt:bundle> - </a> - </div> - </c:forEach> - </div> - <div id="subMenu"> - - </div> - <div id="content-area"> - <c:if test="${not empty fragment}"> - <fmt:setBundle scope="request" basename="${moduleInfo.bundleBaseName}"/> - <c:import url="${fragment}" /> - </c:if> - </div> - </body> -</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/webapp/WEB-INF/jsp/site.jsp Wed May 13 18:45:28 2020 +0200 @@ -0,0 +1,91 @@ +<%-- +DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + +Copyright 2018 Mike Becker. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--%> +<%@page contentType="text/html" pageEncoding="UTF-8" trimDirectiveWhitespaces="true" %> +<%@page import="de.uapcore.lightpit.Constants" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + +<%-- Define an alias for the main menu --%> +<c:set scope="page" var="mainMenu" value="${requestScope[Constants.REQ_ATTR_MENU]}"/> + +<%-- Define an alias for the fragment name --%> +<c:set scope="page" var="fragment" value="${requestScope[Constants.REQ_ATTR_FRAGMENT]}"/> + +<%-- Define an alias for the additional stylesheet --%> +<c:set scope="page" var="extraCss" value="${requestScope[Constants.REQ_ATTR_STYLESHEET]}"/> + +<%-- Define an alias for the module info --%> +<c:set scope="page" var="moduleInfo" value="${requestScope[Constants.REQ_ATTR_MODULE_INFO]}"/> + +<%-- Apply the session locale (should always be present, but check nevertheless) --%> +<c:if test="${not empty sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"> +<fmt:setLocale scope="request" value="${sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"/> +</c:if> + +<!DOCTYPE html> +<html> + <head> + <base href="${pageContext.request.scheme}://${pageContext.request.serverName}:${pageContext.request.serverPort}${pageContext.request.contextPath}/"> + <title>LightPIT - + <fmt:bundle basename="${moduleInfo.bundleBaseName}"> + <fmt:message key="${moduleInfo.titleKey}" /> + </fmt:bundle> + </title> + <meta charset="UTF-8"> + <link rel="stylesheet" href="lightpit.css" type="text/css"> + <c:if test="${not empty extraCss}"> + <link rel="stylesheet" href="${extraCss}" type="text/css"> + </c:if> + </head> + <body> + <div id="mainMenu"> + <c:forEach var="menu" items="${mainMenu}"> + <div class="menuEntry" + <c:if test="${requestScope[Constants.REQ_ATTR_MODULE_CLASSNAME] eq menu.moduleClassName}"> + data-active + </c:if> + > + <a href="${menu.pathName}"> + <fmt:bundle basename="${menu.resourceKey.bundle}"> + <fmt:message key="${menu.resourceKey.key}" /> + </fmt:bundle> + </a> + </div> + </c:forEach> + </div> + <div id="subMenu"> + + </div> + <div id="content-area"> + <c:if test="${not empty fragment}"> + <fmt:setBundle scope="request" basename="${moduleInfo.bundleBaseName}"/> + <c:import url="${fragment}" /> + </c:if> + </div> + </body> +</html>
