From 101dba0d828758adf36b21e9bc0372a66e71140e Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Wed, 26 Nov 2014 18:24:29 +0100 Subject: [PATCH] rename ->LogEventAuthorImpl (instantiating a class named Abstract* feels wrong) --- .../persistence/impl/DomainObjectFactoryImpl.java | 6 +++--- .../test/AbstractGPSFixStoreTest.java | 4 ++-- .../analyzing/test/RaceStatusAnalyzerTest.java | 6 +++--- .../domain/racelog/state/test/RaceStateTest.java | 4 ++-- .../domain/racelog/test/RaceLogEventAuthorTest.java | 12 ++++++------ .../domain/racelog/test/RaceLogRevocationTest.java | 10 +++++----- .../sap/sailing/domain/racelog/test/RaceLogTest.java | 6 +++--- .../racelog/test/SerializeRaceLogEventsTest.java | 6 +++--- .../analyzing/test/AbstractRaceLogTrackingTest.java | 6 +++--- ...gEventAuthorImpl.java => LogEventAuthorImpl.java} | 6 +++--- .../impl/ReadonlyRacingProcedureFactory.java | 4 ++-- .../test/LeaderboardScoringAndRankingTest.java | 10 +++++----- ...ractTestStoringAndRetrievingRaceLogInRegatta.java | 4 ++-- .../test/StoreAndLoadDeviceIdentifierTest.java | 4 ++-- .../mongodb/test/StoreAndLoadRaceLogEventsTest.java | 4 ++-- .../mongodb/test/StoreAndLoadRaceLogsTest.java | 4 ++-- .../sailing/mongodb/test/StoreGPSFixTrackTest.java | 4 ++-- .../TestStoringAndRetrievingRaceLogEventData.java | 4 ++-- ...estStoringAndRetrievingRaceLogInLeaderboards.java | 4 ++-- .../test/racelog/AbstractEventSerializerTest.java | 4 ++-- ...aceLogCourseDesignChangedEventSerializerTest.java | 4 ++-- .../test/racelog/RaceLogEventSerializerTest.java | 4 ++-- ...inishPositioningConfirmedEventSerializerTest.java | 4 ++-- .../racelog/RaceLogWindFixEventSerializerTest.java | 4 ++-- .../racelog/impl/BaseRaceLogEventDeserializer.java | 6 +++--- .../gateway/test/RaceLogSerializationTest.java | 4 ++-- .../replication/test/RaceLogReplicationTest.java | 4 ++-- .../sailing/server/test/MasterDataImportTest.java | 4 ++-- .../sailing/server/test/RaceLogInRaceColumnTest.java | 4 ++-- .../test/RaceLogOperationalTransformationTest.java | 4 ++-- .../sap/sailing/server/test/WindByRaceLogTest.java | 4 ++-- .../sailing/server/impl/RacingEventServiceImpl.java | 6 +++--- .../android/tracking/app/utils/AppPreferences.java | 4 ++-- .../sailing/racecommittee/app/AppPreferences.java | 4 ++-- .../app/ui/fragments/dialogs/LoginDialog.java | 10 +++++----- 35 files changed, 91 insertions(+), 91 deletions(-) rename java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/{AbstractLogEventAuthorImpl.java => LogEventAuthorImpl.java} (78%) diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java index 708658bcedc..ef49bd44ada 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java @@ -31,7 +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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent; @@ -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 AbstractLogEventAuthorImpl(authorName, authorPriority.intValue()); + author = new LogEventAuthorImpl(authorName, authorPriority.intValue()); } else { - author = AbstractLogEventAuthorImpl.createCompatibilityAuthor(); + author = LogEventAuthorImpl.createCompatibilityAuthor(); } String eventClass = (String) dbObject.get(FieldNames.RACE_LOG_EVENT_CLASS.name()); diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java index bcdf31eb053..a97decd840a 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java @@ -7,7 +7,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; @@ -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 AbstractLogEventAuthorImpl("author", 0); + private final AbstractLogEventAuthor author = new LogEventAuthorImpl("author", 0); protected GPSFixMoving createFix(long millis, double lat, double lng, double knots, double degrees) { return new GPSFixMovingImpl(new DegreePosition(lat, lng), diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceStatusAnalyzerTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceStatusAnalyzerTest.java index 1d7e8d042c9..92165c60f3b 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceStatusAnalyzerTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/analyzing/test/RaceStatusAnalyzerTest.java @@ -13,7 +13,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; @@ -128,8 +128,8 @@ public class RaceStatusAnalyzerTest extends PassAwareRaceLogAnalyzerTest 0); @@ -29,8 +29,8 @@ public class RaceLogEventAuthorTest { @Test public void testCompareToMajor() { - AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("", 3); - AbstractLogEventAuthor major = new AbstractLogEventAuthorImpl("", 2); + AbstractLogEventAuthor author = new LogEventAuthorImpl("", 3); + AbstractLogEventAuthor major = new LogEventAuthorImpl("", 2); int result = author.compareTo(major); assertTrue(result < 0); diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java index 08894eca8cc..9f4c9e36cfa 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogRevocationTest.java @@ -10,7 +10,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogChangedListener; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; @@ -25,16 +25,16 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class RaceLogRevocationTest { private RaceLog serverRaceLog; - private AbstractLogEventAuthor serverAuthor = new AbstractLogEventAuthorImpl("server", 2); + private AbstractLogEventAuthor serverAuthor = new LogEventAuthorImpl("server", 2); private RaceLog clientARaceLog; private UUID clientAUUID = UUID.randomUUID(); - private AbstractLogEventAuthor clientAAuthor = new AbstractLogEventAuthorImpl("clientA", 3); + private AbstractLogEventAuthor clientAAuthor = new LogEventAuthorImpl("clientA", 3); private RaceLog clientBRaceLog; private UUID clientBUUID = UUID.randomUUID(); - private AbstractLogEventAuthor clientBAuthor = new AbstractLogEventAuthorImpl("clientB", 1); + private AbstractLogEventAuthor clientBAuthor = new LogEventAuthorImpl("clientB", 1); private RaceLog clientCRaceLog; private UUID clientCUUID = UUID.randomUUID(); - private AbstractLogEventAuthor clientCAuthor = new AbstractLogEventAuthorImpl("clientC", 0); + private AbstractLogEventAuthor clientCAuthor = new LogEventAuthorImpl("clientC", 0); @Before public void setup() { diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogTest.java index 13d54cb2dc7..153f253b88a 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/RaceLogTest.java @@ -20,7 +20,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; @@ -40,7 +40,7 @@ public class RaceLogTest { private static class MockRaceLogEventForSorting extends RaceLogEventImpl { public MockRaceLogEventForSorting(long createdAtMillis) { super(new MillisecondsTimePoint(createdAtMillis), - /* author */ new AbstractLogEventAuthorImpl("Dummy Author", /* priority */ 0), + /* author */ new LogEventAuthorImpl("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 AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @Test public void testAddingEventsFromMultipleClients() { diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java index 734620008df..f2abb2999af 100755 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/test/SerializeRaceLogEventsTest.java @@ -11,7 +11,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; @@ -60,7 +60,7 @@ public class SerializeRaceLogEventsTest { @Test public void testRaceLogSerializationWithSingleEvent() throws IOException, ClassNotFoundException { RaceLogStartTimeEvent startTimeEvent = eventFactory.createStartTimeEvent(MillisecondsTimePoint.now(), - new AbstractLogEventAuthorImpl("Author Name", /* priority */0), /* passId */1, /* startTime */ + new LogEventAuthorImpl("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 AbstractLogEventAuthorImpl("Author Name", /* priority */0), new SmartphoneImeiIdentifier("1948364938463903"), + MillisecondsTimePoint.now(), new LogEventAuthorImpl("Author Name", /* priority */0), new SmartphoneImeiIdentifier("1948364938463903"), AbstractLeaderboardTest.createCompetitor("Test Competitor"), 0, new MillisecondsTimePoint(0), new MillisecondsTimePoint(10)); raceLog.add(mappingEvent); oos.writeObject(raceLog); diff --git a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/AbstractRaceLogTrackingTest.java b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/AbstractRaceLogTrackingTest.java index 21deeaf39d0..251fa779f10 100644 --- a/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/AbstractRaceLogTrackingTest.java +++ b/java/com.sap.sailing.domain.shared.android.test/src/com/sap/sailing/domain/racelog/tracking/analyzing/test/AbstractRaceLogTrackingTest.java @@ -3,7 +3,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; @@ -13,8 +13,8 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public abstract class AbstractRaceLogTrackingTest { protected RaceLog log; - protected final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("author0", 0); - protected final AbstractLogEventAuthor author1 = new AbstractLogEventAuthorImpl("author1", 1); + protected final AbstractLogEventAuthor author = new LogEventAuthorImpl("author0", 0); + protected final AbstractLogEventAuthor author1 = new LogEventAuthorImpl("author1", 1); protected final TimePoint now = MillisecondsTimePoint.now(); protected final RaceLogEventRestoreFactory factory = RaceLogEventRestoreFactory.INSTANCE; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/AbstractLogEventAuthorImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/LogEventAuthorImpl.java similarity index 78% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/AbstractLogEventAuthorImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/LogEventAuthorImpl.java index d60ee22daed..c8479d1f34b 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/AbstractLogEventAuthorImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/impl/LogEventAuthorImpl.java @@ -3,15 +3,15 @@ package com.sap.sailing.domain.abstractlog.impl; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; import com.sap.sse.common.impl.NamedImpl; -public class AbstractLogEventAuthorImpl extends NamedImpl implements AbstractLogEventAuthor { +public class LogEventAuthorImpl extends NamedImpl implements AbstractLogEventAuthor { private static final long serialVersionUID = -5602802911563685812L; private final int priority; public static AbstractLogEventAuthor createCompatibilityAuthor() { - return new AbstractLogEventAuthorImpl(NAME_COMPATIBILITY, PRIORITY_COMPATIBILITY); + return new LogEventAuthorImpl(NAME_COMPATIBILITY, PRIORITY_COMPATIBILITY); } - public AbstractLogEventAuthorImpl(String name, int priority) { + public LogEventAuthorImpl(String name, int priority) { super(name); this.priority = priority; } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/ReadonlyRacingProcedureFactory.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/ReadonlyRacingProcedureFactory.java index 66cc3731638..69f7e652ffe 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/ReadonlyRacingProcedureFactory.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/ReadonlyRacingProcedureFactory.java @@ -1,7 +1,7 @@ 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.impl.LogEventAuthorImpl; 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; @@ -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 AbstractLogEventAuthorImpl("Illegal Author", 128); + AbstractLogEventAuthor author = new LogEventAuthorImpl("Illegal Author", 128); // Wrap the racelog to disable adding... RaceLog wrappedRaceLog = new NoAddingRaceLogWrapper(raceLog); return createProcedure(type, wrappedRaceLog, author, RaceLogEventFactory.INSTANCE); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java index 25862fb5a2d..99f4af1f647 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutionException; import org.junit.Test; -import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventAuthorImpl; +import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; 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.scoring.AdditionalScoringInformationEvent; @@ -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 AbstractLogEventAuthorImpl("Plopp", 1), later, "12345678", Collections.emptyList(), 0, AdditionalScoringInformationType.UNKNOWN)); + raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new LogEventAuthorImpl("Plopp", 1), later, "12345678", Collections.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 AbstractLogEventAuthorImpl("Plopp", 1), later.plus(Duration.ONE_MINUTE), "123456789873773762", Collections.emptyList(), 0, AdditionalScoringInformationType.MAX_POINTS_DECREASE_MAX_SCORE)); + raceLogForRace2.add(new AdditionalScoringInformationEventImpl(now, new LogEventAuthorImpl("Plopp", 1), later.plus(Duration.ONE_MINUTE), "123456789873773762", Collections.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 AbstractLogEventAuthorImpl("Plopp", 1), event); + raceLogForRace2.revokeEvent(new LogEventAuthorImpl("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 AbstractLogEventAuthorImpl("Simon", 1)); + RaceState raceStateForRace2 = RaceStateImpl.create(raceLogForRace2, new LogEventAuthorImpl("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)); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java index 31bbbdaeaf8..14dbf0ca5bb 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/AbstractTestStoringAndRetrievingRaceLogInRegatta.java @@ -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.impl.AbstractLogEventAuthorImpl; +import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; 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 AbstractLogEventAuthorImpl("Test Author", 1); + protected AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); public AbstractTestStoringAndRetrievingRaceLogInRegatta() throws UnknownHostException, MongoException { super(); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java index 7c9a3839db8..8ec79405b84 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadDeviceIdentifierTest.java @@ -13,7 +13,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceCompetitorMappingEvent; @@ -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 AbstractLogEventAuthorImpl("author", 0); + protected final AbstractLogEventAuthor author = new LogEventAuthorImpl("author", 0); protected RaceLogIdentifier logIdentifier; protected MongoObjectFactoryImpl mongoFactory; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java index 9a125f1a6d3..a3a8a0e6ccc 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogEventsTest.java @@ -19,7 +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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory; @@ -67,7 +67,7 @@ public class StoreAndLoadRaceLogEventsTest extends AbstractMongoDBTest { protected Serializable expectedId = UUID.randomUUID(); protected List expectedInvolvedBoats = Collections.emptyList(); protected int expectedPassId = 42; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); public StoreAndLoadRaceLogEventsTest() throws UnknownHostException, MongoException { super(); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java index ab1a3b34258..66c720f8107 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadRaceLogsTest.java @@ -18,7 +18,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent; @@ -194,7 +194,7 @@ public class StoreAndLoadRaceLogsTest extends AbstractMongoDBTest { } private RaceLogFlagEvent createRaceLogFlagEvent(Serializable id) { - return eventFactory.createFlagEvent(new MillisecondsTimePoint(42), new AbstractLogEventAuthorImpl("Test author", /* priority */ 1), id, Collections. emptyList(), + return eventFactory.createFlagEvent(new MillisecondsTimePoint(42), new LogEventAuthorImpl("Test author", /* priority */ 1), id, Collections. emptyList(), 42, Flags.ALPHA, Flags.BRAVO, true); } diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java index 469a2760c81..835dba4f11d 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreGPSFixTrackTest.java @@ -11,7 +11,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; @@ -57,7 +57,7 @@ public class StoreGPSFixTrackTest extends AbstractMongoDBTest { @Test public void testStoreAndLoadFixes() throws TransformationException, NoCorrespondingServiceRegisteredException { TypeBasedServiceFinderFactory factory = new MockSmartphoneImeiServiceFinderFactory(); - AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("author", 0); + AbstractLogEventAuthor author = new LogEventAuthorImpl("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); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java index 56ec0fd4add..8a94a5a819d 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogEventData.java @@ -13,7 +13,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogFlagEvent; import com.sap.sailing.domain.common.racelog.Flags; @@ -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 AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); public TestStoringAndRetrievingRaceLogEventData() throws UnknownHostException, MongoException { super(); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java index 6c00e6d8089..65a1bc2872b 100644 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingRaceLogInLeaderboards.java @@ -20,7 +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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseAreaChangedEvent; @@ -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 AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); public TestStoringAndRetrievingRaceLogInLeaderboards() throws UnknownHostException, MongoException { super(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java index a62dcd39321..064f9cb2a88 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/AbstractEventSerializerTest.java @@ -14,7 +14,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.server.gateway.serialization.JsonSerializer; @@ -31,7 +31,7 @@ public abstract class AbstractEventSerializerTest competitorSerializer; protected JsonSerializer serializer; protected EventType event; - protected final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test author", 1); + protected final AbstractLogEventAuthor author = new LogEventAuthorImpl("Test author", 1); protected abstract EventType createMockEvent(); diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java index 30497392865..3786e43665b 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java @@ -11,7 +11,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.base.ControlPointWithTwoMarks; @@ -50,7 +50,7 @@ public class RaceLogCourseDesignChangedEventSerializerTest { private RaceLogCourseDesignChangedEventDeserializer deserializer; private RaceLogCourseDesignChangedEvent event; private TimePoint now; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @Before public void setUp() { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java index 57ff3efbed2..0e35f55d5bc 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java @@ -9,7 +9,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory; @@ -48,7 +48,7 @@ public class RaceLogEventSerializerTest { private JsonSerializer additionalScoringInformationSerializer; private RaceLogEventFactory factory; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @SuppressWarnings("unchecked") @Before diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java index 8b2d2a08e30..61eeec67fcd 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogFinishPositioningConfirmedEventSerializerTest.java @@ -12,7 +12,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningConfirmedEvent; @@ -39,7 +39,7 @@ public class RaceLogFinishPositioningConfirmedEventSerializerTest { private RaceLogFinishPositioningConfirmedEvent event; private TimePoint now; private CompetitorResults positioningList; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @Before public void setUp() { diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java index aa486737ebe..27bb58aa6ee 100644 --- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java +++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogWindFixEventSerializerTest.java @@ -8,7 +8,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; import com.sap.sailing.domain.base.DomainFactory; @@ -43,7 +43,7 @@ public class RaceLogWindFixEventSerializerTest { private RaceLogWindFixEventDeserializer deserializer; private RaceLogWindFixEvent event; private TimePoint now; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @Before public void setUp() { diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/BaseRaceLogEventDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/BaseRaceLogEventDeserializer.java index df490590fd8..cbd858b9e26 100644 --- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/BaseRaceLogEventDeserializer.java +++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/BaseRaceLogEventDeserializer.java @@ -8,7 +8,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventRestoreFactory; import com.sap.sailing.domain.base.Competitor; @@ -52,9 +52,9 @@ public abstract class BaseRaceLogEventDeserializer implements JsonDeserializer serializer; private JsonDeserializer deserializer; - private final AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("test", 0); + private final AbstractLogEventAuthor author = new LogEventAuthorImpl("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")); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java index 471154a2f0b..2ab97817abe 100644 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RaceLogReplicationTest.java @@ -17,7 +17,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogCourseDesignChangedEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; @@ -69,7 +69,7 @@ public class RaceLogReplicationTest extends AbstractServerReplicationTest { private RaceLogEvent raceLogEvent; private RaceLogEvent anotherRaceLogEvent; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @Before public void setUp() throws Exception { diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java index f112a17a012..fbbca50255b 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java @@ -34,7 +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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; @@ -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 AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); private final TimePoint eventStartDate = new MillisecondsTimePoint(new Date()); private final TimePoint eventEndDate = new MillisecondsTimePoint(new Date()); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java index c3aad0f2ddd..eb597159386 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogInRaceColumnTest.java @@ -6,7 +6,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; @@ -36,7 +36,7 @@ public class RaceLogInRaceColumnTest { private RacingEventService racingEventServiceServer; private Peer, RacingEventService> server; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @Before public void setUp() { diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java index ab4c07064d0..f1fc4865bce 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceLogOperationalTransformationTest.java @@ -12,7 +12,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogStartTimeEvent; import com.sap.sailing.domain.abstractlog.race.impl.RaceLogImpl; @@ -35,7 +35,7 @@ public class RaceLogOperationalTransformationTest { private Peer, RaceLog> client2; private Peer, RaceLog> server; private OperationalTransformer> transformer; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); private CountDownLatch client1Latch; private CountDownLatch client2Latch; private CountDownLatch serverLatch; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java index e83d9a2bb21..20f3f23475d 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java @@ -13,7 +13,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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEventFactory; import com.sap.sailing.domain.abstractlog.race.RaceLogWindFixEvent; @@ -70,7 +70,7 @@ public class WindByRaceLogTest { private Fleet defaultFleet; private RacingEventService service; - private AbstractLogEventAuthor author = new AbstractLogEventAuthorImpl("Test Author", 1); + private AbstractLogEventAuthor author = new LogEventAuthorImpl("Test Author", 1); @Before public void setup() throws Exception { diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 1b0228c847e..81227d88207 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -40,7 +40,7 @@ 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.impl.LogEventAuthorImpl; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogEvent; import com.sap.sailing.domain.abstractlog.race.RaceLogEventVisitor; @@ -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 AbstractLogEventAuthorImpl( + private final AbstractLogEventAuthor raceLogEventAuthorForServer = new LogEventAuthorImpl( 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 AbstractLogEventAuthorImpl(authorName, authorPriority)); + RaceState state = RaceStateImpl.create(raceLog, new LogEventAuthorImpl(authorName, authorPriority)); if (passId > raceLog.getCurrentPassId()) { state.setAdvancePass(logicalTimePoint); } diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java index 46e6814dcd4..c97209c78f8 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java @@ -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.impl.AbstractLogEventAuthorImpl; +import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; public class AppPreferences { protected final Context context; protected final SharedPreferences preferences; - public static final AbstractLogEventAuthor raceLogEventAuthor = new AbstractLogEventAuthorImpl("Tracking App", 0); + public static final AbstractLogEventAuthor raceLogEventAuthor = new LogEventAuthorImpl("Tracking App", 0); public AppPreferences(Context context) { this.context = context; diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java index 79f6f297c10..03e230cd0e7 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java @@ -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.impl.AbstractLogEventAuthorImpl; +import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; 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, ""); int authorPriority = preferences.getInt(HIDDEN_PREFERENCE_AUTHOR_PRIORITY, 0); - return new AbstractLogEventAuthorImpl(authorName, authorPriority); + return new LogEventAuthorImpl(authorName, authorPriority); } public BoatClassType getBoatClass() { diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/LoginDialog.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/LoginDialog.java index 8d5f03dad3e..8a21e5c58c7 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/LoginDialog.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/LoginDialog.java @@ -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.impl.AbstractLogEventAuthorImpl; +import com.sap.sailing.domain.abstractlog.impl.LogEventAuthorImpl; 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 AbstractLogEventAuthorImpl("Race Officer on Start Vessel", 0); + author = new LogEventAuthorImpl("Race Officer on Start Vessel", 0); break; case 1: selectedLoginType = LoginType.OFFICER; - author = new AbstractLogEventAuthorImpl("Race Officer on Finish Vessel", 1); + author = new LogEventAuthorImpl("Race Officer on Finish Vessel", 1); break; case 2: selectedLoginType = LoginType.OFFICER; - author = new AbstractLogEventAuthorImpl("Shore Control", 2); + author = new LogEventAuthorImpl("Shore Control", 2); break; case 3: selectedLoginType = LoginType.VIEWER; - author = new AbstractLogEventAuthorImpl("Viewer", 3); + author = new LogEventAuthorImpl("Viewer", 3); break; default: selectedLoginType = LoginType.NONE;