MeterFwUpdate:
- renamed SetLoadedFiles to ValidateLoadedFiles, - corrected return (was always true)
This commit is contained in:
@@ -1223,7 +1223,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
|
||||
}
|
||||
}
|
||||
|
||||
return SetLoadedFiles();
|
||||
return ValidateLoadedFiles();
|
||||
}
|
||||
|
||||
|
||||
@@ -1246,7 +1246,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
|
||||
{
|
||||
FileApps.Clear();
|
||||
FileApps.AddRange(sourceFileApps);
|
||||
return SetLoadedFiles();
|
||||
return ValidateLoadedFiles();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1276,16 +1276,26 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
|
||||
FileApps.Add(fileApplication);
|
||||
}
|
||||
|
||||
return SetLoadedFiles();
|
||||
return ValidateLoadedFiles();
|
||||
}
|
||||
|
||||
|
||||
private Boolean SetLoadedFiles()
|
||||
/// <summary>
|
||||
/// Common validation of loaded file apps.
|
||||
/// </summary>
|
||||
/// <returns>true if all applications are valid</returns>
|
||||
/// <remarks date="2022-Apr-07" author="Roland Drabesch">
|
||||
/// - Initial
|
||||
/// </remarks>
|
||||
/// <remarks date="2022-Apr-22" author="Thomas Wiedebusch">
|
||||
/// - Corrected return value (was constantly true).
|
||||
/// </remarks>
|
||||
private Boolean ValidateLoadedFiles()
|
||||
{
|
||||
var returnValue = true;
|
||||
|
||||
foreach (var fileApplication in FileApps)
|
||||
{
|
||||
|
||||
fileApplication.IsValid = CheckFileApp(fileApplication);
|
||||
if (!fileApplication.IsValid)
|
||||
{
|
||||
@@ -1296,7 +1306,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
|
||||
_remainingFileAppsParts.Clear();
|
||||
_succeededFileAppsParts.Clear();
|
||||
_failedFileAppsParts.Clear();
|
||||
return true;
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Reference in New Issue
Block a user