Merge branch 'master' into ubilabs--tracking_app--develop

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/racegroup/RaceGroup.java

@@ -47,4 +47,10 @@ public interface RaceGroup extends Named {
      * Gets configuration objects for {@link RacingProcedure}s of this {@link RaceGroup}'s races.
      */
     public RegattaConfiguration getRegattaConfiguration();
+
+    /**
+     * An optional (may be <code>null</code>0 non-identifying name that may, e.g., be a short name
+     * for the necessarily unique and therefore potentially longer, maybe clumsy full {@link #getName()}.
+     */
+    String getDisplayName();
 }

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/racegroup/impl/RaceGroupImpl.java

@@ -10,29 +10,39 @@ import com.sap.sse.common.impl.NamedImpl;
 
 public class RaceGroupImpl extends NamedImpl implements RaceGroup {
     private static final long serialVersionUID = 7760879536339600827L;
-
+    
+    private final String displayName;
     private final BoatClass boatClass;
     private final CourseArea courseArea;
     private final Iterable<SeriesWithRows> series;
     private final RegattaConfiguration regattaConfiguration;
 
-    public RaceGroupImpl(String name, BoatClass boatClass, CourseArea courseArea, Iterable<SeriesWithRows> series,
-            RegattaConfiguration regattaConfiguration) {
+    public RaceGroupImpl(String name, String displayName, BoatClass boatClass, CourseArea courseArea,
+            Iterable<SeriesWithRows> series, RegattaConfiguration regattaConfiguration) {
         super(name);
+        this.displayName = displayName;
         this.boatClass = boatClass;
         this.courseArea = courseArea;
         this.series = series;
         this.regattaConfiguration = regattaConfiguration;
     }
 
+    @Override
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    @Override
     public CourseArea getDefaultCourseArea() {
         return courseArea;
     }
 
+    @Override
     public Iterable<SeriesWithRows> getSeries() {
         return series;
     }
 
+    @Override
     public BoatClass getBoatClass() {
         return boatClass;
     }