fixed bug 1255 by adjusting race column comparison to "by name;" fixed lastN order

This commit is contained in:
Axel Uhl committed 2013-03-05 20:29:37 +04:00
1 parent 48ff9006e5
commit 5a7967fe79
2 files changed
+6 -3

No files matched your search

@@ -24,10 +24,13 @@ public abstract class AbstractRaceColumnSelection implements RaceColumnSelection
@Override
public Iterable<RaceColumnDTO> getSelectedRaceColumnsOrderedAsInLeaderboard(LeaderboardDTO leaderboard) {
Iterable<RaceColumnDTO> selectedColumns = getSelectedRaceColumns();
List<String> namesOfSelectedRaceColumns = new ArrayList<String>();
for (RaceColumnDTO selectedColumn : getSelectedRaceColumns()) {
namesOfSelectedRaceColumns.add(selectedColumn.name);
}
List<RaceColumnDTO> result = new ArrayList<RaceColumnDTO>();
for (RaceColumnDTO column : leaderboard.getRaceList()) {
if (Util.contains(selectedColumns, column)) {
if (Util.contains(namesOfSelectedRaceColumns, column.name)) {
result.add(column);
}
}
@@ -102,7 +102,7 @@ public class LastNRacesColumnSelection extends AbstractRaceColumnSelection imple
Comparator<RaceColumnDTO> comparator = new Comparator<RaceColumnDTO>() {
@Override
public int compare(RaceColumnDTO o1, RaceColumnDTO o2) {
return leaderboard.getRaceList().indexOf(o1) - leaderboard.getRaceList().indexOf(o2);
return leaderboard.getRaceList().indexOf(o2) - leaderboard.getRaceList().indexOf(o1);
}
};
Collections.sort(columns, comparator);