From bf25cbace3e5162d5aa07cd87f07d80abfef2ded Mon Sep 17 00:00:00 2001
From: Alessandro Stoltenberg <alessandro.stoltenberg@sap.com>
Date: Mon, 7 May 2018 17:12:21 +0200
Subject: [PATCH] Made Flags column in CompetitorTableWrapper sortable, fixed
 sorting of SailId and BoatClass columns

---
 .../ui/adminconsole/CompetitorTableWrapper.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
index e26c978233d..5e5a7f373f1 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
@@ -93,9 +93,10 @@ public class CompetitorTableWrapper<S extends RefreshableSelectionModel<Competit
         };
         competitorNameColumn.setSortable(true);
         competitorColumnListHandler.setComparator(competitorNameColumn, new Comparator<CompetitorDTO>() {
+            private final NaturalComparator comparator = new NaturalComparator(/*case sensitive*/ false);
             @Override
             public int compare(CompetitorDTO o1, CompetitorDTO o2) {
-                return o1.getName().compareTo(o2.getName());
+                return comparator.compare(o1.getName(), o2.getName());
             }
         });
 
@@ -126,7 +127,7 @@ public class CompetitorTableWrapper<S extends RefreshableSelectionModel<Competit
             @Override
             public int compare(CompetitorDTO o1, CompetitorDTO o2) {
                 BoatDTO boat1 = o1.hasBoat() ? ((CompetitorWithBoatDTO) o1).getBoat() : null;
-                BoatDTO boat2 = o1.hasBoat() ? ((CompetitorWithBoatDTO) o1).getBoat() : null;
+                BoatDTO boat2 = o2.hasBoat() ? ((CompetitorWithBoatDTO) o2).getBoat() : null;
                 if (boat1 == null && boat2 == null) {
                     return 0;
                 } else if (boat1 != null && boat2 == null) { 
@@ -162,6 +163,14 @@ public class CompetitorTableWrapper<S extends RefreshableSelectionModel<Competit
                 return sb.toSafeHtml();
             }
         };
+        flagImageColumn.setSortable(true);
+        competitorColumnListHandler.setComparator(flagImageColumn, new Comparator<CompetitorDTO>() {
+            private final NaturalComparator comparator = new NaturalComparator(/* case sensitive */ false);
+            @Override
+            public int compare(CompetitorDTO o1, CompetitorDTO o2) {
+                return comparator.compare(o1.getThreeLetterIocCountryCode(), o2.getThreeLetterIocCountryCode());
+            }
+        });
 
         TextColumn<CompetitorDTO> sailIdColumn = new TextColumn<CompetitorDTO>() {
             @Override
@@ -175,7 +184,7 @@ public class CompetitorTableWrapper<S extends RefreshableSelectionModel<Competit
             @Override
             public int compare(CompetitorDTO o1, CompetitorDTO o2) {
                 BoatDTO boat1 = o1.hasBoat() ? ((CompetitorWithBoatDTO) o1).getBoat() : null;
-                BoatDTO boat2 = o1.hasBoat() ? ((CompetitorWithBoatDTO) o1).getBoat() : null;
+                BoatDTO boat2 = o2.hasBoat() ? ((CompetitorWithBoatDTO) o2).getBoat() : null;
                 if (boat1 == null && boat2 == null) {
                     return 0;
                 } else if (boat1 != null && boat2 == null) {