# HG changeset patch # User Mike Becker # Date 1603444477 -7200 # Node ID 8160dfc4dbc3a0c4923cfdefa6d2352a316a75d9 # Parent ac35e58efa4447384bb288e8d77aae75a5307e56 renames sort criteria PHASE to DONE, because phase 0 and 1 are combined diff -r ac35e58efa44 -r 8160dfc4dbc3 src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri Oct 23 10:19:46 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri Oct 23 11:14:37 2020 +0200 @@ -241,7 +241,7 @@ for (var issue : issues) issueDao.joinVersionInformation(issue); issues.sort(new IssueSorter( - new IssueSorter.Criteria(IssueSorter.Field.PHASE, true), + new IssueSorter.Criteria(IssueSorter.Field.DONE, true), new IssueSorter.Criteria(IssueSorter.Field.ETA, true), new IssueSorter.Criteria(IssueSorter.Field.UPDATED, false) )); diff -r ac35e58efa44 -r 8160dfc4dbc3 src/main/java/de/uapcore/lightpit/viewmodel/util/IssueSorter.java --- a/src/main/java/de/uapcore/lightpit/viewmodel/util/IssueSorter.java Fri Oct 23 10:19:46 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/viewmodel/util/IssueSorter.java Fri Oct 23 11:14:37 2020 +0200 @@ -9,7 +9,7 @@ public class IssueSorter implements Comparator { public enum Field { - PHASE, ETA, UPDATED + DONE, ETA, UPDATED } public static class Criteria { @@ -39,7 +39,7 @@ private int compare(Issue left, Issue right, Criteria criteria) { int result; switch (criteria.field) { - case PHASE: + case DONE: result = Boolean.compare( left.getPhase() == IssueStatus.PHASE_DONE, right.getPhase() == IssueStatus.PHASE_DONE);