Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/RaceCommitteeEventFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/impl/RaceCommitteeEventFactoryImpl.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogEventTest.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogFlagEventSerializerTest.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogStartTimeEventSerializerTest.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeFlagEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeStartTimeEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BaseRaceLogEventSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeEventSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeStartTimeEventSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogFlagEventSerializer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventTrackJsonExportServlet.java

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java

@@ -6,24 +6,24 @@ import org.json.simple.JSONObject;
 
 import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
 import com.sap.sailing.domain.common.TimePoint;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
 import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
-import com.sap.sailing.server.gateway.serialization.impl.BaseRaceCommitteeEventSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.BaseRaceLogEventSerializer;
 
 /// TODO deserialize involved boats
-public abstract class BaseRaceCommitteeEventDeserializer implements JsonDeserializer<RaceCommitteeEvent> {
+public abstract class BaseRaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent> {
 
-	protected abstract RaceCommitteeEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId)
+	protected abstract RaceLogEvent deserialize(JSONObject object, Serializable id, TimePoint timePoint, int passId)
 			throws JsonDeserializationException;
 	
 	@Override
-	public RaceCommitteeEvent deserialize(JSONObject object)
+	public RaceLogEvent deserialize(JSONObject object)
 			throws JsonDeserializationException {
 		// Factory handles class field and subclassing...
-		String id = object.get(BaseRaceCommitteeEventSerializer.FIELD_ID).toString();
-		long timeStamp = (Long) object.get(BaseRaceCommitteeEventSerializer.FIELD_TIMESTAMP);
-		int passId = (Integer) object.get(BaseRaceCommitteeEventSerializer.FIELD_PASS_ID);
+		String id = object.get(BaseRaceLogEventSerializer.FIELD_ID).toString();
+		long timeStamp = (Long) object.get(BaseRaceLogEventSerializer.FIELD_TIMESTAMP);
+		int passId = (Integer) object.get(BaseRaceLogEventSerializer.FIELD_PASS_ID);
 		
 		return deserialize(object, Helpers.tryUuidConversion(id), new MillisecondsTimePoint(timeStamp), passId);
 	}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeCourseAreaChangedEventDeserializer.java

@@ -1,36 +0,0 @@
-package com.sap.sailing.server.gateway.deserialization.impl;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.UUID;
-
-import org.json.simple.JSONObject;
-
-import com.sap.sailing.domain.base.Competitor;
-import com.sap.sailing.domain.common.TimePoint;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
-import com.sap.sailing.domain.racecommittee.impl.RaceCommitteeCourseAreaChangeEventImpl;
-import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
-import com.sap.sailing.server.gateway.serialization.impl.RaceCommitteeCourseAreaChangedEventSerializer;
-
-public class RaceCommitteeCourseAreaChangedEventDeserializer extends
-		BaseRaceCommitteeEventDeserializer {
-
-	@Override
-	protected RaceCommitteeEvent deserialize(JSONObject object, Serializable id,
-			TimePoint timePoint, int passId) throws JsonDeserializationException {
-		
-		String courseAreaId = object.get(RaceCommitteeCourseAreaChangedEventSerializer.FIELD_COURSE_AREA_ID).toString(); 
-		UUID courseAreaUuid = null;
-		try {
-			courseAreaUuid = UUID.fromString(courseAreaId);
-		} catch (IllegalArgumentException iae) {
-			throw new JsonDeserializationException(
-					String.format("Field %s with %s couldn't be parsed as UUID.", RaceCommitteeCourseAreaChangedEventSerializer.FIELD_COURSE_AREA_ID, id), 
-					iae);
-		}
-		
-		return new RaceCommitteeCourseAreaChangeEventImpl(timePoint, id, Collections.<Competitor>emptyList(), passId, courseAreaUuid);
-	}
-
-}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeEventDeserializer.java

@@ -1,41 +0,0 @@
-package com.sap.sailing.server.gateway.deserialization.impl;
-
-import org.json.simple.JSONObject;
-
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
-import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
-import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
-import com.sap.sailing.server.gateway.serialization.impl.BaseRaceCommitteeEventSerializer;
-import com.sap.sailing.server.gateway.serialization.impl.RaceCommitteeFlagEventSerializer;
-import com.sap.sailing.server.gateway.serialization.impl.RaceCommitteeStartTimeEventSerializer;
-
-public class RaceCommitteeEventDeserializer implements JsonDeserializer<RaceCommitteeEvent> {
-
-	protected JsonDeserializer<RaceCommitteeEvent> flagEventDeserializer;
-	protected JsonDeserializer<RaceCommitteeEvent> startTimeEventDeserializer;
-
-	public RaceCommitteeEventDeserializer() {
-		flagEventDeserializer = new RaceCommitteeFlagEventDeserializer();
-		startTimeEventDeserializer = new RaceCommitteeStartTimeEventDeserializer();
-	}
-
-	protected JsonDeserializer<RaceCommitteeEvent> getDeserializer(
-			JSONObject object) throws JsonDeserializationException {
-		Object type = object.get(BaseRaceCommitteeEventSerializer.FIELD_CLASS);
-
-		if (type.equals(RaceCommitteeFlagEventSerializer.VALUE_CLASS)) {
-			return flagEventDeserializer;
-		} else if (type.equals(RaceCommitteeStartTimeEventSerializer.VALUE_CLASS)) {
-			return startTimeEventDeserializer;
-		}
-
-		throw new JsonDeserializationException(String.format(
-				"There is no deserializer defined for event type %s.", type));
-	}
-
-	@Override
-	public RaceCommitteeEvent deserialize(JSONObject object)
-			throws JsonDeserializationException {
-		return getDeserializer(object).deserialize(object);
-	}
-}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeFlagEventDeserializer.java

@@ -1,34 +0,0 @@
-package com.sap.sailing.server.gateway.deserialization.impl;
-
-import java.io.Serializable;
-import java.util.Collections;
-
-import org.json.simple.JSONObject;
-
-import com.sap.sailing.domain.base.Competitor;
-import com.sap.sailing.domain.common.TimePoint;
-import com.sap.sailing.domain.racecommittee.Flags;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
-import com.sap.sailing.domain.racecommittee.impl.RaceCommitteeFlagEventImpl;
-import com.sap.sailing.server.gateway.serialization.impl.RaceCommitteeFlagEventSerializer;
-
-public class RaceCommitteeFlagEventDeserializer extends
-		BaseRaceCommitteeEventDeserializer {
-
-	@Override
-	protected RaceCommitteeEvent deserialize(JSONObject object, Serializable id,
-			TimePoint timePoint, int passId) {
-
-		Flags upperFlag = Flags.valueOf(object.get(
-				RaceCommitteeFlagEventSerializer.FIELD_UPPER_FLAG).toString());
-		Flags lowerFlag = Flags.valueOf(object.get(
-				RaceCommitteeFlagEventSerializer.FIELD_LOWER_FLAG).toString());
-		boolean isDisplayed = (Boolean) object
-				.get(RaceCommitteeFlagEventSerializer.FIELD_DISPLAYED);
-		
-		return new RaceCommitteeFlagEventImpl(timePoint, id,
-				Collections.<Competitor>emptyList(), passId, upperFlag,
-				lowerFlag, isDisplayed);
-	}
-
-}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeStartTimeEventDeserializer.java

@@ -1,32 +0,0 @@
-package com.sap.sailing.server.gateway.deserialization.impl;
-
-import java.io.Serializable;
-import java.util.Collections;
-
-import org.json.simple.JSONObject;
-
-import com.sap.sailing.domain.base.Competitor;
-import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
-import com.sap.sailing.domain.common.TimePoint;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
-import com.sap.sailing.domain.racecommittee.impl.RaceCommitteeStartTimeEventImpl;
-import com.sap.sailing.server.gateway.serialization.impl.RaceCommitteeStartTimeEventSerializer;
-
-public class RaceCommitteeStartTimeEventDeserializer extends BaseRaceCommitteeEventDeserializer {
-
-	@Override
-	protected RaceCommitteeEvent deserialize(JSONObject object, Serializable id,
-			TimePoint timePoint, int passId) {
-		
-		long startTime = (Long) object.get(RaceCommitteeStartTimeEventSerializer.FIELD_START_TIME);
-		
-		return new RaceCommitteeStartTimeEventImpl(
-				timePoint, 
-				id, 
-				Collections.<Competitor>emptyList(), 
-				passId, 
-				new MillisecondsTimePoint(startTime));
-	}
-
-
-}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogCourseAreaChangedEventDeserializer.java

@@ -0,0 +1,36 @@
+package com.sap.sailing.server.gateway.deserialization.impl;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.UUID;
+
+import org.json.simple.JSONObject;
+
+import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.common.TimePoint;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
+import com.sap.sailing.domain.racelog.impl.RaceLogCourseAreaChangeEventImpl;
+import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
+import com.sap.sailing.server.gateway.serialization.impl.RaceLogCourseAreaChangedEventSerializer;
+
+public class RaceLogCourseAreaChangedEventDeserializer extends
+		BaseRaceLogEventDeserializer {
+
+	@Override
+	protected RaceLogEvent deserialize(JSONObject object, Serializable id,
+			TimePoint timePoint, int passId) throws JsonDeserializationException {
+		
+		String courseAreaId = object.get(RaceLogCourseAreaChangedEventSerializer.FIELD_COURSE_AREA_ID).toString(); 
+		UUID courseAreaUuid = null;
+		try {
+			courseAreaUuid = UUID.fromString(courseAreaId);
+		} catch (IllegalArgumentException iae) {
+			throw new JsonDeserializationException(
+					String.format("Field %s with %s couldn't be parsed as UUID.", RaceLogCourseAreaChangedEventSerializer.FIELD_COURSE_AREA_ID, id), 
+					iae);
+		}
+		
+		return new RaceLogCourseAreaChangeEventImpl(timePoint, id, Collections.<Competitor>emptyList(), passId, courseAreaUuid);
+	}
+
+}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogEventDeserializer.java

@@ -0,0 +1,49 @@
+package com.sap.sailing.server.gateway.deserialization.impl;
+
+import org.json.simple.JSONObject;
+
+import com.sap.sailing.domain.racelog.RaceLogEvent;
+import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
+import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
+import com.sap.sailing.server.gateway.serialization.impl.BaseRaceLogEventSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.RaceLogCourseAreaChangedEventSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.RaceLogFlagEventSerializer;
+import com.sap.sailing.server.gateway.serialization.impl.RaceLogStartTimeEventSerializer;
+
+public class RaceLogEventDeserializer implements JsonDeserializer<RaceLogEvent> {
+
+	protected JsonDeserializer<RaceLogEvent> flagEventDeserializer;
+	protected JsonDeserializer<RaceLogEvent> startTimeEventDeserializer;
+	protected JsonDeserializer<RaceLogEvent> courseAreaChangedEventDeserializer;
+
+	public RaceLogEventDeserializer(
+			JsonDeserializer<RaceLogEvent> flagEventDeserializer,
+			JsonDeserializer<RaceLogEvent> startTimeEventDeserializer,
+			JsonDeserializer<RaceLogEvent> courseAreaChangedEventDeserializer) {
+		this.flagEventDeserializer = flagEventDeserializer;
+		this.startTimeEventDeserializer = startTimeEventDeserializer;
+		this.courseAreaChangedEventDeserializer = courseAreaChangedEventDeserializer;
+	}
+
+	protected JsonDeserializer<RaceLogEvent> getDeserializer(
+			JSONObject object) throws JsonDeserializationException {
+		Object type = object.get(BaseRaceLogEventSerializer.FIELD_CLASS);
+
+		if (type.equals(RaceLogFlagEventSerializer.VALUE_CLASS)) {
+			return flagEventDeserializer;
+		} else if (type.equals(RaceLogStartTimeEventSerializer.VALUE_CLASS)) {
+			return startTimeEventDeserializer;
+		} else if (type.equals(RaceLogCourseAreaChangedEventSerializer.VALUE_CLASS)) {
+			return courseAreaChangedEventDeserializer;
+		}
+
+		throw new JsonDeserializationException(String.format(
+				"There is no deserializer defined for event type %s.", type));
+	}
+
+	@Override
+	public RaceLogEvent deserialize(JSONObject object)
+			throws JsonDeserializationException {
+		return getDeserializer(object).deserialize(object);
+	}
+}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogFlagEventDeserializer.java

@@ -0,0 +1,34 @@
+package com.sap.sailing.server.gateway.deserialization.impl;
+
+import java.io.Serializable;
+import java.util.Collections;
+
+import org.json.simple.JSONObject;
+
+import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.common.TimePoint;
+import com.sap.sailing.domain.racelog.Flags;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
+import com.sap.sailing.domain.racelog.impl.RaceLogFlagEventImpl;
+import com.sap.sailing.server.gateway.serialization.impl.RaceLogFlagEventSerializer;
+
+public class RaceLogFlagEventDeserializer extends
+		BaseRaceLogEventDeserializer {
+
+	@Override
+	protected RaceLogEvent deserialize(JSONObject object, Serializable id,
+			TimePoint timePoint, int passId) {
+
+		Flags upperFlag = Flags.valueOf(object.get(
+				RaceLogFlagEventSerializer.FIELD_UPPER_FLAG).toString());
+		Flags lowerFlag = Flags.valueOf(object.get(
+				RaceLogFlagEventSerializer.FIELD_LOWER_FLAG).toString());
+		boolean isDisplayed = (Boolean) object
+				.get(RaceLogFlagEventSerializer.FIELD_DISPLAYED);
+		
+		return new RaceLogFlagEventImpl(timePoint, id,
+				Collections.<Competitor>emptyList(), passId, upperFlag,
+				lowerFlag, isDisplayed);
+	}
+
+}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceLogStartTimeEventDeserializer.java

@@ -0,0 +1,32 @@
+package com.sap.sailing.server.gateway.deserialization.impl;
+
+import java.io.Serializable;
+import java.util.Collections;
+
+import org.json.simple.JSONObject;
+
+import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
+import com.sap.sailing.domain.common.TimePoint;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
+import com.sap.sailing.domain.racelog.impl.RaceLogStartTimeEventImpl;
+import com.sap.sailing.server.gateway.serialization.impl.RaceLogStartTimeEventSerializer;
+
+public class RaceLogStartTimeEventDeserializer extends BaseRaceLogEventDeserializer {
+
+	@Override
+	protected RaceLogEvent deserialize(JSONObject object, Serializable id,
+			TimePoint timePoint, int passId) {
+		
+		long startTime = (Long) object.get(RaceLogStartTimeEventSerializer.FIELD_START_TIME);
+		
+		return new RaceLogStartTimeEventImpl(
+				timePoint, 
+				id, 
+				Collections.<Competitor>emptyList(), 
+				passId, 
+				new MillisecondsTimePoint(startTime));
+	}
+
+
+}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BaseRaceLogEventSerializer.java

@@ -4,10 +4,10 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
 import com.sap.sailing.domain.base.Competitor;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 
-public abstract class BaseRaceCommitteeEventSerializer implements JsonSerializer<RaceCommitteeEvent> {
+public abstract class BaseRaceLogEventSerializer implements JsonSerializer<RaceLogEvent> {
 	public static final String FIELD_CLASS = "@class";
 	public static final String FIELD_ID = "id";
 	public static final String FIELD_TIMESTAMP = "timestamp";
@@ -18,12 +18,12 @@ public abstract class BaseRaceCommitteeEventSerializer implements JsonSerializer
 	
 	protected JsonSerializer<Competitor> competitorSerializer;
 	
-	public BaseRaceCommitteeEventSerializer(JsonSerializer<Competitor> competitorSerializer) {
+	public BaseRaceLogEventSerializer(JsonSerializer<Competitor> competitorSerializer) {
 		this.competitorSerializer = competitorSerializer;
 	}
 	
 	@Override
-	public JSONObject serialize(RaceCommitteeEvent object) {
+	public JSONObject serialize(RaceLogEvent object) {
 		JSONObject result = new JSONObject();
 		result.put(FIELD_CLASS, getClassFieldValue());
 		result.put(FIELD_ID, object.getId().toString());

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeEventSerializer.java

@@ -1,46 +0,0 @@
-package com.sap.sailing.server.gateway.serialization.impl;
-
-import org.json.simple.JSONObject;
-
-import com.sap.sailing.domain.racecommittee.RaceCommitteeCourseAreaChangedEvent;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeFlagEvent;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeStartTimeEvent;
-import com.sap.sailing.server.gateway.serialization.JsonSerializer;
-
-public class RaceCommitteeEventSerializer implements JsonSerializer<RaceCommitteeEvent> {
-
-	private final JsonSerializer<RaceCommitteeEvent> flagEventSerializer;
-	private final JsonSerializer<RaceCommitteeEvent> startTimeSerializer;
-	private final JsonSerializer<RaceCommitteeEvent> courseAreaChangedSerializer;
-
-	public RaceCommitteeEventSerializer(
-			JsonSerializer<RaceCommitteeEvent> flagEventSerializer,
-			JsonSerializer<RaceCommitteeEvent> startTimeSerializer,
-			JsonSerializer<RaceCommitteeEvent> courseAreaChangedSerializer) {
-		this.flagEventSerializer = flagEventSerializer;
-		this.startTimeSerializer = startTimeSerializer;
-		this.courseAreaChangedSerializer = courseAreaChangedSerializer;
-	}
-
-	protected JsonSerializer<RaceCommitteeEvent> getSerializer(
-			RaceCommitteeEvent event) {
-		if (event instanceof RaceCommitteeFlagEvent) {
-			return flagEventSerializer;
-		} else if (event instanceof RaceCommitteeStartTimeEvent) {
-			return startTimeSerializer;
-		} else if (event instanceof RaceCommitteeCourseAreaChangedEvent) {
-			return courseAreaChangedSerializer;
-		}
-
-		throw new UnsupportedOperationException(String.format(
-				"There is no serializer defined for event type %s", event
-						.getClass().getName()));
-	}
-
-	@Override
-	public JSONObject serialize(RaceCommitteeEvent object) {
-		return getSerializer(object).serialize(object);
-	}
-
-}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogCourseAreaChangedEventSerializer.java

@@ -3,16 +3,16 @@ package com.sap.sailing.server.gateway.serialization.impl;
 import org.json.simple.JSONObject;
 
 import com.sap.sailing.domain.base.Competitor;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeCourseAreaChangedEvent;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
+import com.sap.sailing.domain.racelog.RaceLogCourseAreaChangedEvent;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 
-public class RaceCommitteeCourseAreaChangedEventSerializer extends BaseRaceCommitteeEventSerializer {
+public class RaceLogCourseAreaChangedEventSerializer extends BaseRaceLogEventSerializer {
 	
-	public static final String VALUE_CLASS = RaceCommitteeCourseAreaChangedEvent.class.getSimpleName();
+	public static final String VALUE_CLASS = RaceLogCourseAreaChangedEvent.class.getSimpleName();
 	public static final String FIELD_COURSE_AREA_ID = "courseAreaId";
 	
-	public RaceCommitteeCourseAreaChangedEventSerializer(
+	public RaceLogCourseAreaChangedEventSerializer(
 			JsonSerializer<Competitor> competitorSerializer) {
 		super(competitorSerializer);
 	}
@@ -23,8 +23,8 @@ public class RaceCommitteeCourseAreaChangedEventSerializer extends BaseRaceCommi
 	}
 	
 	@Override
-	public JSONObject serialize(RaceCommitteeEvent object) {
-		RaceCommitteeCourseAreaChangedEvent caChangedEvent = (RaceCommitteeCourseAreaChangedEvent) object;
+	public JSONObject serialize(RaceLogEvent object) {
+		RaceLogCourseAreaChangedEvent caChangedEvent = (RaceLogCourseAreaChangedEvent) object;
 		
 		JSONObject result = super.serialize(caChangedEvent);
 		result.put(FIELD_COURSE_AREA_ID, caChangedEvent.getCourseAreaId());

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogEventSerializer.java

@@ -0,0 +1,46 @@
+package com.sap.sailing.server.gateway.serialization.impl;
+
+import org.json.simple.JSONObject;
+
+import com.sap.sailing.domain.racelog.RaceLogCourseAreaChangedEvent;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
+import com.sap.sailing.domain.racelog.RaceLogFlagEvent;
+import com.sap.sailing.domain.racelog.RaceLogStartTimeEvent;
+import com.sap.sailing.server.gateway.serialization.JsonSerializer;
+
+public class RaceLogEventSerializer implements JsonSerializer<RaceLogEvent> {
+
+	private final JsonSerializer<RaceLogEvent> flagEventSerializer;
+	private final JsonSerializer<RaceLogEvent> startTimeSerializer;
+	private final JsonSerializer<RaceLogEvent> courseAreaChangedEventSerializer;
+
+	public RaceLogEventSerializer(
+			JsonSerializer<RaceLogEvent> flagEventSerializer,
+			JsonSerializer<RaceLogEvent> startTimeSerializer,
+			JsonSerializer<RaceLogEvent> courseAreaChangedEventSerializer) {
+		this.flagEventSerializer = flagEventSerializer;
+		this.startTimeSerializer = startTimeSerializer;
+		this.courseAreaChangedEventSerializer = courseAreaChangedEventSerializer;
+	}
+
+	protected JsonSerializer<RaceLogEvent> getSerializer(
+			RaceLogEvent event) {
+		if (event instanceof RaceLogFlagEvent) {
+			return flagEventSerializer;
+		} else if (event instanceof RaceLogStartTimeEvent) {
+			return startTimeSerializer;
+		} else if (event instanceof RaceLogCourseAreaChangedEvent) {
+			return courseAreaChangedEventSerializer;
+		}
+
+		throw new UnsupportedOperationException(String.format(
+				"There is no serializer defined for event type %s", event
+						.getClass().getName()));
+	}
+
+	@Override
+	public JSONObject serialize(RaceLogEvent object) {
+		return getSerializer(object).serialize(object);
+	}
+
+}

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogFlagEventSerializer.java

@@ -3,18 +3,18 @@ package com.sap.sailing.server.gateway.serialization.impl;
 import org.json.simple.JSONObject;
 
 import com.sap.sailing.domain.base.Competitor;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeFlagEvent;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
+import com.sap.sailing.domain.racelog.RaceLogFlagEvent;
 import com.sap.sailing.server.gateway.serialization.JsonSerializer;
 
-public class RaceCommitteeFlagEventSerializer extends BaseRaceCommitteeEventSerializer {
+public class RaceLogFlagEventSerializer extends BaseRaceLogEventSerializer {
 	
-	public static final String VALUE_CLASS = RaceCommitteeFlagEvent.class.getSimpleName();
+	public static final String VALUE_CLASS = RaceLogFlagEvent.class.getSimpleName();
 	public static final String FIELD_UPPER_FLAG = "upperFlag";
 	public static final String FIELD_LOWER_FLAG = "lowerFlag";
 	public static final String FIELD_DISPLAYED = "displayed";
 	
-	public RaceCommitteeFlagEventSerializer(
+	public RaceLogFlagEventSerializer(
 			JsonSerializer<Competitor> competitorSerializer) {
 		super(competitorSerializer);
 	}
@@ -25,8 +25,8 @@ public class RaceCommitteeFlagEventSerializer extends BaseRaceCommitteeEventSeri
 	}
 	
 	@Override
-	public JSONObject serialize(RaceCommitteeEvent object) {
-		RaceCommitteeFlagEvent flagEvent = (RaceCommitteeFlagEvent) object;
+	public JSONObject serialize(RaceLogEvent object) {
+		RaceLogFlagEvent flagEvent = (RaceLogFlagEvent) object;
 		
 		JSONObject result = super.serialize(flagEvent);
 		result.put(FIELD_UPPER_FLAG, flagEvent.getUpperFlag());

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogStartTimeEventSerializer.java

@@ -1,34 +1,34 @@
-package com.sap.sailing.server.gateway.serialization.impl;
-
-import org.json.simple.JSONObject;
-
-import com.sap.sailing.domain.base.Competitor;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeEvent;
-import com.sap.sailing.domain.racecommittee.RaceCommitteeStartTimeEvent;
-import com.sap.sailing.server.gateway.serialization.JsonSerializer;
-
-public class RaceCommitteeStartTimeEventSerializer extends BaseRaceCommitteeEventSerializer {
-
-	public static final String VALUE_CLASS = RaceCommitteeStartTimeEvent.class.getSimpleName();
-	public static final String FIELD_START_TIME = "startTime";
-	
-	public RaceCommitteeStartTimeEventSerializer(
-			JsonSerializer<Competitor> competitorSerializer) {
-		super(competitorSerializer);
-	}
-	
-	@Override
-	protected String getClassFieldValue() {
-		return VALUE_CLASS;
-	}
-	
-	@Override
-	public JSONObject serialize(RaceCommitteeEvent object) {
-		RaceCommitteeStartTimeEvent startTimeEvent = (RaceCommitteeStartTimeEvent) object;
-		
-		JSONObject result = super.serialize(startTimeEvent);
-		result.put(FIELD_START_TIME, startTimeEvent.getStartTime().asMillis());
-		return result;
-	}
-
-}
+package com.sap.sailing.server.gateway.serialization.impl;
+
+import org.json.simple.JSONObject;
+
+import com.sap.sailing.domain.base.Competitor;
+import com.sap.sailing.domain.racelog.RaceLogEvent;
+import com.sap.sailing.domain.racelog.RaceLogStartTimeEvent;
+import com.sap.sailing.server.gateway.serialization.JsonSerializer;
+
+public class RaceLogStartTimeEventSerializer extends BaseRaceLogEventSerializer {
+
+	public static final String VALUE_CLASS = RaceLogStartTimeEvent.class.getSimpleName();
+	public static final String FIELD_START_TIME = "startTime";
+	
+	public RaceLogStartTimeEventSerializer(
+			JsonSerializer<Competitor> competitorSerializer) {
+		super(competitorSerializer);
+	}
+	
+	@Override
+	protected String getClassFieldValue() {
+		return VALUE_CLASS;
+	}
+	
+	@Override
+	public JSONObject serialize(RaceLogEvent object) {
+		RaceLogStartTimeEvent startTimeEvent = (RaceLogStartTimeEvent) object;
+		
+		JSONObject result = super.serialize(startTimeEvent);
+		result.put(FIELD_START_TIME, startTimeEvent.getStartTime().asMillis());
+		return result;
+	}
+
+}