Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs (.../ForeshoreProfileReplaceDataStrategy.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/FileImporters/ForeshoreProfileReplaceDataStrategy.cs (.../ForeshoreProfileReplaceDataStrategy.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -28,7 +28,7 @@ using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.IO.FileImporters; -using Ringtoets.Integration.Service; +using Riskeer.Integration.Service; namespace Riskeer.Integration.Plugin.FileImporters { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/AssessmentSectionCompositionChangeHandler.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/AssessmentSectionCompositionChangeHandler.cs (.../AssessmentSectionCompositionChangeHandler.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/AssessmentSectionCompositionChangeHandler.cs (.../AssessmentSectionCompositionChangeHandler.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -31,11 +31,11 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.DuneErosion.Data; -using Ringtoets.Integration.Service; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; using Riskeer.Integration.Forms.PropertyClasses; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.Service; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Riskeer.Integration.Plugin.Handlers Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/FailureMechanismContributionNormChangeHandler.cs (.../FailureMechanismContributionNormChangeHandler.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -29,8 +29,8 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Contribution; using Ringtoets.Common.Forms.PropertyClasses; -using Ringtoets.Integration.Service; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.Service; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Riskeer.Integration.Plugin.Handlers Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs (.../HydraulicBoundaryDatabaseUpdateHandler.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -26,15 +26,13 @@ using Core.Common.Base; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.DuneErosion.Plugin.Handlers; -using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabase; -using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase; -using Ringtoets.Integration.Service; using Riskeer.HydraRing.IO.HydraulicBoundaryDatabase; using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase; using Riskeer.Integration.Data; using Riskeer.Integration.IO.Handlers; using Riskeer.Integration.Plugin.Helpers; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.Service; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Riskeer.Integration.Plugin.Handlers Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -24,13 +24,12 @@ using System.Windows.Forms; using Core.Common.Base; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase; -using Ringtoets.Integration.Service; using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase; using Riskeer.Integration.Data; using Riskeer.Integration.IO.Handlers; using Riskeer.Integration.Plugin.Helpers; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.Service; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Riskeer.Integration.Plugin.Handlers Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/ReferenceLineUpdateHandler.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/ReferenceLineUpdateHandler.cs (.../ReferenceLineUpdateHandler.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Handlers/ReferenceLineUpdateHandler.cs (.../ReferenceLineUpdateHandler.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -27,8 +27,8 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.IO.ReferenceLines; using Ringtoets.Common.Service; -using Ringtoets.Integration.Service; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.Service; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Riskeer.Integration.Plugin.Handlers Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionMerger.cs (.../AssessmentSectionMerger.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -23,11 +23,11 @@ using System.Collections.Generic; using System.Linq; using log4net; -using Ringtoets.Integration.Service.Comparers; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; using Riskeer.Integration.Forms.Merge; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.Service.Comparers; using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; namespace Riskeer.Integration.Plugin.Merge Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionProvider.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionProvider.cs (.../AssessmentSectionProvider.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Merge/AssessmentSectionProvider.cs (.../AssessmentSectionProvider.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -23,9 +23,9 @@ using System.Collections.Generic; using System.Windows.Forms; using Core.Common.Gui.Forms.ProgressDialog; -using Ringtoets.Integration.Service.Merge; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; +using Riskeer.Integration.Service.Merge; using Riskeer.Storage.Core; namespace Riskeer.Integration.Plugin.Merge Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -73,8 +73,6 @@ using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Forms.PresentationObjects; -using Ringtoets.Integration.Service; -using Ringtoets.Integration.Service.Comparers; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; using Ringtoets.Piping.Data; @@ -106,6 +104,8 @@ using Riskeer.Integration.Plugin.Handlers; using Riskeer.Integration.Plugin.Merge; using Riskeer.Integration.Plugin.Properties; +using Riskeer.Integration.Service; +using Riskeer.Integration.Service.Comparers; using RingtoetsDataResources = Riskeer.Integration.Data.Properties.Resources; using RingtoetsFormsResources = Riskeer.Integration.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/AssessmentSectionCalculationActivityFactory.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/AssessmentSectionCalculationActivityFactory.cs (.../AssessmentSectionCalculationActivityFactory.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/AssessmentSectionCalculationActivityFactory.cs (.../AssessmentSectionCalculationActivityFactory.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -34,7 +34,7 @@ using Ringtoets.WaveImpactAsphaltCover.Service; using Riskeer.Integration.Data; -namespace Ringtoets.Integration.Service +namespace Riskeer.Integration.Service { /// /// This class defines factory methods that can be used to create instances of for Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactory.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -25,7 +25,7 @@ using Ringtoets.Common.Service; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; -namespace Ringtoets.Integration.Service +namespace Riskeer.Integration.Service { /// /// This class defines factory methods that can be used to create instances of for Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs (.../AssessmentSectionMergeComparer.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/AssessmentSectionMergeComparer.cs (.../AssessmentSectionMergeComparer.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -28,7 +28,7 @@ using Ringtoets.Common.Data.Hydraulics; using Riskeer.Integration.Data; -namespace Ringtoets.Integration.Service.Comparers +namespace Riskeer.Integration.Service.Comparers { /// /// Class which compares to Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/IAssessmentSectionMergeComparer.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/IAssessmentSectionMergeComparer.cs (.../IAssessmentSectionMergeComparer.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Comparers/IAssessmentSectionMergeComparer.cs (.../IAssessmentSectionMergeComparer.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -22,7 +22,7 @@ using System; using Riskeer.Integration.Data; -namespace Ringtoets.Integration.Service.Comparers +namespace Riskeer.Integration.Service.Comparers { /// /// Specifies the interface for defining classes that can be used to compare assessment sections Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Exceptions/LoadAssessmentSectionException.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Exceptions/LoadAssessmentSectionException.cs (.../LoadAssessmentSectionException.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Exceptions/LoadAssessmentSectionException.cs (.../LoadAssessmentSectionException.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -22,7 +22,7 @@ using System; using System.Runtime.Serialization; -namespace Ringtoets.Integration.Service.Exceptions +namespace Riskeer.Integration.Service.Exceptions { /// /// The exception that is thrown when something went wrong while loading assessment sections. Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/ILoadAssessmentSectionService.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/ILoadAssessmentSectionService.cs (.../ILoadAssessmentSectionService.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/ILoadAssessmentSectionService.cs (.../ILoadAssessmentSectionService.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -20,10 +20,10 @@ // All rights reserved. using System.Collections.Generic; -using Ringtoets.Integration.Service.Exceptions; using Riskeer.Integration.Data; +using Riskeer.Integration.Service.Exceptions; -namespace Ringtoets.Integration.Service.Merge +namespace Riskeer.Integration.Service.Merge { /// /// Interface for reading and providing instances. Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionService.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionService.cs (.../LoadAssessmentSectionService.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionService.cs (.../LoadAssessmentSectionService.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -23,10 +23,10 @@ using System.Collections.Generic; using Core.Common.Base.Storage; using log4net; -using Ringtoets.Integration.Service.Exceptions; using Riskeer.Integration.Data; +using Riskeer.Integration.Service.Exceptions; -namespace Ringtoets.Integration.Service.Merge +namespace Riskeer.Integration.Service.Merge { /// /// Service to load a from a file. Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionsActivity.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionsActivity.cs (.../LoadAssessmentSectionsActivity.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionsActivity.cs (.../LoadAssessmentSectionsActivity.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -21,11 +21,11 @@ using System; using Core.Common.Base.Service; -using Ringtoets.Integration.Service.Properties; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; +using Riskeer.Integration.Service.Properties; -namespace Ringtoets.Integration.Service.Merge +namespace Riskeer.Integration.Service.Merge { /// /// Activity to load a collection of from a file. Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionsActivityFactory.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionsActivityFactory.cs (.../LoadAssessmentSectionsActivityFactory.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Merge/LoadAssessmentSectionsActivityFactory.cs (.../LoadAssessmentSectionsActivityFactory.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -24,7 +24,7 @@ using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; -namespace Ringtoets.Integration.Service.Merge +namespace Riskeer.Integration.Service.Merge { /// /// This class defines factory methods that can be used to create instance of Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs =================================================================== diff -u -r8b56fa4d0c134f2c09485714b586dca1cf1e54e2 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 8b56fa4d0c134f2c09485714b586dca1cf1e54e2) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/RingtoetsDataSynchronizationService.cs (.../RingtoetsDataSynchronizationService.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base; -using Core.Common.Base.Geometry; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.Service; using Ringtoets.Common.Data.AssessmentSection; @@ -53,7 +52,7 @@ using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.WaveImpactAsphaltCover.Service; -namespace Ringtoets.Integration.Service +namespace Riskeer.Integration.Service { /// /// Service for synchronizing ringtoets. Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs =================================================================== diff -u -r1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 1cc4182b92d9c55afdf6a6805ea9b9a96b6fdb76) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Merge/AssessmentSectionMergerTest.cs (.../AssessmentSectionMergerTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -26,11 +26,11 @@ using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.AssessmentSection; -using Ringtoets.Integration.Service.Comparers; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; using Riskeer.Integration.Forms.Merge; using Riskeer.Integration.Plugin.Merge; +using Riskeer.Integration.Service.Comparers; namespace Ringtoets.Integration.Plugin.Test.Merge { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -60,6 +60,7 @@ using Riskeer.HydraRing.Calculation.Data.Input.Structures; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; using Riskeer.Integration.Data; +using Riskeer.Integration.Service; namespace Ringtoets.Integration.Service.Test { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs =================================================================== diff -u -rf67e3fac765fa077b104a5988f5c51b193881e98 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision f67e3fac765fa077b104a5988f5c51b193881e98) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs (.../AssessmentSectionHydraulicBoundaryLocationCalculationActivityFactoryTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -36,6 +36,7 @@ using Riskeer.HydraRing.Calculation.Data.Input; using Riskeer.HydraRing.Calculation.Data.Input.Hydraulics; using Riskeer.HydraRing.Calculation.TestUtil.Calculator; +using Riskeer.Integration.Service; namespace Ringtoets.Integration.Service.Test { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Comparers/AssessmentSectionMergeComparerTest.cs (.../AssessmentSectionMergeComparerTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -27,8 +27,8 @@ using NUnit.Framework; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Contribution; -using Ringtoets.Integration.Service.Comparers; using Riskeer.Integration.Data; +using Riskeer.Integration.Service.Comparers; namespace Ringtoets.Integration.Service.Test.Comparers { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Exceptions/LoadAssessmentSectionExceptionTest.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Exceptions/LoadAssessmentSectionExceptionTest.cs (.../LoadAssessmentSectionExceptionTest.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Exceptions/LoadAssessmentSectionExceptionTest.cs (.../LoadAssessmentSectionExceptionTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -22,7 +22,7 @@ using System; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Integration.Service.Exceptions; +using Riskeer.Integration.Service.Exceptions; namespace Ringtoets.Integration.Service.Test.Exceptions { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs (.../LoadAssessmentSectionServiceTest.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionServiceTest.cs (.../LoadAssessmentSectionServiceTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -25,9 +25,9 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Integration.Service.Exceptions; -using Ringtoets.Integration.Service.Merge; using Riskeer.Integration.Data; +using Riskeer.Integration.Service.Exceptions; +using Riskeer.Integration.Service.Merge; namespace Ringtoets.Integration.Service.Test.Merge { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionsActivityFactoryTest.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionsActivityFactoryTest.cs (.../LoadAssessmentSectionsActivityFactoryTest.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionsActivityFactoryTest.cs (.../LoadAssessmentSectionsActivityFactoryTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -25,9 +25,9 @@ using Core.Common.Base.Service; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Integration.Service.Merge; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; +using Riskeer.Integration.Service.Merge; namespace Ringtoets.Integration.Service.Test.Merge { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionsActivityTest.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionsActivityTest.cs (.../LoadAssessmentSectionsActivityTest.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/Merge/LoadAssessmentSectionsActivityTest.cs (.../LoadAssessmentSectionsActivityTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -25,10 +25,10 @@ using Core.Common.Base.Service; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Integration.Service.Exceptions; -using Ringtoets.Integration.Service.Merge; using Riskeer.Integration.Data; using Riskeer.Integration.Data.Merge; +using Riskeer.Integration.Service.Exceptions; +using Riskeer.Integration.Service.Merge; namespace Ringtoets.Integration.Service.Test.Merge { Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -52,6 +52,7 @@ using Ringtoets.WaveImpactAsphaltCover.Data; using Riskeer.Integration.Data; using Riskeer.Integration.Data.StandAlone; +using Riskeer.Integration.Service; namespace Ringtoets.Integration.Service.Test { Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs =================================================================== diff -u -r47237ae4fc638dcb485ec8100e22c63037a744e1 -r251015cc7402fe3ed830bb9264780f79e5e61c0e --- Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 47237ae4fc638dcb485ec8100e22c63037a744e1) +++ Ringtoets/Integration/test/Ringtoets.Integration.TestUtil/TestDataGenerator.cs (.../TestDataGenerator.cs) (revision 251015cc7402fe3ed830bb9264780f79e5e61c0e) @@ -38,14 +38,14 @@ using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.HeightStructures.Data; -using Ringtoets.Integration.Service; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Revetment.Data; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; using Riskeer.Integration.Data; +using Riskeer.Integration.Service; namespace Ringtoets.Integration.TestUtil {