Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs (.../DAMNewProjectData.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/DAMNewProjectData.cs (.../DAMNewProjectData.cs) (revision 4111) @@ -45,10 +45,7 @@ [XmlIgnore] public DamProjectType DamProjectType { - get - { - return damProjectType; - } + get => damProjectType; set { DataEventPublisher.BeforeChange(this, "DamProjectType"); @@ -199,7 +196,7 @@ { if ((property == "SensorConfigurationFileName") || (property == "SelectSensorConfigurationFile")) { - return (DamProjectType == DamProjectType.DamLiveConfiguration); + return DamProjectType == DamProjectType.DamLiveConfiguration; } return true; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs =================================================================== diff -u -r4089 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs (.../DamLicense.cs) (revision 4089) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs (.../DamLicense.cs) (revision 4111) @@ -20,9 +20,7 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Globalization; -using System.Linq; using Deltares.Authorization; namespace Deltares.Dam.Data.License; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs (.../LocationPropertyImporter.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationPropertyImporter.cs (.../LocationPropertyImporter.cs) (revision 4111) @@ -177,7 +177,7 @@ if (!LocationShapeFileAttributeMap.IsAttributeIdSupported(attributeId)) { - string message = $"The attribute id '{attributeId}' is not supported by this importer."; + var message = $"The attribute id '{attributeId}' is not supported by this importer."; ImproperAttributeMessages.Add(message); } else Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Gauge.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Gauge.cs (.../Gauge.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Gauge.cs (.../Gauge.cs) (revision 4111) @@ -19,8 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; - namespace Deltares.Dam.Data; public class Gauge Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamHelperFunctions.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamHelperFunctions.cs (.../DamHelperFunctions.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamHelperFunctions.cs (.../DamHelperFunctions.cs) (revision 4111) @@ -72,7 +72,7 @@ /// internal static string GetProjectFileName(string dikeName, Location location, int? jobCount, MStabModelType? model, string stabilityWorkingPath, DateTime? dateTime) { - string calculationName = $"Dik({dikeName})_Loc({location.Name})"; + var calculationName = $"Dik({dikeName})_Loc({location.Name})"; if (jobCount != null) { calculationName = calculationName + $"_Stp({jobCount})"; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/ShapeFileReader.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/ShapeFileReader.cs (.../ShapeFileReader.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Maps/ShapeFileReader.cs (.../ShapeFileReader.cs) (revision 4111) @@ -79,8 +79,8 @@ if (reader.RecordCount != count) { - string message = $"The shape file '{File.FullPath}' contains multiple records but only one (composite) shape. " + - "This is not yet supported. The current implementation of the shape file reader only works " + + string message = $"The shape file '{File.FullPath}' contains multiple records but only one (composite) shape. " + + "This is not yet supported. The current implementation of the shape file reader only works " + "with shape files where each shape has exactly one database record."; throw new NotSupportedException(message); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 4111) @@ -181,7 +181,7 @@ switch (property) { - case "SelectedAnalysisType": return Location.DamProjectType == DamProjectType.Design; + case "SelectedAnalysisType": return Location.DamProjectType == DamProjectType.Design || Location.DamProjectType == DamProjectType.DamLiveConfiguration; case "CurrentSpecification": { bool bol = (DamCalculationSpecifications.Count > 0) && Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 4111) @@ -160,10 +160,7 @@ [Description("Indicates the purpose of the calculations")] public virtual DamProjectType DamProjectType { - get - { - return damProjectType; - } + get => damProjectType; set { DataEventPublisher.BeforeChange(this, "DamProjectType"); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs =================================================================== diff -u -r4099 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 4099) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/UISupport/ConfigurationManager.cs (.../ConfigurationManager.cs) (revision 4111) @@ -144,17 +144,15 @@ private void InitDefaultStatus() { configurationStatus = new ConfigurationStatus[GetLength(), - GetLength(), - maxModelCount]; + GetLength(), maxModelCount]; foreach (DamProjectType damProjectType in Enum.GetValues(typeof(DamProjectType))) { foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType))) { for (var i = 0; i < maxModelCount; i++) { - this[damProjectType, failureMechanismSystemType, i] = - ConfigurationStatus.NotImplemented; + this[damProjectType, failureMechanismSystemType, i] = ConfigurationStatus.NotImplemented; } } } @@ -176,7 +174,7 @@ this[DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer] = ConfigurationStatus.Available; this[DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Sellmeijer4Forces] = ConfigurationStatus.Available; this[DamProjectType.Calamity, FailureMechanismSystemType.Piping, (int) PipingModelType.Bligh] = ConfigurationStatus.Available; - + this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.Bishop] = ConfigurationStatus.Available; this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.StabilityInside, (int) MStabModelType.UpliftVan] = ConfigurationStatus.Available; this[DamProjectType.DamLiveConfiguration, FailureMechanismSystemType.Piping, (int) PipingModelType.Wti2017] = ConfigurationStatus.Available; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/CombineImportedData.cs (.../CombineImportedData.cs) (revision 4111) @@ -502,7 +502,7 @@ catch (Exception e) { //var error = new StringBuilder(); - string error = $"Error postprocessing soilprofile '{soilProfile1.Name}': {e.Message}"; + var error = $"Error postprocessing soilprofile '{soilProfile1.Name}': {e.Message}"; var logmessage = new LogMessage(LogMessageType.Error, null, error); ErrorMessages.Add(logmessage); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs (.../SensorImportFromExcelSheet.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Sensors/SensorImportFromExcelSheet.cs (.../SensorImportFromExcelSheet.cs) (revision 4111) @@ -66,7 +66,7 @@ DataSet ds = null; string fileName = sourceFile; - string connectionString = $"Provider=Microsoft.Jet.OLEDB.4.0; data source={fileName}; Extended Properties=Excel 8.0;"; + var connectionString = $"Provider=Microsoft.Jet.OLEDB.4.0; data source={fileName}; Extended Properties=Excel 8.0;"; using (var conn = new OleDbConnection(connectionString)) { ds = FillDataSet(conn, ds, sheets); @@ -243,7 +243,7 @@ { if (!string.IsNullOrWhiteSpace(currentSensorId)) { - string message = $"Error finding sensor. The sensor with ID '{currentSensorId}' was not found in the Excel worksheet '{SensorSheetName}'"; + var message = $"Error finding sensor. The sensor with ID '{currentSensorId}' was not found in the Excel worksheet '{SensorSheetName}'"; throw new InvalidOperationException(message, ioe); } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/GaugePLLine.cs =================================================================== diff -u -r4070 -r4111 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/GaugePLLine.cs (.../GaugePLLine.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/GaugePLLine.cs (.../GaugePLLine.cs) (revision 4111) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Deltares.Geometry; namespace Deltares.Dam.Data; @@ -61,7 +60,7 @@ public override string ToString() { - string result = $"{PLLineType.ToString()} | "; + var result = $"{PLLineType.ToString()} | "; foreach (GaugePLLinePoint point in Points) { result += point + ", ";