diff -r bb4c52bf3439 -r f64255a88d66 src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java --- a/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java Sat May 23 13:52:04 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/AbstractLightPITServlet.java Sat May 23 14:13:09 2020 +0200 @@ -50,7 +50,7 @@ /** * A special implementation of a HTTPServlet which is focused on implementing - * the necessary functionality for {@link LightPITModule}s. + * the necessary functionality for LightPIT pages. */ public abstract class AbstractLightPITServlet extends HttpServlet { @@ -90,15 +90,6 @@ private final Map> mappings = new HashMap<>(); /** - * Gives implementing modules access to the {@link ModuleManager}. - * - * @return the module manager - */ - protected final ModuleManager getModuleManager() { - return (ModuleManager) getServletContext().getAttribute(ModuleManager.SC_ATTR_NAME); - } - - /** * Returns the name of the resource bundle associated with this servlet. * @return the resource bundle base name */ @@ -332,7 +323,12 @@ private void forwardToFullView(HttpServletRequest req, HttpServletResponse resp) throws IOException, ServletException { - final var mainMenu = new ArrayList(getModuleManager().getMainMenu()); + final String lightpitBundle = "localization.lightpit"; + final var mainMenu = List.of( + new MenuEntry(new ResourceKey(lightpitBundle, "menu.projects"), "projects/"), + new MenuEntry(new ResourceKey(lightpitBundle, "menu.users"), "teams/"), + new MenuEntry(new ResourceKey(lightpitBundle, "menu.languages"), "language/") + ); for (var entry : mainMenu) { if (Functions.fullPath(req).startsWith("/" + entry.getPathName())) { entry.setActive(true);