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

move and rename RaceLogEventAuthorImpl -> AbstractLog...

Browse Source
This commit is contained in:
Fredrik Teschke committed 2014-11-23 17:37:11 +01:00
1 parent 5870d1a78f
commit 636c63916c
35 files changed
+92 -92
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
+3 -3
View File
@@ -31,6 +31,7 @@ import com.mongodb.MongoException;
import com.mongodb.util.JSON;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.RevokeEvent;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
@@ -49,7 +50,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType;
import com.sap.sailing.domain.abstractlog.race.scoring.impl.AdditionalScoringInformationEventImpl;
@@ -1296,9 +1296,9 @@ public class DomainObjectFactoryImpl implements DomainObjectFactory {
String authorName = (String) dbObject.get(FieldNames.RACE_LOG_EVENT_AUTHOR_NAME.name());
Number authorPriority = (Number) dbObject.get(FieldNames.RACE_LOG_EVENT_AUTHOR_PRIORITY.name());
if (authorName != null && authorPriority != null) {
author = new RaceLogEventAuthorImpl(authorName, authorPriority.intValue());
author = new AbstractLogEventAuthorImpl(authorName, authorPriority.intValue());
} else {
author = RaceLogEventAuthorImpl.createCompatibilityAuthor();
author = AbstractLogEventAuthorImpl.createCompatibilityAuthor();
}
String eventClass = (String) dbObject.get(FieldNames.RACE_LOG_EVENT_CLASS.name());
java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
+2 -2
View File
@@ -7,9 +7,9 @@ import org.junit.After;
import org.junit.Before;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier;
import com.sap.sailing.domain.base.Competitor;
@@ -43,7 +43,7 @@ public class AbstractGPSFixStoreTest {
protected final Competitor comp = DomainFactory.INSTANCE.getOrCreateCompetitor("comp", "comp", null, null, null);
protected final Mark mark = DomainFactory.INSTANCE.getOrCreateMark("mark");
private final AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("author", 0);
private final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("author", 0);
protected GPSFixMoving createFix(long millis, double lat, double lng, double knots, double degrees) {
return new GPSFixMovingImpl(new DegreePosition(lat, lng),
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceStatusAnalyzerTest.java
+3 -3
View File
@@ -13,13 +13,13 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor;
import com.sap.sailing.domain.abstractlog.race.RaceLogRaceStatusEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceStatusAnalyzer;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
import com.sap.sse.common.TimePoint;
@@ -128,8 +128,8 @@ public class RaceStatusAnalyzerTest extends PassAwareRaceLogAnalyzerTest<RaceSta
}
public void testStartSetByStartVesselAndFinishSetByShoreControl() {
AbstractLogEventAuthor authorStartVessel = new RaceLogEventAuthorImpl("Race Officer on Finish Vessel", 1);
AbstractLogEventAuthor authorShoreControl = new RaceLogEventAuthorImpl("Shore Control", 2);
AbstractLogEventAuthor authorStartVessel = new AbstractLogEventAuthorImpl("Race Officer on Finish Vessel", 1);
AbstractLogEventAuthor authorShoreControl = new AbstractLogEventAuthorImpl("Shore Control", 2);
RaceLogRaceStatusEvent event1 = createEvent(RaceLogRaceStatusEvent.class, 1, 1 /** passId*/, authorStartVessel);
when(event1.getNextStatus()).thenReturn(RaceLogRaceStatus.SCHEDULED);
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/state/test/RaceStateTest.java
+2 -2
View File
@@ -14,9 +14,9 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogStartProcedureChangedEventImpl;
import com.sap.sailing.domain.abstractlog.race.state.RaceState;
@@ -54,7 +54,7 @@ public class RaceStateTest {
@Before
public void setUp() {
raceLog = new RaceLogImpl("test-log");
author = new RaceLogEventAuthorImpl("Test", 1);
author = new AbstractLogEventAuthorImpl("Test", 1);
factory = RaceLogEventFactory.INSTANCE;
defaultRacingProcedureType = RacingProcedureType.RRS26;
configuration = new EmptyRegattaConfiguration();
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogEventAuthorTest.java
+6 -6
View File
@@ -6,13 +6,13 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
public class RaceLogEventAuthorTest {
@Test
public void testCompareToSame() {
AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("", 1);
AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("", 1);
int result = author.compareTo(author);
assertEquals(0, result);
@@ -20,8 +20,8 @@ public class RaceLogEventAuthorTest {
@Test
public void testCompareToMinor() {
AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("", 1);
AbstractLogEventAuthor minor = new RaceLogEventAuthorImpl("", 2);
AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("", 1);
AbstractLogEventAuthor minor = new AbstractLogEventAuthorImpl("", 2);
int result = author.compareTo(minor);
assertTrue(result > 0);
@@ -29,8 +29,8 @@ public class RaceLogEventAuthorTest {
@Test
public void testCompareToMajor() {
AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("", 3);
AbstractLogEventAuthor major = new RaceLogEventAuthorImpl("", 2);
AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("", 3);
AbstractLogEventAuthor major = new AbstractLogEventAuthorImpl("", 2);
int result = author.compareTo(major);
assertTrue(result < 0);
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java
+5 -5
View File
@@ -10,12 +10,12 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogChangedListener;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogChangedVisitor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent;
import com.sap.sailing.domain.common.racelog.tracking.NotRevokableException;
@@ -25,16 +25,16 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
public class RaceLogRevocationTest {
private RaceLog serverRaceLog;
private AbstractLogEventAuthor serverAuthor = new RaceLogEventAuthorImpl("server", 2);
private AbstractLogEventAuthor serverAuthor = new AbstractLogEventAuthorImpl("server", 2);
private RaceLog clientARaceLog;
private UUID clientAUUID = UUID.randomUUID();
private AbstractLogEventAuthor clientAAuthor = new RaceLogEventAuthorImpl("clientA", 3);
private AbstractLogEventAuthor clientAAuthor = new AbstractLogEventAuthorImpl("clientA", 3);
private RaceLog clientBRaceLog;
private UUID clientBUUID = UUID.randomUUID();
private AbstractLogEventAuthor clientBAuthor = new RaceLogEventAuthorImpl("clientB", 1);
private AbstractLogEventAuthor clientBAuthor = new AbstractLogEventAuthorImpl("clientB", 1);
private RaceLog clientCRaceLog;
private UUID clientCUUID = UUID.randomUUID();
private AbstractLogEventAuthor clientCAuthor = new RaceLogEventAuthorImpl("clientC", 0);
private AbstractLogEventAuthor clientCAuthor = new AbstractLogEventAuthorImpl("clientC", 0);
@Before
public void setup() {
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogTest.java
+3 -3
View File
@@ -20,13 +20,13 @@ import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor;
import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sse.common.TimePoint;
@@ -40,7 +40,7 @@ public class RaceLogTest {
private static class MockRaceLogEventForSorting extends RaceLogEventImpl {
public MockRaceLogEventForSorting(long createdAtMillis) {
super(new MillisecondsTimePoint(createdAtMillis),
/* author */ new RaceLogEventAuthorImpl("Dummy Author", /* priority */ 0),
/* author */ new AbstractLogEventAuthorImpl("Dummy Author", /* priority */ 0),
MillisecondsTimePoint.now(), /* ID */ UUID.randomUUID(), /* pInvolvedBoats */ null, /* pass ID */ 1);
}
@@ -425,7 +425,7 @@ public class RaceLogTest {
assertEquals(event2, Util.get(raceLog.getFixesDescending(), 2));
raceLog.unlockAfterRead();
}
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@Test
public void testAddingEventsFromMultipleClients() {
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java
+3 -3
View File
@@ -11,10 +11,10 @@ import java.io.ObjectOutputStream;
import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent;
import com.sap.sailing.domain.racelog.tracking.test.mock.SmartphoneImeiIdentifier;
@@ -60,7 +60,7 @@ public class SerializeRaceLogEventsTest {
@Test
public void testRaceLogSerializationWithSingleEvent() throws IOException, ClassNotFoundException {
RaceLogStartTimeEvent startTimeEvent = eventFactory.createStartTimeEvent(MillisecondsTimePoint.now(),
new RaceLogEventAuthorImpl("Author Name", /* priority */0), /* passId */1, /* startTime */
new AbstractLogEventAuthorImpl("Author Name", /* priority */0), /* passId */1, /* startTime */
MillisecondsTimePoint.now());
raceLog.add(startTimeEvent);
oos.writeObject(raceLog);
@@ -80,7 +80,7 @@ public class SerializeRaceLogEventsTest {
@Test
public void testRaceLogSerializationWithEventContainingDeviceIdentifier() throws IOException, ClassNotFoundException {
DeviceCompetitorMappingEvent mappingEvent = eventFactory.createDeviceCompetitorMappingEvent(
MillisecondsTimePoint.now(), new RaceLogEventAuthorImpl("Author Name", /* priority */0), new SmartphoneImeiIdentifier("1948364938463903"),
MillisecondsTimePoint.now(), new AbstractLogEventAuthorImpl("Author Name", /* priority */0), new SmartphoneImeiIdentifier("1948364938463903"),
AbstractLeaderboardTest.createCompetitor("Test Competitor"), 0, new MillisecondsTimePoint(0), new MillisecondsTimePoint(10));
raceLog.add(mappingEvent);
oos.writeObject(raceLog);
java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/AbstractRaceLogTrackingTest.java
+3 -3
View File
@@ -3,9 +3,9 @@ package com.sap.sailing.domain.racelog.tracking.analyzing.test;
import org.junit.Before;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.impl.MillisecondsTimePoint;
@@ -13,8 +13,8 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
public abstract class AbstractRaceLogTrackingTest {
protected RaceLog log;
protected final AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("author0", 0);
protected final AbstractLogEventAuthor author1 = new RaceLogEventAuthorImpl("author1", 1);
protected final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("author0", 0);
protected final AbstractLogEventAuthor author1 = new AbstractLogEventAuthorImpl("author1", 1);
protected final TimePoint now = MillisecondsTimePoint.now();
protected final RaceLogEventRestoreFactory factory = RaceLogEventRestoreFactory.INSTANCE;
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventAuthorImpl.java → java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/AbstractLogEventAuthorImpl.java
+4 -4
View File
@@ -1,17 +1,17 @@
package com.sap.sailing.domain.abstractlog.race.impl;
package com.sap.sailing.domain.abstractlog.impl;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sse.common.impl.NamedImpl;
public class RaceLogEventAuthorImpl extends NamedImpl implements AbstractLogEventAuthor {
public class AbstractLogEventAuthorImpl extends NamedImpl implements AbstractLogEventAuthor {
private static final long serialVersionUID = -5602802911563685812L;
private final int priority;
public static AbstractLogEventAuthor createCompatibilityAuthor() {
return new RaceLogEventAuthorImpl(NAME_COMPATIBILITY, PRIORITY_COMPATIBILITY);
return new AbstractLogEventAuthorImpl(NAME_COMPATIBILITY, PRIORITY_COMPATIBILITY);
}
public RaceLogEventAuthorImpl(String name, int priority) {
public AbstractLogEventAuthorImpl(String name, int priority) {
super(name);
this.priority = priority;
}
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/ReadonlyRacingProcedureFactory.java
+2 -2
View File
@@ -1,10 +1,10 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.NoAddingRaceLogWrapper;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureFactory;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ReadonlyRacingProcedure;
@@ -56,7 +56,7 @@ public class ReadonlyRacingProcedureFactory implements RacingProcedureFactory {
@Override
public ReadonlyRacingProcedure createRacingProcedure(RacingProcedureType type, RaceLog raceLog) {
// Just a mock author since we will never add anything to the racelog
AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Illegal Author", 128);
AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Illegal Author", 128);
// Wrap the racelog to disable adding...
RaceLog wrappedRaceLog = new NoAddingRaceLogWrapper(raceLog);
return createProcedure(type, wrappedRaceLog, author, RaceLogEventFactory.INSTANCE);
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
+5 -5
View File
@@ -21,9 +21,9 @@ import java.util.concurrent.ExecutionException;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.AdditionalScoringInformationFinder;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationEvent;
import com.sap.sailing.domain.abstractlog.race.scoring.AdditionalScoringInformationType;
import com.sap.sailing.domain.abstractlog.race.scoring.impl.AdditionalScoringInformationEventImpl;
@@ -831,11 +831,11 @@ public class LeaderboardScoringAndRankingTest extends AbstractLeaderboardTest {
assertEquals(new Double(18), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[1], later));
assertEquals(new Double(2), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later));
RaceLog raceLogForRace2 = leaderboardHighPoint10Or8AndLastBreaksTie.getRaceColumnByName("R2").getRaceLog(leaderboardHighPoint10Or8AndLastBreaksTie.getFleet(null));
raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new RaceLogEventAuthorImpl("Plopp", 1), later, "12345678", Collections.<Competitor>emptyList(), 0, AdditionalScoringInformationType.UNKNOWN));
raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new AbstractLogEventAuthorImpl("Plopp", 1), later, "12345678", Collections.<Competitor>emptyList(), 0, AdditionalScoringInformationType.UNKNOWN));
assertEquals(new Double(20), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[0], later));
assertEquals(new Double(18), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[1], later));
assertEquals(new Double(2), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later));
raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new RaceLogEventAuthorImpl("Plopp", 1), later.plus(Duration.ONE_MINUTE), "123456789873773762", Collections.<Competitor>emptyList(), 0, AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE));
raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new AbstractLogEventAuthorImpl("Plopp", 1), later.plus(Duration.ONE_MINUTE), "123456789873773762", Collections.<Competitor>emptyList(), 0, AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE));
assertEquals(new Double(18), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[0], later));
assertEquals(new Double(16), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[1], later));
assertEquals(new Double(2), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later));
@@ -847,7 +847,7 @@ public class LeaderboardScoringAndRankingTest extends AbstractLeaderboardTest {
AdditionalScoringInformationEvent event = finder.analyze(/*filterBy*/AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE);
assert event != null;
try {
raceLogForRace2.revokeEvent(new RaceLogEventAuthorImpl("Plopp", 1), event);
raceLogForRace2.revokeEvent(new AbstractLogEventAuthorImpl("Plopp", 1), event);
} catch (NotRevokableException e1) {
e1.printStackTrace();
}
@@ -855,7 +855,7 @@ public class LeaderboardScoringAndRankingTest extends AbstractLeaderboardTest {
assert event == null;
assertEquals(new Double(30), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[0], later));
assertEquals(new Double(3), leaderboardHighPoint10Or8AndLastBreaksTie.getTotalPoints(competitors[9], later));
RaceState raceStateForRace2 = RaceStateImpl.create(raceLogForRace2, new RaceLogEventAuthorImpl("Simon", 1));
RaceState raceStateForRace2 = RaceStateImpl.create(raceLogForRace2, new AbstractLogEventAuthorImpl("Simon", 1));
assertFalse(raceStateForRace2.isAdditionalScoringInformationEnabled(AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE));
raceStateForRace2.setAdditionalScoringInformationEnabled(later.plus(Duration.ONE_MINUTE).plus(Duration.ONE_SECOND), /*enable*/true, AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE);
assertTrue(raceStateForRace2.isAdditionalScoringInformationEnabled(AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE));
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java
+2 -2
View File
@@ -9,7 +9,7 @@ import org.junit.Before;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.CourseArea;
import com.sap.sailing.domain.base.DomainFactory;
@@ -36,7 +36,7 @@ public abstract class AbstractTestStoringAndRetrievingRaceLogInRegatta extends R
protected MongoObjectFactory mongoObjectFactory = null;
protected DomainObjectFactory domainObjectFactory = null;
protected Regatta regatta = null;
protected AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
protected AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
public AbstractTestStoringAndRetrievingRaceLogInRegatta() throws UnknownHostException, MongoException {
super();
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java
+2 -2
View File
@@ -13,9 +13,9 @@ import org.junit.Test;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier;
import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier;
@@ -46,7 +46,7 @@ public class StoreAndLoadDeviceIdentifierTest extends AbstractMongoDBTest {
protected static final String group = "group";
protected static final String column = "column";
protected static final String fleet = "fleet";
protected final AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("author", 0);
protected final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("author", 0);
protected RaceLogIdentifier logIdentifier;
protected MongoObjectFactoryImpl mongoFactory;
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java
+2 -2
View File
@@ -19,6 +19,7 @@ import org.junit.Test;
import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory;
@@ -27,7 +28,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogPassChangeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogRaceStatusEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogRevokeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.CloseOpenEndedDeviceMappingEvent;
import com.sap.sailing.domain.abstractlog.race.tracking.DefineMarkEvent;
import com.sap.sailing.domain.abstractlog.race.tracking.DenoteForTrackingEvent;
@@ -67,7 +67,7 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest {
protected Serializable expectedId = UUID.randomUUID();
protected List<Competitor> expectedInvolvedBoats = Collections.emptyList();
protected int expectedPassId = 42;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
public StoreAndLoadRaceLogEventsTest() throws UnknownHostException, MongoException {
super();
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java
+2 -2
View File
@@ -18,10 +18,10 @@ import com.mongodb.BasicDBObject;
import com.mongodb.DBCollection;
import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.base.Fleet;
@@ -194,7 +194,7 @@ public class StoreAndLoadRaceLogsTest extends AbstractMongoDBTest {
}
private RaceLogFlagEvent createRaceLogFlagEvent(Serializable id) {
return eventFactory.createFlagEvent(new MillisecondsTimePoint(42), new RaceLogEventAuthorImpl("Test author", /* priority */ 1), id, Collections.<Competitor> emptyList(),
return eventFactory.createFlagEvent(new MillisecondsTimePoint(42), new AbstractLogEventAuthorImpl("Test author", /* priority */ 1), id, Collections.<Competitor> emptyList(),
42, Flags.ALPHA, Flags.BRAVO, true);
}
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java
+2 -2
View File
@@ -11,9 +11,9 @@ import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier;
import com.sap.sailing.domain.base.Competitor;
@@ -57,7 +57,7 @@ public class StoreGPSFixTrackTest extends AbstractMongoDBTest {
@Test
public void testStoreAndLoadFixes() throws TransformationException, NoCorrespondingServiceRegisteredException {
TypeBasedServiceFinderFactory factory = new MockSmartphoneImeiServiceFinderFactory();
AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("author", 0);
AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("author", 0);
Competitor comp = DomainFactory.INSTANCE.getOrCreateCompetitor("comp", "comp", null, null, null);
Mark mark = DomainFactory.INSTANCE.getOrCreateMark("mark");
MongoObjectFactory mongoObjectFactory = PersistenceFactory.INSTANCE.getMongoObjectFactory(getMongoService(), factory);
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java
+2 -2
View File
@@ -13,9 +13,9 @@ import com.mongodb.DBCollection;
import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.persistence.PersistenceFactory;
import com.sap.sailing.domain.persistence.impl.DomainObjectFactoryImpl;
@@ -25,7 +25,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
public class TestStoringAndRetrievingRaceLogEventData extends AbstractMongoDBTest {
private static final String RACELOG_TEST_COLLECTION = "racelog_test_collection";
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
public TestStoringAndRetrievingRaceLogEventData() throws UnknownHostException, MongoException {
super();
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java
+2 -2
View File
@@ -20,6 +20,7 @@ import com.mongodb.BasicDBObject;
import com.mongodb.DBObject;
import com.mongodb.MongoException;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent;
@@ -38,7 +39,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogStartProcedureChangedEvent
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventComparator;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CourseBase;
@@ -71,7 +71,7 @@ public class TestStoringAndRetrievingRaceLogInLeaderboards extends RaceLogMongoD
String leaderboardName = "TestLeaderboard";
final int[] discardIndexResultsStartingWithHowManyRaces = new int[] { 5, 8 };
FlexibleLeaderboardImpl leaderboard = null;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
public TestStoringAndRetrievingRaceLogInLeaderboards() throws UnknownHostException, MongoException {
super();
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java
+2 -2
View File
@@ -14,8 +14,8 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
import com.sap.sailing.server.gateway.serialization.racelog.impl.BaseRaceLogEventSerializer;
@@ -31,7 +31,7 @@ public abstract class AbstractEventSerializerTest<EventType extends RaceLogEvent
private JsonSerializer<Competitor> competitorSerializer;
protected JsonSerializer<RaceLogEvent> serializer;
protected EventType event;
protected final AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test author", 1);
protected final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test author", 1);
protected abstract EventType createMockEvent();
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
+2 -2
View File
@@ -11,9 +11,9 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.ControlPointWithTwoMarks;
import com.sap.sailing.domain.base.CourseBase;
import com.sap.sailing.domain.base.DomainFactory;
@@ -50,7 +50,7 @@ public class RaceLogCourseDesignChangedEventSerializerTest {
private RaceLogCourseDesignChangedEventDeserializer deserializer;
private RaceLogCourseDesignChangedEvent event;
private TimePoint now;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@Before
public void setUp() {
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
+2 -2
View File
@@ -9,10 +9,10 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
@@ -48,7 +48,7 @@ public class RaceLogEventSerializerTest {
private JsonSerializer<RaceLogEvent> additionalScoringInformationSerializer;
private RaceLogEventFactory factory;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@SuppressWarnings("unchecked")
@Before
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java
+2 -2
View File
@@ -12,11 +12,11 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningConfirmedEvent;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.base.SharedDomainFactory;
import com.sap.sailing.domain.common.MaxPointsReason;
@@ -39,7 +39,7 @@ public class RaceLogFinishPositioningConfirmedEventSerializerTest {
private RaceLogFinishPositioningConfirmedEvent event;
private TimePoint now;
private CompetitorResults positioningList;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@Before
public void setUp() {
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java
+2 -2
View File
@@ -8,9 +8,9 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.base.SharedDomainFactory;
import com.sap.sailing.domain.common.Bearing;
@@ -43,7 +43,7 @@ public class RaceLogWindFixEventSerializerTest {
private RaceLogWindFixEventDeserializer deserializer;
private RaceLogWindFixEvent event;
private TimePoint now;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@Before
public void setUp() {
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/BaseRaceLogEventDeserializer.java
+3 -3
View File
@@ -8,9 +8,9 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializationException;
import com.sap.sailing.server.gateway.deserialization.JsonDeserializer;
@@ -52,9 +52,9 @@ public abstract class BaseRaceLogEventDeserializer implements JsonDeserializer<R
final Number authorPriority = (Number) object.get(BaseRaceLogEventSerializer.FIELD_AUTHOR_PRIORITY);
final AbstractLogEventAuthor author;
if (authorName != null && authorPriority != null) {
author = new RaceLogEventAuthorImpl(authorName, authorPriority.intValue());
author = new AbstractLogEventAuthorImpl(authorName, authorPriority.intValue());
} else {
author = new RaceLogEventAuthorImpl("default", 4);
author = new AbstractLogEventAuthorImpl("default", 4);
}
return deserialize(
object,
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/RaceLogSerializationTest.java
+2 -2
View File
@@ -11,9 +11,9 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent;
import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier;
import com.sap.sailing.domain.abstractlog.race.tracking.PlaceHolderDeviceIdentifier;
@@ -46,7 +46,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint;
public class RaceLogSerializationTest {
private JsonSerializer<RaceLogEvent> serializer;
private JsonDeserializer<RaceLogEvent> deserializer;
private final AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("test", 0);
private final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("test", 0);
private static final Competitor competitor = new CompetitorImpl("a", "b", null,
new TeamImpl("a", Collections.singletonList(new PersonImpl("a", new NationalityImpl("GER"), new Date(), "abc")), null),
new BoatImpl("a", new BoatClassImpl("a", true), "abc"));
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java
+2 -2
View File
@@ -17,12 +17,12 @@ import org.junit.Ignore;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogRaceStatusEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.ControlPointWithTwoMarks;
import com.sap.sailing.domain.base.CourseBase;
import com.sap.sailing.domain.base.Fleet;
@@ -69,7 +69,7 @@ public class RaceLogReplicationTest extends AbstractServerReplicationTest {
private RaceLogEvent raceLogEvent;
private RaceLogEvent anotherRaceLogEvent;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@Before
public void setUp() throws Exception {
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
+2 -2
View File
@@ -34,6 +34,7 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.CompetitorResults;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
@@ -41,7 +42,6 @@ import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningConfirmed
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.impl.CompetitorResultsImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventFactoryImpl;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.Competitor;
@@ -124,7 +124,7 @@ public class MasterDataImportTest {
private static final String TEST_GROUP_NAME2 = "testGroup2";
private final UUID eventUUID = UUID.randomUUID();
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
private final TimePoint eventStartDate = new MillisecondsTimePoint(new Date());
private final TimePoint eventEndDate = new MillisecondsTimePoint(new Date());
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java
+2 -2
View File
@@ -6,10 +6,10 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.common.racelog.Flags;
@@ -36,7 +36,7 @@ public class RaceLogInRaceColumnTest {
private RacingEventService racingEventServiceServer;
private Peer<RacingEventServiceOperation<?>, RacingEventService> server;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@Before
public void setUp() {
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java
+2 -2
View File
@@ -12,9 +12,9 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogStartTimeEventImpl;
import com.sap.sailing.domain.base.Competitor;
@@ -35,7 +35,7 @@ public class RaceLogOperationalTransformationTest {
private Peer<RaceLogEventWithTransformationSupport<?>, RaceLog> client2;
private Peer<RaceLogEventWithTransformationSupport<?>, RaceLog> server;
private OperationalTransformer<RaceLog, RaceLogEventWithTransformationSupport<?>> transformer;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
private CountDownLatch client1Latch;
private CountDownLatch client2Latch;
private CountDownLatch serverLatch;
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java
+2 -2
View File
@@ -13,10 +13,10 @@ import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory;
import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.DomainFactory;
@@ -70,7 +70,7 @@ public class WindByRaceLogTest {
private Fleet defaultFleet;
private RacingEventService service;
private AbstractLogEventAuthor author = new RaceLogEventAuthorImpl("Test Author", 1);
private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1);
@Before
public void setup() throws Exception {
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
+3 -3
View File
@@ -40,10 +40,10 @@ import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.RaceLogEvent;
import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.race.state.RaceState;
import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState;
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateImpl;
@@ -327,7 +327,7 @@ public class RacingEventServiceImpl implements RacingEventServiceWithTestSupport
/**
* This author should be used for server generated race log events
*/
private final AbstractLogEventAuthor raceLogEventAuthorForServer = new RaceLogEventAuthorImpl(
private final AbstractLogEventAuthor raceLogEventAuthorForServer = new AbstractLogEventAuthorImpl(
RacingEventService.class.getName(), 0);
/**
@@ -2688,7 +2688,7 @@ public class RacingEventServiceImpl implements RacingEventServiceWithTestSupport
RacingProcedureType racingProcedure) {
RaceLog raceLog = getRaceLog(leaderboardName, raceColumnName, fleetName);
if (raceLog != null) {
RaceState state = RaceStateImpl.create(raceLog, new RaceLogEventAuthorImpl(authorName, authorPriority));
RaceState state = RaceStateImpl.create(raceLog, new AbstractLogEventAuthorImpl(authorName, authorPriority));
if (passId > raceLog.getCurrentPassId()) {
state.setAdvancePass(logicalTimePoint);
}
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
+2 -2
View File
@@ -7,12 +7,12 @@ import android.preference.PreferenceManager;
import com.sap.sailing.android.shared.util.PrefUtils;
import com.sap.sailing.android.tracking.app.R;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
public class AppPreferences {
protected final Context context;
protected final SharedPreferences preferences;
public static final AbstractLogEventAuthor raceLogEventAuthor = new RaceLogEventAuthorImpl("Tracking App", 0);
public static final AbstractLogEventAuthor raceLogEventAuthor = new AbstractLogEventAuthorImpl("Tracking App", 0);
public AppPreferences(Context context) {
this.context = context;
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+2 -2
View File
@@ -12,7 +12,7 @@ import android.preference.PreferenceManager;
import android.provider.Settings.Secure;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.domain.common.CourseDesignerMode;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
@@ -82,7 +82,7 @@ public class AppPreferences {
public AbstractLogEventAuthor getAuthor() {
String authorName = preferences.getString(HIDDEN_PREFERENCE_AUTHOR_NAME, "<anonymous>");
int authorPriority = preferences.getInt(HIDDEN_PREFERENCE_AUTHOR_PRIORITY, 0);
return new RaceLogEventAuthorImpl(authorName, authorPriority);
return new AbstractLogEventAuthorImpl(authorName, authorPriority);
}
public BoatClassType getBoatClass() {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/LoginDialog.java
+5 -5
View File
@@ -7,7 +7,7 @@ import android.os.Bundle;
import com.sap.sailing.android.shared.logging.ExLog;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.impl.RaceLogEventAuthorImpl;
import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.logging.LogEvent;
@@ -62,19 +62,19 @@ public class LoginDialog extends ActivityAttachedDialogFragment {
// see loginTypeDescriptions for the indices of the login types
case 0:
selectedLoginType = LoginType.OFFICER;
author = new RaceLogEventAuthorImpl("Race Officer on Start Vessel", 0);
author = new AbstractLogEventAuthorImpl("Race Officer on Start Vessel", 0);
break;
case 1:
selectedLoginType = LoginType.OFFICER;
author = new RaceLogEventAuthorImpl("Race Officer on Finish Vessel", 1);
author = new AbstractLogEventAuthorImpl("Race Officer on Finish Vessel", 1);
break;
case 2:
selectedLoginType = LoginType.OFFICER;
author = new RaceLogEventAuthorImpl("Shore Control", 2);
author = new AbstractLogEventAuthorImpl("Shore Control", 2);
break;
case 3:
selectedLoginType = LoginType.VIEWER;
author = new RaceLogEventAuthorImpl("Viewer", 3);
author = new AbstractLogEventAuthorImpl("Viewer", 3);
break;
default:
selectedLoginType = LoginType.NONE;