Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs
===================================================================
diff -u -r4070 -r4089
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs (.../DamLicense.cs) (revision 4070)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/License/DamLicense.cs (.../DamLicense.cs) (revision 4089)
@@ -44,9 +44,7 @@
public static DamLicenseType DamLicenseType { get; private set; } = DamLicenseType.None;
///
- /// Checkouts the license.
- /// Look up all features starting with the specified string
- /// See if any of them has the correct license version, according to the version we get from the Application version info
+ /// Checks out the license.
///
/// The feature.
/// The version.
@@ -57,26 +55,18 @@
throw new ArgumentNullException(nameof(feature));
}
- IEnumerable featureNames = GetAllFeaturesStartingWith(feature);
- if (featureNames == null)
- {
- checkedOutFeature = null;
- DamLicenseType = DamLicenseType.None;
- return;
- }
-
int majorVersion = GetMajorVersionFromVersionString(version);
var versionString = majorVersion.ToString(CultureInfo.InvariantCulture);
- DamLicenseType = DamLicenseType.None;
- foreach (string featureName in featureNames)
+ if (DAuthClient.CheckOut(feature, versionString))
{
- if (DAuthClient.CheckOut(featureName, versionString))
- {
- DamLicenseType = DamLicenseType.LFM;
- checkedOutFeature = featureName;
- break;
- }
+ DamLicenseType = DamLicenseType.LFM;
+ checkedOutFeature = feature;
}
+ else
+ {
+ DamLicenseType = DamLicenseType.None;
+ checkedOutFeature = null;
+ }
}
///
@@ -90,24 +80,6 @@
}
}
- ///
- /// Gets all features starting with the specified feature string
- ///
- /// the feature string to look up
- /// all the feature names that start with the specified feature string
- public static IEnumerable GetAllFeaturesStartingWith(string feature)
- {
- string[] features = null;
- DAuthClient.GetAvailableFeatures(ref features);
- if (features == null)
- {
- return null;
- }
-
- IEnumerable featureNames = features.Where(s => s.StartsWith(feature));
- return featureNames;
- }
-
private static DAuthClient DAuthClient
{
get
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Program.cs
===================================================================
diff -u -r4065 -r4089
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Program.cs (.../Program.cs) (revision 4065)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/Program.cs (.../Program.cs) (revision 4089)
@@ -143,7 +143,9 @@
commandLineArguments.TimeSeriesOutputFileName,
Path.GetDirectoryName(commandLineArguments.TimeSeriesOutputFileName));
- Logger.LogInfo("v19.1 - Deltares 2019");
+ var thisAssembly = new AssemblyInfoHelper(typeof(Program));
+ Logger.LogInfo(thisAssembly.Title + " " + thisAssembly.AssemblyVersion);
+ Logger.LogInfo(thisAssembly.Copyright);
Logger.LogInfo("Model runner started");
Console.WriteLine();
program.StartCalculations(
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CommandOptions.cs
===================================================================
diff -u -r4082 -r4089
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CommandOptions.cs (.../CommandOptions.cs) (revision 4082)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/CommandOptions.cs (.../CommandOptions.cs) (revision 4089)
@@ -60,7 +60,6 @@
HandleParsingErrorsInHelp(help);
- //help.AddPreOptionsLine("<>");
help.AddPreOptionsLine("Usage: damlive[.exe] -d DamXInputFile -i InputTimeSeriesFileName -o OutputTimeSeriesFileName [-p CalculationParametersFileName] [-f LocationFilter(comma separated)");
help.AddOptions(this);