LightPIT: comparison src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java

-:0552cc5755f3
+:b7b685f31e39
 protected String getResourceBundleName() {
 return "localization.projects";
 }
-private static final int BREADCRUMB_LEVEL_ROOT = 0;
+private static final int NAV_LEVEL_ROOT = 0;
-private static final int BREADCRUMB_LEVEL_PROJECT = 1;
+private static final int NAV_LEVEL_PROJECT = 1;
-private static final int BREADCRUMB_LEVEL_VERSION = 2;
+private static final int NAV_LEVEL_VERSION = 2;
-private static final int BREADCRUMB_LEVEL_ISSUE_LIST = 3;
+private static final int NAV_LEVEL_ISSUE_LIST = 3;
-private static final int BREADCRUMB_LEVEL_ISSUE = 4;
+private static final int NAV_LEVEL_ISSUE = 4;
 /**
-* Creates the breadcrumb menu.
+* Creates the navigation menu.
 *
-* @param level           the current active level (0: root, 1: project, 2: version, 3: issue list, 4: issue)
+* @param level     the current active level (0: root, 1: project, 2: version, 3: issue list, 4: issue)
 * @param selection the currently selected objects
-* @return a dynamic breadcrumb menu trying to display as many levels as possible
+* @return a dynamic navigation menu trying to display as many levels as possible
 */
-private List<MenuEntry> getBreadcrumbs(int level, SessionSelection selection) {
+private List<MenuEntry> getNavMenu(int level, SessionSelection selection) {
 MenuEntry entry;
-final var breadcrumbs = new ArrayList<MenuEntry>();
+final var navigation = new ArrayList<MenuEntry>();
 entry = new MenuEntry(new ResourceKey("localization.lightpit", "menu.projects"),
 "projects/");
-breadcrumbs.add(entry);
+navigation.add(entry);
-if (level == BREADCRUMB_LEVEL_ROOT) entry.setActive(true);
+if (level == NAV_LEVEL_ROOT) entry.setActive(true);
 if (selection.project != null) {
 if (selection.project.getId() < 0) {
 entry = new MenuEntry(new ResourceKey("localization.projects", "button.create"),
 "projects/edit");
 } else {
 entry = new MenuEntry(selection.project.getName(),
 "projects/view?pid=" + selection.project.getId());
 }
-if (level == BREADCRUMB_LEVEL_PROJECT) entry.setActive(true);
+if (level == NAV_LEVEL_PROJECT) entry.setActive(true);
-breadcrumbs.add(entry);
+navigation.add(entry);
 }
 if (selection.version != null) {
 if (selection.version.getId() < 0) {
 entry = new MenuEntry(new ResourceKey("localization.projects", "button.version.create"),
 "projects/versions/edit");
 } else {
 entry = new MenuEntry(selection.version.getName(),
 "projects/versions/view?vid=" + selection.version.getId());
 }
-if (level == BREADCRUMB_LEVEL_VERSION) entry.setActive(true);
+if (level == NAV_LEVEL_VERSION) entry.setActive(true);
-breadcrumbs.add(entry);
+navigation.add(entry);
 }
 if (selection.project != null) {
 String path = "projects/issues/?pid=" + selection.project.getId();
 if (selection.version != null) {
-path += "&vid="+selection.version.getId();
+path += "&vid=" + selection.version.getId();
 }
 entry = new MenuEntry(new ResourceKey("localization.projects", "menu.issues"),
 path);
-if (level == BREADCRUMB_LEVEL_ISSUE_LIST) entry.setActive(true);
+if (level == NAV_LEVEL_ISSUE_LIST) entry.setActive(true);
-breadcrumbs.add(entry);
+navigation.add(entry);
 }
 if (selection.issue != null) {
 if (selection.issue.getId() < 0) {
 entry = new MenuEntry(new ResourceKey("localization.projects", "button.issue.create"),
 } else {
 entry = new MenuEntry("#" + selection.issue.getId(),
 // TODO: maybe change link to a view rather than directly opening the editor
 "projects/issues/edit?issue=" + selection.issue.getId());
 }
-if (level == BREADCRUMB_LEVEL_ISSUE) entry.setActive(true);
+if (level == NAV_LEVEL_ISSUE) entry.setActive(true);
-breadcrumbs.add(entry);
+navigation.add(entry);
 }
-return breadcrumbs;
+return navigation;
 }
 @RequestMapping(method = HttpMethod.GET)
 public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
 final var sessionSelection = new SessionSelection(req, dao);
 setViewModel(req, viewModel);
 setContentPage(req, "projects");
 setStylesheet(req, "projects");
-setBreadcrumbs(req, getBreadcrumbs(BREADCRUMB_LEVEL_ROOT, sessionSelection));
+setNavItems(req, getNavMenu(NAV_LEVEL_ROOT, sessionSelection));
 return ResponseType.HTML;
 }
 private ProjectEditView configureEditForm(HttpServletRequest req, DataAccessObjects dao, SessionSelection selection) throws SQLException {
 final var viewModel = new ProjectEditView();
 viewModel.setProject(selection.project);
 viewModel.setUsers(dao.getUserDao().list());
 setViewModel(req, viewModel);
 setContentPage(req, "project-form");
-setBreadcrumbs(req, getBreadcrumbs(BREADCRUMB_LEVEL_PROJECT, selection));
+setNavItems(req, getNavMenu(NAV_LEVEL_PROJECT, selection));
 return viewModel;
 }
 @RequestMapping(requestPath = "edit", method = HttpMethod.GET)
 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
 viewModel.setIssues(issues);
 viewModel.setVersions(versionDao.list(selection.project));
 viewModel.updateVersionInfo();
 setViewModel(req, viewModel);
-setBreadcrumbs(req, getBreadcrumbs(BREADCRUMB_LEVEL_PROJECT, selection));
+setNavItems(req, getNavMenu(NAV_LEVEL_PROJECT, selection));
 setContentPage(req, "project-details");
 setStylesheet(req, "projects");
 return ResponseType.HTML;
 }
 final var issues = issueDao.list(selection.version);
 for (var issue : issues) issueDao.joinVersionInformation(issue);
 viewModel.setIssues(issues);
 setViewModel(req, viewModel);
