Merge remote-tracking branch 'origin/master' into raceboard-simulation

This commit is contained in:
Christopher Ronnewinkel (D036654)
2015-01-06 16:48:37 +01:00
469 changed files with 11060 additions and 5513 deletions
@@ -102,7 +102,8 @@ public class RaceDataAccessEval {
service = new RacingEventServiceImpl();
tracTracAdapterFactory = new TracTracAdapterFactoryImpl();
logger.info("Calling service.addTracTracRace");
raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramUrl, liveUri, storedUri, null, 60000);
raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramUrl, liveUri, storedUri, null, null,
60000);
logger.info("Calling raceHandle.getRaces(): " + raceHandle);
RaceDefinition race = raceHandle.getRace(); // wait for RaceDefinition to be completely wired in Regatta
logger.info("Obtained race: " + race);
@@ -52,7 +52,7 @@ public class RacingEventPersistence {
URI liveURI = new URI(liveURIStr);
URI storedURI = new URI(storedURIStr);
raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramURL, liveURI, storedURI, null,
raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramURL, liveURI, storedURI, null, null,
60000);
System.out.println("Done loading race.");
@@ -64,7 +64,7 @@ public class TracTracReaderFromURLs implements TracTracReader {
for (String paramURLStr : tracTracParamURLs) {
URL paramURL = new URL(paramURLStr);
RaceHandle raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramURL, liveURI, storedURI,
null, 60000);
null, null, 60000);
String regatta = raceHandle.getRegatta().getName();
RaceDefinition r = raceHandle.getRace();
RegattaAndRaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
@@ -42,7 +42,7 @@ public class TracTracWriter {
for (String paramURLStr : sources) {
URL paramURL = new URL(paramURLStr);
RaceHandle raceHandle = SimulatorUtils.loadRace(service, tracTracAdapterFactory, paramURL, liveURI, storedURI,
null, 60000);
null, null, 60000);
String regatta = raceHandle.getRegatta().getName();
RaceDefinition r = raceHandle.getRace();
List<TrackedRace> racesList = new ArrayList<TrackedRace>();