eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

# better sorting for the RegattaOverview (when displaying race 10 and above)

Browse Source
This commit is contained in:
Lukas Niemeier committed 2013-05-03 23:57:52 +08:00
1 parent 34c2be29ca
commit 5b9a4d4f40
1 file changed
+12 -2
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/RegattaOverviewTableComposite.java
+12 -2
View File
@@ -125,6 +125,8 @@ public class RegattaOverviewTableComposite extends Composite {
private Collection<? extends RegattaOverviewEntryDTO> filterAndSort(List<RegattaOverviewEntryDTO> raceList) {
List<RegattaOverviewEntryDTO> reversedUnfilterted = new ArrayList<RegattaOverviewEntryDTO>(raceList);
// This has grown to an ugly hack. Consider moving this filtering to a better place and
// change the handling of alphanum-like race names!
Collections.sort(reversedUnfilterted, new Comparator<RegattaOverviewEntryDTO>() {
@Override
public int compare(RegattaOverviewEntryDTO left, RegattaOverviewEntryDTO right) {
@@ -136,7 +138,15 @@ public class RegattaOverviewTableComposite extends Composite {
if (result == 0) {
result = left.raceInfo.fleet.compareTo(right.raceInfo.fleet);
if (result == 0) {
result = right.raceInfo.raceName.compareTo(left.raceInfo.raceName);
// Ok this is where it's getting worse. We want race "R10" to be on top of "R1".
// Sorting just by the value of the race name would yield a wrong result. Therefore
// we first sort by the length of the string (effectively pushing numbers with
// more digits higher) and THEN by the value of the race name (i.e. sorting the
// last digit).
result = Integer.valueOf(right.raceInfo.raceName.length()).compareTo(Integer.valueOf(left.raceInfo.raceName.length()));
if (result == 0) {
result = right.raceInfo.raceName.compareTo(left.raceInfo.raceName);
}
}
}
}
@@ -150,7 +160,7 @@ public class RegattaOverviewTableComposite extends Composite {
}
List<RegattaOverviewEntryDTO> filtered = new ArrayList<RegattaOverviewEntryDTO>();
int maxAddtionalRacesCount = 2;
int maxAddtionalRacesCount = 100;
for (RegattaOverviewEntryDTO entry : reversedUnfilterted) {
RaceLogRaceStatus status = entry.raceInfo.lastStatus;
if (status != null && isRaceActive(status)) {