From a8e8d228576b2f782fbfe5c72646689176d6361e Mon Sep 17 00:00:00 2001 From: Fredrik Teschke Date: Wed, 24 Dec 2014 12:27:58 +0100 Subject: [PATCH] move TimeRange to SSE --- .../domain/persistence/impl/DomainObjectFactoryImpl.java | 4 ++-- .../domain/persistence/impl/MongoObjectFactoryImpl.java | 2 +- .../racelog/tracking/impl/MongoGPSFixStoreImpl.java | 4 ++-- .../racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java | 2 +- .../domain/abstractlog/race/tracking/DeviceMapping.java | 2 +- .../abstractlog/race/tracking/DeviceWithTimeRange.java | 2 +- .../race/tracking/analyzing/impl/DeviceMappingFinder.java | 4 ++-- .../abstractlog/race/tracking/impl/DeviceMappingImpl.java | 4 ++-- .../com/sap/sailing/domain/common/test/TimeRangeTest.java | 4 ++-- .../sailing/domain/racelog/tracking/EmptyGPSFixStore.java | 2 +- .../com/sap/sailing/domain/racelog/tracking/GPSFixStore.java | 2 +- .../sailing/gwt/home/client/place/start/StartActivity.java | 4 ++-- .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java | 4 ++-- .../gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java | 2 +- .../src/com/sap/sailing/server/impl/MediaLibaryTest.java | 4 ++-- .../src/com/sap/sse}/common/TimeRange.java | 5 +---- .../src/com/sap/sse}/common/impl/TimeRangeImpl.java | 5 ++--- 17 files changed, 26 insertions(+), 30 deletions(-) rename java/{com.sap.sailing.domain.common/src/com/sap/sailing/domain => com.sap.sse.common/src/com/sap/sse}/common/TimeRange.java (91%) rename java/{com.sap.sailing.domain.common/src/com/sap/sailing/domain => com.sap.sse.common/src/com/sap/sse}/common/impl/TimeRangeImpl.java (96%) 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 ca26c350e33..d1ae1a6d523 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 @@ -103,7 +103,6 @@ import com.sap.sailing.domain.common.RegattaName; import com.sap.sailing.domain.common.RegattaNameAndRaceName; import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.configuration.DeviceConfigurationMatcherType; @@ -111,7 +110,6 @@ import com.sap.sailing.domain.common.impl.DegreeBearingImpl; import com.sap.sailing.domain.common.impl.DegreePosition; import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.RGBColor; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.common.impl.WindSourceWithAdditionalID; import com.sap.sailing.domain.common.racelog.Flags; @@ -157,8 +155,10 @@ import com.sap.sailing.server.gateway.deserialization.impl.DeviceConfigurationJs import com.sap.sailing.server.gateway.deserialization.impl.Helpers; import com.sap.sailing.server.gateway.deserialization.impl.RegattaConfigurationJsonDeserializer; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.common.impl.TimeRangeImpl; public class DomainObjectFactoryImpl implements DomainObjectFactory { private static final Logger logger = Logger.getLogger(DomainObjectFactoryImpl.class.getName()); 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 f2ba598d2cd..a0535491ef2 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 @@ -73,7 +73,6 @@ import com.sap.sailing.domain.common.PassingInstruction; import com.sap.sailing.domain.common.RaceIdentifier; import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; -import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; @@ -100,6 +99,7 @@ import com.sap.sailing.server.gateway.serialization.impl.CompetitorJsonSerialize import com.sap.sailing.server.gateway.serialization.impl.DeviceConfigurationJsonSerializer; import com.sap.sailing.server.gateway.serialization.impl.RegattaConfigurationJsonSerializer; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util; import com.sap.sse.common.WithID; import com.sap.sse.common.impl.MillisecondsTimePoint; diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java index 57bacf58f9a..c92fe7b5110 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/racelog/tracking/impl/MongoGPSFixStoreImpl.java @@ -21,8 +21,6 @@ import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceCom import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceMarkMappingFinder; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; -import com.sap.sailing.domain.common.TimeRange; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.common.racelog.tracking.TypeBasedServiceFinder; @@ -40,7 +38,9 @@ import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util; +import com.sap.sse.common.impl.TimeRangeImpl; /** * At the moment, the timerange covered by the fixes for a device, and the number of diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java index 6e7de825266..7e37084b5ae 100644 --- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java +++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java @@ -22,7 +22,6 @@ import com.sap.sailing.domain.base.impl.CourseImpl; import com.sap.sailing.domain.base.impl.RaceDefinitionImpl; import com.sap.sailing.domain.base.impl.RegattaImpl; import com.sap.sailing.domain.base.impl.WaypointImpl; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.racelog.impl.EmptyRaceLogStore; @@ -34,6 +33,7 @@ import com.sap.sailing.domain.tracking.impl.AbstractRaceChangeListener; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRaceImpl; import com.sap.sailing.domain.tracking.impl.DynamicTrackedRegattaImpl; import com.sap.sailing.domain.tracking.impl.EmptyWindStore; +import com.sap.sse.common.impl.TimeRangeImpl; public class TrackedRaceLoadsFixesTest extends AbstractGPSFixStoreTest { private final BoatClass boatClass = DomainFactory.INSTANCE.getOrCreateBoatClass("49er"); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMapping.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMapping.java index 76fe4547104..90d5e8d1f37 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMapping.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceMapping.java @@ -5,7 +5,7 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.DeviceMappingFinder; import com.sap.sailing.domain.base.Timed; -import com.sap.sailing.domain.common.TimeRange; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.WithID; /** diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java index 612501b8b4e..12250a1f948 100755 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java @@ -1,7 +1,7 @@ package com.sap.sailing.domain.abstractlog.race.tracking; import com.sap.sailing.domain.base.Timed; -import com.sap.sailing.domain.common.TimeRange; +import com.sap.sse.common.TimeRange; public interface DeviceWithTimeRange extends Timed { DeviceIdentifier getDevice(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMappingFinder.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMappingFinder.java index 1296105e346..1839824e087 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMappingFinder.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/analyzing/impl/DeviceMappingFinder.java @@ -16,10 +16,10 @@ import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; import com.sap.sailing.domain.abstractlog.race.tracking.impl.DeviceMappingImpl; -import com.sap.sailing.domain.common.TimeRange; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.WithID; +import com.sap.sse.common.impl.TimeRangeImpl; /** * Extracts the {@link DeviceMapping}s with the appropriate {@link TimeRange}s from the {@link RaceLog}. diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/DeviceMappingImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/DeviceMappingImpl.java index 838450a7753..0fdaf36564b 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/DeviceMappingImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/impl/DeviceMappingImpl.java @@ -7,10 +7,10 @@ import java.util.List; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMappingEvent; -import com.sap.sailing.domain.common.TimeRange; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.WithID; +import com.sap.sse.common.impl.TimeRangeImpl; public class DeviceMappingImpl implements DeviceMapping { private static final long serialVersionUID = -4602948402371623654L; diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/TimeRangeTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/TimeRangeTest.java index d1b6afb0602..225eeb82cd8 100644 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/TimeRangeTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/TimeRangeTest.java @@ -8,10 +8,10 @@ import junit.framework.Assert; import org.junit.Test; -import com.sap.sailing.domain.common.TimeRange; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.common.impl.TimeRangeImpl; public class TimeRangeTest { protected TimeRange create(long from, long to) { diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java index fb4fb3ebc6f..a708c4e8508 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java @@ -5,10 +5,10 @@ import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; -import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; +import com.sap.sse.common.TimeRange; public enum EmptyGPSFixStore implements GPSFixStore { INSTANCE; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java index cae62dd832d..fbfaff0f926 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/GPSFixStore.java @@ -7,12 +7,12 @@ import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMapping; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceMarkMappingEvent; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Mark; -import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.common.racelog.tracking.NoCorrespondingServiceRegisteredException; import com.sap.sailing.domain.common.racelog.tracking.TransformationException; import com.sap.sailing.domain.tracking.DynamicGPSFixTrack; import com.sap.sailing.domain.tracking.GPSFix; import com.sap.sailing.domain.tracking.GPSFixMoving; +import com.sap.sse.common.TimeRange; public interface GPSFixStore { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/start/StartActivity.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/start/StartActivity.java index d3848971235..8077f9cbd19 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/start/StartActivity.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/start/StartActivity.java @@ -10,15 +10,15 @@ import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.AcceptsOneWidget; -import com.sap.sailing.domain.common.TimeRange; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sailing.gwt.home.client.shared.placeholder.Placeholder; import com.sap.sailing.gwt.home.client.shared.stage.StageEventType; import com.sap.sailing.gwt.ui.shared.EventBaseDTO; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.common.impl.TimeRangeImpl; public class StartActivity extends AbstractActivity { private final StartClientFactory clientFactory; 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 f06e4ff42e6..648dd2528c3 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -159,7 +159,6 @@ import com.sap.sailing.domain.common.ScoringSchemeType; import com.sap.sailing.domain.common.Speed; import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; -import com.sap.sailing.domain.common.TimeRange; import com.sap.sailing.domain.common.WindSource; import com.sap.sailing.domain.common.WindSourceType; import com.sap.sailing.domain.common.abstractlog.NotRevokableException; @@ -188,7 +187,6 @@ import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl; import com.sap.sailing.domain.common.impl.MeterDistance; import com.sap.sailing.domain.common.impl.PolarSheetGenerationResponseImpl; import com.sap.sailing.domain.common.impl.PolarSheetsXYDiagramDataImpl; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sailing.domain.common.impl.WindSourceImpl; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.domain.common.racelog.FlagPole; @@ -405,11 +403,13 @@ import com.sap.sailing.xrr.structureimport.buildstructure.SetRacenumberFromSerie import com.sap.sse.BuildVersion; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util; import com.sap.sse.common.Util.Pair; import com.sap.sse.common.Util.Triple; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.common.impl.TimeRangeImpl; import com.sap.sse.common.search.KeywordQuery; import com.sap.sse.common.search.Result; import com.sap.sse.replication.OperationWithResult; diff --git a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java index eec9a326bbb..ac761383eb0 100755 --- a/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java +++ b/java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java @@ -2,8 +2,8 @@ package com.sap.sailing.server.gateway.trackfiles.impl; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceIdentifier; import com.sap.sailing.domain.abstractlog.race.tracking.DeviceWithTimeRange; -import com.sap.sailing.domain.common.TimeRange; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; public class DeviceWithTimeRangeImpl implements DeviceWithTimeRange { private static final long serialVersionUID = -4676108888517968890L; diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java index 8277675d4bc..aa0d05603dd 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaLibaryTest.java @@ -11,14 +11,14 @@ import org.junit.Test; import com.sap.sailing.domain.common.RegattaAndRaceIdentifier; import com.sap.sailing.domain.common.RegattaNameAndRaceName; -import com.sap.sailing.domain.common.TimeRange; -import com.sap.sailing.domain.common.impl.TimeRangeImpl; import com.sap.sailing.domain.common.media.MediaTrack; import com.sap.sailing.domain.common.media.MediaTrack.MimeType; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.impl.MillisecondsDurationImpl; import com.sap.sse.common.impl.MillisecondsTimePoint; +import com.sap.sse.common.impl.TimeRangeImpl; import static org.junit.Assert.*; import static org.hamcrest.Matchers.*; diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TimeRange.java b/java/com.sap.sse.common/src/com/sap/sse/common/TimeRange.java similarity index 91% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TimeRange.java rename to java/com.sap.sse.common/src/com/sap/sse/common/TimeRange.java index d79a0905a9e..0d5ba3438d3 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/TimeRange.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/TimeRange.java @@ -1,10 +1,7 @@ -package com.sap.sailing.domain.common; +package com.sap.sse.common; import java.io.Serializable; -import com.sap.sse.common.Duration; -import com.sap.sse.common.TimePoint; - public interface TimeRange extends Comparable, Serializable { /** * @return {@code null}, if the timepoint is at the beginning of time diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/TimeRangeImpl.java b/java/com.sap.sse.common/src/com/sap/sse/common/impl/TimeRangeImpl.java similarity index 96% rename from java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/TimeRangeImpl.java rename to java/com.sap.sse.common/src/com/sap/sse/common/impl/TimeRangeImpl.java index a091604b75f..09e050f48cf 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/TimeRangeImpl.java +++ b/java/com.sap.sse.common/src/com/sap/sse/common/impl/TimeRangeImpl.java @@ -1,10 +1,9 @@ -package com.sap.sailing.domain.common.impl; +package com.sap.sse.common.impl; -import com.sap.sailing.domain.common.TimeRange; import com.sap.sse.common.Duration; import com.sap.sse.common.TimePoint; +import com.sap.sse.common.TimeRange; import com.sap.sse.common.Util; -import com.sap.sse.common.impl.MillisecondsTimePoint; public class TimeRangeImpl extends Util.Pair implements TimeRange { public static final TimePoint BeginningOfTime = new MillisecondsTimePoint(Long.MIN_VALUE);