Fisheye: Tag 1616 refers to a dead (removed) revision in file `DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Group.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs =================================================================== diff -u -r1614 -r1616 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs (.../SensorRepository.cs) (revision 1614) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorRepository.cs (.../SensorRepository.cs) (revision 1616) @@ -46,42 +46,42 @@ sensorLocation = location.SensorLocation; - if (sensorLocation.Group == null) - sensorLocation.Group = new Group(); + if (sensorLocation.SensorGroup == null) + sensorLocation.SensorGroup = new SensorGroup(); } - internal Group Group + internal SensorGroup SensorGroup { - get { return sensorLocation.Group; } + get { return sensorLocation.SensorGroup; } } public IEnumerable Sensors { - get { return Group.Selection; } + get { return SensorGroup.Selection; } } internal int GetUniqueSensorId() { - return Group.Selection.GetUniqueID(x => x.ID); + return SensorGroup.Selection.GetUniqueID(x => x.ID); } /// - /// Adds a new sensor to the location sensor group. + /// Adds a new sensor to the location sensor sensorGroup. /// /// The created Sensor public Sensor AddNew() { var factory = new SensorFactory(); - Sensor sensor = factory.CreateUniqueSensor(Group.Selection); + Sensor sensor = factory.CreateUniqueSensor(SensorGroup.Selection); AddSensor(sensor); return sensor; } /// - /// Adds the collection of sensors to the group. + /// Adds the collection of sensors to the sensorGroup. /// /// The sensor needs to meet the business rules before it can be added - /// The sensor collection to add to the group of this location. + /// The sensor collection to add to the sensorGroup of this location. /// /// public void Add(IEnumerable sensors) @@ -126,7 +126,7 @@ { ids.Add(sensor.ID); names.Add(sensor.Name); - sensorLocation.Group.Add(sensor); + sensorLocation.SensorGroup.Add(sensor); } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorData.cs =================================================================== diff -u -r877 -r1616 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorData.cs (.../SensorData.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorData.cs (.../SensorData.cs) (revision 1616) @@ -32,7 +32,7 @@ public class SensorData { private List sensors = new List(); - private List sensorGroups = new List(); + private List sensorGroups = new List(); private List sensorLocations = new List(); /// @@ -64,7 +64,7 @@ /// /// The sensor groups. /// - public List SensorGroups + public List SensorGroups { get { return sensorGroups; } set { sensorGroups = value; } @@ -86,7 +86,7 @@ return sensors.FirstOrDefault(sensor => sensor.ID == id); } - public Group GetGroupById(int id) + public SensorGroup GetGroupById(int id) { return sensorGroups.FirstOrDefault(sensorGroup => sensorGroup.ID == id); } @@ -101,9 +101,9 @@ /// /// The sensoLocation. /// - public IEnumerable GetGroups(SensorLocation sensorLocation) + public IEnumerable GetGroups(SensorLocation sensorLocation) { - var list = new List(); + var list = new List(); list.AddRange(sensorGroups); return list; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs =================================================================== diff -u -r1602 -r1616 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamProjectData.cs) (revision 1602) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectData.cs (.../DamProjectData.cs) (revision 1616) @@ -333,10 +333,10 @@ sensorData.Sensors.Add(sensor); } } - if (sensorData.GetGroupById(sensorLocation.Group.ID) == null && sensorLocation.Group.ID >= 0) + if (sensorData.GetGroupById(sensorLocation.SensorGroup.ID) == null && sensorLocation.SensorGroup.ID >= 0) { - sensorLocation.Group.PickSensors = sensorData.Sensors; - sensorData.SensorGroups.Add(sensorLocation.Group); + sensorLocation.SensorGroup.PickSensors = sensorData.Sensors; + sensorData.SensorGroups.Add(sensorLocation.SensorGroup); } if (sensorData.GetSensorLocationByLocationName(sensorLocation.LocationName) == null) { Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj =================================================================== diff -u -r1581 -r1616 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 1581) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Deltares.DamEngine.Data.csproj (.../Deltares.DamEngine.Data.csproj) (revision 1616) @@ -72,7 +72,7 @@ - + Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs =================================================================== diff -u -r1602 -r1616 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs (.../SensorFactory.cs) (revision 1602) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorFactory.cs (.../SensorFactory.cs) (revision 1616) @@ -34,7 +34,7 @@ /// internal SensorLocation CreateSensorLocation(Location location) { - return CreateSensorLocation(location, new Group()); + return CreateSensorLocation(location, new SensorGroup()); } internal Sensor CreateUniqueSensor(IEnumerable sensors) @@ -53,13 +53,13 @@ /// Creates a sensor location. /// /// The location. - /// The group to associate the location with + /// The sensorGroup to associate the location with /// Should return a valid instance - internal SensorLocation CreateSensorLocation(Location location, Group group) + internal SensorLocation CreateSensorLocation(Location location, SensorGroup sensorGroup) { return new SensorLocation { - Group = group, + SensorGroup = sensorGroup, Location = location, SourceTypePl1WaterLevelAtRiver = DataSourceTypeSensors.LocationData, SourceTypePl1PlLineOffsetBelowDikeToeAtPolder = DataSourceTypeSensors.LocationData, Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs =================================================================== diff -u -r1602 -r1616 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 1602) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/SensorLocation.cs (.../SensorLocation.cs) (revision 1616) @@ -74,7 +74,7 @@ SourceTypePl1WaterLevelAtPolder = DataSourceTypeSensors.LocationData; } - private Group sensorGroup; + private SensorGroup sensorGroup; /// /// Gets the PL line offset below dike top at river. @@ -130,13 +130,13 @@ } /// - /// Gets or sets the sensor group. + /// Gets or sets the sensor sensorGroup. /// /// - /// The group. + /// The sensorGroup. /// // [Specification(typeof(NotNullSpecification))] - public Group Group + public SensorGroup SensorGroup { get { return sensorGroup; } set @@ -151,11 +151,11 @@ } /// - /// Gets the group ID. + /// Gets the sensorGroup ID. /// /// /// If the ID has value -1 then the there is no valid reference (null) - /// or the group is transient. + /// or the sensorGroup is transient. /// public int GroupID { @@ -262,7 +262,7 @@ { get { - return sensorGroup == null ? 0 : Group.SensorCount; + return sensorGroup == null ? 0 : SensorGroup.SensorCount; } } @@ -463,6 +463,6 @@ /// /// The list of available Groups. /// - public static Func> GetGroups { get; set; } + public static Func> GetGroups { get; set; } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Group.cs =================================================================== diff -u -r877 -r1616 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Group.cs (.../Group.cs) (revision 877) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Sensors/Group.cs (.../SensorGroup.cs) (revision 1616) @@ -25,7 +25,7 @@ namespace Deltares.DamEngine.Data.General.Sensors { - public class Group + public class SensorGroup { /// /// Holds a reference to the set of selected sensors @@ -39,7 +39,7 @@ /// private readonly IDictionary relativeLocationAlongProfileDictionary; - public Group() + public SensorGroup() { sensors = new HashSet(); relativeLocationAlongProfileDictionary = new Dictionary(); @@ -190,7 +190,7 @@ } /// - /// Adds the specified sensor to the selected sensor list for this group. + /// Adds the specified sensor to the selected sensor list for this sensorGroup. /// /// The sensor to add. public void Add(Sensor sensor) @@ -202,7 +202,7 @@ } /// - /// Removes the specified sensor from the selected sensor list from this group. + /// Removes the specified sensor from the selected sensor list from this sensorGroup. /// /// The sensor to remove. public void Remove(Sensor sensor)