eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 14:20:55 +00:00
Code Activity

fixed some errors after merge, renamed EventDataJsonDeserializer to EventBaseJsonDeserializer

Browse Source
This commit is contained in:
Armin Zamani committed 2013-05-16 17:08:42 +02:00
1 parent 7df9f09491
commit 19ca062a34
4 files changed
+45 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
+2 -2
View File
@@ -34,7 +34,7 @@ import com.sap.sailing.racecommittee.app.data.parsers.MarksDataParser;
import com.sap.sailing.racecommittee.app.deserialization.impl.BoatClassJsonDeserializer;
import com.sap.sailing.racecommittee.app.deserialization.impl.ColorDeserializer;
import com.sap.sailing.racecommittee.app.deserialization.impl.CourseAreaJsonDeserializer;
import com.sap.sailing.racecommittee.app.deserialization.impl.EventDataJsonDeserializer;
import com.sap.sailing.racecommittee.app.deserialization.impl.EventBaseJsonDeserializer;
import com.sap.sailing.racecommittee.app.deserialization.impl.FleetDeserializer;
import com.sap.sailing.racecommittee.app.deserialization.impl.RaceCellDeserializer;
import com.sap.sailing.racecommittee.app.deserialization.impl.RaceGroupDeserializer;
@@ -86,7 +86,7 @@ public class OnlineDataManager extends DataManager {
}
protected void reloadEvents(LoadClient<Collection<EventBase>> client) {
DataParser<Collection<EventBase>> parser = new EventsDataParser(new EventDataJsonDeserializer(
DataParser<Collection<EventBase>> parser = new EventsDataParser(new EventBaseJsonDeserializer(
new VenueJsonDeserializer(new CourseAreaJsonDeserializer())));
DataHandler<Collection<EventBase>> handler = new EventsDataHandler(this, client);
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/EventDataJsonDeserializer.java → mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/EventBaseJsonDeserializer.java
+40 -40
View File
@@ -1,40 +1,40 @@
package com.sap.sailing.racecommittee.app.deserialization.impl;
import java.io.Serializable;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.EventBase;
import com.sap.sailing.domain.base.Venue;
import com.sap.sailing.domain.base.impl.EventBaseImpl;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
import com.sap.sailing.server.gateway.serialization.impl.EventDataJsonSerializer;
public class EventDataJsonDeserializer implements JsonDeserializer<EventBase> {
private JsonDeserializer<Venue> venueDeserializer;
public EventDataJsonDeserializer(JsonDeserializer<Venue> venueDeserializer) {
this.venueDeserializer = venueDeserializer;
}
public EventBase deserialize(JSONObject object) throws JsonDeserializationException {
Serializable id = (Serializable) object.get(EventDataJsonSerializer.FIELD_ID);
String name = object.get(EventDataJsonSerializer.FIELD_NAME).toString();
String publicationUrl = object.get(EventDataJsonSerializer.FIELD_PUBLICATION_URL).toString();
JSONObject venueObject = Helpers.getNestedObjectSafe(
object,
EventDataJsonSerializer.FIELD_VENUE);
Venue venue = venueDeserializer.deserialize(venueObject);
return new EventBaseImpl(
name,
venue,
publicationUrl,
true,
Helpers.tryUuidConversion(id));
}
}
package com.sap.sailing.racecommittee.app.deserialization.impl;
import java.io.Serializable;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.base.EventBase;
import com.sap.sailing.domain.base.Venue;
import com.sap.sailing.domain.base.impl.EventBaseImpl;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
import com.sap.sailing.server.gateway.serialization.impl.EventJsonSerializer;
public class EventBaseJsonDeserializer implements JsonDeserializer<EventBase> {
private JsonDeserializer<Venue> venueDeserializer;
public EventBaseJsonDeserializer(JsonDeserializer<Venue> venueDeserializer) {
this.venueDeserializer = venueDeserializer;
}
public EventBase deserialize(JSONObject object) throws JsonDeserializationException {
Serializable id = (Serializable) object.get(EventJsonSerializer.FIELD_ID);
String name = object.get(EventJsonSerializer.FIELD_NAME).toString();
String publicationUrl = object.get(EventJsonSerializer.FIELD_PUBLICATION_URL).toString();
JSONObject venueObject = Helpers.getNestedObjectSafe(
object,
EventJsonSerializer.FIELD_VENUE);
Venue venue = venueDeserializer.deserialize(venueObject);
return new EventBaseImpl(
name,
venue,
publicationUrl,
true,
Helpers.tryUuidConversion(id));
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/FleetDeserializer.java
+1 -1
View File
@@ -8,7 +8,7 @@ import com.sap.sailing.domain.common.Color;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.Helpers;
import com.sap.sailing.server.gateway.serialization.racegroup.impl.FleetJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.FleetJsonSerializer;
public class FleetDeserializer implements JsonDeserializer<Fleet> {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/RaceStateService.java
+2 -2
View File
@@ -33,7 +33,7 @@ import com.sap.sailing.racecommittee.app.logging.ExLog;
import com.sap.sailing.racecommittee.app.services.sending.RaceEventSender;
import com.sap.sailing.racecommittee.app.ui.activities.LoginActivity;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sailing.server.gateway.serialization.racegroup.impl.CompetitorJsonSerializer;
import com.sap.sailing.server.gateway.serialization.impl.CompetitorJsonSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.RaceLogEventSerializer;
public class RaceStateService extends Service {
@@ -224,7 +224,7 @@ public class RaceStateService extends Service {
registerAlarms(race, state);
// Register on event additions...
JsonSerializer<RaceLogEvent> eventSerializer = RaceLogEventSerializer.create(new CompetitorJsonSerializer());
JsonSerializer<RaceLogEvent> eventSerializer = RaceLogEventSerializer.create(new CompetitorJsonSerializer(null));
RaceEventSender sender = new RaceEventSender(this, eventSerializer, race);
RaceLogChangedVisitor logListener = new RaceLogChangedVisitor(sender);
state.getRaceLog().addListener(logListener);