Index: DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs =================================================================== diff -u -r6823 -r6857 --- DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs (.../DamNewProjectDialog.cs) (revision 6823) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamNewProjectDialog.cs (.../DamNewProjectDialog.cs) (revision 6857) @@ -71,9 +71,6 @@ // Sensor configuration file BindSupport.BindTextAndValue(this, SensorConfigurationFilenameLabel, SensorConfigurationFilenameTextEdit, typeof(DAMNewProjectData), "SensorConfigurationFileName"); - // Select dikerings - SelectDikeRingsLabel.Text = LocalizationManager.GetTranslatedText(this, "SelectDikerings"); - // projection button & name: BindSupport.Bind(this, ProjectionButton, typeof(DAMNewProjectData), "SelectProjection"); BindSupport.Bind(this, projectionMemoEdit, typeof(DAMNewProjectData), "DataSourceProjectionName"); @@ -213,28 +210,7 @@ if (!IsValidDestinationProjectFileName(damNewProjectData.DamProjectFileName)) { DialogResult = DialogResult.None; - return; } - - // Check if at least 1 dikering is selected - var selectedDikeRings = new List(); - for (var i = 0; i < DikeRingsCheckedListBox.Items.Count; i++) - { - // Add selected items to list - if (DikeRingsCheckedListBox.GetItemChecked(i)) - { - selectedDikeRings.Add(DikeRingsCheckedListBox.GetItemText(i)); - } - } - - if (selectedDikeRings.Count < 1) - { - LocalizedMessageBox.Show(this, "SelectAtLeastOneDikering"); - DialogResult = DialogResult.None; - return; - } - - damNewProjectData.SelectedDikeRingIds = selectedDikeRings; } /// @@ -327,7 +303,6 @@ if (!currentSourceFileName.Equals(sourceFileName)) { DataSourceContainer dataSourceContainer = DataSourceContainer.Deserialize(sourceFileName); - UpdateDikeRingCheckedListbox(sourceFileName, dataSourceContainer); UpdateSensorConfigurationFilename(sourceFileName, dataSourceContainer); } } @@ -362,50 +337,6 @@ } /// - /// Updates the dike ring checked listbox. - /// - /// Name of the source file. - /// The data source container. - private void UpdateDikeRingCheckedListbox(string sourceFileName, DataSourceContainer dataSourceContainer) - { - string damProjectFolder = Path.GetDirectoryName(sourceFileName); - List importLogMessages = null; - string dikeRingId = null; - DataEventPublisher.InvokeWithoutPublishingEvents(() => - { - dikeRingId = WaterBoardImporter.ImportDikeRingIds( - damProjectFolder, dataSourceContainer, - DamNewProjectData.DamProjectType, out importLogMessages); - }); - var dikeRingIds = new List(); - if (dikeRingId != null) - { - dikeRingIds.Add(dikeRingId); - } - - DikeRingsCheckedListBox.Items.Clear(); - if (dikeRingIds.Count > 0) - { - DikeRingsCheckedListBox.Items.AddRange(dikeRingIds.ToArray()); - DikeRingsCheckedListBox.Items[0].CheckState = CheckState.Checked; - } - else - { - string paragraphSepatator = Environment.NewLine + Environment.NewLine; - string openingMessage = LocalizationManager.GetTranslatedText(this, "NoDikeRingsFound"); - var output = new StringBuilder(); - foreach (LogMessage logMessage in importLogMessages) - { - output.Append(logMessage.Message + Environment.NewLine); - } - - LocalizedMessageBox.ShowTranslatedText(null, openingMessage + paragraphSepatator + output); - } - - currentSourceFileName = sourceFileName; - } - - /// /// Browse for destination filename /// ///