From ec3bb5144026a21f0c4121e9c8f2931e55b61388 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Tue, 10 Jan 2012 16:33:46 +0100 Subject: [PATCH] Refactoring done --- .../META-INF/MANIFEST.MF | 3 ++- .../sailing/declination/test/DeclinationStoreTest.java | 6 +++--- .../declination/test/SimpleDeclinationTest.java | 4 ++-- java/com.sap.sailing.declination/META-INF/MANIFEST.MF | 1 + .../src/com/sap/sailing/declination/Declination.java | 6 +++--- .../sap/sailing/declination/DeclinationService.java | 6 +++--- .../declination/impl/DeclinationRecordImpl.java | 6 +++--- .../declination/impl/DeclinationServiceImpl.java | 6 +++--- .../sap/sailing/declination/impl/DeclinationStore.java | 6 +++--- .../com/sap/sailing/declination/impl/NOAAImporter.java | 4 ++-- .../src/com/sap/sailing/domain/common}/Bearing.java | 2 +- .../src/com/sap/sailing/domain/common}/Distance.java | 3 ++- .../src/com/sap/sailing/domain/common}/Position.java | 2 +- .../src/com/sap/sailing/domain/common}/Speed.java | 3 +-- .../src/com/sap/sailing/domain/common}/TimePoint.java | 2 +- .../persistence/impl/DomainObjectFactoryImpl.java | 4 ++-- .../persistence/impl/MongoObjectFactoryImpl.java | 4 ++-- .../classes/services/MessageFileServiceImpl.java | 4 ++-- .../test/SailMasterConnectivityTest.java | 4 ++-- .../test/SwissTimingSailMasterLiveTest.java | 6 +++--- .../domain/swisstimingadapter/DomainFactory.java | 2 +- .../com/sap/sailing/domain/swisstimingadapter/Fix.java | 6 +++--- .../sap/sailing/domain/swisstimingadapter/Race.java | 2 +- .../domain/swisstimingadapter/SailMasterAdapter.java | 4 ++-- .../domain/swisstimingadapter/SailMasterConnector.java | 8 ++++---- .../domain/swisstimingadapter/SailMasterListener.java | 4 ++-- .../domain/swisstimingadapter/SwissTimingFactory.java | 2 +- .../domain/swisstimingadapter/SwissTimingMessage.java | 6 +++--- .../swisstimingadapter/impl/DomainFactoryImpl.java | 2 +- .../domain/swisstimingadapter/impl/FixImpl.java | 6 +++--- .../domain/swisstimingadapter/impl/RaceImpl.java | 2 +- .../impl/SailMasterConnectorImpl.java | 8 ++++---- .../impl/SwissTimingFactoryImpl.java | 2 +- .../impl/SwissTimingMessageImpl.java | 6 +++--- .../impl/SwissTimingRaceTrackerImpl.java | 4 ++-- .../src/com/sap/sailing/domain/test/BearingTest.java | 2 +- .../sailing/domain/test/LeaderboardOfflineTest.java | 2 +- .../test/ManeuverAnalysisIDMChampionsFinalTest.java | 4 ++-- ...ManeuverDetectionOnKielerWoche505Race2DataTest.java | 2 +- .../test/ManeuverDetectionOnMdM2011SemifinalTest.java | 4 ++-- .../domain/test/MockedTrackedRaceWithFixedRank.java | 2 +- .../sailing/domain/test/OnlineTracTracBasedTest.java | 4 ++-- .../sailing/domain/test/PositionConversionTest.java | 2 +- .../src/com/sap/sailing/domain/test/PositionTest.java | 6 +++--- .../src/com/sap/sailing/domain/test/QuadTreeTest.java | 2 +- .../sap/sailing/domain/test/StoredTrackBasedTest.java | 4 ++-- .../sap/sailing/domain/test/TrackSmootheningTest.java | 6 +++--- .../src/com/sap/sailing/domain/test/TrackTest.java | 6 +++--- .../test/WindEstimationOnConstructedTracksTest.java | 6 +++--- .../WindEstimationOnKielerWoche505Race2DataTest.java | 2 +- .../domain/test/WindEstimationOnStoredTracksTest.java | 4 ++-- .../src/com/sap/sailing/domain/test/WindTest.java | 2 +- .../sailing/domain/test/mock/MockedTrackedRace.java | 6 +++--- .../sailing/domain/tractracadapter/DomainFactory.java | 6 +++--- .../sap/sailing/domain/tractracadapter/RaceRecord.java | 2 +- .../domain/tractracadapter/impl/DomainFactoryImpl.java | 4 ++-- .../tractracadapter/impl/MarkPassingReceiver.java | 2 +- .../tractracadapter/impl/TracTracTrackedLegImpl.java | 2 +- .../impl/TracTracTrackedLegOfCompetitor.java | 10 +++++----- .../tractracadapter/impl/TracTracTrackedRaceImpl.java | 4 ++-- .../src/com/sap/sailing/domain/base/BoatClass.java | 1 + .../src/com/sap/sailing/domain/base/DomainFactory.java | 1 + .../com/sap/sailing/domain/base/SpeedWithBearing.java | 5 +++++ .../src/com/sap/sailing/domain/base/Timed.java | 2 ++ .../sap/sailing/domain/base/impl/AbstractBearing.java | 2 +- .../sap/sailing/domain/base/impl/AbstractDistance.java | 4 ++-- .../sap/sailing/domain/base/impl/AbstractPosition.java | 6 +++--- .../sailing/domain/base/impl/AbstractSpeedImpl.java | 6 +++--- .../domain/base/impl/AbstractSpeedWithBearingImpl.java | 6 +++--- .../sailing/domain/base/impl/AbstractTimePoint.java | 2 +- .../sap/sailing/domain/base/impl/BoatClassImpl.java | 2 +- .../sailing/domain/base/impl/CentralAngleDistance.java | 2 +- .../sailing/domain/base/impl/DegreeBearingImpl.java | 2 +- .../sailing/domain/base/impl/DomainFactoryImpl.java | 2 +- .../sap/sailing/domain/base/impl/DouglasPeucker.java | 8 ++++---- .../domain/base/impl/KilometersPerHourSpeedImpl.java | 2 +- .../impl/KilometersPerHourSpeedWithBearingImpl.java | 6 +++--- .../sap/sailing/domain/base/impl/KnotSpeedImpl.java | 2 +- .../domain/base/impl/KnotSpeedWithBearingImpl.java | 2 +- .../sap/sailing/domain/base/impl/MeterDistance.java | 2 +- .../sailing/domain/base/impl/NauticalMileDistance.java | 2 +- .../sailing/domain/base/impl/RadianBearingImpl.java | 2 +- .../sap/sailing/domain/leaderboard/Leaderboard.java | 4 ++-- .../sailing/domain/leaderboard/LeaderboardColumn.java | 2 +- .../domain/leaderboard/ResultDiscardingRule.java | 2 +- .../sailing/domain/leaderboard/ScoreCorrection.java | 2 +- .../domain/leaderboard/impl/LeaderboardImpl.java | 2 +- .../domain/leaderboard/impl/RaceInLeaderboardImpl.java | 2 +- .../leaderboard/impl/ResultDiscardingRuleImpl.java | 2 +- .../domain/leaderboard/impl/ScoreCorrectionImpl.java | 2 +- .../sailing/domain/tracking/DynamicTrackedRace.java | 2 +- .../com/sap/sailing/domain/tracking/GPSFixTrack.java | 8 ++++---- .../com/sap/sailing/domain/tracking/Positioned.java | 2 +- .../src/com/sap/sailing/domain/tracking/Track.java | 2 +- .../com/sap/sailing/domain/tracking/TrackedEvent.java | 2 +- .../com/sap/sailing/domain/tracking/TrackedLeg.java | 2 +- .../domain/tracking/TrackedLegOfCompetitor.java | 6 +++--- .../com/sap/sailing/domain/tracking/TrackedRace.java | 6 +++--- .../src/com/sap/sailing/domain/tracking/Wind.java | 2 +- .../src/com/sap/sailing/domain/tracking/WindTrack.java | 4 ++-- .../domain/tracking/impl/AbstractGPSFixImpl.java | 6 +++--- .../sailing/domain/tracking/impl/BearingCluster.java | 2 +- .../domain/tracking/impl/CompactGPSFixImpl.java | 4 ++-- .../domain/tracking/impl/CompactGPSFixMovingImpl.java | 6 +++--- .../domain/tracking/impl/CourseBasedWindTrackImpl.java | 2 +- .../impl/DummyMarkPassingWithTimePointOnly.java | 2 +- .../tracking/impl/DynamicGPSFixMovingTrackImpl.java | 6 +++--- .../sailing/domain/tracking/impl/DynamicTrackImpl.java | 2 +- .../domain/tracking/impl/DynamicTrackedRaceImpl.java | 2 +- .../impl/EstimatedWindFixesAsNavigableSet.java | 2 +- .../sap/sailing/domain/tracking/impl/GPSFixImpl.java | 4 ++-- .../sailing/domain/tracking/impl/GPSFixMovingImpl.java | 4 ++-- .../sailing/domain/tracking/impl/GPSFixTrackImpl.java | 10 +++++----- .../sap/sailing/domain/tracking/impl/ManeuverImpl.java | 4 ++-- .../sailing/domain/tracking/impl/MarkPassingImpl.java | 2 +- .../domain/tracking/impl/RaceRankComparator.java | 2 +- .../impl/TrackBasedEstimationWindTrackImpl.java | 4 ++-- .../sap/sailing/domain/tracking/impl/TrackImpl.java | 2 +- .../sailing/domain/tracking/impl/TrackedEventImpl.java | 2 +- .../sailing/domain/tracking/impl/TrackedLegImpl.java | 6 +++--- .../tracking/impl/TrackedLegOfCompetitorImpl.java | 10 +++++----- .../sailing/domain/tracking/impl/TrackedRaceImpl.java | 8 ++++---- .../com/sap/sailing/domain/tracking/impl/WindImpl.java | 6 +++--- .../sailing/domain/tracking/impl/WindTrackImpl.java | 10 +++++----- .../domain/tracking/impl/WindwardToGoComparator.java | 4 ++-- .../src/com/sap/sailing/util/Bounds.java | 2 +- .../src/com/sap/sailing/util/QuadTree.java | 2 +- .../src/com/sap/sailing/util/impl/QuadTreeLeaf.java | 2 +- .../src/com/sap/sailing/util/impl/QuadTreeNode.java | 2 +- .../test/UDPExpeditionReceiverTest.java | 4 ++-- .../sailing/expeditionconnector/ExpeditionMessage.java | 4 ++-- .../expeditionconnector/ExpeditionWindTracker.java | 2 +- .../impl/ExpeditionMessageImpl.java | 4 ++-- .../impl/ExpeditionMessageParser.java | 2 +- .../sap/sailing/gwt/ui/server/SailingServiceImpl.java | 10 +++++----- .../mongodb/test/TestStoringAndRetrievingWindData.java | 2 +- .../test/TestStoringAndRetrievingWindTracksTest.java | 2 +- .../src/com/sap/sailing/server/Servlet.java | 2 +- .../src/com/sap/sailing/server/impl/AdminApp.java | 8 ++++---- .../src/com/sap/sailing/server/impl/ModeratorApp.java | 8 ++++---- .../sailing/server/impl/RacingEventServiceImpl.java | 2 +- .../src/com/sap/sailing/xcelsiusadapter/Action.java | 2 +- .../com/sap/sailing/xcelsiusadapter/GPSPerRace.java | 6 +++--- .../com/sap/sailing/xcelsiusadapter/ListEvents.java | 2 +- .../com/sap/sailing/xcelsiusadapter/RankPerLeg.java | 6 +++--- .../com/sap/sailing/xcelsiusadapter/RankPerLeg2.java | 6 +++--- .../com/sap/sailing/xcelsiusadapter/RankPerRace.java | 2 +- 147 files changed, 285 insertions(+), 274 deletions(-) rename java/{com.sap.sailing.domain/src/com/sap/sailing/domain/base => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common}/Bearing.java (94%) rename java/{com.sap.sailing.domain/src/com/sap/sailing/domain/base => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common}/Distance.java (93%) rename java/{com.sap.sailing.domain/src/com/sap/sailing/domain/base => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common}/Position.java (95%) rename java/{com.sap.sailing.domain/src/com/sap/sailing/domain/base => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common}/Speed.java (93%) rename java/{com.sap.sailing.domain/src/com/sap/sailing/domain/base => com.sap.sailing.domain.common/src/com/sap/sailing/domain/common}/TimePoint.java (72%) diff --git a/java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF index d8b85efa7cc..0ad48b6518e 100755 --- a/java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.declination.test/META-INF/MANIFEST.MF @@ -7,5 +7,6 @@ Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: com.sap.sailing.declination, com.sap.sailing.domain -Import-Package: junit.framework;version="4.8.1", +Import-Package: com.sap.sailing.domain.common, + junit.framework;version="4.8.1", org.junit;version="4.8.1" diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java index 80282adfd18..086b29b3827 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/DeclinationStoreTest.java @@ -30,12 +30,12 @@ import org.junit.Test; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.impl.DeclinationRecordImpl; import com.sap.sailing.declination.impl.DeclinationStore; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.util.QuadTree; public class DeclinationStoreTest extends AbstractDeclinationTest { diff --git a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java index db8e8099ed4..1f0866d5b10 100755 --- a/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java +++ b/java/com.sap.sailing.declination.test/src/com/sap/sailing/declination/test/SimpleDeclinationTest.java @@ -8,10 +8,10 @@ import java.text.ParseException; import org.junit.Test; import com.sap.sailing.declination.Declination; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.TimePoint; public class SimpleDeclinationTest extends AbstractDeclinationTest { @Test diff --git a/java/com.sap.sailing.declination/META-INF/MANIFEST.MF b/java/com.sap.sailing.declination/META-INF/MANIFEST.MF index 0094411b2df..b59e45e019d 100755 --- a/java/com.sap.sailing.declination/META-INF/MANIFEST.MF +++ b/java/com.sap.sailing.declination/META-INF/MANIFEST.MF @@ -9,3 +9,4 @@ Bundle-ActivationPolicy: lazy Require-Bundle: com.sap.sailing.domain Export-Package: com.sap.sailing.declination, com.sap.sailing.declination.impl;x-friends:="com.sap.sailing.declination.test" +Import-Package: com.sap.sailing.domain.common diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java index 3d9b8dad7ba..9de3dcba313 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/Declination.java @@ -1,9 +1,9 @@ package com.sap.sailing.declination; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Timed; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; /** * Tells the magnetic declination for a position and a given point in time together with an anticipated annual change. diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java index bfb5a6f7bd1..da1ccd35cc1 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/DeclinationService.java @@ -4,11 +4,11 @@ import java.io.IOException; import java.text.ParseException; import com.sap.sailing.declination.impl.DeclinationServiceImpl; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Mile; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.CentralAngleDistance; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; public interface DeclinationService { /** diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java index f3704ed2e91..c2e1787b80b 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationRecordImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.declination.impl; import com.sap.sailing.declination.Declination; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; public class DeclinationRecordImpl implements Declination { private final Position position; diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java index 50ad20b7656..6f592fd8230 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationServiceImpl.java @@ -9,9 +9,9 @@ import java.util.Map; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.util.QuadTree; public class DeclinationServiceImpl implements DeclinationService { diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java index 024ca398f63..9b017b4937e 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/DeclinationStore.java @@ -15,12 +15,12 @@ import java.util.Calendar; import java.util.GregorianCalendar; import com.sap.sailing.declination.Declination; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.util.QuadTree; /** diff --git a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java index d86a783dca5..767aab958fa 100755 --- a/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java +++ b/java/com.sap.sailing.declination/src/com/sap/sailing/declination/impl/NOAAImporter.java @@ -14,9 +14,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.sap.sailing.declination.Declination; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; /** * Imports magnetic declination data for earth from NOAA (http://www.ngdc.noaa.gov) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Bearing.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Bearing.java similarity index 94% rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Bearing.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Bearing.java index 4e59a17223a..335fdac0e18 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Bearing.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Bearing.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.base; +package com.sap.sailing.domain.common; public interface Bearing { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Distance.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Distance.java similarity index 93% rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Distance.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Distance.java index d1e65109428..869641c8111 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Distance.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Distance.java @@ -1,4 +1,5 @@ -package com.sap.sailing.domain.base; +package com.sap.sailing.domain.common; + /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Position.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java similarity index 95% rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Position.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java index 7a1c9bc6c79..d7359140c7e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Position.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.base; +package com.sap.sailing.domain.common; public interface Position { double getLatRad(); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Speed.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java similarity index 93% rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Speed.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java index 886f219aa05..91e1d286256 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Speed.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java @@ -1,5 +1,4 @@ -package com.sap.sailing.domain.base; - +package com.sap.sailing.domain.common; /** * A speed, convertable in various units of measure. Can be negative. diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/TimePoint.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TimePoint.java similarity index 72% rename from java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/TimePoint.java rename to java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TimePoint.java index 4d8e4b3814b..fd0fd07609f 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/TimePoint.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TimePoint.java @@ -1,4 +1,4 @@ -package com.sap.sailing.domain.base; +package com.sap.sailing.domain.common; import java.util.Date; 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 ac811e1a2f4..544bd1e7a18 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 @@ -11,14 +11,14 @@ import com.mongodb.DB; import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +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.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.RaceInLeaderboard; diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java index 5c992e1df86..25d41241370 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java @@ -7,13 +7,13 @@ import com.mongodb.BasicDBObject; import com.mongodb.DB; import com.mongodb.DBCollection; import com.mongodb.DBObject; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.Timed; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.RaceInLeaderboard; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java index bb8b2dadb6c..4b2b21f7917 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/classes/services/MessageFileServiceImpl.java @@ -14,13 +14,13 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.KnotSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MeterDistance; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.swisstimingadapter.Competitor; import com.sap.sailing.domain.swisstimingadapter.Mark; import com.sap.sailing.domain.swisstimingadapter.Race; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java index 386bab2e94d..2322d96ba04 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java @@ -18,9 +18,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Triple; import com.sap.sailing.domain.swisstimingadapter.Competitor; diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java index 3655ffdc506..c99d007215d 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SwissTimingSailMasterLiveTest.java @@ -18,9 +18,9 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.common.Util.Triple; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java index f650d0a6154..dc8a2af5d29 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java @@ -7,8 +7,8 @@ import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Nationality; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.swisstimingadapter.impl.DomainFactoryImpl; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.MarkPassing; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java index 07206dd56be..d80ed9adfea 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.swisstimingadapter; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; /** * Data fix transmitted periodically from the SwissTiming Sail Master system, telling boat position and speed diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Race.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Race.java index 9cb1764ed49..180cc7cd79c 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Race.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Race.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.swisstimingadapter; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; public interface Race extends WithDescription { String getRaceID(); diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java index e7ee9f6756c..a2567c785c7 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterAdapter.java @@ -3,8 +3,8 @@ package com.sap.sailing.domain.swisstimingadapter; import java.util.Collection; import java.util.List; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Triple; public abstract class SailMasterAdapter implements SailMasterListener { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java index 665f08f2638..5a060a6368f 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java @@ -6,9 +6,9 @@ import java.text.ParseException; import java.util.List; import java.util.Map; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.common.Util.Triple; @@ -63,7 +63,7 @@ public interface SailMasterConnector { /** * Enables receiving RPD (Race Position Data) events to be emitted by the server. If such events are received, they * are forwarded to {@link #addSailMasterListener(SailMasterListener) registered} listeners by calling their - * {@link SailMasterListener#receivedRacePositionData(String, RaceStatus, TimePoint, TimePoint, Long, Integer, com.sap.sailing.domain.base.Distance, java.util.Collection)} + * {@link SailMasterListener#receivedRacePositionData(String, RaceStatus, TimePoint, TimePoint, Long, Integer, com.sap.sailing.domain.common.Distance, java.util.Collection)} * method. */ void enableRacePositionData() throws UnknownHostException, IOException, InterruptedException; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java index dfbff9d9c93..c6bac4015c3 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterListener.java @@ -3,8 +3,8 @@ package com.sap.sailing.domain.swisstimingadapter; import java.util.Collection; import java.util.List; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Triple; public interface SailMasterListener { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java index 7be0153817b..3fde4a05837 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.net.UnknownHostException; import java.text.ParseException; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.swisstimingadapter.impl.SwissTimingFactoryImpl; import com.sap.sailing.domain.tracking.TrackedEventRegistry; import com.sap.sailing.domain.tracking.WindStore; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java index 47b59496f6b..2c2444401e5 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingMessage.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.swisstimingadapter; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.udpconnector.UDPMessage; public interface SwissTimingMessage extends UDPMessage { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java index 624328bcf50..669d033e5ab 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java @@ -18,7 +18,6 @@ import com.sap.sailing.domain.base.Nationality; import com.sap.sailing.domain.base.Person; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Team; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; @@ -28,6 +27,7 @@ import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.TeamImpl; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.swisstimingadapter.Course; import com.sap.sailing.domain.swisstimingadapter.DomainFactory; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java index 5e571d9662a..6823ed4b973 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.swisstimingadapter.impl; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.swisstimingadapter.Fix; import com.sap.sailing.domain.swisstimingadapter.TrackerType; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/RaceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/RaceImpl.java index b073eb1f5d4..555241d5919 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/RaceImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/RaceImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.swisstimingadapter.impl; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.swisstimingadapter.Race; public class RaceImpl implements Race { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java index d37a99d2a62..e26f2d02648 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SailMasterConnectorImpl.java @@ -24,11 +24,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Logger; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedImpl; @@ -36,6 +32,10 @@ import com.sap.sailing.domain.base.impl.KnotSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MeterDistance; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.common.Util.Triple; import com.sap.sailing.domain.swisstimingadapter.Competitor; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java index ce70ce26d9c..857e8025d51 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java @@ -7,7 +7,7 @@ import java.text.ParseException; import java.util.HashMap; import java.util.Map; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Triple; import com.sap.sailing.domain.swisstimingadapter.DomainFactory; import com.sap.sailing.domain.swisstimingadapter.Race; diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java index 6f14db40343..4f798368caf 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingMessageImpl.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.swisstimingadapter.impl; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.swisstimingadapter.SwissTimingMessage; public class SwissTimingMessageImpl implements SwissTimingMessage { diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java index badd388cfda..140716af279 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java @@ -13,12 +13,12 @@ import java.util.logging.Logger; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; 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.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Triple; import com.sap.sailing.domain.swisstimingadapter.Course; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java index b8c644cbbcf..b23d19258cf 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/BearingTest.java @@ -4,9 +4,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.RadianBearingImpl; +import com.sap.sailing.domain.common.Bearing; public class BearingTest { @Test diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java index 1d22be23264..1f0d7655f44 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardOfflineTest.java @@ -15,7 +15,6 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; import com.sap.sailing.domain.base.impl.CompetitorImpl; @@ -24,6 +23,7 @@ import com.sap.sailing.domain.base.impl.NationalityImpl; import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.TeamImpl; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.leaderboard.Leaderboard; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java index 076bce62826..cf9cc514a35 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java @@ -18,14 +18,14 @@ import org.junit.Test; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; 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.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.Maneuver; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java index ae5ec323337..8991b3deeec 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java @@ -18,7 +18,6 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DouglasPeucker; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; @@ -26,6 +25,7 @@ import com.sap.sailing.domain.base.impl.MeterDistance; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.common.Tack; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java index ef27e6b796e..db8c3fb7dca 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java @@ -18,15 +18,15 @@ import org.junit.Test; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.Maneuver.Type; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MockedTrackedRaceWithFixedRank.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MockedTrackedRaceWithFixedRank.java index 01eb0df43b1..581d0f1b50b 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MockedTrackedRaceWithFixedRank.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MockedTrackedRaceWithFixedRank.java @@ -6,8 +6,8 @@ import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.test.mock.MockedTrackedRace; public class MockedTrackedRaceWithFixedRank extends MockedTrackedRace { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java index 43731bb99cf..4f3612e1d59 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java @@ -20,12 +20,12 @@ import org.junit.Before; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; import com.sap.sailing.domain.tracking.DynamicTrackedRace; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java index 49fb15e5b3d..8a2c6d0bcc8 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionConversionTest.java @@ -10,7 +10,7 @@ import java.util.Collections; import org.junit.Test; import com.maptrack.client.io.TypeController; -import com.sap.sailing.domain.base.Position; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tractracadapter.DomainFactory; import com.sap.sailing.domain.tractracadapter.Receiver; import com.tractrac.clientmodule.ControlPoint; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java index 1ef2d8e562f..602b575e12e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java @@ -6,16 +6,16 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Mile; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.base.impl.NauticalMileDistance; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.tracking.impl.CompactGPSFixImpl; import com.sap.sailing.domain.tracking.impl.CompactGPSFixMovingImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java index e6b0ed63e73..17e187c89a5 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/QuadTreeTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.impl.DegreePosition; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.util.QuadTree; public class QuadTreeTest { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java index 2b74a617ae6..ccb437eee04 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/StoredTrackBasedTest.java @@ -18,10 +18,8 @@ import java.util.Set; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Person; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.Team; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; import com.sap.sailing.domain.base.impl.CompetitorImpl; @@ -31,6 +29,8 @@ import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.TeamImpl; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.impl.DynamicGPSFixMovingTrackImpl; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java index bc1bef67b35..e4a72deea59 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackSmootheningTest.java @@ -15,9 +15,9 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java index 58a13b0a810..9cd8a143bda 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java @@ -17,16 +17,16 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.base.Boat; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java index 09c962b8fbd..fe36cd7bfb6 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnConstructedTracksTest.java @@ -19,9 +19,6 @@ import org.junit.Before; import org.junit.Test; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.BoatClassImpl; import com.sap.sailing.domain.base.impl.BoatImpl; @@ -34,8 +31,11 @@ import com.sap.sailing.domain.base.impl.NationalityImpl; import com.sap.sailing.domain.base.impl.NauticalMileDistance; import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.TeamImpl; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; 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.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java index b1ebd60696e..c7953072baf 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnKielerWoche505Race2DataTest.java @@ -11,11 +11,11 @@ import java.net.URISyntaxException; import org.junit.Before; import org.junit.Test; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.tracking.TrackedRace; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java index 13bcf058512..331e6475c60 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.java @@ -10,12 +10,12 @@ import java.io.IOException; import org.junit.Test; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java index 3aecb4dded8..7267d0f3b00 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java @@ -10,11 +10,11 @@ import java.util.Set; import org.junit.Test; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.tracking.Wind; import com.sap.sailing.domain.tracking.WindTrack; 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 ba192348ed4..70fa3d1b17c 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 @@ -6,15 +6,15 @@ import java.util.NavigableSet; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java index 724c6d590d6..47cbb9358c2 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java @@ -17,8 +17,8 @@ import com.sap.sailing.domain.base.Nationality; import com.sap.sailing.domain.base.Person; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Team; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; @@ -47,9 +47,9 @@ import difflib.PatchFailedException; public interface DomainFactory { static DomainFactory INSTANCE = new DomainFactoryImpl(com.sap.sailing.domain.base.DomainFactory.INSTANCE); - com.sap.sailing.domain.base.Position createPosition(Position position); + com.sap.sailing.domain.common.Position createPosition(Position position); - com.sap.sailing.domain.base.TimePoint createTimePoint(long timestamp); + com.sap.sailing.domain.common.TimePoint createTimePoint(long timestamp); Course createCourse(String name, Iterable controlPoints); diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java index 2916fc0363c..74cc62749cd 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/RaceRecord.java @@ -12,8 +12,8 @@ import java.util.logging.Logger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.util.DateParser; import com.sap.sailing.util.InvalidDateException; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java index d63f8efa80b..324e823385f 100644 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java @@ -26,10 +26,8 @@ import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Nationality; import com.sap.sailing.domain.base.Person; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Team; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.BoatImpl; import com.sap.sailing.domain.base.impl.CompetitorImpl; @@ -42,6 +40,8 @@ import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.base.impl.PersonImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.TeamImpl; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java index 12e470d1fa6..e596829051f 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java @@ -11,9 +11,9 @@ import com.maptrack.client.io.TypeController; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Triple; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; import com.sap.sailing.domain.tracking.DynamicTrackedRace; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegImpl.java index c5e504c2578..b6d19fef626 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegImpl.java @@ -6,9 +6,9 @@ import java.util.Map; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java index 6e6b1321a05..0acba590cbb 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedLegOfCompetitor.java @@ -2,21 +2,21 @@ package com.sap.sailing.domain.tractracadapter.impl; import java.util.List; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Mile; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.NauticalMileDistance; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java index 01e12f7b65a..1edb2a222e4 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracTrackedRaceImpl.java @@ -2,10 +2,10 @@ package com.sap.sailing.domain.tractracadapter.impl; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.TrackedEvent; import com.sap.sailing.domain.tracking.TrackedLeg; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/BoatClass.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/BoatClass.java index fdb022be44f..0dbe51ed062 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/BoatClass.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/BoatClass.java @@ -1,5 +1,6 @@ package com.sap.sailing.domain.base; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.tracking.TrackedRace; public interface BoatClass extends Named { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java index 53e269e93a9..255a6213f3e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java @@ -1,6 +1,7 @@ package com.sap.sailing.domain.base; import com.sap.sailing.domain.base.impl.DomainFactoryImpl; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.MarkPassing; public interface DomainFactory { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithBearing.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithBearing.java index ba42c3ed9ed..6a625690527 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithBearing.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithBearing.java @@ -1,5 +1,10 @@ package com.sap.sailing.domain.base; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; + public interface SpeedWithBearing extends Speed { Bearing getBearing(); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Timed.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Timed.java index 96b10ea15c5..3126bacc338 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Timed.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Timed.java @@ -1,5 +1,7 @@ package com.sap.sailing.domain.base; +import com.sap.sailing.domain.common.TimePoint; + public interface Timed { TimePoint getTimePoint(); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractBearing.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractBearing.java index 737301c4317..e0c869e54ba 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractBearing.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractBearing.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Bearing; +import com.sap.sailing.domain.common.Bearing; public abstract class AbstractBearing implements Bearing { @Override diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java index bd32b85e8c1..c2e1ad0bdce 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractDistance.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Mile; -import com.sap.sailing.domain.base.Speed; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; public abstract class AbstractDistance implements Distance { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractPosition.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractPosition.java index ef207e1d3c4..8125fe1ffcb 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractPosition.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractPosition.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; public class AbstractPosition implements Position { public int hashCode() { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedImpl.java index 0fbbb6cc3cb..52c1eab99d2 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Mile; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; public abstract class AbstractSpeedImpl implements Speed { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedWithBearingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedWithBearingImpl.java index f58376ae6e9..5d2cf8a472d 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedWithBearingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedWithBearingImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.CourseChange; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; public abstract class AbstractSpeedWithBearingImpl extends AbstractSpeedImpl implements SpeedWithBearing { private final Bearing bearing; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java index c87f7dca24a..857c777dee9 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java @@ -4,7 +4,7 @@ import java.text.SimpleDateFormat; import java.util.Comparator; import java.util.Date; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; public abstract class AbstractTimePoint implements TimePoint { private static SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ"); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java index 8d280eaac31..2881674b582 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.base.impl; import com.sap.sailing.domain.base.BoatClass; -import com.sap.sailing.domain.base.Distance; +import com.sap.sailing.domain.common.Distance; public class BoatClassImpl extends NamedImpl implements BoatClass { /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CentralAngleDistance.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CentralAngleDistance.java index dc07572f4fc..100948480fa 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CentralAngleDistance.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CentralAngleDistance.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Mile; +import com.sap.sailing.domain.common.Distance; public class CentralAngleDistance extends AbstractDistance { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DegreeBearingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DegreeBearingImpl.java index fcbf2583cb2..04260ac7f2a 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DegreeBearingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DegreeBearingImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Bearing; +import com.sap.sailing.domain.common.Bearing; public class DegreeBearingImpl extends AbstractBearing implements Bearing { private final double bearingDeg; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java index 0c680ac6a57..d5505cdb39d 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java @@ -11,8 +11,8 @@ import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.DomainFactory; import com.sap.sailing.domain.base.Gate; import com.sap.sailing.domain.base.Nationality; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.impl.MarkPassingImpl; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java index 663b72fa8cb..cfc519cfbe5 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DouglasPeucker.java @@ -13,10 +13,10 @@ import java.util.concurrent.Future; import java.util.concurrent.FutureTask; import java.util.concurrent.RunnableFuture; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixTrack; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedImpl.java index a7ea445b6b7..982ff89b618 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.base.impl; import com.sap.sailing.domain.base.Mile; -import com.sap.sailing.domain.base.Speed; +import com.sap.sailing.domain.common.Speed; public class KilometersPerHourSpeedImpl extends AbstractSpeedImpl implements Speed { private final double speedInKilometersPerHour; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java index ded2b5441c7..786f9655c51 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.CourseChange; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; public class KilometersPerHourSpeedWithBearingImpl extends KilometersPerHourSpeedImpl implements SpeedWithBearing { private final Bearing bearing; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedImpl.java index b6520baeb50..274ae4c70d2 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Speed; +import com.sap.sailing.domain.common.Speed; public class KnotSpeedImpl extends AbstractSpeedImpl implements Speed { private final double knots; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedWithBearingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedWithBearingImpl.java index 5fcd5a55b43..3da48713256 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedWithBearingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KnotSpeedWithBearingImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Bearing; +import com.sap.sailing.domain.common.Bearing; public class KnotSpeedWithBearingImpl extends AbstractSpeedWithBearingImpl { private final double speedInKnots; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MeterDistance.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MeterDistance.java index 7b7a2d9d063..f1d834460ce 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MeterDistance.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MeterDistance.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Distance; +import com.sap.sailing.domain.common.Distance; public class MeterDistance extends AbstractDistance { private final double meters; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NauticalMileDistance.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NauticalMileDistance.java index d80fbd99126..1c7f127442c 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NauticalMileDistance.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/NauticalMileDistance.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Distance; +import com.sap.sailing.domain.common.Distance; public class NauticalMileDistance extends AbstractDistance { private final double nauticalMiles; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RadianBearingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RadianBearingImpl.java index c74c61aac3f..837defbcd9b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RadianBearingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RadianBearingImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.base.impl; -import com.sap.sailing.domain.base.Bearing; +import com.sap.sailing.domain.common.Bearing; public class RadianBearingImpl extends AbstractBearing implements Bearing { private final double bearingRad; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java index b5ee874e560..f15673c4a1f 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java @@ -4,8 +4,8 @@ import java.util.Map; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Named; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.leaderboard.ScoreCorrection.MaxPointsReason; import com.sap.sailing.domain.tracking.TrackedRace; @@ -57,7 +57,7 @@ public interface Leaderboard extends Named { int getCarriedPoints(Competitor competitor); /** - * Shorthand for {@link TrackedRace#getRank(Competitor, com.sap.sailing.domain.base.TimePoint)} with the + * Shorthand for {@link TrackedRace#getRank(Competitor, com.sap.sailing.domain.common.TimePoint)} with the * additional logic that in case the race hasn't {@link TrackedRace#hasStarted(TimePoint) started} * yet, 0 points will be allotted to the race for all competitors. * diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardColumn.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardColumn.java index 57c8d607b2a..1cb33d4f540 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardColumn.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardColumn.java @@ -2,8 +2,8 @@ package com.sap.sailing.domain.leaderboard; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Named; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; /** * Represents the data common to all columns in a {@link Leaderboard}. A column enables diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ResultDiscardingRule.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ResultDiscardingRule.java index bc2365e7bc2..391d4d5ddfc 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ResultDiscardingRule.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ResultDiscardingRule.java @@ -3,7 +3,7 @@ package com.sap.sailing.domain.leaderboard; import java.util.Set; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; /** * A result discarding rule is used to determine for a competitor those races from a list of diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java index b9a2a08881a..5df62fe0f46 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.leaderboard; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedRace; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardImpl.java index e525690e40a..6ffa3b54666 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardImpl.java @@ -10,8 +10,8 @@ import java.util.Set; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Named; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.leaderboard.Leaderboard; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RaceInLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RaceInLeaderboardImpl.java index 1cd3cd8f7f4..0258efa6e34 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RaceInLeaderboardImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RaceInLeaderboardImpl.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.leaderboard.impl; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.RaceInLeaderboard; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ResultDiscardingRuleImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ResultDiscardingRuleImpl.java index b5d513e6db0..0cada9244ed 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ResultDiscardingRuleImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ResultDiscardingRuleImpl.java @@ -8,9 +8,9 @@ import java.util.Set; import java.util.TreeSet; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindError; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.RaceInLeaderboard; import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java index 53a9820f5ef..57bb44fab13 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/ScoreCorrectionImpl.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Map; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.leaderboard.RaceInLeaderboard; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java index 158e0201f15..5291f8a5246 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java @@ -2,7 +2,7 @@ package com.sap.sailing.domain.tracking; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; public interface DynamicTrackedRace extends TrackedRace { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java index e127c060f54..e03b41aec20 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Positioned.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Positioned.java index 037eac2fac8..82f97e325b4 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Positioned.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Positioned.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.base.Position; +import com.sap.sailing.domain.common.Position; public interface Positioned { Position getPosition(); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Track.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Track.java index 160d98288ed..0ba95f7ba84 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Track.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Track.java @@ -2,8 +2,8 @@ package com.sap.sailing.domain.tracking; import java.util.Iterator; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Timed; +import com.sap.sailing.domain.common.TimePoint; /** * A track records {@link Timed} items for an object of type ItemType. It allows clients to ask for a value diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedEvent.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedEvent.java index 945cdfed31f..6202bd0ba53 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedEvent.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedEvent.java @@ -4,8 +4,8 @@ import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; /** * Manages a set of {@link TrackedRace} objects that belong to the same {@link Event} (regatta, sailing event for a diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java index 1958e277427..e61add467a8 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java @@ -4,9 +4,9 @@ import java.util.LinkedHashMap; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; public interface TrackedLeg { Leg getLeg(); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java index 4bb1b7e0903..8436516abb7 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java @@ -3,12 +3,12 @@ package com.sap.sailing.domain.tracking; import java.util.List; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; public interface TrackedLegOfCompetitor { Leg getLeg(); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java index 08582c0759a..cc4b523a3aa 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java @@ -6,16 +6,16 @@ import java.util.NavigableSet; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Course; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.DouglasPeucker; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Wind.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Wind.java index eb104ae0f4c..314872fbbc7 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Wind.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Wind.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.Timed; +import com.sap.sailing.domain.common.Bearing; /** * Records a wind observation made at a certain position at a given time with an observed speed and a bearing. diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java index e54611fd20f..0f178d7625b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrack.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.tracking; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; public interface WindTrack extends Track { static final long DEFAULT_MILLISECONDS_OVER_WHICH_TO_AVERAGE_WIND = 30000; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractGPSFixImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractGPSFixImpl.java index 35b503cb288..caef9a7a4d5 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractGPSFixImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractGPSFixImpl.java @@ -1,10 +1,10 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.tracking.GPSFix; public abstract class AbstractGPSFixImpl implements GPSFix { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BearingCluster.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BearingCluster.java index 7b5986d35ee..cb56e7b6981 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BearingCluster.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/BearingCluster.java @@ -3,8 +3,8 @@ package com.sap.sailing.domain.tracking.impl; import java.util.ArrayList; import java.util.List; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.impl.RadianBearingImpl; +import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.Util.Pair; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixImpl.java index dd2a76c0d4e..762e178817f 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.AbstractPosition; import com.sap.sailing.domain.base.impl.AbstractTimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFix; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixMovingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixMovingImpl.java index 249760475a8..578d8940204 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixMovingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactGPSFixMovingImpl.java @@ -1,13 +1,13 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.CourseChange; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.AbstractBearing; import com.sap.sailing.domain.base.impl.AbstractSpeedImpl; import com.sap.sailing.domain.base.impl.AbstractSpeedWithBearingImpl; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFixMoving; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java index b57fc79c084..807ef0248e3 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseBasedWindTrackImpl.java @@ -2,7 +2,7 @@ package com.sap.sailing.domain.tracking.impl; import java.util.NavigableSet; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.Wind; import com.sap.sailing.util.impl.ArrayListNavigableSet; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java index b6c8ce2c730..7c4c33c5ee9 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.tracking.impl; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.MarkPassing; public class DummyMarkPassingWithTimePointOnly implements MarkPassing { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java index b6ee6d614c4..cce0d4f910f 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.java @@ -5,12 +5,12 @@ import java.util.LinkedList; import java.util.List; import java.util.NavigableSet; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.KilometersPerHourSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackImpl.java index 5d252e26fbc..715a2d35836 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackImpl.java @@ -1,6 +1,6 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Speed; +import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSTrackListener; 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 5574a8bffe7..a96b5c071e6 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 @@ -16,9 +16,9 @@ import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EstimatedWindFixesAsNavigableSet.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EstimatedWindFixesAsNavigableSet.java index 74a679f32e9..b84bfa92a43 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EstimatedWindFixesAsNavigableSet.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EstimatedWindFixesAsNavigableSet.java @@ -5,8 +5,8 @@ import java.util.Iterator; import java.util.NavigableSet; import java.util.SortedSet; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.Wind; import com.sap.sailing.domain.tracking.impl.WindTrackImpl.DummyWind; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixImpl.java index 575eea1ed32..543f0686ebd 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixImpl.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFix; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixMovingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixMovingImpl.java index 24072fb852f..33d96ab5ef2 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixMovingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixMovingImpl.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFixMoving; public class GPSFixMovingImpl extends GPSFixImpl implements GPSFixMoving { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java index 314ddcf390d..07a187f61f7 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java @@ -8,16 +8,16 @@ import java.util.List; import java.util.NavigableSet; import java.util.Set; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.KnotSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; import com.sap.sailing.domain.base.impl.NauticalMileDistance; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java index a33cdd25527..2c52d4ed38f 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java @@ -1,9 +1,9 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.Maneuver; public class ManeuverImpl extends AbstractGPSFixImpl implements Maneuver { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPassingImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPassingImpl.java index c0b492c5012..8cc26caaf16 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPassingImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MarkPassingImpl.java @@ -1,8 +1,8 @@ package com.sap.sailing.domain.tracking.impl; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.MarkPassing; public class MarkPassingImpl implements MarkPassing { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java index 0acd93e65d5..5e0431f2ffc 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java @@ -6,7 +6,7 @@ import java.util.NavigableSet; import java.util.SortedSet; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.MarkPassing; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; 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 74800838be0..bf9d7531397 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 @@ -6,10 +6,10 @@ import java.util.NavigableSet; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.AbstractTimePoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.MarkPassing; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java index 0f4b3367d46..14e40d57bec 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java @@ -3,8 +3,8 @@ package com.sap.sailing.domain.tracking.impl; import java.util.Iterator; import java.util.NavigableSet; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Timed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.Track; import com.sap.sailing.util.impl.ArrayListNavigableSet; import com.sap.sailing.util.impl.UnmodifiableNavigableSet; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java index 8e787ac8da0..2d3edd4c10b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedEventImpl.java @@ -13,8 +13,8 @@ import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.DynamicRaceDefinitionSet; import com.sap.sailing.domain.tracking.RaceListener; import com.sap.sailing.domain.tracking.TrackedEvent; 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 508eed9d994..502dd507851 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 @@ -8,14 +8,14 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Bearing; import com.sap.sailing.domain.common.LegType; 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.Util; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.tracking.GPSFix; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java index 3164ec18ab5..f7ef4d7e8af 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java @@ -3,18 +3,18 @@ package com.sap.sailing.domain.tracking.impl; import java.util.Iterator; import java.util.List; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MeterDistance; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.Maneuver; 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 ef32ecdc3ac..158f09b5fb7 100644 --- 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 @@ -11,26 +11,26 @@ import java.util.NavigableSet; import java.util.concurrent.ConcurrentSkipListSet; import java.util.logging.Logger; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.CourseChange; import com.sap.sailing.domain.base.CourseListener; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.DouglasPeucker; 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.Distance; import com.sap.sailing.domain.common.LegType; import com.sap.sailing.domain.common.NoWindError; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Tack; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.common.WindSource; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindImpl.java index 1953f29de00..b33dbf71c09 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindImpl.java @@ -1,11 +1,11 @@ package com.sap.sailing.domain.tracking.impl; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.Wind; public class WindImpl extends KnotSpeedWithBearingImpl implements Wind { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java index 762d4945b65..3a49aff1b6c 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java @@ -7,15 +7,15 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.CourseChange; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Timed; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.Wind; import com.sap.sailing.domain.tracking.WindListener; import com.sap.sailing.domain.tracking.WindTrack; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java index 7aebeb3d0f1..b42654313d2 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindwardToGoComparator.java @@ -4,10 +4,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.SortedSet; -import com.sap.sailing.domain.base.Distance; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.NoWindError; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/Bounds.java b/java/com.sap.sailing.domain/src/com/sap/sailing/util/Bounds.java index ddd9cd4a4d0..1d8e25ccfc1 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/Bounds.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/util/Bounds.java @@ -1,6 +1,6 @@ package com.sap.sailing.util; -import com.sap.sailing.domain.base.Position; +import com.sap.sailing.domain.common.Position; public class Bounds { private final Position southWest; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/QuadTree.java b/java/com.sap.sailing.domain/src/com/sap/sailing/util/QuadTree.java index 36af7209c11..74f65da6c9e 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/QuadTree.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/util/QuadTree.java @@ -26,8 +26,8 @@ import java.io.Serializable; import java.util.Collection; import java.util.Vector; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.impl.DegreePosition; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.util.impl.QuadTreeNode; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeLeaf.java b/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeLeaf.java index 314b7c1d986..d0c77065dec 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeLeaf.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeLeaf.java @@ -26,7 +26,7 @@ package com.sap.sailing.util.impl; import java.io.Serializable; -import com.sap.sailing.domain.base.Position; +import com.sap.sailing.domain.common.Position; public class QuadTreeLeaf implements Serializable { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeNode.java b/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeNode.java index 2722cd70136..7a2f6ab1353 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeNode.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/QuadTreeNode.java @@ -27,8 +27,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.Vector; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.impl.DegreePosition; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.util.Bounds; import com.sap.sailing.util.QuadTree; diff --git a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java index 92bb43d4ecd..f4fed6b7e42 100755 --- a/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java +++ b/java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/UDPExpeditionReceiverTest.java @@ -28,10 +28,10 @@ import org.junit.Test; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; -import com.sap.sailing.domain.base.Position; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.test.mock.MockedTrackedRace; import com.sap.sailing.domain.tracking.GPSFix; diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java index 6f233271aed..c8ec922110b 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionMessage.java @@ -2,9 +2,9 @@ package com.sap.sailing.expeditionconnector; import java.util.Set; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Bearing; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.udpconnector.UDPMessage; diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java index dc3ff9796a8..291fee7d8f0 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java @@ -5,10 +5,10 @@ import java.util.logging.Logger; import com.sap.sailing.declination.Declination; import com.sap.sailing.declination.DeclinationService; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.SpeedWithBearing; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.tracking.DynamicTrackedRace; import com.sap.sailing.domain.tracking.Wind; diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java index 58d4b47089d..868b4573b62 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageImpl.java @@ -8,13 +8,13 @@ import java.util.Set; import java.util.TimeZone; import java.util.TreeSet; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; 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.TimePoint; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.impl.GPSFixImpl; diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageParser.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageParser.java index c57167672ea..c7843518286 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageParser.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/impl/ExpeditionMessageParser.java @@ -6,8 +6,8 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.expeditionconnector.ExpeditionMessage; import com.sap.sailing.expeditionconnector.UDPExpeditionReceiver; import com.sap.sailing.udpconnector.UDPMessageParser; 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 953c285ba9c..2dc9570917d 100644 --- 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 @@ -35,18 +35,13 @@ import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; import com.google.gwt.user.server.rpc.RemoteServiceServlet; -import com.sap.sailing.domain.base.Bearing; import com.sap.sailing.domain.base.BoatClass; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.Waypoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; @@ -55,10 +50,15 @@ import com.sap.sailing.domain.base.impl.KnotSpeedImpl; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MeterDistance; 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.NoWindError; import com.sap.sailing.domain.common.NoWindException; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.Tack; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.common.WindSource; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java index 48193722b61..88aa0d07e6f 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindData.java @@ -13,11 +13,11 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.Mongo; import com.mongodb.MongoException; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.persistence.DomainObjectFactory; import com.sap.sailing.domain.persistence.MongoObjectFactory; import com.sap.sailing.domain.persistence.impl.DomainObjectFactoryImpl; diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java index 03d5c30e430..2cfbe129ace 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java @@ -15,12 +15,12 @@ import com.mongodb.DB; import com.mongodb.Mongo; import com.mongodb.MongoException; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; import com.sap.sailing.domain.base.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.persistence.impl.DomainObjectFactoryImpl; import com.sap.sailing.domain.persistence.impl.MongoObjectFactoryImpl; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/Servlet.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/Servlet.java index 42813cc0057..e21427fb272 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/Servlet.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/Servlet.java @@ -8,8 +8,8 @@ import org.osgi.util.tracker.ServiceTracker; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.impl.Activator; import com.sap.sailing.util.DateParser; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/AdminApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/AdminApp.java index 7ff2720d628..64824658395 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/AdminApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/AdminApp.java @@ -20,18 +20,18 @@ import org.json.simple.JSONArray; import org.json.simple.JSONObject; import com.mongodb.MongoException; -import com.sap.sailing.domain.base.Bearing; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.DegreeBearingImpl; import com.sap.sailing.domain.base.impl.DegreePosition; 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.Distance; 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.Util.Triple; import com.sap.sailing.domain.persistence.DomainObjectFactory; diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java index c2c1965b9f2..b218f12e711 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java @@ -14,17 +14,17 @@ import org.json.simple.JSONObject; import com.sap.sailing.domain.base.Buoy; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.Person; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; 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.NoWindException; +import com.sap.sailing.domain.common.Position; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; 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.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 354e2f9ba7c..16658cbc626 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 @@ -27,7 +27,7 @@ import java.util.logging.Logger; import com.sap.sailing.domain.base.ControlPoint; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.common.Util.Pair; import com.sap.sailing.domain.common.Util.Triple; diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java index 9b43e4a2d75..11f0ea37a25 100644 --- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java +++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java @@ -13,8 +13,8 @@ import org.jdom.output.XMLOutputter; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; import com.sap.sailing.domain.base.impl.MillisecondsTimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.DynamicTrackedEvent; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.RacingEventService; diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java index d14193d6d11..a31f39964b3 100755 --- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java +++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/GPSPerRace.java @@ -12,13 +12,13 @@ import javax.servlet.http.HttpServletResponse; import org.jdom.Document; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.Speed; import com.sap.sailing.domain.base.SpeedWithBearing; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sailing.domain.tracking.GPSFixTrack; import com.sap.sailing.domain.tracking.TrackedLeg; diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/ListEvents.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/ListEvents.java index 53783ca77f1..93d68d16aec 100644 --- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/ListEvents.java +++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/ListEvents.java @@ -17,9 +17,9 @@ import org.jdom.Document; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; -import com.sap.sailing.domain.base.Position; import com.sap.sailing.domain.base.RaceDefinition; import com.sap.sailing.domain.base.Waypoint; +import com.sap.sailing.domain.common.Position; import com.sap.sailing.domain.common.Util; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java index c8c5efbe79b..ddc821e1c34 100644 --- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java +++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg.java @@ -12,13 +12,13 @@ import javax.servlet.http.HttpServletResponse; import org.jdom.Document; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.LegType; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java index bfa18b0c729..f6025701ef4 100644 --- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java +++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerLeg2.java @@ -12,12 +12,12 @@ import javax.servlet.http.HttpServletResponse; import org.jdom.Document; import com.sap.sailing.domain.base.Competitor; -import com.sap.sailing.domain.base.Distance; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.Speed; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.Distance; +import com.sap.sailing.domain.common.Speed; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor; import com.sap.sailing.domain.tracking.TrackedRace; diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerRace.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerRace.java index e17b121c0b6..064f3f6895b 100755 --- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerRace.java +++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RankPerRace.java @@ -16,7 +16,7 @@ import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Event; import com.sap.sailing.domain.base.Leg; import com.sap.sailing.domain.base.RaceDefinition; -import com.sap.sailing.domain.base.TimePoint; +import com.sap.sailing.domain.common.TimePoint; import com.sap.sailing.domain.tracking.TrackedLeg; import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.server.RacingEventService;