Merge bug3212 into bug2851

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogFixedMarkPassingEventImpl.java

@@ -49,7 +49,8 @@ public class RaceLogFixedMarkPassingEventImpl extends RaceLogEventImpl implement
 
     @Override
     public String getShortInfo() {
-        return getInvolvedBoats().get(0).getName() + " at mark " + getZeroBasedIndexOfPassedWaypoint() + " at "
+        return (getInvolvedBoats() == null || getInvolvedBoats().get(0) == null ? "Unknown" :
+            getInvolvedBoats().get(0).getName()) + " at mark " + getZeroBasedIndexOfPassedWaypoint() + " at "
                 + getTimePointOfFixedPassing();
     }
 }

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/RaceLogDefineMarkEventImpl.java

@@ -40,4 +40,9 @@ public class RaceLogDefineMarkEventImpl extends AbstractDefineMarkEventImpl<Race
         return Collections.<Competitor>emptyList();
     }
 
+    @Override
+    public String getShortInfo() {
+        return mark.toString();
+    }
+
 }

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

@@ -75,7 +75,4 @@ public class MarkImpl extends NamedImpl implements Mark {
     public String toString() {
         return getId() + " " + (getColor() == null ? "" : (getColor() + " ")) + super.toString();
     }
-
-
-
 }