# HG changeset patch # User Mike Becker # Date 1590157319 -7200 # Node ID 0646c14e36fbe0f377117731444c07b0fbc41b38 # Parent dca186d3911fd0b04fe132221f0f063d68050f82 some reformatting diff -r dca186d3911f -r 0646c14e36fb src/main/java/de/uapcore/lightpit/ModuleManager.java --- a/src/main/java/de/uapcore/lightpit/ModuleManager.java Fri May 22 16:21:31 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/ModuleManager.java Fri May 22 16:21:59 2020 +0200 @@ -155,7 +155,7 @@ new ResourceKey( mod.bundleBaseName(), mod.menuKey()), - mod.modulePath()+"/", + mod.modulePath() + "/", mod.defaultPriority())) .sorted() .forEachOrdered(mainMenu::add); diff -r dca186d3911f -r 0646c14e36fb src/main/java/de/uapcore/lightpit/dao/DataAccessObjects.java --- a/src/main/java/de/uapcore/lightpit/dao/DataAccessObjects.java Fri May 22 16:21:31 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/DataAccessObjects.java Fri May 22 16:21:59 2020 +0200 @@ -30,7 +30,10 @@ public interface DataAccessObjects { UserDao getUserDao(); + ProjectDao getProjectDao(); + VersionDao getVersionDao(); + IssueDao getIssueDao(); } diff -r dca186d3911f -r 0646c14e36fb src/main/java/de/uapcore/lightpit/dao/IssueDao.java --- a/src/main/java/de/uapcore/lightpit/dao/IssueDao.java Fri May 22 16:21:31 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/IssueDao.java Fri May 22 16:21:59 2020 +0200 @@ -38,6 +38,7 @@ /** * Lists all issues for the specified project. + * * @param project the project * @return a list of issues * @throws SQLException on any kind of SQL error diff -r dca186d3911f -r 0646c14e36fb src/main/java/de/uapcore/lightpit/dao/VersionDao.java --- a/src/main/java/de/uapcore/lightpit/dao/VersionDao.java Fri May 22 16:21:31 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/VersionDao.java Fri May 22 16:21:59 2020 +0200 @@ -38,6 +38,7 @@ /** * Lists all versions for the specified project. + * * @param project the project * @return a list of versions * @throws SQLException on any kind of SQL error diff -r dca186d3911f -r 0646c14e36fb src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Fri May 22 16:21:31 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Fri May 22 16:21:59 2020 +0200 @@ -75,10 +75,10 @@ } private Version obtainVersion(ResultSet result, Project project, String prefix) throws SQLException { - final int vplan = result.getInt(prefix+"id"); + final int vplan = result.getInt(prefix + "id"); if (vplan > 0) { final var ver = new Version(vplan, project); - ver.setName(result.getString(prefix+"name")); + ver.setName(result.getString(prefix + "name")); return ver; } else { return null; diff -r dca186d3911f -r 0646c14e36fb src/main/java/de/uapcore/lightpit/entities/User.java --- a/src/main/java/de/uapcore/lightpit/entities/User.java Fri May 22 16:21:31 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/entities/User.java Fri May 22 16:21:59 2020 +0200 @@ -89,7 +89,7 @@ dn.append(lastname); dn.append(' '); if (mail != null && !mail.isBlank()) { - dn.append("<"+mail+">"); + dn.append("<" + mail + ">"); } final var str = dn.toString().trim(); return str.isBlank() ? username : str; diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/commit-successful.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/commit-successful.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/commit-successful.jsp Fri May 22 16:21:59 2020 +0200 @@ -30,5 +30,5 @@ - - + + diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/error.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/error.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/error.jsp Fri May 22 16:21:59 2020 +0200 @@ -31,7 +31,7 @@ <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - + @@ -40,28 +40,28 @@ - + - + - + <%--@elvariable id="exception" type="java.lang.Exception"--%> - - - - + + + + - - - - + + + +
:${errorCode} - ${errorCode} -
::
::
:${exception['class'].name} - ${exception.message}
:${exception['class'].name} - ${exception.message}
:${returnLink}
:${returnLink}
diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/language.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/language.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/language.jsp Fri May 22 16:21:59 2020 +0200 @@ -46,7 +46,7 @@ - + "/> diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/project-details.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/project-details.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/project-details.jsp Fri May 22 16:21:59 2020 +0200 @@ -37,41 +37,42 @@
- - + +
- - - - - - - - - - - - - - +
+ + + + + - - -
+ + + + + + + + + + + +
- - - - - - + + + + + + diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/project-form.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/project-form.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/project-form.jsp Fri May 22 16:21:59 2020 +0200 @@ -43,23 +43,25 @@ - + - + - + @@ -68,9 +70,10 @@ diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/projects.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/projects.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/projects.jsp Fri May 22 16:21:59 2020 +0200 @@ -37,49 +37,51 @@
- +
- +
-
- - - + + +
- - - - - - - - - - - - - - - - - - - - - - - - +
- - "> - - - - -
+ + + + + + + + + + + + + + - - -
+ + + + + + + + + + + "> + + + + + + + + + + diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/user-form.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/user-form.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/user-form.jsp Fri May 22 16:21:59 2020 +0200 @@ -42,27 +42,29 @@ - readonly /> + readonly /> - + - + - + - - - + + + diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/users.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/users.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/users.jsp Fri May 22 16:21:59 2020 +0200 @@ -35,12 +35,12 @@
- +
- +
diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/dynamic_fragments/version-form.jsp --- a/src/main/webapp/WEB-INF/dynamic_fragments/version-form.jsp Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/version-form.jsp Fri May 22 16:21:59 2020 +0200 @@ -33,7 +33,7 @@ - +
@@ -44,14 +44,16 @@ - + @@ -59,16 +61,17 @@ "> diff -r dca186d3911f -r 0646c14e36fb src/main/webapp/WEB-INF/web.xml --- a/src/main/webapp/WEB-INF/web.xml Fri May 22 16:21:31 2020 +0200 +++ b/src/main/webapp/WEB-INF/web.xml Fri May 22 16:21:59 2020 +0200 @@ -1,5 +1,6 @@ - + 30
- +
- - - + + +