eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-07 21:01:03 +00:00
Code Activity

made compile again

Browse Source
This commit is contained in:
Axel Uhl committed 2013-09-17 21:30:22 +02:00
1 parent abdae7e871
commit 4aa504741f
7 files changed
+34 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java
+2 -1
View File
@@ -27,6 +27,7 @@ import com.sap.sailing.domain.racelog.RaceLogEventFactory;
import com.sap.sailing.domain.racelog.RaceLogFlagEvent;
import com.sap.sailing.domain.racelog.RaceLogIdentifier;
import com.sap.sailing.domain.racelog.RaceLogIdentifierTemplate;
import com.sap.sailing.domain.racelog.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.racelog.impl.RaceLogIdentifierImpl;
public class StoreAndLoadRaceLogsTest extends AbstractMongoDBTest {
@@ -145,7 +146,7 @@ public class StoreAndLoadRaceLogsTest extends AbstractMongoDBTest {
}
private RaceLogFlagEvent createRaceLogFlagEvent(Serializable id) {
return eventFactory.createFlagEvent(new MillisecondsTimePoint(42), id, Collections.<Competitor> emptyList(),
return eventFactory.createFlagEvent(new MillisecondsTimePoint(42), new RaceLogEventAuthorImpl("Test author", /* priority */ 1), id, Collections.<Competitor> emptyList(),
42, Flags.ALPHA, Flags.BRAVO, true);
}
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/BaseEventSerializerTest.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.junit.Test;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.racelog.RaceLogEvent;
import com.sap.sailing.domain.racelog.RaceLogEventAuthor;
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java
+1 -1
View File
@@ -11,7 +11,7 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.impl.Util;
import com.sap.sailing.domain.racelog.RaceLog;
import com.sap.sailing.domain.racelog.RaceLogEventAuthor;
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
+8 -9
View File
@@ -12,8 +12,6 @@ import java.util.concurrent.Callable;
import android.app.LoaderManager.LoaderCallbacks;
import android.content.Context;
import android.content.Context;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.CourseBase;
@@ -33,6 +31,7 @@ import com.sap.sailing.domain.common.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
import com.sap.sailing.domain.common.racelog.StartProcedureType;
import com.sap.sailing.domain.racelog.RaceLog;
import com.sap.sailing.domain.racelog.RaceLogEventAuthor;
import com.sap.sailing.domain.racelog.RaceLogEventFactory;
import com.sap.sailing.domain.racelog.impl.RaceLogEventFactoryImpl;
import com.sap.sailing.domain.racelog.impl.RaceLogImpl;
@@ -59,8 +58,7 @@ public class OfflineDataManager extends DataManager {
}
private void fillDataStore(DataStore dataStore) {
dataStore
.addEvent(new EventBaseImpl("Extreme Sailing Series 2012 (Cardiff)", "Cardiff", "", true, "DUMBUUIDA"));
dataStore.addEvent(new EventBaseImpl("Extreme Sailing Series 2012 (Cardiff)", "Cardiff", "", true, "DUMBUUIDA"));
dataStore.addEvent(new EventBaseImpl("Extreme Sailing Series 2012 (Nice)", "Nice", "", true, "DUMBUUIDB"));
dataStore.addEvent(new EventBaseImpl("Extreme Sailing Series 2012 (Rio)", "Rio", "", true, "DUMBUUIDC"));
EventBase newEvent = new EventBaseImpl("Extreme Sailing Series 2013 (Muscat)", "Muscat", "", true, "FIXUUID");
@@ -82,14 +80,15 @@ public class OfflineDataManager extends DataManager {
RaceLogEventFactory factory = new RaceLogEventFactoryImpl();
RaceLog log = new RaceLogImpl(UUID.randomUUID());
log.add(factory.createStartTimeEvent(new MillisecondsTimePoint(new Date().getTime() - 2000), 1,
final RaceLogEventAuthor author = AppPreferences.getAuthor(context);
log.add(factory.createStartTimeEvent(new MillisecondsTimePoint(new Date().getTime() - 2000), author,
1, new MillisecondsTimePoint(new Date().getTime() - 1000)));
log.add(factory.createRaceStatusEvent(new MillisecondsTimePoint(new Date().getTime()), 1,
log.add(factory.createRaceStatusEvent(new MillisecondsTimePoint(new Date().getTime()),
AppPreferences.getAuthor(context),
1, RaceLogRaceStatus.FINISHING));
ManagedRace q1 = new ManagedRaceImpl(new ManagedRaceIdentifierImpl("A.B", new FleetImpl("A"), qualifying,
ManagedRace q1 = new ManagedRaceImpl(context, new ManagedRaceIdentifierImpl("A.B", new FleetImpl("A"), qualifying,
raceGroup), StartProcedureType.ESS, log);
log = new RaceLogImpl(UUID.randomUUID());
@@ -98,7 +97,7 @@ public class OfflineDataManager extends DataManager {
* new MillisecondsTimePoint(new Date().getTime() + 100000)));
*/
ManagedRace q2 = new ManagedRaceImpl(new ManagedRaceIdentifierImpl("B", new FleetImpl("A.A"), qualifying,
ManagedRace q2 = new ManagedRaceImpl(context, new ManagedRaceIdentifierImpl("B", new FleetImpl("A.A"), qualifying,
raceGroup), StartProcedureType.ESS, log);
log = new RaceLogImpl(UUID.randomUUID());
@@ -106,7 +105,7 @@ public class OfflineDataManager extends DataManager {
* log.add(factory.createRaceStatusEvent( new MillisecondsTimePoint(new Date()), 5,
* RaceLogRaceStatus.FINISHED));
*/
ManagedRace q3 = new ManagedRaceImpl(new ManagedRaceIdentifierImpl("Q3", new FleetImpl("Default"), qualifying,
ManagedRace q3 = new ManagedRaceImpl(context, new ManagedRaceIdentifierImpl("Q3", new FleetImpl("Default"), qualifying,
raceGroup), StartProcedureType.ESS, log);
/*
* ManagedRace m1 = new ManagedRaceImpl( new ManagedRaceIdentifierImpl( "M1", new FleetImpl("Default"), medal,
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
+10 -13
View File
@@ -142,14 +142,11 @@ public class OnlineDataManager extends DataManager {
new RaceCellDeserializer(new RaceLogDeserializer(
RaceLogEventDeserializer.create(domainFactory)))))));
DataHandler<Collection<ManagedRace>> handler = new ManagedRacesDataHandler(OnlineDataManager.this);
+ "/sailingserver/rc/racegroups?"+
RaceLogServletConstants.PARAM_COURSE_AREA_FILTER + "=" + courseAreaId.toString()+"&"+
RaceLogServletConstants.PARAMS_CLIENT_UUID + "=" + EventSendingService.uuid), parser, handler)
return new OnlineDataLoader<Collection<ManagedRace>>(context, new URL(AppPreferences
.getServerBaseURL(context)
+ "/sailingserver/rc/racegroups?courseArea="
+ courseAreaId.toString()), parser, handler);
+ "/sailingserver/rc/racegroups?"+
RaceLogServletConstants.PARAM_COURSE_AREA_FILTER + "=" + courseAreaId.toString()+"&"+
RaceLogServletConstants.PARAMS_CLIENT_UUID + "=" + EventSendingService.uuid), parser, handler);
}
});
}
@@ -175,7 +172,7 @@ public class OnlineDataManager extends DataManager {
.getServerBaseURL(context)
+ "/sailingserver/rc/marks?"+RaceLogServletConstants.PARAMS_LEADERBOARD_NAME + "=" + raceGroupName +
"&"+RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME+"=" + raceColumnName
+ "&"+RaceLogServletConstants.PARAMS_RACE_FLEET_NAME+"=" + fleetName), parser, handler)
+ "&"+RaceLogServletConstants.PARAMS_RACE_FLEET_NAME+"=" + fleetName), parser, handler);
}
});
}
@@ -202,7 +199,7 @@ public class OnlineDataManager extends DataManager {
return new OnlineDataLoader<CourseBase>(context, new URL(AppPreferences.getServerBaseURL(context)
+ "/sailingserver/rc/currentcourse?" + RaceLogServletConstants.PARAMS_LEADERBOARD_NAME + "="
+ raceGroupName + "&" + RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME + "=" + raceColumnName
+ "&"+RaceLogServletConstants.PARAMS_RACE_FLEET_NAME+"=" + fleetName), parser, handler).forceLoad();
+ "&"+RaceLogServletConstants.PARAMS_RACE_FLEET_NAME+"=" + fleetName), parser, handler);
}
});
}
@@ -226,11 +223,11 @@ public class OnlineDataManager extends DataManager {
String raceColumnName = URLEncoder.encode(identifier.getRaceName());
String fleetName = URLEncoder.encode(identifier.getFleet().getName());
return new OnlineDataLoader<Collection<Competitor>>(context, new URL(AppPreferences
.getServerBaseURL(context)
+ "/sailingserver/rc/competitors?" + RaceLogServletConstants.PARAMS_LEADERBOARD_NAME + "=" + raceGroupName + "&" + RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME + "=" + raceColumnName
+ "&"+RaceLogServletConstants.PARAMS_RACE_FLEET_NAME+"=" + fleetName), parser, handler)
return new OnlineDataLoader<Collection<Competitor>>(context, new URL(
AppPreferences.getServerBaseURL(context) + "/sailingserver/rc/competitors?"
+ RaceLogServletConstants.PARAMS_LEADERBOARD_NAME + "=" + raceGroupName + "&"
+ RaceLogServletConstants.PARAMS_RACE_COLUMN_NAME + "=" + raceColumnName + "&"
+ RaceLogServletConstants.PARAMS_RACE_FLEET_NAME + "=" + fleetName), parser, handler);
}
});
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
+1 -2
View File
@@ -35,7 +35,6 @@ public class ManagedRacesDataParser implements DataParser<Collection<ManagedRace
public ManagedRacesDataParser(Context context, JsonDeserializer<RaceGroup> deserializer) {
this.context = context;
this.deserializer = deserializer;
this.context = context;
}
public Collection<ManagedRace> parse(Reader reader) throws Exception {
@@ -68,7 +67,7 @@ public class ManagedRacesDataParser implements DataParser<Collection<ManagedRace
private ManagedRace createManagedRace(RaceGroup raceGroup, SeriesBase series, Fleet fleet, String name,
RaceLog raceLog) {
StartProcedureType startType = AppPreferences.getDefaultStartProcedureType(context);
return new ManagedRaceImpl(new ManagedRaceIdentifierImpl(name,
return new ManagedRaceImpl(context, new ManagedRaceIdentifierImpl(name,
new FleetIdentifierImpl(fleet, series, raceGroup)), startType, raceLog);
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventSenderTask.java
+11 -13
View File
@@ -1,5 +1,6 @@
package com.sap.sailing.racecommittee.app.services.sending;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.ArrayList;
@@ -53,21 +54,18 @@ public class EventSenderTask extends AsyncTask<Intent, Void, Triple<Intent, Bool
final List<RaceLogEvent> eventsToAdd = new ArrayList<RaceLogEvent>();
try {
ExLog.i(TAG, "Posting event: " + serializedEventAsJson);
HttpRequest post = new HttpJsonPostRequest(URI.create(url), serializedEventAsJson);
HttpRequest post = new HttpJsonPostRequest(new URL(url), serializedEventAsJson);
SharedDomainFactory domainFactory = DomainFactoryImpl.INSTANCE;
try {
// TODO read JSON-serialized race log events that need to be merged into the local race log because they were added on the server in the interim
final InputStream inputStream = post.execute();
JSONParser parser = new JSONParser();
JSONArray eventsToAddAsJson = (JSONArray) parser.parse(new InputStreamReader(inputStream));
for (Object o : eventsToAddAsJson) {
RaceLogEvent eventToAdd = RaceLogEventDeserializer.create(domainFactory).deserialize((JSONObject) o);
eventsToAdd.add(eventToAdd);
}
inputStream.close();
} finally {
post.disconnect();
// TODO read JSON-serialized race log events that need to be merged into the local race log because they
// were added on the server in the interim
final InputStream inputStream = post.execute();
JSONParser parser = new JSONParser();
JSONArray eventsToAddAsJson = (JSONArray) parser.parse(new InputStreamReader(inputStream));
for (Object o : eventsToAddAsJson) {
RaceLogEvent eventToAdd = RaceLogEventDeserializer.create(domainFactory).deserialize((JSONObject) o);
eventsToAdd.add(eventToAdd);
}
inputStream.close();
ExLog.i(TAG, "Post successful for the following event: " + serializedEventAsJson);
result = new Triple<Intent, Boolean, Iterable<RaceLogEvent>>(intent, true, eventsToAdd);
} catch (Exception e) {