Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r5803 -r6019
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 5803)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 6019)
@@ -800,36 +800,6 @@
     }
 
     /// <summary>
-    /// Import data from Iris shapefiles
-    /// </summary>
-    /// <param name="importFolder">path where the data can be found</param>
-    private void ImportIrisFiles(string importFolder)
-    {
-        DataSourceManager.CurrentSource = DataSourceSystemType.Iris;
-
-        // get locations (locationid and beginpoint and endpoint in RD) from "locations.shp" (LocationsNew)
-        // get line of buitenkruinlijn
-        // voeg aan elke locatie snijpunt met buitenkruinlijn toe (geen snijpunt is exception)
-        // nu heeft locatie een begin-, eind- en buitenrkuinpunt
-        // get line of binnenkruinlijn
-        // voeg aan elke locatie snijpunt met binnenkruinlijn toe (geen snijpunt is exception)
-        // nu heeft locatie een begin-, eind-, binnen- en buitenrkuinpunt
-
-        // er is al een lijst met locaties in Waterboard WaterBoard.Dike[0].Locations (LocationsOrg)
-        // LocationOrg.GeometryPoint[DikeTopAtRiver] = LocationNew.buitenkuinpunt
-        // LocationOrg.GeometryPoint[DikeTopAtPolder] = LocationNew.binnnenkuinpunt
-        //  Als LocationNew.id niet gevonden kan worden in LocationsOrg dan exception
-
-        // Get all locations from waterboard            
-        IEnumerable<Location> locations = GetAllLocations();
-
-        var importer = new LocationCharacteristicPointImporter(importFolder, locations);
-        importer.Import();
-
-        DataSourceManager.CurrentSource = DataSourceSystemType.User;
-    }
-
-    /// <summary>
     /// Get background shapefile for this waterboard
     /// </summary>
     /// <param name="importFolder">path where the data can be found</param>
@@ -1031,7 +1001,6 @@
                 ImportShapeFile(dataLocation, ref locationRecords);
                 csvImporter.LocationRecords = locationRecords;
                 break;
-            case DataSourceType.Iris:
             case DataSourceType.BackgroundShapeFiles:
             default:
                 throw new ArgumentOutOfRangeException();
@@ -1056,9 +1025,6 @@
                 // New importer
                 ImportCsvFiles(dataLocation, importMode, progress, ref csvImporter);
                 break;
-            case DataSourceType.Iris:
-                ImportIrisFiles(dataLocation);
-                break;
             case DataSourceType.DataShapeFiles:
                 List<CsvImporterLocations.LocationRecord> locationRecords = csvImporter.LocationRecords;
                 ImportDataShapeFiles(dataLocation, attributes, importMode, progress, ref locationRecords);
@@ -1137,25 +1103,11 @@
 
         foreach (DataSource dataSource in DataSources)
         {
-            // Skip Iris because it needs the locations
-            // Data from shapefiles is added to locationrecords from csvImporter
-            if (dataSource.DataSourceType != DataSourceType.Iris)
-            {
-                ImportData2(dataSource, importMode, progress, ref csvImporter);
-            }
+            ImportData2(dataSource, importMode, progress, ref csvImporter);
         }
 
         // create and fill the locations, scenarios etc. with the data from csv and shapefiles
         AddCsvDataToDikes(csvImporter);
-        // Now that the locations are defined, read Iris data
-        foreach (DataSource dataSource in DataSources)
-        {
-            if (dataSource.DataSourceType == DataSourceType.Iris)
-            {
-                ImportData2(dataSource, importMode, progress, ref csvImporter);
-            }
-        }
-
         AddScenarioDataToDikes(csvImporter);
         if (importMode == ImportMode.All)
         {
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs
===================================================================
diff -u -r5954 -r6019
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 5954)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DAMEnumerations.cs	(.../DAMEnumerations.cs)	(revision 6019)
@@ -218,7 +218,6 @@
 public enum DataSourceType
 {
     CsvFiles,
-    Iris,
     DataShapeFiles,
     BackgroundShapeFiles
 }
Fisheye: Tag 6019 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterIrisTests.cs'.
Fisheye: No comparison available.  Pass `N' to diff?