eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-25 05:23:51 +00:00
Code Activity

Merge branch 'master' into feature/android_tracking_app

Browse Source
This commit is contained in:
Peter Siegmund committed 2014-11-06 09:11:51 +01:00
2 parents b6f24e8137 680ef21207
commit bbfcaddd2d
526 files changed
+14301 -2143
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogRevokeEventDeserializer.java
+5 -1
View File
@@ -24,7 +24,11 @@ public class RaceLogRevokeEventDeserializer extends BaseRaceLogEventDeserializer
throws JsonDeserializationException {
Serializable revokedEventId = Helpers.tryUuidConversion(
(Serializable) object.get(RaceLogRevokeEventSerializer.FIELD_REVOKED_EVENT_ID));
String revokedEventType = (String) object.get(RaceLogRevokeEventSerializer.FIELD_REVOKED_EVENT_TYPE);
String revokedEventShortInfo = (String) object.get(RaceLogRevokeEventSerializer.FIELD_REVOKED_EVENT_SHORT_INFO);
String reason = (String) object.get(RaceLogRevokeEventSerializer.FIELD_REASON);
return factory.createRevokeEvent(createdAt, author, timePoint, id, passId, revokedEventId);
return factory.createRevokeEvent(createdAt, author, timePoint, id, passId, revokedEventId,
revokedEventType, revokedEventShortInfo, reason);
}
}
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogRevokeEventSerializer.java
+6
View File
@@ -10,6 +10,9 @@ import com.sap.sailing.server.gateway.serialization.JsonSerializer;
public class RaceLogRevokeEventSerializer extends BaseRaceLogEventSerializer {
public static final String VALUE_CLASS = RevokeEvent.class.getSimpleName();
public static final String FIELD_REVOKED_EVENT_ID = "revokedEventId";
public static final String FIELD_REVOKED_EVENT_TYPE = "revokedEventType";
public static final String FIELD_REVOKED_EVENT_SHORT_INFO = "revokedEventShortInfo";
public static final String FIELD_REASON = "reason";
public RaceLogRevokeEventSerializer(
JsonSerializer<Competitor> competitorSerializer) {
@@ -27,6 +30,9 @@ public class RaceLogRevokeEventSerializer extends BaseRaceLogEventSerializer {
JSONObject result = super.serialize(event);
result.put(FIELD_REVOKED_EVENT_ID, event.getRevokedEventId().toString());
result.put(FIELD_REVOKED_EVENT_TYPE, event.getRevokedEventType());
result.put(FIELD_REVOKED_EVENT_SHORT_INFO, event.getRevokedEventShortInfo());
result.put(FIELD_REASON, event.getReason());
return result;
}