Sat, 31 Oct 2020 09:27:36 +0100
wrong sort order for components - fixes #35
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | package de.uapcore.lightpit.viewmodel.util; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | import de.uapcore.lightpit.entities.Issue; |
150
822b7e3d064d
migrate entities package
Mike Becker <universe@uap-core.de>
parents:
143
diff
changeset
|
4 | import de.uapcore.lightpit.entities.IssueStatusPhase; |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | import java.util.Arrays; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | import java.util.Comparator; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | public class IssueSorter implements Comparator<Issue> { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | public enum Field { |
141
8160dfc4dbc3
renames sort criteria PHASE to DONE, because phase 0 and 1 are combined
Mike Becker <universe@uap-core.de>
parents:
121
diff
changeset
|
12 | DONE, ETA, UPDATED |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | public static class Criteria { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | private Field field; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | private boolean asc; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | public Criteria(Field field, boolean asc) { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | this.field = field; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | this.asc = asc; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | @Override |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | public boolean equals(Object obj) { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | if (obj == null || !obj.getClass().equals(Criteria.class)) |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | return false; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | final var other = (Criteria)obj; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | return other.field.equals(field) && other.asc == asc; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
32 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
33 | private final Criteria[] criteria; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
34 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
35 | public IssueSorter(Criteria ... criteria) { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
36 | this.criteria = criteria; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
37 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
38 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
39 | private int compare(Issue left, Issue right, Criteria criteria) { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
40 | int result; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
41 | switch (criteria.field) { |
141
8160dfc4dbc3
renames sort criteria PHASE to DONE, because phase 0 and 1 are combined
Mike Becker <universe@uap-core.de>
parents:
121
diff
changeset
|
42 | case DONE: |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
43 | result = Boolean.compare( |
150
822b7e3d064d
migrate entities package
Mike Becker <universe@uap-core.de>
parents:
143
diff
changeset
|
44 | left.getStatus().getPhase().equals(IssueStatusPhase.Companion.getDone()), |
822b7e3d064d
migrate entities package
Mike Becker <universe@uap-core.de>
parents:
143
diff
changeset
|
45 | right.getStatus().getPhase().equals(IssueStatusPhase.Companion.getDone())); |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
46 | break; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
47 | case ETA: |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
48 | if (left.getEta() != null && right.getEta() != null) |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
49 | result = left.getEta().compareTo(right.getEta()); |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
50 | else |
143
4a391ffa30d3
fixes bug in IssueSorter where ETA did not get sorted correctly
Mike Becker <universe@uap-core.de>
parents:
141
diff
changeset
|
51 | result = left.getEta() != null ? -1 : 1; |
121
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
52 | break; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
53 | case UPDATED: |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
54 | result = left.getUpdated().compareTo(right.getUpdated()); |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
55 | break; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
56 | default: |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
57 | throw new UnsupportedOperationException(); |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
58 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
59 | return criteria.asc ? result : -result; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
60 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
61 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
62 | @Override |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
63 | public int compare(Issue left, Issue right) { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
64 | for (var c : criteria) { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
65 | int r = compare(left, right, c); |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
66 | if (r != 0) return r; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
67 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
68 | return 0; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
69 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
70 | |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
71 | @Override |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
72 | public boolean equals(Object o) { |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
73 | if (o == null || !o.getClass().equals(IssueSorter.class)) |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
74 | return false; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
75 | final var other = (IssueSorter) o; |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
76 | return Arrays.equals(criteria, other.criteria); |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
77 | } |
428dca747d6b
adds application level issue sorting (fixes #19)
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
78 | } |