-setBreadcrumbs(req, getBreadcrumbs(BREADCRUMB_LEVEL_VERSION, selection));
+setNavItems(req, getNavMenu(NAV_LEVEL_VERSION, selection));
 setContentPage(req, "version");
 setStylesheet(req, "projects");
 return ResponseType.HTML;
 }
 if (selection.version.getProject() == null) {
 viewModel.setProjects(dao.getProjectDao().list());
 }
 setViewModel(req, viewModel);
 setContentPage(req, "version-form");
-setBreadcrumbs(req, getBreadcrumbs(BREADCRUMB_LEVEL_VERSION, selection));
+setNavItems(req, getNavMenu(NAV_LEVEL_VERSION, selection));
 return viewModel;
 }
 @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET)
 public ResponseType editVersion(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
 getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal);
 version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow()));
 dao.getVersionDao().saveOrUpdate(version);
 // specifying the pid parameter will purposely reset the session selected version!
-setRedirectLocation(req, "./projects/view?pid="+version.getProject().getId());
+setRedirectLocation(req, "./projects/view?pid=" + version.getProject().getId());
 setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL);
 } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) {
 LOG.warn("Form validation failure: {}", ex.getMessage());
 LOG.debug("Details:", ex);
 final var selection = new SessionSelection(req, dao);
 }
 viewModel.setUsers(dao.getUserDao().list());
 setViewModel(req, viewModel);
 setContentPage(req, "issue-form");
-setBreadcrumbs(req, getBreadcrumbs(BREADCRUMB_LEVEL_ISSUE, selection));
+setNavItems(req, getNavMenu(NAV_LEVEL_ISSUE, selection));
 return viewModel;
 }
 @RequestMapping(requestPath = "issues/", method = HttpMethod.GET)
 public ResponseType issues(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException {
 viewModel.setVersion(selection.version);
 viewModel.setIssues(dao.getIssueDao().list(selection.version));
 }
 setViewModel(req, viewModel);
-setBreadcrumbs(req, getBreadcrumbs(BREADCRUMB_LEVEL_ISSUE_LIST, selection));
+setNavItems(req, getNavMenu(NAV_LEVEL_ISSUE_LIST, selection));
 setContentPage(req, "issues");
 setStylesheet(req, "projects");
 return ResponseType.HTML;
 }
 getParameter(req, Date.class, "eta").ifPresent(issue::setEta);
 getParameter(req, Integer[].class, "affected")
 .map(Stream::of)
 .map(stream ->
 stream.map(Version::new).collect(Collectors.toList())
 ).ifPresent(issue::setAffectedVersions);
 getParameter(req, Integer[].class, "resolved")
 .map(Stream::of)
 .map(stream ->
 stream.map(Version::new).collect(Collectors.toList())
 ).ifPresent(issue::setResolvedVersions);
 dao.getIssueDao().saveOrUpdate(issue);
-// specifying the issue parameter keeps the edited issue as breadcrumb
+// specifying the issue parameter keeps the edited issue as menu item
-setRedirectLocation(req, "./projects/issues/?issue="+issue.getId());
+setRedirectLocation(req, "./projects/issues/?issue=" + issue.getId());
 setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL);
 } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) {
 // TODO: set request attribute with error text
 LOG.warn("Form validation failure: {}", ex.getMessage());
 LOG.debug("Details:", ex);

Mercurial > hg > LightPIT / file comparison

comparison: src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java

src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java