From 2f7e58ba93503210f1cac43bf9936085d9756ddf Mon Sep 17 00:00:00 2001 From: Simon Pamies Date: Tue, 29 Jan 2013 19:07:51 +0100 Subject: [PATCH] Moved LifecycleState to com.sap.sailing.domain.common --- .../src/com/sap/sailing/domain/common}/LifecycleState.java | 2 +- .../src/com/sap/sailing/domain/common}/TrackedRaceState.java | 4 +--- .../impl/SwissTimingReplayToDomainAdapter.java | 4 ++-- .../src/com/sap/sailing/domain/test/LifecycleTest.java | 4 ++-- .../com/sap/sailing/domain/test/mock/MockedTrackedRace.java | 2 +- .../test/mock/MockedTrackedRaceWithStartTimeAndRanks.java | 2 +- .../domain/tractracadapter/impl/TracTracRaceTrackerImpl.java | 4 ++-- .../src/com/sap/sailing/domain/lifecycle/Lifecycle.java | 2 ++ .../domain/lifecycle/LifecycleStateChangeListener.java | 2 ++ .../sailing/domain/lifecycle/LifecycleStateChangedEvent.java | 2 ++ .../src/com/sap/sailing/domain/lifecycle/WithLifecycle.java | 2 ++ .../com/sap/sailing/domain/lifecycle/impl/LifecycleImpl.java | 2 +- .../sailing/domain/lifecycle/impl/TrackedRaceLifecycle.java | 1 + .../com/sap/sailing/domain/tracking/RaceChangeListener.java | 2 +- .../domain/tracking/impl/AbstractRaceChangeListener.java | 2 +- .../sailing/domain/tracking/impl/CrossTrackErrorCache.java | 2 +- .../sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java | 2 +- .../tracking/impl/TrackBasedEstimationWindTrackImpl.java | 4 ++-- .../com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java | 2 +- .../com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java | 4 ++-- .../com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java | 2 +- .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java | 4 ++-- .../java/com/sap/sailing/gwt/ui/shared/RaceStatusDTO.java | 2 +- .../com/sap/sailing/server/impl/RacingEventServiceImpl.java | 2 +- .../operationaltransformation/UpdateTrackedRaceStatus.java | 2 +- 25 files changed, 35 insertions(+), 28 deletions(-) rename java/{com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common}/LifecycleState.java (94%) rename java/{com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common}/TrackedRaceState.java (96%) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleState.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/LifecycleState.java similarity index 94% rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleState.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/LifecycleState.java index 0d65a7b6177..2248dc90e76 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleState.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/LifecycleState.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.lifecycle; +package com.sap.sailing.domain.common; import java.util.HashMap; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/TrackedRaceState.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TrackedRaceState.java similarity index 96% rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/TrackedRaceState.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TrackedRaceState.java index 02eb2c0f421..d2d08fe0dbc 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/TrackedRaceState.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TrackedRaceState.java @@ -1,9 +1,7 @@ -package com.sap.sailing.domain.lifecycle.impl; +package com.sap.sailing.domain.common; import java.util.HashMap; -import com.sap.sailing.domain.lifecycle.LifecycleState; - /** *

Races undergo a variety of different states in our application. They may be created with a competitor list, maybe not * having a confirmed course yet and not even an expected start time. Later, the start time may be set. The race starts, diff --git a/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java b/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java index 10b5f5249d0..c4d9af0d7ea 100644 --- a/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java +++ b/java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java @@ -27,15 +27,15 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TimePoint; +import com.sap.sailing.domain.common.TrackedRaceState; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.Util; import com.sap.sailing.domain.common.impl.WindSourceWithAdditionalID; -import com.sap.sailing.domain.lifecycle.LifecycleState; -import com.sap.sailing.domain.lifecycle.impl.TrackedRaceState; import com.sap.sailing.domain.swisstimingadapter.DomainFactory; import com.sap.sailing.domain.swisstimingreplayadapter.CompetitorStatus; import com.sap.sailing.domain.swisstimingreplayadapter.SwissTimingReplayListener; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LifecycleTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LifecycleTest.java index 9bf1238e629..383c4353167 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LifecycleTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LifecycleTest.java @@ -10,11 +10,11 @@ import java.util.List; import org.junit.Test; import com.sap.sailing.domain.base.RaceDefinition; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TrackedRaceState; import com.sap.sailing.domain.lifecycle.Lifecycle; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.lifecycle.impl.TrackedRaceLifecycle; -import com.sap.sailing.domain.lifecycle.impl.TrackedRaceState; import com.sap.sailing.domain.test.mock.MockedTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tractracadapter.ReceiverType; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java index c81f64c03f3..12f743ea8ff 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java @@ -15,6 +15,7 @@ import com.sap.sailing.domain.base.RegattaListener; import com.sap.sailing.domain.base.Series; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; @@ -26,7 +27,6 @@ import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.Util.Pair; import com.sap.sailing.domain.leaderboard.ScoringScheme; import com.sap.sailing.domain.lifecycle.Lifecycle; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.lifecycle.impl.TrackedRaceLifecycle; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java index c353381c802..973c90a4a87 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java @@ -13,6 +13,7 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; @@ -21,7 +22,6 @@ import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.Util.Pair; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.lifecycle.impl.LifecycleImpl; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java index 4b9e6044708..bb0bad234ed 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java @@ -28,11 +28,11 @@ import com.sap.sailing.domain.base.Regatta; import com.sap.sailing.domain.base.Series; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TimePoint; +import com.sap.sailing.domain.common.TrackedRaceState; import com.sap.sailing.domain.common.impl.Util.Triple; -import com.sap.sailing.domain.lifecycle.LifecycleState; -import com.sap.sailing.domain.lifecycle.impl.TrackedRaceState; import com.sap.sailing.domain.tracking.AbstractRaceTrackerImpl; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/Lifecycle.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/Lifecycle.java index f9b63f549af..bcb2694ca68 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/Lifecycle.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/Lifecycle.java @@ -2,6 +2,8 @@ package com.sap.sailing.domain.lifecycle; import java.util.List; +import com.sap.sailing.domain.common.LifecycleState; + /** *

Interface describing a lifecycle of an object. There are two possibilities * to be notified of lifecycle status changes:

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangeListener.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangeListener.java index c692a7992a2..ffd7d2b88b4 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangeListener.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangeListener.java @@ -2,6 +2,8 @@ package com.sap.sailing.domain.lifecycle; import java.util.EventListener; +import com.sap.sailing.domain.common.LifecycleState; + /** *

During a lifecycle of an object many state changes can occur (see {@link LifecycleState}). These changes * can trigger different actions. To achieve this goal one can register for such state changes and perform diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangedEvent.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangedEvent.java index 044b6f36ba4..883a4982b52 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangedEvent.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/LifecycleStateChangedEvent.java @@ -1,5 +1,7 @@ package com.sap.sailing.domain.lifecycle; +import com.sap.sailing.domain.common.LifecycleState; + /** *

When a state change occurs during a lifecycle a {@link LifecycleStateChangeListener} is triggered * and gets an instance of a {@link LifecycleStateChangedEvent}.

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/WithLifecycle.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/WithLifecycle.java index 1a872780037..1682c9417df 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/WithLifecycle.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/WithLifecycle.java @@ -1,5 +1,7 @@ package com.sap.sailing.domain.lifecycle; +import com.sap.sailing.domain.common.LifecycleState; + /** *

Interface all objects need to implement that have a lifecycle. * See {@link Lifecycle} for more information.

diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/LifecycleImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/LifecycleImpl.java index 76a3d02d5f6..fc46c878e71 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/LifecycleImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/LifecycleImpl.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.lifecycle.Lifecycle; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.lifecycle.WithLifecycle; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/TrackedRaceLifecycle.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/TrackedRaceLifecycle.java index 8e8cafb9443..f33f37b4395 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/TrackedRaceLifecycle.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/lifecycle/impl/TrackedRaceLifecycle.java @@ -1,5 +1,6 @@ package com.sap.sailing.domain.lifecycle.impl; +import com.sap.sailing.domain.common.TrackedRaceState; import com.sap.sailing.domain.lifecycle.WithLifecycle; import com.sap.sailing.domain.tracking.TrackedRace; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.java index f0fc22a6276..dc82da9911b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.java @@ -5,9 +5,9 @@ import java.util.Map; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; -import com.sap.sailing.domain.lifecycle.LifecycleState; public interface RaceChangeListener { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java index ff31874a25c..e7f33ff5ec4 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java @@ -5,9 +5,9 @@ import java.util.Map; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.MarkPassing; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java index 4e8a8161cdf..d1a946a629e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java @@ -14,10 +14,10 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.impl.MeterDistance; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java index c5948ed895d..3f80319b074 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java @@ -20,12 +20,12 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.Util; import com.sap.sailing.domain.common.impl.WindSourceImpl; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.DynamicTrackedRegatta; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java index e8d36788886..1c0c0cc869c 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java @@ -20,16 +20,16 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.AbstractTimePoint; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TimePoint; +import com.sap.sailing.domain.common.TrackedRaceState; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.Util.Pair; import com.sap.sailing.domain.confidence.ConfidenceFactory; import com.sap.sailing.domain.confidence.Weigher; -import com.sap.sailing.domain.lifecycle.LifecycleState; -import com.sap.sailing.domain.lifecycle.impl.TrackedRaceState; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.MarkPassing; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java index 2d521e28d98..a5f0b841036 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java @@ -15,13 +15,13 @@ import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.Util; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.MarkPassing; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index 2d4800d674c..84d8b0922d8 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -48,6 +48,7 @@ import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.NoWindError; import com.sap.sailing.domain.common.NoWindException; @@ -56,6 +57,7 @@ import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaNameAndRaceName; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.TimePoint; +import com.sap.sailing.domain.common.TrackedRaceState; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.impl.Util; @@ -69,9 +71,7 @@ import com.sap.sailing.domain.confidence.Weigher; import com.sap.sailing.domain.confidence.impl.HyperbolicTimeDifferenceWeigher; import com.sap.sailing.domain.confidence.impl.PositionAndTimePointWeigher; import com.sap.sailing.domain.lifecycle.Lifecycle; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.lifecycle.impl.TrackedRaceLifecycle; -import com.sap.sailing.domain.lifecycle.impl.TrackedRaceState; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java index b6d5ea2de21..61c9ff22e1b 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java @@ -24,6 +24,7 @@ import com.sap.sailing.domain.base.Mark; import com.sap.sailing.domain.base.RaceColumn; import com.sap.sailing.domain.base.RaceColumnListener; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.TimePoint; @@ -34,7 +35,6 @@ import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.ScoreCorrection; import com.sap.sailing.domain.leaderboard.ScoreCorrectionListener; import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.MarkPassing; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index aa9d5f2f81f..5f7fc76f596 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -70,6 +70,7 @@ import com.sap.sailing.domain.common.CountryCode; import com.sap.sailing.domain.common.DetailType; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.ManeuverType; import com.sap.sailing.domain.common.MaxPointsReason; import com.sap.sailing.domain.common.NoWindError; @@ -83,6 +84,7 @@ import com.sap.sailing.domain.common.RegattaIdentifier; import com.sap.sailing.domain.common.RegattaName; import com.sap.sailing.domain.common.RegattaNameAndRaceName; import com.sap.sailing.domain.common.RegattaScoreCorrections; +import com.sap.sailing.domain.common.TrackedRaceState; import com.sap.sailing.domain.common.RegattaScoreCorrections.ScoreCorrectionForCompetitorInRace; import com.sap.sailing.domain.common.RegattaScoreCorrections.ScoreCorrectionsForRace; import com.sap.sailing.domain.common.ScoreCorrectionProvider; @@ -105,8 +107,6 @@ import com.sap.sailing.domain.leaderboard.Leaderboard.Entry; import com.sap.sailing.domain.leaderboard.LeaderboardGroup; import com.sap.sailing.domain.leaderboard.MetaLeaderboard; import com.sap.sailing.domain.leaderboard.RegattaLeaderboard; -import com.sap.sailing.domain.lifecycle.LifecycleState; -import com.sap.sailing.domain.lifecycle.impl.TrackedRaceState; import com.sap.sailing.domain.persistence.DomainObjectFactory; import com.sap.sailing.domain.persistence.MongoFactory; import com.sap.sailing.domain.persistence.MongoObjectFactory; diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceStatusDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceStatusDTO.java index 6fc74c6b83b..686f588c0fe 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceStatusDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceStatusDTO.java @@ -1,7 +1,7 @@ package com.sap.sailing.gwt.ui.shared; import com.google.gwt.user.client.rpc.IsSerializable; -import com.sap.sailing.domain.lifecycle.impl.TrackedRaceState; +import com.sap.sailing.domain.common.TrackedRaceState; public class RaceStatusDTO implements IsSerializable { public TrackedRaceState status; 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 ee1bd3b3b57..48bb4f3dd1e 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 @@ -44,6 +44,7 @@ import com.sap.sailing.domain.base.impl.EventImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.common.Color; import com.sap.sailing.domain.common.LeaderboardNameConstants; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaIdentifier; import com.sap.sailing.domain.common.RegattaName; @@ -67,7 +68,6 @@ import com.sap.sailing.domain.leaderboard.impl.RegattaLeaderboardImpl; import com.sap.sailing.domain.leaderboard.impl.ResultDiscardingRuleImpl; import com.sap.sailing.domain.leaderboard.impl.ScoreCorrectionImpl; import com.sap.sailing.domain.leaderboard.meta.LeaderboardGroupMetaLeaderboard; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.persistence.DomainObjectFactory; import com.sap.sailing.domain.persistence.MongoFactory; import com.sap.sailing.domain.persistence.MongoObjectFactory; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateTrackedRaceStatus.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateTrackedRaceStatus.java index 89cd3fcf816..4ac254ce91f 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateTrackedRaceStatus.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/UpdateTrackedRaceStatus.java @@ -1,7 +1,7 @@ package com.sap.sailing.server.operationaltransformation; +import com.sap.sailing.domain.common.LifecycleState; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; -import com.sap.sailing.domain.lifecycle.LifecycleState; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.server.RacingEventService; import com.sap.sailing.server.RacingEventServiceOperation;