From 4714b14b26a7e95cecb4aae3185eb53c8939c302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Bro=C3=9F?= Date: Thu, 10 Dec 2015 19:03:52 +0100 Subject: [PATCH] Refactor DefindeMarkEvent --- .../impl/RaceLogRaceTracker.java | 3 +- .../events/RegattaLogDefineMarkEvent.java | 5 +-- .../impl/RegattaLogDefineMarkEventImpl.java | 19 +++++++++-- .../shared/events/DefineMarkEvent.java | 9 ----- .../impl/AbstractDefineMarkEventImpl.java | 33 ------------------- 5 files changed, 18 insertions(+), 51 deletions(-) delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DefineMarkEvent.java delete mode 100644 java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/AbstractDefineMarkEventImpl.java diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java index 9d514a64671..0c94ca999c6 100755 --- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java @@ -33,7 +33,6 @@ import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogDeviceMarkMap import com.sap.sailing.domain.abstractlog.regatta.impl.BaseRegattaLogEventVisitor; import com.sap.sailing.domain.abstractlog.regatta.tracking.analyzing.impl.RegattaLogDeviceCompetitorMappingFinder; import com.sap.sailing.domain.abstractlog.regatta.tracking.analyzing.impl.RegattaLogDeviceMarkMappingFinder; -import com.sap.sailing.domain.abstractlog.shared.events.DefineMarkEvent; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.ControlPoint; @@ -360,7 +359,7 @@ public class RaceLogRaceTracker implements RaceTracker, GPSFixReceivedListener { * {@link RaceLogDefineMarkEvent} is received, the existence of the track for that mark in the {@link TrackedRace} * has to be ensured, also ensuring that the mark will exist in the mark tracks map key set. */ - private void onDefineMarkEvent(DefineMarkEvent event) { + private void onDefineMarkEvent(RegattaLogDefineMarkEvent event) { if (trackedRace != null) { trackedRace.getOrCreateTrack(event.getMark()); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/RegattaLogDefineMarkEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/RegattaLogDefineMarkEvent.java index bb8c7fa5229..03c39fb4e67 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/RegattaLogDefineMarkEvent.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/RegattaLogDefineMarkEvent.java @@ -1,15 +1,12 @@ package com.sap.sailing.domain.abstractlog.regatta.events; -import com.sap.sailing.domain.abstractlog.Revokable; import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEvent; -import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEventVisitor; -import com.sap.sailing.domain.abstractlog.shared.events.DefineMarkEvent; import com.sap.sailing.domain.base.Mark; /** * Defines a mark, that can then be used to build a course. * */ -public interface RegattaLogDefineMarkEvent extends DefineMarkEvent, RegattaLogEvent, Revokable { +public interface RegattaLogDefineMarkEvent extends RegattaLogEvent { Mark getMark(); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/impl/RegattaLogDefineMarkEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/impl/RegattaLogDefineMarkEventImpl.java index 3698880617b..88b6bda748d 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/impl/RegattaLogDefineMarkEventImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/regatta/events/impl/RegattaLogDefineMarkEventImpl.java @@ -3,23 +3,36 @@ package com.sap.sailing.domain.abstractlog.regatta.events.impl; import java.io.Serializable; import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; +import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventImpl; import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEventVisitor; import com.sap.sailing.domain.abstractlog.regatta.events.RegattaLogDefineMarkEvent; -import com.sap.sailing.domain.abstractlog.shared.events.impl.AbstractDefineMarkEventImpl; import com.sap.sailing.domain.base.Mark; import com.sap.sse.common.TimePoint; -public class RegattaLogDefineMarkEventImpl extends AbstractDefineMarkEventImpl implements RegattaLogDefineMarkEvent { +public class RegattaLogDefineMarkEventImpl extends AbstractLogEventImpl implements RegattaLogDefineMarkEvent { private static final long serialVersionUID = -5114645637316367845L; + + protected final Mark mark; public RegattaLogDefineMarkEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, Serializable pId, Mark mark) { - super(createdAt, author, logicalTimePoint, pId, mark); + super(createdAt, logicalTimePoint, author, pId); + this.mark = mark; } @Override public void accept(RegattaLogEventVisitor visitor) { visitor.visit(this); } + + @Override + public Mark getMark() { + return mark; + } + + @Override + public String getShortInfo() { + return "mark: "+mark.toString(); + } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DefineMarkEvent.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DefineMarkEvent.java deleted file mode 100644 index e014178ee87..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/DefineMarkEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.sap.sailing.domain.abstractlog.shared.events; - -import com.sap.sailing.domain.abstractlog.AbstractLogEvent; -import com.sap.sailing.domain.abstractlog.Revokable; -import com.sap.sailing.domain.base.Mark; - -public interface DefineMarkEvent extends AbstractLogEvent, Revokable { - Mark getMark(); -} diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/AbstractDefineMarkEventImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/AbstractDefineMarkEventImpl.java deleted file mode 100644 index e03f7c5e960..00000000000 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/events/impl/AbstractDefineMarkEventImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.sap.sailing.domain.abstractlog.shared.events.impl; - -import java.io.Serializable; - -import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor; -import com.sap.sailing.domain.abstractlog.impl.AbstractLogEventImpl; -import com.sap.sailing.domain.abstractlog.shared.events.DefineMarkEvent; -import com.sap.sailing.domain.base.Mark; -import com.sap.sse.common.TimePoint; - -public abstract class AbstractDefineMarkEventImpl extends AbstractLogEventImpl implements -DefineMarkEvent { - - private static final long serialVersionUID = 5865183507521850320L; - - protected final Mark mark; - - public AbstractDefineMarkEventImpl(TimePoint createdAt, AbstractLogEventAuthor author, TimePoint logicalTimePoint, - Serializable pId, Mark mark) { - super(createdAt, logicalTimePoint, author, pId); - this.mark = mark; - } - - @Override - public Mark getMark() { - return mark; - } - - @Override - public String getShortInfo() { - return "mark: "+mark.toString(); - } -}