Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs =================================================================== diff -u -r4205 -r4206 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 4205) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 4206) @@ -69,22 +69,15 @@ { DamProjectData = new DamProjectData() }; - var csvSource = new DataSource - { - DataSourceType = DataSourceType.CsvFiles, - DataLocation = "" - }; - var soilSource = new DataSource - { - DataSourceType = DataSourceType.MSoilBase, - DataLocation = "./soilmaterials.mdb" - }; var container = new DataSourceContainer { DataSourceList = { - csvSource, - soilSource + new DataSource + { + DataSourceType = DataSourceType.CsvFiles, + DataLocation = "" + } } }; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ImportDirector.cs =================================================================== diff -u -r4070 -r4206 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ImportDirector.cs (.../ImportDirector.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/ImportDirector.cs (.../ImportDirector.cs) (revision 4206) @@ -32,22 +32,15 @@ { DamProjectData = new DamProjectData() }; - var csvSource = new DataSource - { - DataSourceType = DataSourceType.CsvFiles, - DataLocation = "" - }; - var soilSource = new DataSource - { - DataSourceType = DataSourceType.MSoilBase, - DataLocation = "./soilmaterials.mdb" - }; var container = new DataSourceContainer { DataSourceList = { - csvSource, - soilSource + new DataSource + { + DataSourceType = DataSourceType.CsvFiles, + DataLocation = "" + } } }; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs =================================================================== diff -u -r4203 -r4206 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 4203) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 4206) @@ -684,36 +684,6 @@ } /// - /// Gets the or create dike. - /// - /// The dike ring identifier. - /// - private Dike GetOrCreateDike(string dikeRingId) - { - // first check to see if this dike is already known, if not create it - Dike dike = null; - - // try to get it - if (waterBoard.Dikes.Any()) - { - string id = dikeRingId; - dike = waterBoard.Dikes.FirstOrDefault(x => x.Name.Equals(id)); - } - - // not found, create it - if (dike == null) - { - dike = new Dike - { - Name = dikeRingId - }; - waterBoard.Dikes.Add(dike); - } - - return dike; - } - - /// /// Gets the segment. /// /// The segment identifier. @@ -829,32 +799,6 @@ } /// - /// Import name of the specified soilbase to all dikerings with id as specified in dikeRingIds. - /// Note that it does NOT import the soils in the database themselves. - /// If dikeringId not found then a new dike is created for that dikeRingId. - /// - /// path where the data can be found - /// - private void ImportMSoilBaseName(string importFolder, IEnumerable dikeRingIds) - { - if (dikeRingIds == null) - { - return; - } - - DataSourceManager.CurrentSource = DataSourceSystemType.MSoilBase; - - foreach (string dikeRingId in dikeRingIds) - { - Dike dike = GetOrCreateDike(dikeRingId); - - dike.SoilDatabaseName = importFolder; - } - - DataSourceManager.CurrentSource = DataSourceSystemType.User; - } - - /// /// Import data from Iris shapefiles /// /// path where the data can be found @@ -1082,8 +1026,6 @@ break; case DataSourceType.Iris: case DataSourceType.BackgroundShapeFiles: - case DataSourceType.MSoilBase: - break; default: throw new ArgumentOutOfRangeException(); } @@ -1124,9 +1066,6 @@ } break; - case DataSourceType.MSoilBase: - ImportMSoilBaseName(dataLocation, dikeRingIdList); - break; default: throw new ArgumentOutOfRangeException(); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs =================================================================== diff -u -r4199 -r4206 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4199) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs (.../DAMEnumerations.cs) (revision 4206) @@ -230,8 +230,7 @@ CsvFiles, Iris, DataShapeFiles, - BackgroundShapeFiles, - MSoilBase + BackgroundShapeFiles } public enum LayerType Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs =================================================================== diff -u -r4070 -r4206 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginDataSourceXmlSerializerTests.cs (.../DataPluginDataSourceXmlSerializerTests.cs) (revision 4206) @@ -42,11 +42,6 @@ var dataSourceContainerSrc = new DataSourceContainer(); dataSourceContainerSrc.DataSourceList.Add(new DataSource { - DataSourceType = DataSourceType.MSoilBase, - DataLocation = "Soilbase.mdb" - }); - dataSourceContainerSrc.DataSourceList.Add(new DataSource - { DataSourceType = DataSourceType.CsvFiles, DataLocation = @".\CSVFiles\" }); @@ -72,12 +67,11 @@ Assert.AreEqual(dataSourceContainerSrc.IsImportAsRelativeProfiles, dataSourceContainerDest.IsImportAsRelativeProfiles); Assert.AreEqual(dataSourceContainerSrc.SoilProfileCharacteristicPointReference, dataSourceContainerDest.SoilProfileCharacteristicPointReference); Assert.AreEqual(dataSourceContainerSrc.DataSourceList.Count, dataSourceContainerDest.DataSourceList.Count); - Assert.AreEqual(dataSourceContainerSrc.DataSourceList[1].DataSourceType, dataSourceContainerDest.DataSourceList[1].DataSourceType); - Assert.AreEqual(dataSourceContainerSrc.DataSourceList[1].DataLocation, dataSourceContainerDest.DataSourceList[1].DataLocation); + Assert.AreEqual(dataSourceContainerSrc.DataSourceList[0].DataSourceType, dataSourceContainerDest.DataSourceList[0].DataSourceType); + Assert.AreEqual(dataSourceContainerSrc.DataSourceList[0].DataLocation, dataSourceContainerDest.DataSourceList[0].DataLocation); Assert.IsNotNull(dataSourceContainerDest.DataAttributes); - Assert.IsTrue(dataSourceContainerDest.DataAttributes.Count() == 1); + Assert.IsTrue(dataSourceContainerDest.DataAttributes.Count == 1); Assert.AreEqual(dataSourceContainerSrc.DataAttributes.ElementAt(0).AttributeName, dataSourceContainerDest.DataAttributes.ElementAt(0).AttributeName); - //Assert.AreEqual(dataSourceContainerSrc.DataAttributes.ElementAt(0).DataSource, dataSourceContainerDest.DataAttributes.ElementAt(0).DataSource); } [Test]