src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java

changeset 70
821c4950b619
parent 63
51aa5e267c7f
child 71
dca186d3911f
     1.1 --- a/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java	Tue May 19 18:49:48 2020 +0200
     1.2 +++ b/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java	Tue May 19 19:34:57 2020 +0200
     1.3 @@ -92,8 +92,6 @@
     1.4       */
     1.5      private final Map<HttpMethod, Map<String, Method>> mappings = new HashMap<>();
     1.6  
     1.7 -    private final List<MenuEntry> subMenu = new ArrayList<>();
     1.8 -
     1.9      /**
    1.10       * Gives implementing modules access to the {@link ModuleManager}.
    1.11       *
    1.12 @@ -187,9 +185,6 @@
    1.13                      }
    1.14                      if (paramsInjectible) {
    1.15                          String requestPath = "/" + mapping.get().requestPath();
    1.16 -                        if (!mapping.get().requestPath().isBlank() && !mapping.get().menuKey().isBlank()) {
    1.17 -                            requestPath += "/";
    1.18 -                        }
    1.19  
    1.20                          if (mappings
    1.21                                  .computeIfAbsent(mapping.get().method(), k -> new HashMap<>())
    1.22 @@ -200,14 +195,6 @@
    1.23                              );
    1.24                          }
    1.25  
    1.26 -                        final var menuKey = mapping.get().menuKey();
    1.27 -                        if (!menuKey.isBlank()) {
    1.28 -                            subMenu.add(new MenuEntry(
    1.29 -                                    new ResourceKey(moduleInfo.getBundleBaseName(), menuKey),
    1.30 -                                    moduleInfo.getModulePath() + requestPath,
    1.31 -                                    mapping.get().menuSequence()));
    1.32 -                        }
    1.33 -
    1.34                          LOG.debug("{} {} maps to {}::{}",
    1.35                                  mapping.get().method(),
    1.36                                  requestPath,
    1.37 @@ -325,7 +312,6 @@
    1.38              throws IOException, ServletException {
    1.39  
    1.40          req.setAttribute(Constants.REQ_ATTR_MENU, getModuleManager().getMainMenu());
    1.41 -        req.setAttribute(Constants.REQ_ATTR_SUB_MENU, subMenu);
    1.42          req.getRequestDispatcher(SITE_JSP).forward(req, resp);
    1.43      }
    1.44  

mercurial