Bug fix in App: Races with different Boatclass, Series and fleet are separated in the list of managed races

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/racelist/RaceListDataTypeTitle.java

@@ -6,29 +6,37 @@ import com.sap.sailing.domain.base.SeriesBase;
 
 public class RaceListDataTypeTitle extends RaceListDataType {
 
-	private BoatClassSeriesDataFleet data;
-	
-	public RaceListDataTypeTitle(BoatClassSeriesDataFleet data) {
-		this.data = data;
-	}
-	
-	public BoatClassSeriesDataFleet getBoatClassSeriesDataFleet() {
-		return data;
-	}
+    private BoatClassSeriesDataFleet data;
+    private final static String DEFAULT = "Default";
 
-	public BoatClass getBoatClass() {
-		return data.getBoatClass();
-	}
-	
-	public SeriesBase getSeries() {
-		return data.getSeries();
-	}
+    public RaceListDataTypeTitle(BoatClassSeriesDataFleet data) {
+        this.data = data;
+    }
 
-	public Fleet getFleet() {
-		return data.getFleet();
-	}
+    public BoatClassSeriesDataFleet getBoatClassSeriesDataFleet() {
+        return data;
+    }
 
-	public String toString() {
-		return getBoatClass().getName() + " - " + getSeries().getName() + " - " + getFleet().getName();
-	}
+    public BoatClass getBoatClass() {
+        return data.getBoatClass();
+    }
+
+    public SeriesBase getSeries() {
+        return data.getSeries();
+    }
+
+    public Fleet getFleet() {
+        return data.getFleet();
+    }
+
+    public String toString() {
+        String result = getBoatClass().getName();
+        if (!getSeries().getName().equals(DEFAULT)) {
+            result += " - " + getSeries().getName();
+        }
+        if (!getFleet().getName().equals(DEFAULT)) {
+            result += " - " + getFleet().getName();
+        }
+        return result;
+    }
 }

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/comparators/SeriesComparator.java

@@ -6,12 +6,20 @@ import com.sap.sailing.racecommittee.app.ui.adapters.racelist.BoatClassSeriesDat
 
 public class SeriesComparator implements Comparator<BoatClassSeriesDataFleet> {
 
-	public int compare(BoatClassSeriesDataFleet lhs, BoatClassSeriesDataFleet rhs) {
-		//int result = lhs.getSeries().getOrderNumber().compareTo(rhs.getSeries().getOrderNumber());
-		//if (result == 0) {
-			return lhs.getFleetName().compareTo(rhs.getFleetName());
-		//}
-		//return result;
-	}
-
+    public int compare(BoatClassSeriesDataFleet lhs, BoatClassSeriesDataFleet rhs) {
+        int result;
+        int boatClassResult = lhs.getBoatClassName().compareTo(rhs.getBoatClassName());
+        if (boatClassResult == 0) {
+            int seriesResult = lhs.getSeriesName().compareTo(rhs.getSeriesName());
+            if (seriesResult == 0) {
+                result = lhs.getFleetName().compareTo(rhs.getFleetName());
+            } else {
+                result = seriesResult;
+            }
+        } else {
+            result = boatClassResult;
+        }
+        
+        return result;
+    }
 }