Merge remote-tracking branch 'server/master'

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/CourseBase.java

@@ -8,7 +8,7 @@ import com.sap.sailing.domain.common.Named;
  * Base interface for courses consisting of all static information, which might be shared
  * by the server and an Android application.
  */
-public interface CourseData extends Named {
+public interface CourseBase extends Named {
     /**
      * Clients can safely iterate over the resulting list because it's a copy which therefore won't reflect
      * waypoint additions and removals. 

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/EventBase.java

@@ -8,7 +8,7 @@ import com.sap.sailing.domain.common.WithID;
  * Base interface for an Event consisting of all static information, which might be shared
  * by the server and an Android application.
  */
-public interface EventData extends Named, Renamable, WithID {
+public interface EventBase extends Named, Renamable, WithID {
 
     /**
      * @return a non-<code>null</code> venue for this event

java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SeriesBase.java

@@ -5,7 +5,7 @@ import com.sap.sailing.domain.common.Named;
 /**
  * Base interface for series consisting of static information describing the Series.
  */
-public interface SeriesData extends Named {
+public interface SeriesBase extends Named {
 
     /**
      * Returns the fleets of this series, in ascending order, better fleets first.

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

@@ -2,10 +2,10 @@ package com.sap.sailing.domain.base.impl;
 
 import java.io.Serializable;
 
-import com.sap.sailing.domain.base.EventData;
+import com.sap.sailing.domain.base.EventBase;
 import com.sap.sailing.domain.base.Venue;
 
-public class EventDataImpl implements EventData {
+public class EventBaseImpl implements EventBase {
     private static final long serialVersionUID = -5749964088848611074L;
 
     private String name;
@@ -14,14 +14,14 @@ public class EventDataImpl implements EventData {
     private boolean isPublic;
     private final Serializable id;
 
-    public EventDataImpl(String name, String venueName, String publicationUrl, boolean isPublic, Serializable id) {
+    public EventBaseImpl(String name, String venueName, String publicationUrl, boolean isPublic, Serializable id) {
         this(name, new VenueImpl(venueName), publicationUrl, isPublic, id);
     }
 
     /**
      * @param venue must not be <code>null</code>
      */
-    public EventDataImpl(String name, Venue venue, String publicationUrl, boolean isPublic, Serializable id) {
+    public EventBaseImpl(String name, Venue venue, String publicationUrl, boolean isPublic, Serializable id) {
         assert venue != null;
         this.id = id;
         this.name = name;

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

@@ -1,11 +1,11 @@
 package com.sap.sailing.domain.base.racegroup;
 
-import com.sap.sailing.domain.base.SeriesData;
+import com.sap.sailing.domain.base.SeriesBase;
 
 /**
  * The interface represents a series and holds its races. The interface abstracts from the server internal differences 
  * between Leaderboards and Regattas for any app since Leaderboards do not have any series, but Regattas.
  */
-public interface SeriesWithRows extends SeriesData {
+public interface SeriesWithRows extends SeriesBase {
     public Iterable<RaceRow> getRaceRows();
 }